Cleaning up

Loukious · Oct 28, 2023 · 043c585 · 043c585
1 parent e7139a9
commit 043c585
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 38 deletions.
diff --git a/app/src/main/res/layout/layout_translate_config.xml b/app/src/main/res/layout/layout_translate_config.xml
@@ -108,19 +108,7 @@
             android:layout_alignParentStart="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
-<!--            <EditText-->
-<!--                android:layout_below="@+id/text_source_language_sent"-->
-<!--                android:layout_alignParentStart="true"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_gravity="center"-->
-<!--                android:id="@+id/edit_source_language_sent"-->
-<!--                android:minEms="2"-->
-<!--                android:maxEms="5"-->
-<!--                android:inputType="textVisiblePassword"-->
-<!--                android:digits="abcdefghijklmnopqrstuvwxyz-"-->
-<!--                android:hint="auto"-->
-<!--                tools:ignore="HardcodedText" />-->
+
         <TextView
             android:layout_alignParentEnd="true"
             android:layout_width="wrap_content"
@@ -138,19 +126,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-<!--            <EditText-->
-<!--                android:layout_below="@+id/text_target_language_sent"-->
-<!--                android:layout_alignParentEnd="true"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_gravity="center"-->
-<!--                android:id="@+id/edit_target_language_sent"-->
-<!--                android:inputType="textVisiblePassword"-->
-<!--                android:digits="abcdefghijklmnopqrstuvwxyz-"-->
-<!--                android:minEms="2"-->
-<!--                android:maxEms="5"/>-->
-
-
     </RelativeLayout>
 
     <Switch

diff --git a/app/src/main/res/layout/row_hookstate.xml b/app/src/main/res/layout/row_hookstate.xml
@@ -38,7 +38,7 @@
         android:layout_height="32dp"
         style="@style/ButtonReset"
         android:src="@drawable/baseline_refresh_24"
-        app:tint="@android:color/tab_indicator_text"
+        app:tint="?attr/colorOnSurface"
         android:gravity="center_vertical|center_horizontal"
         android:background="?selectableItemBackgroundBorderless"
         app:layout_constraintRight_toRightOf="parent"

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,5 +1,5 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Base.AppTheme" parent="Base.AppTheme.Night" />
-    <style name="AppTheme" parent="AppTheme.Night" />
+    <style name="Base.AppTheme" parent="Theme.Material3.DayNight" />
+    <style name="AppTheme" parent="Theme.Material3.DayNight" />
 </resources>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
@@ -1,9 +1,8 @@
 <resources>
-
-    <style name="AppTheme" parent="Base.AppTheme">
+    <style name="AppTheme" parent="Theme.Material3.DayNight">
         <!-- Transparent system bars for edge-to-edge. -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
     </style>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,10 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background_color">#FDFDFD</color>
 
+    <!-- Primary and secondary colors -->
     <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
+    <color name="colorPrimaryContainer">#3700B3</color>
+    <color name="colorSecondary">#03DAC5</color>
+    <color name="colorSecondaryContainer">#018786</color>
+
+    <!-- On colors -->
+    <color name="colorOnPrimary">#FFFFFF</color>
+    <color name="colorOnSecondary">#000000</color>
     <color name="colorOnSurface">#3a3a3a</color>
+    <color name="colorOnBackground">#000000</color>
+
+    <!-- Additional colors -->
+    <color name="colorSurface">#FFFFFF</color>
+    <color name="colorError">#B00020</color>
+    <color name="colorOnError">#FFFFFF</color>
+
     <color name="colorSemiTransparentOverlay">#80000000</color>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ButtonReset" parent="Widget.AppCompat.ImageButton">
+    <style name="ButtonReset" parent="Widget.Material3.MaterialTimePicker.ImageButton">
         <item name="cornerRadius">16dp</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -10,5 +10,5 @@
         <item name="colorDarkOverlay">#66000000</item>
     </style>
 
-    <style name="AppTheme" parent="Base.AppTheme" />
+    <style name="AppTheme" parent="Theme.Material3.DayNight" />
 </resources>