theme cleanup

app/build.gradle

@@ -21,7 +21,7 @@ android {
         minSdk 23
         targetSdk 34
         versionCode ((System.currentTimeMillis() / 60000).toInteger())
-        versionName "0.1.3"
+        versionName "0.1.5"
         signingConfig signingConfigs.debug
     }
 

app/src/main/java/ani/dantotsu/MainActivity.kt

@@ -7,7 +7,10 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.graphics.Color
 import android.graphics.drawable.Animatable
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -21,6 +24,7 @@ import android.view.animation.AnticipateInterpolator
 import android.widget.TextView
 import androidx.activity.addCallback
 import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.animation.doOnEnd
 import androidx.core.app.ActivityCompat
@@ -80,6 +84,17 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val bottomBar = findViewById<AnimatedBottomBar>(R.id.navbar)
+            val backgroundDrawable = bottomBar.background as GradientDrawable
+            val currentColor = backgroundDrawable.color?.defaultColor ?: 0
+            val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0x80000000.toInt()
+            backgroundDrawable.setColor(semiTransparentColor)
+            bottomBar.background = backgroundDrawable
+        }
+
+
         val animeScope = CoroutineScope(Dispatchers.Default)
         animeScope.launch {
             animeExtensionManager.findAvailableExtensions()
@@ -238,13 +253,6 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        if (ActivityHelper.shouldRefreshMainActivity) {
-            ActivityHelper.shouldRefreshMainActivity = false
-            Refresh.all()
-            finish()
-            startActivity(Intent(this, MainActivity::class.java))
-            initActivity(this)
-        }
     }
 
 
@@ -264,8 +272,4 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-}
+}
-
-object ActivityHelper {
-    var shouldRefreshMainActivity: Boolean = false
-}

app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt

@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.media.GenreActivity
 import ani.dantotsu.MediaPageTransformer
+import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.databinding.ItemAnimePageBinding
 import ani.dantotsu.loadData
@@ -31,6 +32,8 @@ import ani.dantotsu.setSlideUp
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.statusBarHeight
+import com.google.android.material.card.MaterialCardView
+import com.google.android.material.textfield.TextInputLayout
 
 class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHolder>() {
     val ready = MutableLiveData(false)
@@ -49,6 +52,13 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
         binding = holder.binding
         trendingViewPager = binding.animeTrendingViewPager
 
+        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.animeSearchBar)
+        val currentColor = textInputLayout.boxBackgroundColor
+        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0x80000000.toInt()
+        textInputLayout.boxBackgroundColor = semiTransparentColor
+        val materialCardView = holder.itemView.findViewById<MaterialCardView>(R.id.animeUserAvatarContainer)
+        materialCardView.setCardBackgroundColor(semiTransparentColor)
+
         binding.animeTitleContainer.updatePadding(top = statusBarHeight)
 
         if (uiSettings.smallView) binding.animeTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {

app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt

@@ -31,6 +31,8 @@ import ani.dantotsu.setSlideUp
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.statusBarHeight
+import com.google.android.material.card.MaterialCardView
+import com.google.android.material.textfield.TextInputLayout
 
 class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHolder>() {
     val ready = MutableLiveData(false)
@@ -49,6 +51,13 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
         binding = holder.binding
         trendingViewPager = binding.mangaTrendingViewPager
 
+        val textInputLayout = holder.itemView.findViewById<TextInputLayout>(R.id.mangaSearchBar)
+        val currentColor = textInputLayout.boxBackgroundColor
+        val semiTransparentColor = (currentColor and 0x00FFFFFF) or 0x80000000.toInt()
+        textInputLayout.boxBackgroundColor = semiTransparentColor
+        val materialCardView = holder.itemView.findViewById<MaterialCardView>(R.id.mangaUserAvatarContainer)
+        materialCardView.setCardBackgroundColor(semiTransparentColor)
+
         binding.mangaTitleContainer.updatePadding(top = statusBarHeight)
 
         if (uiSettings.smallView) binding.mangaTrendingContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {

app/src/main/java/ani/dantotsu/media/CalendarActivity.kt

@@ -4,6 +4,8 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
+import android.view.Window
+import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -12,7 +14,9 @@ import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.databinding.ActivityListBinding
+import ani.dantotsu.loadData
 import ani.dantotsu.media.user.ListViewPagerAdapter
+import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
@@ -31,16 +35,16 @@ class CalendarActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         ThemeManager(this).applyTheme()
         binding = ActivityListBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+
 
         val typedValue = TypedValue()
-        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue, true)
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true)
         val primaryColor = typedValue.data
         val typedValue2 = TypedValue()
-        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue2, true)
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue2, true)
         val primaryTextColor = typedValue2.data
         val typedValue3 = TypedValue()
