diff --git a/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
index ebf29d87c8737d03ebd46741d8066c5b16e26ff5..97a60a0ed5dc7eace1210022797518376a256d21 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
@@ -76,6 +76,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
tvVersion.setOnLongClickListener { toggleDeveloperMode(); true }
tvPushNotifications.setOnClickListener { navigator.navigateToPushSettings() }
ivShareProfile.setOnClickListener { navigator.navigateToShareProfile(viewModel.getSharedCircleSpaceId()) }
+ tvIgnoredUsers.setOnClickListener { navigator.navigateToIgnoredUsers() }
}
setVersion()
}
diff --git a/app/src/main/res/drawable/ic_ignore.xml b/app/src/main/res/drawable/ic_ignore.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d32aad997c2cdd9aaa7ea4960e885da7550ab12
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ignore.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="@color/menu_icon_color"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M8.65,5.82C9.36,4.72 10.6,4 12,4c2.21,0 4,1.79 4,4c0,1.4 -0.72,2.64 -1.82,3.35L8.65,5.82zM20,17.17c-0.02,-1.1 -0.63,-2.11 -1.61,-2.62c-0.54,-0.28 -1.13,-0.54 -1.77,-0.76L20,17.17zM21.19,21.19L2.81,2.81L1.39,4.22l8.89,8.89c-1.81,0.23 -3.39,0.79 -4.67,1.45C4.61,15.07 4,16.1 4,17.22V20h13.17l2.61,2.61L21.19,21.19z" />
+</vector>
diff --git a/app/src/main/res/layout/bottom_sheet_post_menu.xml b/app/src/main/res/layout/bottom_sheet_post_menu.xml
index e5c1ca92e3920f4091b400fb90abe042995a495b..01ee909916622ab1f12178cf2a90228ced08487f 100644
--- a/app/src/main/res/layout/bottom_sheet_post_menu.xml
+++ b/app/src/main/res/layout/bottom_sheet_post_menu.xml
@@ -77,7 +77,7 @@
android:id="@+id/tvIgnore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:optionIcon="@drawable/ic_notifications_off"
+ app:optionIcon="@drawable/ic_ignore"
app:optionName="@string/ignore_sender" />
<org.futo.circles.core.view.SettingsMenuItemView
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 3c846598712b47d5aae1807e2a2d35e8b204360a..c276550b202d7fd66925948c1ad084f484a25d18 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -131,9 +131,7 @@
android:id="@+id/lMediaStorage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="gone"
- tools:visibility="visible">
+ android:orientation="vertical">
<TextView
style="@style/settingMenuHeader"
@@ -156,7 +154,6 @@
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:gravity="center"
- android:paddingBottom="4dp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/ivProfile"
app:layout_constraintEnd_toEndOf="@id/ivEditProfile"
@@ -164,50 +161,48 @@
app:layout_constraintTop_toBottomOf="@id/ivEditProfile"
tools:text="7 GB of 15 GB used" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/divider_height"
+ android:layout_marginTop="8dp"
+ android:background="@color/divider_color" />
+
</LinearLayout>
<TextView
style="@style/settingMenuHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/notifications" />
+ android:text="@string/general" />
<org.futo.circles.core.view.SettingsMenuItemView
android:id="@+id/tvPushNotifications"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:hasDivider="false"
app:optionIcon="@drawable/ic_notifications"
app:optionName="@string/push_notifications" />
- <TextView
- style="@style/settingMenuHeader"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/session" />
-
<org.futo.circles.core.view.SettingsMenuItemView
android:id="@+id/tvLoginSessions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-
app:optionIcon="@drawable/ic_phone"
app:optionName="@string/login_sessions" />
<org.futo.circles.core.view.SettingsMenuItemView
- android:id="@+id/tvSwitchUser"
+ android:id="@+id/tvIgnoredUsers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:optionIcon="@drawable/ic_switch_user"
- app:optionName="@string/switch_user" />
+ app:optionIcon="@drawable/ic_ignore"
+ app:optionName="@string/ignored_users" />
<org.futo.circles.core.view.SettingsMenuItemView
- android:id="@+id/tvLogout"
+ android:id="@+id/tvManageSubscription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hasDivider="false"
- app:optionIcon="@drawable/ic_logout"
- app:optionName="@string/log_out" />
+ app:optionIcon="@drawable/ic_payment"
+ app:optionName="@string/manage_subscription" />
<TextView
@@ -216,12 +211,6 @@
android:layout_height="wrap_content"
android:text="@string/account" />
- <org.futo.circles.core.view.SettingsMenuItemView
- android:id="@+id/tvManageSubscription"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:optionIcon="@drawable/ic_payment"
- app:optionName="@string/manage_subscription" />
<org.futo.circles.core.view.SettingsMenuItemView
android:id="@+id/tvChangePassword"
@@ -230,6 +219,19 @@
app:optionIcon="@drawable/ic_lock"
app:optionName="@string/change_password" />
+ <org.futo.circles.core.view.SettingsMenuItemView
+ android:id="@+id/tvSwitchUser"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:optionIcon="@drawable/ic_switch_user"
+ app:optionName="@string/switch_user" />
+
+ <org.futo.circles.core.view.SettingsMenuItemView
+ android:id="@+id/tvLogout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:optionIcon="@drawable/ic_logout"
+ app:optionName="@string/log_out" />
<TextView
android:id="@+id/tvDeactivate"
diff --git a/app/src/main/res/menu/user_menu.xml b/app/src/main/res/menu/user_menu.xml
index 11ab82429ad5fc97330568339b8219f5ebcf7e78..c9aff5dc61aca5ae31d159908ddafa6b4732f698 100644
--- a/app/src/main/res/menu/user_menu.xml
+++ b/app/src/main/res/menu/user_menu.xml
@@ -8,7 +8,7 @@
<item
android:id="@+id/ignore"
- android:icon="@drawable/ic_notifications_off"
+ android:icon="@drawable/ic_ignore"
android:title="@string/ignore" />
<item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d0abb5e2f4988f306cd57ef40d50ac0453c6b44f..1779c41ed492f68ba40f00a919a637e5dd96a1a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -225,6 +225,7 @@
<string name="rich_text_editor_unindent">Unindent</string>
<string name="rich_text_editor_quote">Toggle quote</string>
<string name="rich_text_editor_code_block">Toggle code block</string>
+ <string name="general">General</string>
<string-array name="report_categories">
<item>@string/crude_language</item>