Skip to content

Commit 19e7631

Browse files
committed
fix settings dialog theme
1 parent 9bc6fc8 commit 19e7631

5 files changed

Lines changed: 35 additions & 12 deletions

File tree

app/src/main/java/io/github/a13e300/myinjector/SettingsDialog.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import io.github.a13e300.myinjector.telegram.findBaseActivity
4949

5050
abstract class SettingDialog(val activityCtx: Context) : Preference.OnPreferenceChangeListener,
5151
Preference.OnPreferenceClickListener {
52-
val appCtx = activityCtx.call(
52+
private val appCtx = (activityCtx.call(
5353
"createApplicationContext",
5454
ApplicationInfo(activityCtx.applicationInfo).apply {
5555
packageName = BuildConfig.APPLICATION_ID
@@ -59,15 +59,13 @@ abstract class SettingDialog(val activityCtx: Context) : Preference.OnPreference
5959
splitPublicSourceDirs = null
6060
splitNames = null
6161
}, 0
62-
) as Context
62+
) as Context).createConfigurationContext(activityCtx.resources.configuration)
6363
val context = object : ContextThemeWrapper(
64-
activityCtx,
65-
android.R.style.Theme_DeviceDefault_DayNight
64+
appCtx,
65+
R.style.AppTheme
6666
) {
67-
override fun getResources(): Resources = this@SettingDialog.appCtx.resources
68-
6967
override fun getSystemService(name: String): Any? {
70-
if (name == LAYOUT_INFLATER_SERVICE) return appCtx.getSystemService(name)
68+
if (name == WINDOW_SERVICE) return activityCtx.getSystemService(name)
7169
return super.getSystemService(name)
7270
}
7371
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="AppTheme" parent="android:Theme.Material.NoActionBar">
5+
<item name="android:windowLightStatusBar">false</item>
6+
<item name="android:windowLightNavigationBar">false</item>
7+
<item name="android:colorAccent">#64b5f6</item>
8+
<item name="android:navigationBarColor">@android:color/transparent</item>
9+
<item name="android:statusBarColor">@android:color/transparent</item>
10+
</style>
11+
</resources>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<resources>
22

3-
<style name="AppTheme" parent="android:Theme.Material">
4-
<item name="android:colorAccent">#3F51B5</item>
3+
<style name="AppTheme" parent="android:Theme.Material.NoActionBar">
4+
<item name="android:windowLightStatusBar">false</item>
5+
<item name="android:colorAccent">#64b5f6</item>
56
<item name="android:navigationBarColor">@android:color/transparent</item>
7+
<item name="android:statusBarColor">@android:color/transparent</item>
68
</style>
79

810
</resources>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar">
5+
<item name="android:windowLightStatusBar">true</item>
6+
<item name="android:windowLightNavigationBar">true</item>
7+
<item name="android:colorAccent">#1a73e9</item>
8+
<item name="android:navigationBarColor">@android:color/transparent</item>
9+
<item name="android:statusBarColor">@android:color/transparent</item>
10+
</style>
11+
</resources>

app/src/main/res/values/styles.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<resources>
22

3-
<style name="AppTheme" parent="android:Theme.Material.Light.LightStatusBar">
4-
<item name="android:colorAccent">#3F51B5</item>
3+
<style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar">
4+
<item name="android:windowLightStatusBar">true</item>
5+
<item name="android:colorAccent">#1a73e9</item>
56
<item name="android:navigationBarColor">@android:color/transparent</item>
6-
<item name="android:windowLightNavigationBar">true</item>
7+
<item name="android:statusBarColor">@android:color/transparent</item>
78
</style>
89

910
</resources>

0 commit comments

Comments
 (0)