Merge pull request #1689 from novasamatech/feature/new-settings-order

Changed settings ordering
novasamatech · Oct 10, 2024 · 9b568d5 · 9b568d5
2 parents ca7b644 + 880c94f
commit 9b568d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="TypographyEllipsis">
 
+    <!--<string name="settings_email">Email</string>-->
+    <string name="settings_email">Get support via Email</string>
+
     <string name="swipe_gov_card_placeholder_basket_full_text">You have already voted for all available referenda</string>
     <string name="swipe_gov_cards_placeholder_button">Confirm your votes</string>
     <string name="swipe_gov_cards_basket_title">Vote list</string>
@@ -2036,7 +2039,6 @@
     <string name="search_recipient_welcome_v2_2_0">Search results will be displayed here</string>
     <string name="search_result_header">Search results</string>
     <string name="settings_community">Community</string>
-    <string name="settings_email">Email</string>
     <string name="settings_general">General</string>
     <string name="settings_preferences">Preferences</string>
     <string name="settings_security">Security</string>

diff --git a/feature-settings-impl/src/main/res/layout/fragment_settings.xml b/feature-settings-impl/src/main/res/layout/fragment_settings.xml
@@ -161,66 +161,65 @@
         <io.novafoundation.nova.common.view.settings.SettingsGroupHeaderView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings_community" />
+            android:text="@string/settings_support" />
 
         <io.novafoundation.nova.common.view.settings.SettingsGroupView
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
             <io.novafoundation.nova.common.view.settings.SettingsItemView
-                android:id="@+id/settingsTelegram"
+                android:id="@+id/settingsEmail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:icon="@drawable/ic_tg"
-                app:title="@string/about_telegram_v2_2_0" />
+                app:icon="@drawable/ic_mail_outline"
+                app:title="@string/settings_email" />
 
             <io.novafoundation.nova.common.view.settings.SettingsItemView
-                android:id="@+id/settingsTwitter"
+                android:id="@+id/settingsRateUs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:icon="@drawable/ic_twitter"
-                app:title="@string/settings_twitter" />
+                app:icon="@drawable/ic_rate_us"
+                app:title="@string/about_rate_app" />
 
             <io.novafoundation.nova.common.view.settings.SettingsItemView
-                android:id="@+id/settingsYoutube"
+                android:id="@+id/settingsWiki"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:icon="@drawable/ic_youtube"
-                app:title="@string/settings_youtube" />
-        </io.novafoundation.nova.common.view.settings.SettingsGroupView>
+                app:icon="@drawable/ic_nova_wiki"
+                app:title="@string/settings_wiki" />
 
+        </io.novafoundation.nova.common.view.settings.SettingsGroupView>
         <io.novafoundation.nova.common.view.settings.SettingsGroupHeaderView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings_support" />
+            android:text="@string/settings_community" />
 
         <io.novafoundation.nova.common.view.settings.SettingsGroupView
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
             <io.novafoundation.nova.common.view.settings.SettingsItemView
-                android:id="@+id/settingsRateUs"
+                android:id="@+id/settingsTelegram"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:icon="@drawable/ic_rate_us"
-                app:title="@string/about_rate_app" />
+                app:icon="@drawable/ic_tg"
+                app:title="@string/about_telegram_v2_2_0" />
 
             <io.novafoundation.nova.common.view.settings.SettingsItemView
-                android:id="@+id/settingsWiki"
+                android:id="@+id/settingsTwitter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:icon="@drawable/ic_nova_wiki"
-                app:title="@string/settings_wiki" />
+                app:icon="@drawable/ic_twitter"
+                app:title="@string/settings_twitter" />
 
             <io.novafoundation.nova.common.view.settings.SettingsItemView
-                android:id="@+id/settingsEmail"
+                android:id="@+id/settingsYoutube"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:icon="@drawable/ic_mail_outline"
-                app:title="@string/settings_email" />
+                app:icon="@drawable/ic_youtube"
+                app:title="@string/settings_youtube" />
         </io.novafoundation.nova.common.view.settings.SettingsGroupView>
 
-
         <io.novafoundation.nova.common.view.settings.SettingsGroupHeaderView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"