Merge branch 'eink' of https://github.com/FadeApp/legado into FadeApp-eink

# Conflicts:
#	app/src/main/java/io/legado/app/lib/theme/ATH.kt
#	app/src/main/java/io/legado/app/utils/ContextExtensions.kt
pull/83/head
kunfei 5 years ago
parent b18827bc56
commit f95c07cc3c
  1. 7
      app/src/main/res/xml/pref_config_theme.xml
  2. 7
      app/src/main/res/xml/pref_main.xml

@ -2,13 +2,6 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<io.legado.app.lib.theme.prefs.ATESwitchPreference
android:defaultValue="true"
android:key="autoDarkMode"
android:summary="@string/auto_dark_mode_s"
android:title="@string/auto_dark_mode"
app:iconSpaceReserved="false" />
<io.legado.app.lib.theme.prefs.ATESwitchPreference <io.legado.app.lib.theme.prefs.ATESwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="transparentStatusBar" android:key="transparentStatusBar"

@ -12,6 +12,13 @@
android:title="@string/replace_purify" android:title="@string/replace_purify"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<io.legado.app.lib.theme.prefs.ATESwitchPreference
android:defaultValue="true"
android:key="autoDarkMode"
android:summary="@string/auto_dark_mode_s"
android:title="@string/auto_dark_mode"
app:iconSpaceReserved="false" />
<io.legado.app.lib.theme.prefs.ATESwitchPreference <io.legado.app.lib.theme.prefs.ATESwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="isNightTheme" android:key="isNightTheme"

Loading…
Cancel
Save