From ec75809808e86dc092eb83ba331a10880edf77c3 Mon Sep 17 00:00:00 2001
From: Andrewerr <toddot@protonmail.com>
Date: Sun, 19 Nov 2023 16:49:12 +0100
Subject: [PATCH] Unify Material3 theme, add labels for action button, add
 gradient overlay under button panel

---
 .../main/res/drawable/gradient_overlay.xml    |  8 +++
 app/src/main/res/layout/action_panel.xml      | 63 +++++++++++++------
 app/src/main/res/layout/activity_main.xml     | 12 +++-
 app/src/main/res/values-night/themes.xml      | 16 -----
 4 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 app/src/main/res/drawable/gradient_overlay.xml
 delete mode 100644 app/src/main/res/values-night/themes.xml

diff --git a/app/src/main/res/drawable/gradient_overlay.xml b/app/src/main/res/drawable/gradient_overlay.xml
new file mode 100644
index 0000000..3dc844b
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_overlay.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="@android:color/transparent"
+        android:endColor="#AA000000"
+        android:angle="270"/>
+</shape>
diff --git a/app/src/main/res/layout/action_panel.xml b/app/src/main/res/layout/action_panel.xml
index 0ba97d5..0d4c7a4 100644
--- a/app/src/main/res/layout/action_panel.xml
+++ b/app/src/main/res/layout/action_panel.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/action_panel_layout"
@@ -14,25 +13,53 @@
         android:layout_marginBottom="64dp"
         android:visibility="visible">
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/exit_button"
-            style="@style/Widget.Mirror.FloatingActionButton"
+        <!-- Wrapper for Exit Button and Label -->
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
-            android:contentDescription="@string/exit"
-            android:src="@android:drawable/ic_menu_close_clear_cancel" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/freeze_button"
-            style="@style/Widget.Mirror.FloatingActionButton"
+            android:orientation="vertical"
+            android:layout_margin="16dp">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/exit_button"
+                style="@style/Widget.Mirror.FloatingActionButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/exit"
+                android:src="@android:drawable/ic_menu_close_clear_cancel" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/exit"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+
+        <!-- Wrapper for Freeze Button and Label -->
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
-            android:contentDescription="@string/exit"
-            android:src="@android:drawable/ic_media_pause" />
+            android:orientation="vertical"
+            android:layout_margin="16dp">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/freeze_button"
+                style="@style/Widget.Mirror.FloatingActionButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/freeze"
+                android:src="@android:drawable/ic_media_pause" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/freeze"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
 
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad4c076..95a95b5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,8 @@
     <androidx.camera.view.PreviewView
         android:id="@+id/preview_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent" >
+    </androidx.camera.view.PreviewView>
 
     <ImageView
         android:id="@+id/stop_view"
@@ -19,6 +20,15 @@
         android:scaleType="centerCrop"
         android:contentDescription="@string/stop_view_desc" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="256dp"
+        android:layout_gravity="bottom"
+        android:background="@drawable/gradient_overlay"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <include layout="@layout/action_panel" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 912f1b8..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Mirror" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file