mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-05 16:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
arkon
2020-04-10 11:14:09 -04:00
parent df625a998f f14af7cf83
commit 145a744ce0
12 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/res/values/arrays.xml
View File

@@ -54,6 +54,22 @@
<item>@string/scale_type_smart_fit</item>
</string-array>
<string-array name="webtoon_margin_ratio">
<item>@string/webtoon_margin_ratio_0</item>
<item>@string/webtoon_margin_ratio_10</item>
<item>@string/webtoon_margin_ratio_15</item>
<item>@string/webtoon_margin_ratio_20</item>
<item>@string/webtoon_margin_ratio_25</item>
</string-array>
<string-array name="webtoon_margin_ratio_values">
<item>0.0</item>
<item>0.1</item>
<item>0.15</item>
<item>0.2</item>
<item>0.25</item>
</string-array>
<string-array name="image_scale_type_values">
<item>1</item>
<item>2</item>

6
app/src/main/res/values/strings.xml
View File

@@ -241,6 +241,7 @@
<string name="pref_read_with_tapping">Tapping</string>
<string name="pref_read_with_long_tap">Long tap dialog</string>
<string name="pref_reader_theme">Background color</string>
<string name="pref_reader_margin">Margin ratio</string>
<string name="white_background">White</string>
<string name="black_background">Black</string>
<string name="pref_viewer_type">Default viewer</string>
@@ -278,6 +279,11 @@
<string name="color_filter_a_value">A</string>
<string name="pref_always_show_chapter_transition">Always show chapter transition</string>
<string name="pref_category_reading">Reading</string>
<string name="webtoon_margin_ratio_0">No margin</string>
<string name="webtoon_margin_ratio_10">10%</string>
<string name="webtoon_margin_ratio_15">15%</string>
<string name="webtoon_margin_ratio_20">20%</string>
<string name="webtoon_margin_ratio_25">25%</string>
<!-- Downloads section -->
<string name="pref_download_directory">Download location</string>