diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
index 466abcb..d16cfa5 100644
--- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
@@ -66,7 +66,7 @@ class MainActivity : AppCompatActivity(),
when (currentTheme) {
"dark" -> R.style.darkTheme
"finn" -> R.style.finnmglasTheme
- else -> R.style.finnmglasTheme
+ else -> R.style.customTheme
}
)
setContentView(R.layout.activity_main)
diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
index 36af54a..bb77d13 100644
--- a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
@@ -34,7 +34,7 @@ class SettingsActivity : AppCompatActivity() {
when (getSavedTheme(this)) {
"dark" -> R.style.darkTheme
"finn" -> R.style.finnmglasTheme
- else -> R.style.finnmglasTheme
+ else -> R.style.customTheme
}
)
diff --git a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
index 2049178..c2c967a 100644
--- a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
+++ b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
@@ -8,10 +8,7 @@ import android.content.Intent
import android.content.SharedPreferences
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
-import android.graphics.Bitmap
-import android.graphics.BlendMode
-import android.graphics.BlendModeColorFilter
-import android.graphics.PorterDuff
+import android.graphics.*
import android.net.Uri
import android.os.Build
import android.os.Bundle
@@ -325,6 +322,9 @@ fun getDominantColor(bitmap: Bitmap?): Int {
fun setButtonColor(btn: Button, color: Int) {
if (Build.VERSION.SDK_INT >= 29)
btn.background.colorFilter = BlendModeColorFilter(color, BlendMode.MULTIPLY)
- else
- btn.background.setColorFilter(color, PorterDuff.Mode.MULTIPLY)
+ else {
+ // not setting it here, unable to find a good alternative
+ // I tried:
+ // btn.background.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0d1f376..916ab05 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,6 +31,16 @@
- @style/WindowFadeTransition
+
+
+