From da4d55a9a86c45765d61ee04ab8d88a48c64a3f2 Mon Sep 17 00:00:00 2001
From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com>
Date: Wed, 25 Oct 2023 00:35:09 -0500
Subject: [PATCH] final fixes before update

---
 app/build.gradle                              |  2 +-
 .../ani/dantotsu/media/CalendarActivity.kt    | 19 +++++++++++++++++-
 .../ani/dantotsu/media/user/ListActivity.kt   | 20 ++++++++++++++++++-
 app/src/main/res/layout/activity_list.xml     |  1 +
 stable.md                                     | 14 +++++++------
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 184d04a7..77544145 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
         minSdk 23
         targetSdk 34
         versionCode ((System.currentTimeMillis() / 60000).toInteger())
-        versionName "0.1.2"
+        versionName "0.1.3"
         signingConfig signingConfigs.debug
     }
 
diff --git a/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt b/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt
index 5a3251a3..15a31d0a 100644
--- a/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/CalendarActivity.kt
@@ -2,6 +2,7 @@ package ani.dantotsu.media
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -32,7 +33,23 @@ class CalendarActivity : AppCompatActivity() {
         binding = ActivityListBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg)
+        val typedValue = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue, true)
+        val primaryColor = typedValue.data
+        val typedValue2 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue2, true)
+        val primaryTextColor = typedValue2.data
+        val typedValue3 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimaryContainer, typedValue3, true)
+        val secondaryColor = typedValue3.data
+
+        window.statusBarColor = primaryColor
+        window.navigationBarColor = primaryColor
+        binding.listTabLayout.setBackgroundColor(primaryColor)
+        binding.listAppBar.setBackgroundColor(primaryColor)
+        binding.listTitle.setTextColor(primaryTextColor)
+        binding.listTabLayout.setTabTextColors(primaryTextColor, secondaryColor)
+        binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
         binding.listTitle.setText(R.string.release_calendar)
         binding.listSort.visibility = View.GONE
 
diff --git a/app/src/main/java/ani/dantotsu/media/user/ListActivity.kt b/app/src/main/java/ani/dantotsu/media/user/ListActivity.kt
index b18ae4e0..bf8a1666 100644
--- a/app/src/main/java/ani/dantotsu/media/user/ListActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/user/ListActivity.kt
@@ -2,6 +2,7 @@ package ani.dantotsu.media.user
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -31,7 +32,24 @@ class ListActivity : AppCompatActivity() {
         binding = ActivityListBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg)
+        val typedValue = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue, true)
+        val primaryColor = typedValue.data
+        val typedValue2 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue2, true)
+        val primaryTextColor = typedValue2.data
+        val typedValue3 = TypedValue()
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimaryContainer, typedValue3, true)
+        val secondaryColor = typedValue3.data
+
+        window.statusBarColor = primaryColor
+        window.navigationBarColor = primaryColor
+        binding.listTabLayout.setBackgroundColor(primaryColor)
+        binding.listAppBar.setBackgroundColor(primaryColor)
+        binding.listTitle.setTextColor(primaryTextColor)
+        binding.listTabLayout.setTabTextColors(primaryTextColor, secondaryColor)
+        binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
+
         val anime = intent.getBooleanExtra("anime", true)
         binding.listTitle.text = intent.getStringExtra("username") + "'s " + (if (anime) "Anime" else "Manga") + " List"
 
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index bfaf603b..665e0a9a 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -14,6 +14,7 @@
         android:layout_gravity="center" />
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/listAppBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorPrimaryContainer"
diff --git a/stable.md b/stable.md
index 238cfae2..53a4fdf8 100644
--- a/stable.md
+++ b/stable.md
@@ -1,12 +1,14 @@
-# 0.1.2
+# 0.1.3
 
 - **Bugfixes:**
   - Fixes for manga and anime extensions
-  - Auto search is now EVEN MORE likely to find correct series
-  - Fixed a crash for large manga chapters
-  - Fixed most manga titles
-  - Fixed manga Anilist logging
+  - Fixed softsubs not showing
+  - Fixed various crashes
+  - Fixed manga continue button not showing
+  - Fixed calendat/anime list page not following Material You
   - probably other stuff I forgor
 
 - **New Features:**
-  - none
+  - App coloring rework
+  - Themes! 4 themes added
+  - Added Extension-specific DNS