-        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimaryContainer, typedValue3, true)
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue3, true)
         val secondaryColor = typedValue3.data
 
         window.statusBarColor = primaryColor
@@ -48,8 +52,21 @@ class CalendarActivity : AppCompatActivity() {
         binding.listTabLayout.setBackgroundColor(primaryColor)
         binding.listAppBar.setBackgroundColor(primaryColor)
         binding.listTitle.setTextColor(primaryTextColor)
-        binding.listTabLayout.setTabTextColors(primaryTextColor, secondaryColor)
+        binding.listTabLayout.setTabTextColors(primaryTextColor, primaryTextColor)
         binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
+        val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
+        if (!uiSettings.immersiveMode) {
+            this.window.statusBarColor =
+                ContextCompat.getColor(this, R.color.nav_bg_inv)
+            binding.root.fitsSystemWindows = true
+
+        }else{
+            binding.root.fitsSystemWindows = false
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        }
+        setContentView(binding.root)
+
         binding.listTitle.setText(R.string.release_calendar)
         binding.listSort.visibility = View.GONE
 

app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt

@@ -190,7 +190,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                 R.drawable.ic_round_favorite_24,
                 R.drawable.ic_round_favorite_border_24,
                 R.color.bg_opp,
-                R.color.violet_400,
+                R.color.violet_400,//TODO: Change to colorSecondary
                 media.isFav
             ) {
                 media.isFav = it

app/src/main/java/ani/dantotsu/media/user/ListActivity.kt

@@ -4,6 +4,8 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
+import android.view.Window
+import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
@@ -13,6 +15,8 @@ import androidx.lifecycle.lifecycleScope
 import ani.dantotsu.R
 import ani.dantotsu.Refresh
 import ani.dantotsu.databinding.ActivityListBinding
+import ani.dantotsu.loadData
+import ani.dantotsu.settings.UserInterfaceSettings
 import ani.dantotsu.themes.ThemeManager
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
@@ -30,16 +34,15 @@ class ListActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         ThemeManager(this).applyTheme()
         binding = ActivityListBinding.inflate(layoutInflater)
-        setContentView(binding.root)
 
         val typedValue = TypedValue()
-        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue, true)
+        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue, true)
         val primaryColor = typedValue.data
         val typedValue2 = TypedValue()
-        theme.resolveAttribute(com.google.android.material.R.attr.colorOnPrimary, typedValue2, true)
+        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue2, true)
         val primaryTextColor = typedValue2.data
         val typedValue3 = TypedValue()
-        theme.resolveAttribute(com.google.android.material.R.attr.colorPrimaryContainer, typedValue3, true)
+        theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue3, true)
         val secondaryColor = typedValue3.data
 
         window.statusBarColor = primaryColor
