diff --git a/api/api.iml b/api/api.iml
index ce0230c2..ca9c4bea 100644
--- a/api/api.iml
+++ b/api/api.iml
@@ -70,15 +70,15 @@
-
+
-
-
+
+
diff --git a/app/app.iml b/app/app.iml
index 690cfc9a..bf6b2504 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -70,17 +70,17 @@
-
-
-
+
+
+
-
+
@@ -135,10 +135,10 @@
-
-
-
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 92e29e18..f3ed55fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ android {
buildTypes {
release {
- minifyEnabled true
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
index 17e0437f..7eee40fa 100644
--- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
+++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
@@ -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)
- }
- }
}
diff --git a/app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt b/app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt
index 9a5ec153..fdaf2ebe 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/BaseActivity.kt
@@ -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)