jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-02-23 06:21:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #25 from finnmglas/fix/buttons-old-api

Browse source 
Fix button appearance for older devices
This commit is contained in:
Finn M Glas 2020-05-25 18:45:50 +02:00 • committed by GitHub
commit 0d7adf0c0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/finnmglas/launcher/MainActivity.kt
View file

@ -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)

2
app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
View file

@ -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
}
)

12
app/src/main/java/com/finnmglas/launcher/extern/Functions.kt vendored
View file

@ -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)
}
}

10
app/src/main/res/values/styles.xml
View file

@ -31,6 +31,16 @@
<item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
</style>
<!-- Custom theme -->
<style name="customTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:textColor">#ffffff</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
<item name="colorButtonNormal">#252827</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
</style>
<style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:textColor">#000000</item>
</style>