From 21e6c1fdc4d6ad5d4801109f889ab7ced1063714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sat, 5 Oct 2019 16:48:01 +0200
Subject: [PATCH] Some Android Styling

---
 android/app/src/main/AndroidManifest.xml      |  2 +-
 .../main/res/drawable/ic_console_ready.xml    |  2 +-
 .../main/res/drawable/ic_console_standby.xml  |  2 +-
 .../main/res/layout/activity_test_start.xml   |  2 +-
 android/app/src/main/res/values/styles.xml    | 21 ++++++++++++++++++-
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 977e511..66f41c5 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
             android:name=".settings.SettingsActivity" />
 
         <activity android:name=".TestStartActivity"
-            android:theme="@style/AppTheme.Transparent"/>
+            android:theme="@style/MageTheme"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_console_ready.xml b/android/app/src/main/res/drawable/ic_console_ready.xml
index 177e2a6..dff307c 100644
--- a/android/app/src/main/res/drawable/ic_console_ready.xml
+++ b/android/app/src/main/res/drawable/ic_console_ready.xml
@@ -7,7 +7,7 @@
       android:pathData="m13.537,0 l-5.607,9.425l121.929,0l5.607,-9.425zM5.606,13.33 L0,22.754l121.929,0l5.606,-9.424z"
       android:strokeAlpha="1"
       android:strokeWidth="12.74962807"
-      android:fillColor="#000000"
+      android:fillColor="?android:attr/textColorPrimary"
       android:strokeColor="#00000000"
       android:fillAlpha="1"/>
   <path
diff --git a/android/app/src/main/res/drawable/ic_console_standby.xml b/android/app/src/main/res/drawable/ic_console_standby.xml
index 177e2a6..dff307c 100644
--- a/android/app/src/main/res/drawable/ic_console_standby.xml
+++ b/android/app/src/main/res/drawable/ic_console_standby.xml
@@ -7,7 +7,7 @@
       android:pathData="m13.537,0 l-5.607,9.425l121.929,0l5.607,-9.425zM5.606,13.33 L0,22.754l121.929,0l5.606,-9.424z"
       android:strokeAlpha="1"
       android:strokeWidth="12.74962807"
-      android:fillColor="#000000"
+      android:fillColor="?android:attr/textColorPrimary"
       android:strokeColor="#00000000"
       android:fillAlpha="1"/>
   <path
diff --git a/android/app/src/main/res/layout/activity_test_start.xml b/android/app/src/main/res/layout/activity_test_start.xml
index 4910543..74bd369 100644
--- a/android/app/src/main/res/layout/activity_test_start.xml
+++ b/android/app/src/main/res/layout/activity_test_start.xml
@@ -43,7 +43,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/registKeyEditText" />
 
-    <Button
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/startButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index f36dbcb..1d35a0b 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -12,11 +12,30 @@
         <item name="android:windowActivityTransitions">true</item>
     </style>
 
-    <style name="AppTheme.Transparent" parent="AppTheme">
+    <style name="MageTheme" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="colorOnPrimary">#ffffff</item>
+        <item name="colorSecondary">@color/accent</item>
+        <item name="colorOnSecondary">#000000</item>
+        <item name="colorPrimarySurface">@color/primary</item>
+        <item name="android:windowBackground">@color/primary</item>
+        <item name="android:statusBarColor">?attr/colorPrimarySurface</item>
+        <item name="android:navigationBarColor">?attr/colorPrimarySurface</item>
+        <item name="colorControlNormal">@color/accent</item>
+        <item name="colorButtonNormal">@color/accent</item>
+        <item name="android:textAppearanceButton">@style/TextAppearanceButton</item>
+
+        <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
+    <style name="TextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
+        <item name="android:textColor">?attr/colorOnSecondary</item>
+    </style>
+
     <style name="StreamTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>