disabled proguard
This commit is contained in:
parent
216cf0601a
commit
067ef3bc21
|
@ -70,15 +70,15 @@
|
|||
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
|
|
14
app/app.iml
14
app/app.iml
|
@ -70,17 +70,17 @@
|
|||
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
|
||||
|
@ -135,10 +135,10 @@
|
|||
<library name="Gradle: kaptGeneratedClasses">
|
||||
<CLASSES>
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
|
||||
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -25,7 +25,7 @@ android {
|
|||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled true
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,11 +22,6 @@ class MainActivity : Main() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
|
||||
pref = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
currentTheme = pref.getString("theme_mode", "LIGHT").toString()
|
||||
|
||||
setFinalTheme(currentTheme)
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_main)
|
||||
|
||||
|
@ -49,16 +44,6 @@ class MainActivity : Main() {
|
|||
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
val theme = pref.getString("theme_mode", "LIGHT")
|
||||
|
||||
//if for some weird reasons we get invalid
|
||||
//theme, recreate activity
|
||||
if (currentTheme != theme)
|
||||
recreate()
|
||||
}
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
val navHost = findNavController(R.id.bottom_nav_host)
|
||||
when (item.itemId) {
|
||||
|
@ -90,18 +75,4 @@ class MainActivity : Main() {
|
|||
else -> toolbar.navigationIcon = null
|
||||
}
|
||||
}
|
||||
|
||||
private fun setFinalTheme(currentTheme: String) {
|
||||
when (currentTheme) {
|
||||
"LIGHT" -> setTheme(R.style.LightTheme_Blue)
|
||||
"DARK" -> setTheme(R.style.DarkTheme_Blue)
|
||||
"FOLLOW" -> {
|
||||
when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
|
||||
Configuration.UI_MODE_NIGHT_YES -> setTheme(R.style.DarkTheme_Blue)
|
||||
Configuration.UI_MODE_NIGHT_NO -> setTheme(R.style.LightTheme_Blue)
|
||||
}
|
||||
}
|
||||
else -> setTheme(R.style.LightTheme_Blue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,16 +16,16 @@ import com.vanced.manager.R
|
|||
@SuppressLint("Registered")
|
||||
open class ThemeActivity : AppCompatActivity() {
|
||||
|
||||
//private lateinit var currentTheme: String
|
||||
//private lateinit var pref: SharedPreferences
|
||||
private lateinit var currentTheme: String
|
||||
private lateinit var pref: SharedPreferences
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
//pref = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
//currentTheme = pref.getString("theme_mode", "LIGHT").toString()
|
||||
pref = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
currentTheme = pref.getString("theme_mode", "LIGHT").toString()
|
||||
|
||||
//setFinalTheme(currentTheme)
|
||||
setFinalTheme(currentTheme)
|
||||
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
|
||||
setTaskBG()
|
||||
|
@ -34,12 +34,12 @@ open class ThemeActivity : AppCompatActivity() {
|
|||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
//val theme = pref.getString("theme_mode", "LIGHT")
|
||||
val theme = pref.getString("theme_mode", "LIGHT")
|
||||
|
||||
//if for some weird reasons we get invalid
|
||||
//theme, recreate activity
|
||||
//if (currentTheme != theme)
|
||||
//recreate()
|
||||
if (currentTheme != theme)
|
||||
recreate()
|
||||
|
||||
//set Task Header color in recents menu for
|
||||
//devices with lower Android version than Pie
|
||||
|
@ -51,7 +51,7 @@ open class ThemeActivity : AppCompatActivity() {
|
|||
//This stupid ass AppCompatDelegate does
|
||||
//not want to work, so I have to use my
|
||||
//own implementation of theme switching
|
||||
/*
|
||||
|
||||
private fun setFinalTheme(currentTheme: String) {
|
||||
when (currentTheme) {
|
||||
"LIGHT" -> setTheme(R.style.LightTheme_Blue)
|
||||
|
@ -65,7 +65,6 @@ open class ThemeActivity : AppCompatActivity() {
|
|||
else -> setTheme(R.style.LightTheme_Blue)
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
private fun setTaskBG() {
|
||||
val label = getString(R.string.app_name)
|
||||
|
|
Loading…
Reference in New Issue