@@ -47,8 +50,20 @@ class ListActivity : AppCompatActivity() {
         binding.listTabLayout.setBackgroundColor(primaryColor)
         binding.listAppBar.setBackgroundColor(primaryColor)
         binding.listTitle.setTextColor(primaryTextColor)
-        binding.listTabLayout.setTabTextColors(primaryTextColor, secondaryColor)
+        binding.listTabLayout.setTabTextColors(primaryTextColor, primaryTextColor)
         binding.listTabLayout.setSelectedTabIndicatorColor(primaryTextColor)
+        val uiSettings = loadData<UserInterfaceSettings>("ui_settings") ?: UserInterfaceSettings()
+        if (!uiSettings.immersiveMode) {
+            this.window.statusBarColor =
+                ContextCompat.getColor(this, R.color.nav_bg_inv)
+            binding.root.fitsSystemWindows = true
+
+        }else{
+            binding.root.fitsSystemWindows = false
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        }
+        setContentView(binding.root)
 
         val anime = intent.getBooleanExtra("anime", true)
         binding.listTitle.text = intent.getStringExtra("username") + "'s " + (if (anime) "Anime" else "Manga") + " List"

app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt

@@ -33,6 +33,7 @@ import ani.dantotsu.subcriptions.Subscription.Companion.defaultTime
 import ani.dantotsu.subcriptions.Subscription.Companion.startSubscription
 import ani.dantotsu.subcriptions.Subscription.Companion.timeMinutes
 import ani.dantotsu.themes.ThemeManager
+import com.google.android.material.snackbar.Snackbar
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.tachiyomi.network.NetworkPreferences
 import io.noties.markwon.Markwon
@@ -101,7 +102,7 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
         binding.settingsUseMaterialYou.isChecked = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getBoolean("use_material_you", false)
         binding.settingsUseMaterialYou.setOnCheckedChangeListener { _, isChecked ->
             getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putBoolean("use_material_you", isChecked).apply()
-            Toast.makeText(this, "Restart app to apply changes", Toast.LENGTH_LONG).show()
+            restartApp()
         }
 
         val themeString  = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getString("theme", "PURPLE")!!
@@ -111,12 +112,9 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
 
         binding.themeSwitcher.setOnItemClickListener { _, _, i, _ ->
             getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).edit().putString("theme", ThemeManager.Companion.Theme.values()[i].theme).apply()
-            ActivityHelper.shouldRefreshMainActivity = true
+            //ActivityHelper.shouldRefreshMainActivity = true
             binding.themeSwitcher.clearFocus()
-            Refresh.all()
+            restartApp()
-            finish()
-            startActivity(Intent(this, SettingsActivity::class.java))
-            initActivity(this)
 
         }
 
@@ -586,4 +584,18 @@ OS Version: $CODENAME $RELEASE ($SDK_INT)
             }
         }
     }
+    private fun restartApp() {
+        Snackbar.make(
+            binding.root,
+            R.string.restart_app, Snackbar.LENGTH_SHORT
+        ).apply {
+            val mainIntent =
+                Intent.makeRestartActivityTask(context.packageManager.getLaunchIntentForPackage(context.packageName)!!.component)
+            setAction("Do it!") {
+                context.startActivity(mainIntent)
+                Runtime.getRuntime().exit(0)
+            }
+            show()
+        }
+    }
 }

app/src/main/res/layout/activity_list.xml

@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".media.user.ListActivity">
+    tools:context=".media.user.ListActivity"
+    android:fitsSystemWindows="true">
 
     <ProgressBar
         android:id="@+id/listProgressBar"

app/src/main/res/layout/activity_media.xml

@@ -242,14 +242,14 @@
         android:layout_height="wrap_content"
         android:padding="0dp"
         android:layout_gravity="bottom"
-        android:background="?attr/colorPrimaryContainer"
+        android:background="?attr/colorSurface"
         android:translationZ="1dp"
         app:itemActiveIndicatorStyle="@style/BottomNavBar"
         app:itemIconTint="@color/tab_layout_icon"
-        app:itemRippleColor="?attr/colorSecondary"
+        app:itemRippleColor="?attr/colorPrimary"
         app:itemTextAppearanceActive="@style/NavBarText"
         app:itemTextAppearanceInactive="@style/NavBarText"
-        app:itemTextColor="?attr/colorOnPrimaryContainer"
+        app:itemTextColor="@color/tab_layout_icon"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" />
 
     <androidx.cardview.widget.CardView

app/src/main/res/layout/item_anime_page.xml

@@ -60,6 +60,7 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.card.MaterialCardView
+                android:id="@+id/animeUserAvatarContainer"
                 android:layout_width="52dp"
                 android:layout_height="match_parent"
                 android:layout_marginTop="4dp"

app/src/main/res/layout/item_manga_page.xml

@@ -62,6 +62,7 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.card.MaterialCardView
+                android:id="@+id/mangaUserAvatarContainer"
                 android:layout_width="52dp"
                 android:layout_height="match_parent"
                 android:layout_marginTop="4dp"

app/src/main/res/values/style.xml

@@ -53,5 +53,8 @@
         <item name="android:popupBackground">?android:colorBackground</item>
     </style>
 
-    <style name="BottomNavBar" parent="Widget.Material3.BottomNavigationView.ActiveIndicator"/>
+    <style name="BottomNavBar" parent="">
+        <!-- set background color  to transparent -->
+        <item name="android:background">@android:color/transparent</item>
+    </style>
 </resources>

app/src/main/res/values/themes.xml

@@ -1,6 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.Base" parent="Theme.Material3.DayNight">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="elevationOverlayEnabled">false</item>