From e32b24ef7069240a25e75977d357ab7544fb905d Mon Sep 17 00:00:00 2001
From: JRoberts <8711996+jr-simplex@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:27:22 +0400
Subject: [PATCH] android: move preferences files to respective packages;
 dividers (#1413)

---
 .../app/views/{usersettings => chat}/ContactPreferences.kt    | 3 ++-
 .../views/{usersettings => chat/group}/GroupPreferences.kt    | 4 +++-
 .../java/chat/simplex/app/views/usersettings/Preferences.kt   | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename apps/android/app/src/main/java/chat/simplex/app/views/{usersettings => chat}/ContactPreferences.kt (98%)
 rename apps/android/app/src/main/java/chat/simplex/app/views/{usersettings => chat/group}/GroupPreferences.kt (97%)

diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ContactPreferences.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt
similarity index 98%
rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ContactPreferences.kt
rename to apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt
index 530c62c812..81fde876fd 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ContactPreferences.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt
@@ -1,4 +1,4 @@
-package chat.simplex.app.views.usersettings
+package chat.simplex.app.views.chat
 
 import SectionDivider
 import SectionItemView
@@ -137,6 +137,7 @@ private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Bool
     SectionItemView(reset) {
       Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
     }
+    SectionDivider()
     SectionItemView(save) {
       Text(stringResource(R.string.save_and_notify_contact), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
     }
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/GroupPreferences.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt
similarity index 97%
rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/GroupPreferences.kt
rename to apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt
index 90f530a093..cbcb2d1c41 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/GroupPreferences.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt
@@ -1,5 +1,6 @@
-package chat.simplex.app.views.usersettings
+package chat.simplex.app.views.chat.group
 
+import SectionDivider
 import SectionItemView
 import SectionItemWithValue
 import SectionSpacer
@@ -112,6 +113,7 @@ private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Bool
     SectionItemView(reset) {
       Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
     }
+    SectionDivider()
     SectionItemView(save) {
       Text(stringResource(R.string.save_and_notify_group_members), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
     }
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt
index d786e047a2..7a57a22b55 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt
@@ -1,5 +1,6 @@
 package chat.simplex.app.views.usersettings
 
+import SectionDivider
 import SectionItemView
 import SectionSpacer
 import SectionTextFooter
@@ -102,6 +103,7 @@ private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Bool
     SectionItemView(reset) {
       Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
     }
+    SectionDivider()
     SectionItemView(save) {
       Text(stringResource(R.string.save_and_notify_contacts), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
     }