Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins

# Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt # app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt # app/src/main/res/values/strings.xml
2020-04-10 11:14:09 -04:00
parent df625a998f f14af7cf83
commit 145a744ce0
12 changed files with 119 additions and 1 deletions
@@ -146,6 +146,17 @@ class SettingsReaderController : SettingsController() {
                titleRes = R.string.pref_crop_borders
                defaultValue = false
            }
+
+            floatListPreference {
+                key = Keys.marginRatioWebtoon
+                titleRes = R.string.pref_reader_margin
+                entriesRes = arrayOf(R.string.webtoon_margin_ratio_0,
+                        R.string.webtoon_margin_ratio_10, R.string.webtoon_margin_ratio_15,
+                        R.string.webtoon_margin_ratio_20, R.string.webtoon_margin_ratio_25)
+                entryValues = arrayOf("0", "0.1", "0.15", "0.2", "0.25")
+                defaultValue = "0"
+                summary = "%s"
+            }
        }

        preferenceCategory {