diff --git a/app/build.gradle b/app/build.gradle index f504eb7f..e2a836f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,8 +33,6 @@ android { buildTypes { release { //debuggable true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } debug { diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt index 7e5202f5..707b9c92 100644 --- a/app/src/main/java/code/name/monkey/retromusic/App.kt +++ b/app/src/main/java/code/name/monkey/retromusic/App.kt @@ -22,6 +22,7 @@ import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.TransactionDetails +import com.google.android.material.color.DynamicColors import org.koin.android.ext.koin.androidContext import org.koin.core.context.startKoin @@ -45,11 +46,14 @@ class App : Application() { .commit() } + DynamicColors.applyToActivitiesIfAvailable(this) + if (VersionUtils.hasNougatMR()) DynamicShortcutManager(this).initDynamicShortcuts() // automatically restores purchases - billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, + billingProcessor = BillingProcessor( + this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, object : BillingProcessor.IBillingHandler { override fun onProductPurchased(productId: String, details: TransactionDetails?) {} diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt index 337f54b3..67eca8cf 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt @@ -51,6 +51,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable { registerSystemUiVisibility() toggleScreenOn() setDrawUnderNavigationBar() + setLightNavigationAuto() //MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this) } @@ -150,6 +151,10 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable { setNavigationbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface)) } + fun setLightNavigationAuto() { + ATH.setLightNavigationbarAuto(this, surfaceColor()) + } + open fun setLightStatusbar(enabled: Boolean) { ATH.setLightStatusbar(this, enabled) } diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml index a03ffe0c..a58d6980 100644 --- a/app/src/main/res/layout/activity_permission.xml +++ b/app/src/main/res/layout/activity_permission.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorSurface"> + android:background="?attr/colorSurface" + android:fitsSystemWindows="true">