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.core.app.ActivityOptionsCompat
import androidx.core.app.ShareCompat
import androidx.core.content.ContextCompat
import com.aurora.Constants
import com.aurora.gplayapi.data.models.App
import com.aurora.store.MainActivity
import com.aurora.store.R
import com.aurora.store.util.Log
import com.aurora.store.util.Preferences
import kotlin.system.exitProcess
val Context.inflater: LayoutInflater
@@ -128,3 +130,24 @@ fun Context.getStyledAttributeColor(id: Int): Int {
arr.recycle()
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.content.Intent
import android.content.res.ColorStateList
import android.os.Build
import android.os.Bundle
import android.os.Environment
@@ -158,7 +159,11 @@ class MainActivity : BaseActivity() {
bottomNavigationView.setupWithNavController(navController)
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 navigationList =

View File

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