Skip to content

Commit 07887cf

Browse files
committed
updating commons and some style
1 parent 639509d commit 07887cf

File tree

5 files changed

+165
-170
lines changed

5 files changed

+165
-170
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ android {
5555
}
5656

5757
dependencies {
58-
implementation 'com.github.SimpleMobileTools:Simple-Commons:a74ec200da'
58+
implementation 'com.github.SimpleMobileTools:Simple-Commons:c615eda325'
5959
implementation 'org.greenrobot:eventbus:3.2.0'
6060
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
6161
}

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ class SettingsActivity : SimpleActivity() {
3030
setupForcePortrait()
3131
updateTextColors(settings_holder)
3232
invalidateOptionsMenu()
33+
34+
arrayOf(settings_color_customization_label, settings_general_settings_label).forEach {
35+
it.setTextColor(getAdjustedPrimaryColor())
36+
}
37+
38+
arrayOf(settings_color_customization_holder, settings_general_settings_holder).forEach {
39+
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
40+
}
3341
}
3442

3543
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -39,6 +47,12 @@ class SettingsActivity : SimpleActivity() {
3947

4048
private fun setupPurchaseThankYou() {
4149
settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
50+
51+
// make sure the corners at ripple fit the stroke rounded corners
52+
if (settings_purchase_thank_you_holder.isGone()) {
53+
settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
54+
}
55+
4256
settings_purchase_thank_you_holder.setOnClickListener {
4357
launchPurchaseThankYouIntent()
4458
}
@@ -63,6 +77,11 @@ class SettingsActivity : SimpleActivity() {
6377
private fun setupUseEnglish() {
6478
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
6579
settings_use_english.isChecked = config.useEnglish
80+
81+
if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
82+
settings_turn_flashlight_on_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
83+
}
84+
6685
settings_use_english_holder.setOnClickListener {
6786
settings_use_english.toggle()
6887
config.useEnglish = settings_use_english.isChecked

0 commit comments

Comments
 (0)