From 045248adc6d2f31c061ce168f7ac685a77dbf1b6 Mon Sep 17 00:00:00 2001
From: Antoine POPINEAU <antoine.popineau@appscho.com>
Date: Mon, 21 Oct 2019 12:20:29 +0200
Subject: [PATCH] Updated dark mode colors to be more pleasing on the eye.

---
 app/build.gradle                            |  4 ++--
 app/src/main/res/layout/activity_login.xml  |  1 +
 app/src/main/res/layout/fragment_browse.xml |  3 ++-
 app/src/main/res/values-night/colors.xml    |  6 +++++-
 app/src/main/res/values/colors.xml          |  1 +
 app/src/main/res/values/styles.xml          | 11 +++++++++++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 99a72d7..4361ee1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
     applicationId "com.github.apognu.otter"
     minSdkVersion 23
     targetSdkVersion 29
-    versionCode 4
-    versionName "1.0.3"
+    versionCode 5
+    versionName "1.0.4"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 525293b..62da405 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -93,5 +93,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:backgroundTint="@color/colorAccent"
+    android:textColor="@android:color/white"
     android:text="@string/login_submit" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_browse.xml b/app/src/main/res/layout/fragment_browse.xml
index 78b3cd1..f9da308 100644
--- a/app/src/main/res/layout/fragment_browse.xml
+++ b/app/src/main/res/layout/fragment_browse.xml
@@ -13,7 +13,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:elevation="4dp"
-    app:tabMode="scrollable" />
+    app:tabMode="scrollable"
+    app:tabSelectedTextColor="@color/controlColor" />
 
   <androidx.viewpager.widget.ViewPager
     android:id="@+id/pager"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cc9facb..adf3fb2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <color name="surface">#121212</color>
-  <color name="colorPrimary">#71a5cd</color>
+
+  <color name="colorPrimary">#283f4e</color>
+  <color name="colorAccent">#99440c</color>
 
   <color name="colorSelected">#525252</color>
   <color name="itemTitle">#caffffff</color>
 
   <color name="controlForeground">#caffffff</color>
+
+  <color name="controlColor">#327eae</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ee90bdf..d07417e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,4 +13,5 @@
   <color name="itemTitle">@android:color/black</color>
 
   <color name="controlForeground">@color/colorPrimary</color>
+  <color name="controlColor">@color/colorPrimary</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3783e6e..d4c1a75 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,12 +8,23 @@
     <item name="colorAccent">@color/colorAccent</item>
     <item name="android:navigationBarColor">@color/colorPrimary</item>
 
+    <item name="materialButtonStyle">@style/AppTheme.ButtonStyle</item>
+
     <item name="preferenceTheme">@style/AppTheme.Preference</item>
   </style>
 
   <style name="AppTheme.Fragment">
   </style>
 
+  <style name="AppTheme.ButtonStyle" parent="Widget.MaterialComponents.Button">
+    <item name="materialThemeOverlay">@style/AppTheme.ButtonStyleTextColor</item>
+  </style>
+
+  <style name="AppTheme.ButtonStyleTextColor">
+    <item name="colorPrimary">@android:color/transparent</item>
+    <item name="colorOnPrimary">@color/controlColor</item>
+  </style>
+
   <style name="AppTheme.Title">
     <item name="android:fontFamily">sans-serif-light</item>
     <item name="android:textSize">28sp</item>