From 53168d195329eb09958afc1304e6509e7a900251 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 29 Jul 2022 23:58:22 +0200
Subject: [PATCH] theme account chooser dialog

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../dialog/ChooseAccountDialogFragment.java   |  4 ++++
 .../nextcloud/talk/ui/theme/ViewThemeUtils.kt | 19 +++++++++++++++++++
 .../main/res/layout/dialog_choose_account.xml |  5 +++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
index 3881bed5c..dbda72fe6 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
@@ -114,6 +114,10 @@ public class ChooseAccountDialogFragment extends DialogFragment {
         super.onViewCreated(view, savedInstanceState);
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
+        viewThemeUtils.themeDialog(binding.getRoot());
+        viewThemeUtils.themeDialogDivider(binding.dividerTop);
+        viewThemeUtils.themeDialogDivider(binding.dividerBottom);
+
         // Defining user picture
         binding.currentAccount.userIcon.setTag("");
 
diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
index a3d95c9b4..0acb5a2d6 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
@@ -53,6 +53,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.textfield.TextInputLayout
+import com.google.android.material.textview.MaterialTextView
 import com.nextcloud.talk.R
 import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.DrawableUtils
@@ -111,6 +112,12 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
         }
     }
 
+    fun themeSearchBarText(searchText: MaterialTextView) {
+        withScheme(searchText) { scheme ->
+            searchText.setHintTextColor(scheme.onSurfaceVariant)
+        }
+    }
+
     fun themeStatusBar(activity: Activity, view: View) {
         withScheme(view) { scheme ->
             DisplayUtils.applyColorToStatusBar(activity, scheme.surface)
@@ -128,6 +135,18 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
         )
     }
 
+    fun themeDialog(view: View) {
+        withScheme(view) { scheme ->
+            view.setBackgroundColor(scheme.surface)
+        }
+    }
+
+    fun themeDialogDivider(view: View) {
+        withScheme(view) { scheme ->
+            view.setBackgroundColor(scheme.surfaceVariant)
+        }
+    }
+
     fun themeFAB(fab: FloatingActionButton) {
         withScheme(fab) { scheme ->
             fab.backgroundTintList = ColorStateList.valueOf(scheme.primaryContainer)
diff --git a/app/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml
index 599c4453e..4dc777d25 100644
--- a/app/src/main/res/layout/dialog_choose_account.xml
+++ b/app/src/main/res/layout/dialog_choose_account.xml
@@ -45,6 +45,7 @@
         tools:visibility="visible">
 
         <View
+            android:id="@+id/dividerTop"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="4dp"
@@ -71,7 +72,7 @@
     </LinearLayout>
 
     <View
-        android:id="@+id/separator_line"
+        android:id="@+id/dividerBottom"
         android:layout_width="0dp"
         android:layout_height="1dp"
         android:layout_marginTop="4dp"
@@ -90,7 +91,7 @@
         app:layout_constraintBottom_toTopOf="@+id/add_account"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/separator_line"
+        app:layout_constraintTop_toBottomOf="@+id/dividerBottom"
         tools:listitem="@layout/account_item" />
 
     <com.google.android.material.button.MaterialButton