From 71acd0b681cd9340b5e2e7f0b71777e8af32914a Mon Sep 17 00:00:00 2001
From: androidacy-user <opensource@androidacy.com>
Date: Wed, 6 Sep 2023 21:37:29 -0400
Subject: [PATCH] tweak theming + bump minSdk

Signed-off-by: androidacy-user <opensource@androidacy.com>
---
 app/build.gradle.kts                          |  6 ++---
 .../fox2code/mmm/module/ModuleViewAdapter.kt  |  4 ++--
 app/src/main/res/values/colors.xml            |  6 +++++
 app/src/main/res/values/themes.xml            | 22 +++++++++----------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c55581d..45fe94b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -51,7 +51,7 @@ android {
     }
     defaultConfig {
         applicationId = "com.fox2code.mmm"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 34
         versionCode = 82
         versionName = "2.3.0"
@@ -215,7 +215,7 @@ android {
         // play variant. pretty similiar to default, but with an empty inital online repo list, and use play_client_id instead of client_id
         create("play") {
             dimension = "type"
-            applicationIdSuffix = ".play"
+            versionNameSuffix = "-play"
             applicationId = "com.androidacy.mmm"
             // current timestamp of build
             buildConfigField("long", "BUILD_TIME", "$timestamp")
@@ -528,7 +528,7 @@ dependencies {
     implementation("androidx.security:security-crypto:1.1.0-alpha06")
 
     // some utils
-    implementation("commons-io:commons-io:20030203.000550")
+    implementation("commons-io:commons-io:2.13.0")
     implementation("org.apache.commons:commons-compress:1.23.0")
 
     // analytics
diff --git a/app/src/main/kotlin/com/fox2code/mmm/module/ModuleViewAdapter.kt b/app/src/main/kotlin/com/fox2code/mmm/module/ModuleViewAdapter.kt
index 1d6d94f..745d58b 100644
--- a/app/src/main/kotlin/com/fox2code/mmm/module/ModuleViewAdapter.kt
+++ b/app/src/main/kotlin/com/fox2code/mmm/module/ModuleViewAdapter.kt
@@ -380,8 +380,8 @@ ${getString(R.string.module_repo)} ${moduleHolder.repoName}""" + if ((repoModule
                         backgroundAttr = moduleHolder.notificationType.backgroundAttr
                     }
                 } else if (type === ModuleHolder.Type.INSTALLED && moduleHolder.hasFlag(ModuleInfo.FLAG_METADATA_INVALID)) {
-                    invalidPropsChip.setOnClickListener { _view: View ->
-                        val builder = MaterialAlertDialogBuilder(_view.context)
+                    invalidPropsChip.setOnClickListener { view: View ->
+                        val builder = MaterialAlertDialogBuilder(view.context)
                         builder.setTitle(R.string.low_quality_module)
                             .setMessage(R.string.low_quality_module_desc).setCancelable(true)
                             .setPositiveButton(
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a990d86..e685d3e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,4 +23,10 @@
     <color name="light_backgroundColor">#FFFFFFFF</color>
     <color name="gray_900">#3A3A3A</color>
     <color name="gray_800">#424242</color>
+    <color name="blue_200">#2196F3</color>
+    <color name="blue_500">#2196F3</color>
+    <color name="blue_700">#1976D2</color>
+    <color name="indigo_200">#3F51B5</color>
+    <color name="indigo_500">#3F51B5</color>
+    <color name="indigo_700">#303F9F</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8cb2978..f892a90 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -8,12 +8,12 @@
         <item name="android:isLightTheme" tools:targetApi="q">true</item>
         <item name="isLightTheme">true</item>
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/orange_200</item>
+        <item name="colorPrimary">@color/indigo_200</item>
         <item name="colorPrimaryVariant">@color/white</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/orange_200</item>
-        <item name="colorSecondaryVariant">@color/orange_200</item>
+        <item name="colorSecondary">@color/blue_200</item>
+        <item name="colorSecondaryVariant">@color/blue_200</item>
         <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/status_bar_color</item>
@@ -75,12 +75,12 @@
         <item name="android:isLightTheme" tools:targetApi="q">false</item>
         <item name="isLightTheme">false</item>
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/orange_200</item>
+        <item name="colorPrimary">@color/indigo_200</item>
         <item name="colorPrimaryVariant">@color/black</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/orange_200</item>
-        <item name="colorSecondaryVariant">@color/orange_200</item>
+        <item name="colorSecondary">@color/blue_200</item>
+        <item name="colorSecondaryVariant">@color/blue_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/status_bar_color</item>
@@ -117,11 +117,11 @@
         <item name="backgroundColor">@color/black</item>
         <item name="colorSurface">@color/black</item>
         <!-- Darker variants of the colors -->
-        <item name="colorPrimary">@color/orange_500</item>
-        <item name="colorPrimaryVariant">@color/orange_700</item>
-        <item name="colorSecondary">@color/orange_500</item>
-        <item name="colorSecondaryVariant">@color/orange_700</item>
-        <item name="android:colorAccent">@color/orange_200</item>
+        <item name="colorPrimary">@color/indigo_500</item>
+        <item name="colorPrimaryVariant">@color/indigo_700</item>
+        <item name="colorSecondary">@color/blue_500</item>
+        <item name="colorSecondaryVariant">@color/blue_700</item>
+        <item name="android:colorAccent">@color/blue_200</item>
         <item name="android:colorBackground">@color/black</item>
         <item name="android:colorForeground">@color/white</item>
         <item name="android:colorBackgroundCacheHint">@null</item>