From d70ac8fe8b13288d402bb019bf10fc5a78d1413b Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 12 Feb 2022 14:26:31 +0100
Subject: [PATCH] make bottom sheets dark/light themed

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../res/layout/dialog_bottom_contacts.xml     | 27 ++++++-
 .../layout/dialog_conversation_operations.xml | 81 ++++++++++++-------
 app/src/main/res/values/dimens.xml            |  2 +-
 3 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/layout/dialog_bottom_contacts.xml b/app/src/main/res/layout/dialog_bottom_contacts.xml
index 393e4fb17..fcb75b6a7 100644
--- a/app/src/main/res/layout/dialog_bottom_contacts.xml
+++ b/app/src/main/res/layout/dialog_bottom_contacts.xml
@@ -1,13 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk application
+  ~
+  ~ @author Marcel Hibbe
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/bg_call_screen_dialog"
+    android:background="@color/bg_bottom_sheet"
     android:orientation="vertical"
     android:paddingStart="@dimen/standard_padding"
     android:paddingEnd="@dimen/standard_padding"
     android:paddingBottom="@dimen/standard_half_padding">
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_conversation_operations.xml b/app/src/main/res/layout/dialog_conversation_operations.xml
index 7cfc54b08..a267d4efe 100644
--- a/app/src/main/res/layout/dialog_conversation_operations.xml
+++ b/app/src/main/res/layout/dialog_conversation_operations.xml
@@ -1,19 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk application
+  ~
+  ~ @author Marcel Hibbe
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/bg_call_screen_dialog"
+    android:background="@color/bg_bottom_sheet"
     android:orientation="vertical"
     android:paddingStart="@dimen/standard_padding"
     android:paddingEnd="@dimen/standard_padding"
     android:paddingBottom="@dimen/standard_half_padding">
 
     <LinearLayout
+        android:id="@+id/operation_items_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/operation_items_layout"
         android:orientation="vertical">
 
         <TextView
@@ -21,9 +42,9 @@
             android:layout_width="wrap_content"
             android:layout_height="@dimen/bottom_sheet_item_height"
             android:gravity="start|center_vertical"
-            android:textColor="@color/medium_emphasis_text_dark_background"
+            android:textColor="@color/medium_emphasis_text"
             android:textSize="@dimen/bottom_sheet_text_size"
-            tools:text="conversation name"/>
+            tools:text="conversation name" />
 
         <LinearLayout
             android:id="@+id/conversation_operation_remove_favorite"
@@ -44,11 +65,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_remove_from_favorites"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -71,11 +92,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_add_to_favorites"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -98,11 +119,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_mark_as_read"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -125,11 +146,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_rename"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -152,11 +173,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_make_call_public"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -179,11 +200,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_change_password"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -206,11 +227,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_clear_password"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -233,11 +254,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_set_password"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -260,11 +281,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_delete_call"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -287,11 +308,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_share_link"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -314,11 +335,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_make_call_private"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
@@ -341,16 +362,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_double_padding"
+                android:paddingStart="40dp"
                 android:paddingEnd="@dimen/zero"
                 android:text="@string/nc_leave"
                 android:textAlignment="viewStart"
-                android:textColor="@color/high_emphasis_text_dark_background"
+                android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
     </LinearLayout>
 
-
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9aaae6ed5..2bcef5826 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,7 @@
 
     <dimen name="item_height">72dp</dimen>
     <dimen name="bottom_sheet_item_height">56dp</dimen>
-    <dimen name="bottom_sheet_text_size">16dp</dimen>
+    <dimen name="bottom_sheet_text_size">16sp</dimen>
     <dimen name="small_item_height">48dp</dimen>
 
     <dimen name="min_size_clickable_area">48dp</dimen>