athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ThemeEngine: Rework theme configuration

Browse Source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2023-08-25 13:10:22 +05:30
parent 2a9771c953
commit cfcccf811a
13 changed files with 112 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/aurora/store/MainActivity.kt
View File

@@ -48,7 +48,7 @@ import coil.load
import coil.transform.RoundedCornersTransformation
import com.aurora.Constants
import com.aurora.extensions.accentColor
import com.aurora.extensions.applyTheme
import com.aurora.extensions.applyThemeAccent
import com.aurora.extensions.isRAndAbove
import com.aurora.extensions.toast
import com.aurora.gplayapi.data.models.AuthData
@@ -89,9 +89,7 @@ class MainActivity : AppCompatActivity() {
)
override fun onCreate(savedInstanceState: Bundle?) {
val themeId = Preferences.getInteger(this, Preferences.PREFERENCE_THEME_TYPE)
val accentId = Preferences.getInteger(this, Preferences.PREFERENCE_THEME_ACCENT)
applyTheme(themeId, accentId)
applyThemeAccent()
super.onCreate(savedInstanceState)
B = ActivityMainBinding.inflate(layoutInflater)

3
app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt
View File

@@ -29,7 +29,6 @@ import android.view.View
import android.view.ViewAnimationUtils
import android.view.ViewGroup
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.aurora.extensions.applyTheme
import com.aurora.extensions.hide
import com.aurora.extensions.isSAndAbove
import com.aurora.extensions.isVisible
@@ -124,7 +123,7 @@ class AccentFragment : BaseFragment() {
}
private fun updateAccent(accentId: Int) {
applyTheme(themeId)
requireActivity().recreate()
save(PREFERENCE_THEME_ACCENT, accentId)
}

3
app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt
View File

@@ -28,7 +28,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewAnimationUtils
import android.view.ViewGroup
import com.aurora.extensions.applyTheme
import com.aurora.extensions.hide
import com.aurora.extensions.isVisible
import com.aurora.extensions.show
@@ -110,7 +109,7 @@ class ThemeFragment : BaseFragment() {
}
private fun update(themeId: Int) {
applyTheme(themeId)
requireActivity().recreate()
save(PREFERENCE_THEME_TYPE, themeId)
}

9
app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
View File

@@ -29,7 +29,6 @@ import androidx.navigation.fragment.findNavController
import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import com.aurora.extensions.applyTheme
import com.aurora.extensions.isTAndAbove
import com.aurora.store.R
import com.aurora.store.util.Preferences
@@ -71,7 +70,7 @@ class UIPreference : PreferenceFragmentCompat() {
val themeId = Integer.parseInt(newValue.toString())
save(Preferences.PREFERENCE_THEME_TYPE, themeId)
applyTheme(themeId)
requireActivity().recreate()
true
}
}
@@ -79,14 +78,10 @@ class UIPreference : PreferenceFragmentCompat() {
val accentPreference: ListPreference? = findPreference(Preferences.PREFERENCE_THEME_ACCENT)
accentPreference?.let {
it.setOnPreferenceChangeListener { _, newValue ->
val themeId = Preferences.getInteger(
requireContext(),
Preferences.PREFERENCE_THEME_TYPE
)
val accentId = Integer.parseInt(newValue.toString())
save(Preferences.PREFERENCE_THEME_ACCENT, accentId)
applyTheme(themeId)
requireActivity().recreate()
true
}
}