Skip to content

Commit 238c121

Browse files
committed
pref: preference add auto dark switch
1 parent 81f5ff9 commit 238c121

File tree

6 files changed

+19
-4
lines changed

6 files changed

+19
-4
lines changed

app/src/main/java/com/osfans/trime/ime/core/Preferences.kt

+4
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,17 @@ class Preferences(
248248
companion object {
249249
const val SELECTED_THEME = "looks__selected_theme"
250250
const val SELECTED_COLOR = "looks__selected_color_scheme"
251+
const val AUTO_DARK = "looks__auto_dark"
251252
}
252253
var selectedTheme: String
253254
get() = prefs.getPref(SELECTED_THEME, "trime")
254255
set(v) = prefs.setPref(SELECTED_THEME, v)
255256
var selectedColor: String
256257
get() = prefs.getPref(SELECTED_COLOR, "default")
257258
set(v) = prefs.setPref(SELECTED_COLOR, v)
259+
var autoDark: Boolean = false
260+
get() = prefs.getPref(AUTO_DARK, false)
261+
private set
258262
}
259263

260264
/**

app/src/main/java/com/osfans/trime/ime/core/Trime.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,14 @@ public void setShowComment(boolean show_comment) {
748748
@Override
749749
public void onStartInputView(EditorInfo attribute, boolean restarting) {
750750
super.onStartInputView(attribute, restarting);
751-
UiModeManager uiModeManager = (UiModeManager) getSystemService(Context.UI_MODE_SERVICE);
752-
if (setDarkMode(uiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES)) {
753-
Timber.i("dark mode changed");
754-
initKeyboardDarkMode(darkMode);
751+
if (getPrefs().getLooks().getAutoDark()) {
752+
UiModeManager uiModeManager = (UiModeManager) getSystemService(Context.UI_MODE_SERVICE);
753+
if (setDarkMode(uiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES)) {
754+
Timber.i("dark mode changed");
755+
initKeyboardDarkMode(darkMode);
756+
} else Timber.i("dark mode not changed");
757+
} else {
758+
Timber.i("auto dark off");
755759
}
756760

757761
Sound.resetProgress();

app/src/main/res/values-zh-rCN/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,5 @@
182182
<string name="setup__skip_hint">您确定要跳过向导吗?</string>
183183
<string name="setup__skip_hint_yes">好的,谢谢</string>
184184
<string name="setup__skip_hint_no">不,我想留在这儿</string>
185+
<string name="keyboard__auto_dark_title">自动切换暗黑/明亮配色方案</string>
185186
</resources>

app/src/main/res/values-zh-rTW/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,5 @@
183183
<string name="setup__skip_hint">您確定要跳過嚮導嗎?</string>
184184
<string name="setup__skip_hint_yes">好的,謝謝</string>
185185
<string name="setup__skip_hint_no">不,我想留在這兒</string>
186+
<string name="keyboard__auto_dark_title">自動切換暗黑/明亮配色方案</string>
186187
</resources>

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

+1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,5 @@
183183
<string name="setup__skip_hint">"Do you want to skip the setup wizard? "</string>
184184
<string name="setup__skip_hint_yes">OK, thanks</string>
185185
<string name="setup__skip_hint_no">No, please leave me here</string>
186+
<string name="keyboard__auto_dark_title">Auto change dark/light color scheme</string>
186187
</resources>

app/src/main/res/xml/looks_preference.xml

+4
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@
99
app:iconSpaceReserved="false"
1010
android:title="@string/looks__selected_color_title"
1111
android:summary="@string/looks__selected_color_summary" />
12+
<SwitchPreferenceCompat android:key="looks__auto_dark"
13+
app:iconSpaceReserved="false"
14+
android:title="@string/keyboard__auto_dark_title"
15+
android:defaultValue="false"/>
1216
</PreferenceScreen>

0 commit comments

Comments
 (0)