github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorganize reader settings. Update Conductor version

Browse source
This commit is contained in:
inorichi 2018-04-28 10:40:08 +02:00
parent 18883f1ba3
commit 303e6c0102
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -203,7 +203,7 @@ dependencies {
implementation 'me.gujun.android.taggroup:library:1.4@aar' implementation 'me.gujun.android.taggroup:library:1.4@aar'
// Conductor // Conductor
implementation "com.github.inorichi.Conductor:conductor:05c4d4d" implementation "com.github.inorichi.Conductor:conductor:be8b3c5"
implementation ("com.bluelinelabs:conductor-support:2.1.5-SNAPSHOT") { implementation ("com.bluelinelabs:conductor-support:2.1.5-SNAPSHOT") {
exclude group: "com.bluelinelabs", module: "conductor" exclude group: "com.bluelinelabs", module: "conductor"
} }

38
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
View file

@ -76,8 +76,8 @@ class SettingsReaderController : SettingsController() {
defaultValue = true defaultValue = true
} }
switchPreference { switchPreference {
key = Keys.enableTransitions key = Keys.keepScreenOn
titleRes = R.string.pref_page_transitions titleRes = R.string.pref_keep_screen_on
defaultValue = true defaultValue = true
} }
switchPreference { switchPreference {
@ -85,20 +85,28 @@ class SettingsReaderController : SettingsController() {
titleRes = R.string.pref_show_page_number titleRes = R.string.pref_show_page_number
defaultValue = true defaultValue = true
} }
switchPreference { preferenceCategory {
key = Keys.cropBorders titleRes = R.string.pager_viewer
titleRes = R.string.pref_crop_borders
defaultValue = false switchPreference {
key = Keys.enableTransitions
titleRes = R.string.pref_page_transitions
defaultValue = true
}
switchPreference {
key = Keys.cropBorders
titleRes = R.string.pref_crop_borders
defaultValue = false
}
} }
switchPreference { preferenceCategory {
key = Keys.cropBordersWebtoon titleRes = R.string.webtoon_viewer
titleRes = R.string.pref_crop_borders_webtoon
defaultValue = false switchPreference {
} key = Keys.cropBordersWebtoon
switchPreference { titleRes = R.string.pref_crop_borders
key = Keys.keepScreenOn defaultValue = false
titleRes = R.string.pref_keep_screen_on }
defaultValue = true
} }
preferenceCategory { preferenceCategory {
titleRes = R.string.pref_reader_navigation titleRes = R.string.pref_reader_navigation

1
app/src/main/res/values/strings.xml
View file

@ -190,6 +190,7 @@
<string name="right_to_left_viewer">Right to left</string> <string name="right_to_left_viewer">Right to left</string>
<string name="vertical_viewer">Vertical</string> <string name="vertical_viewer">Vertical</string>
<string name="webtoon_viewer">Webtoon</string> <string name="webtoon_viewer">Webtoon</string>
<string name="pager_viewer">Pager</string>
<string name="pref_image_decoder">Image decoder</string> <string name="pref_image_decoder">Image decoder</string>
<string name="pref_image_scale_type">Scale type</string> <string name="pref_image_scale_type">Scale type</string>
<string name="scale_type_fit_screen">Fit screen</string> <string name="scale_type_fit_screen">Fit screen</string>