Switch to Material3 theme

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2023-04-30 11:01:42 +05:30
parent aad9395d50
commit 5a7615691b
7 changed files with 38 additions and 19 deletions

View File

@@ -35,11 +35,13 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.app.ActivityOptionsCompat import androidx.core.app.ActivityOptionsCompat
import androidx.core.app.ShareCompat import androidx.core.app.ShareCompat
import androidx.core.content.ContextCompat
import com.aurora.Constants import com.aurora.Constants
import com.aurora.gplayapi.data.models.App import com.aurora.gplayapi.data.models.App
import com.aurora.store.MainActivity import com.aurora.store.MainActivity
import com.aurora.store.R import com.aurora.store.R
import com.aurora.store.util.Log import com.aurora.store.util.Log
import com.aurora.store.util.Preferences
import kotlin.system.exitProcess import kotlin.system.exitProcess
val Context.inflater: LayoutInflater val Context.inflater: LayoutInflater
@@ -128,3 +130,24 @@ fun Context.getStyledAttributeColor(id: Int): Int {
arr.recycle() arr.recycle()
return styledAttr return styledAttr
} }
fun Context.accentColor(): Int {
val color = when (Preferences.getInteger(this, Preferences.PREFERENCE_THEME_ACCENT)) {
0 -> R.color.colorAccent
1 -> R.color.colorAccent01
2 -> R.color.colorAccent02
3 -> R.color.colorAccent03
4 -> R.color.colorAccent04
5 -> R.color.colorAccent05
6 -> R.color.colorAccent06
7 -> R.color.colorAccent07
8 -> R.color.colorAccent08
9 -> R.color.colorAccent09
10 -> R.color.colorAccent10
11 -> R.color.colorAccent11
12 -> R.color.colorAccent12
13 -> R.color.colorAccent13
else -> if (isSAndAbove()) R.color.colorAccent else R.color.colorAccent01
}
return ContextCompat.getColor(this, color)
}

View File

@@ -22,6 +22,7 @@ package com.aurora.store
import android.Manifest import android.Manifest
import android.content.Intent import android.content.Intent
import android.content.res.ColorStateList
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Environment import android.os.Environment
@@ -158,7 +159,11 @@ class MainActivity : BaseActivity() {
bottomNavigationView.setupWithNavController(navController) bottomNavigationView.setupWithNavController(navController)
val backGroundColor = getStyledAttributeColor(android.R.attr.colorBackground) val backGroundColor = getStyledAttributeColor(android.R.attr.colorBackground)
bottomNavigationView.setBackgroundColor(ColorUtils.setAlphaComponent(backGroundColor, 245)) bottomNavigationView.apply {
setBackgroundColor(ColorUtils.setAlphaComponent(backGroundColor, 245))
val alphaColor = ColorUtils.setAlphaComponent(this@MainActivity.accentColor(), 100)
itemActiveIndicatorColor = ColorStateList.valueOf(alphaColor)
}
val defaultTab = Preferences.getInteger(this, Preferences.PREFERENCE_DEFAULT_SELECTED_TAB) val defaultTab = Preferences.getInteger(this, Preferences.PREFERENCE_DEFAULT_SELECTED_TAB)
val navigationList = val navigationList =

View File

@@ -45,7 +45,7 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val bottomSheetDialog = BottomSheetDialog( val bottomSheetDialog = BottomSheetDialog(
requireContext(), requireContext(),
R.style.Aurora_BottomSheetDialog R.style.Theme_Material3_DayNight_BottomSheetDialog
) )
VM = SheetBaseBinding.inflate(layoutInflater) VM = SheetBaseBinding.inflate(layoutInflater)

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--Common Colors--> <!--Common Colors-->
<color name="colorAccent">@android:color/system_accent1_200</color> <color name="colorAccent">@android:color/system_accent1_400</color>
</resources> </resources>

View File

@@ -51,7 +51,7 @@
<dimen name="screenshot_height_mini">120dp</dimen> <dimen name="screenshot_height_mini">120dp</dimen>
<dimen name="screenshot_width_mini">68dp</dimen> <dimen name="screenshot_width_mini">68dp</dimen>
<dimen name="height_bottom_adj">64dp</dimen> <dimen name="height_bottom_adj">100dp</dimen>
<dimen name="cluster_size">128dp</dimen> <dimen name="cluster_size">128dp</dimen>
<dimen name="elevation_small">3dp</dimen> <dimen name="elevation_small">3dp</dimen>

View File

@@ -19,7 +19,7 @@
<resources> <resources>
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="colorPrimary">@color/colorAccent</item> <item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">?android:colorBackground</item> <item name="colorPrimaryDark">?android:colorBackground</item>
@@ -32,7 +32,7 @@
<item name="chipStyle">@style/Widget.Aurora.Chip</item> <item name="chipStyle">@style/Widget.Aurora.Chip</item>
</style> </style>
<style name="AppTheme.Light" parent="Theme.MaterialComponents.Light.NoActionBar"> <style name="AppTheme.Light" parent="Theme.Material3.Light.NoActionBar">
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="colorPrimary">@color/colorAccent</item> <item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorWhite</item> <item name="colorPrimaryDark">@color/colorWhite</item>
@@ -49,7 +49,7 @@
<item name="chipStyle">@style/Widget.Aurora.Chip</item> <item name="chipStyle">@style/Widget.Aurora.Chip</item>
</style> </style>
<style name="AppTheme.Dark" parent="Theme.MaterialComponents.NoActionBar"> <style name="AppTheme.Dark" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="colorPrimary">@color/colorAccent</item> <item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item> <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>

View File

@@ -64,15 +64,6 @@
<item name="android:textAppearance">@style/TextAppearance.Aurora.Chip</item> <item name="android:textAppearance">@style/TextAppearance.Aurora.Chip</item>
</style> </style>
<style name="Aurora.BottomSheetDialogStyle" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@android:color/transparent</item>
<item name="android:padding">@dimen/padding_small</item>
</style>
<style name="Aurora.BottomSheetDialog" parent="Theme.Design.BottomSheetDialog">
<item name="bottomSheetStyle">@style/Aurora.BottomSheetDialogStyle</item>
</style>
<style name="AuroraProgressView"> <style name="AuroraProgressView">
<item name="minWidth">32dp</item> <item name="minWidth">32dp</item>
<item name="maxWidth">46dp</item> <item name="maxWidth">46dp</item>