chore: Debrand a series type to webcomic and reading mode to long strip

app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt

@@ -90,7 +90,7 @@ interface Manga : SManga {
     fun seriesType(context: Context, sourceManager: SourceManager? = null): String {
         return context.getString(
             when (seriesType(sourceManager = sourceManager)) {
-                TYPE_WEBTOON -> R.string.webtoon
+                TYPE_WEBTOON -> R.string.webcomic
                 TYPE_MANHWA -> R.string.manhwa
                 TYPE_MANHUA -> R.string.manhua
                 TYPE_COMIC -> R.string.comic

app/src/main/java/eu/kanade/tachiyomi/ui/more/stats/details/StatsDetailsPresenter.kt

@@ -84,7 +84,7 @@ class StatsDetailsPresenter(
             context.getString(R.string.manhwa),
             context.getString(R.string.manhua),
             context.getString(R.string.comic),
-            context.getString(R.string.webtoon),
+            context.getString(R.string.webcomic),
         )
     }
     val statusStats by lazy {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -1215,7 +1215,7 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
                         when (mangaViewer) {
                             ReadingModeType.RIGHT_TO_LEFT.flagValue -> R.string.right_to_left_viewer
                             ReadingModeType.VERTICAL.flagValue -> R.string.vertical_viewer
-                            ReadingModeType.WEBTOON.flagValue -> R.string.webtoon_style
+                            ReadingModeType.WEBTOON.flagValue -> R.string.long_strip
                             else -> R.string.left_to_right_viewer
                         },
                     ).lowercase(Locale.getDefault()),

app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderBottomButton.kt

@@ -9,7 +9,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int)
     ReadingMode("rm", R.string.reading_mode),
     Rotation("rot", R.string.rotation),
     CropBordersPaged("cbp", R.string.crop_borders_paged),
-    CropBordersWebtoon("cbw", R.string.crop_borders_webtoon),
+    CropBordersWebtoon("cbw", R.string.crop_borders_long_strip),
     PageLayout("pl", R.string.page_layout),
     ShiftDoublePage("sdp", R.string.shift_double_pages),
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReadingModeType.kt

@@ -10,7 +10,7 @@ enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @D
     LEFT_TO_RIGHT(1, R.string.left_to_right_viewer, R.drawable.ic_reader_ltr_24dp),
     RIGHT_TO_LEFT(2, R.string.right_to_left_viewer, R.drawable.ic_reader_rtl_24dp),
     VERTICAL(3, R.string.vertical_viewer, R.drawable.ic_reader_vertical_24dp),
-    WEBTOON(4, R.string.webtoon, R.drawable.ic_reader_webtoon_24dp),
+    WEBTOON(4, R.string.long_strip, R.drawable.ic_reader_webtoon_24dp),
     CONTINUOUS_VERTICAL(5, R.string.continuous_vertical, R.drawable.ic_reader_continuous_vertical_24dp),
     ;
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt

@@ -62,7 +62,7 @@ class TabbedReaderSettingsSheet(
 
     override fun getTabTitles(): List<Int> = listOf(
         R.string.general,
-        if (showWebtoonView) R.string.webtoon else R.string.paged,
+        if (showWebtoonView) R.string.webcomic else R.string.paged,
         R.string.filter,
     )
 

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

@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation
 import eu.kanade.tachiyomi.util.lang.addBetaTag
 import eu.kanade.tachiyomi.util.system.isTablet
 import eu.kanade.tachiyomi.util.view.activityBinding
-import kotlinx.coroutines.flow.launchIn
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsReaderController : SettingsController() {
@@ -292,7 +291,7 @@ class SettingsReaderController : SettingsController() {
             }
         }
         preferenceCategory {
-            titleRes = R.string.webtoon
+            titleRes = R.string.webcomic
 
             intListPreference(activity) {
                 key = Keys.navigationModeWebtoon
@@ -334,14 +333,14 @@ class SettingsReaderController : SettingsController() {
 
             intListPreference(activity) {
                 key = Keys.webtoonSidePadding
-                titleRes = R.string.pref_webtoon_side_padding
+                titleRes = R.string.pref_long_strip_side_padding
                 entriesRes = arrayOf(
-                    R.string.webtoon_side_padding_0,
-                    R.string.webtoon_side_padding_5,
-                    R.string.webtoon_side_padding_10,
-                    R.string.webtoon_side_padding_15,
-                    R.string.webtoon_side_padding_20,
-                    R.string.webtoon_side_padding_25,
+                    R.string.long_strip_side_padding_0,
+                    R.string.long_strip_side_padding_5,
+                    R.string.long_strip_side_padding_10,
+                    R.string.long_strip_side_padding_15,
+                    R.string.long_strip_side_padding_20,
+                    R.string.long_strip_side_padding_25,
                 )
                 entryValues = listOf(0, 5, 10, 15, 20, 25)
                 defaultValue = "0"

app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt

@@ -440,7 +440,7 @@ fun Context.mapSeriesType(seriesType: Int): String {
             Manga.TYPE_MANHWA -> R.string.manhwa
             Manga.TYPE_MANHUA -> R.string.manhua
             Manga.TYPE_COMIC -> R.string.comic
-            Manga.TYPE_WEBTOON -> R.string.webtoon
+            Manga.TYPE_WEBTOON -> R.string.webcomic
             else -> R.string.unknown
         },
     )

app/src/main/res/layout/reader_paged_layout.xml

@@ -135,7 +135,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            app:title="@string/pref_webtoon_side_padding"
+            app:title="@string/pref_long_strip_side_padding"
             android:entries="@array/webtoon_side_padding" />
 
         <com.google.android.material.materialswitch.MaterialSwitch

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

@@ -93,7 +93,6 @@
     <string name="left_to_right_viewer">يسارًا فيمينًا</string>
     <string name="right_to_left_viewer">يمينًا فيسارًا</string>
     <string name="vertical_viewer">عموديٌّ</string>
-    <string name="webtoon">وِبتون</string>
     <string name="scale_type">نوع التحجيم</string>
     <string name="fit_screen">لائم الشاشة</string>
     <string name="stretch">مدِّد</string>
@@ -297,12 +296,12 @@
     <string name="pinned">المثبتة</string>
     <string name="reorder">إعادة ترتيب</string>
     <string name="always_show_chapter_transition">أظهر صفحة الانتقال بين الفصول دائمًا</string>
-    <string name="pref_webtoon_side_padding">الإزاحة الجانبية</string>
-    <string name="webtoon_side_padding_0">بلا</string>
-    <string name="webtoon_side_padding_10">١٠٪</string>
-    <string name="webtoon_side_padding_15">١٥٪</string>
-    <string name="webtoon_side_padding_20">٢٠٪</string>
-    <string name="webtoon_side_padding_25">٢٥٪</string>
+    <string name="pref_long_strip_side_padding">الإزاحة الجانبية</string>
+    <string name="long_strip_side_padding_0">بلا</string>
+    <string name="long_strip_side_padding_10">١٠٪</string>
+    <string name="long_strip_side_padding_15">١٥٪</string>
+    <string name="long_strip_side_padding_20">٢٠٪</string>
+    <string name="long_strip_side_padding_25">٢٥٪</string>
     <string name="chapters_">الفصول %1$s</string>
     <string name="remove_from_library">أزل من المكتبة</string>
     <string name="refresh_tracking">حدِّث بيانات التتبُّع</string>
@@ -548,7 +547,6 @@
     <string name="smart_by_theme">ذكيٌّ (حسب السمة)</string>
     <string name="smart_by_page">ذكيٌّ (حسب الصفحة)</string>
     <string name="enable_zoom_out">مكِّن التصغير</string>
-    <string name="webtoon_style">نمط الوِبتون</string>
     <string name="reading_">تُقرأ %1$s</string>
     <string name="set_as_default_for_all">عيِّنه مبدئيًا للكلِّ</string>
     <string name="extension_updates">تحديثات اﻹضافات</string>
@@ -748,7 +746,6 @@
     <string name="changing_will_reset_reading_mode">تغيير هذا يعيد يصفِّر وضع القراءة لهذه السلسلة</string>
     <string name="change">تغيير</string>
     <string name="reading_mode">وضع القراءة</string>
-    <string name="crop_borders_webtoon">اقتصَّ الحدود (وِبتون)</string>
     <string name="crop_borders_paged">اقتصَّ الحدود (مُصَفَّح)</string>
     <string name="couldnt_download_low_space">لا توجد مساحة كافية لتحميل الفصول</string>
     <string name="amount_of_pages_to_preload">عدد الصفحات التي تُحمَّل بينما تقرأ. تحسِّن القيم الكبرى القراءة، ولكنها تستخدم ذاكرةً مؤقَّتةً أكثر وتزيد من استخدام الشبكة.</string>
@@ -1082,7 +1079,7 @@
     <string name="tap_zones">مواضع اللمس</string>
     <string name="lavender">أرجواني</string>
     <string name="violet">بنفسجي</string>
-    <string name="webtoon_side_padding_5">٥٪</string>
+    <string name="long_strip_side_padding_5">٥٪</string>
     <string name="user_agent_string">سلسلة وكيل المستخدم المبدئية</string>
     <string name="loader_rar5_error">تنسيق RARv5 ليس مدعومًا</string>
     <string name="language_requires_app_restart">تتطلَّب بعض اللغات إعادة التشغيل لتظهر صحيحةً</string>

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

@@ -13,7 +13,6 @@
     <string name="external_storage_download_notice">TachiyomiJ2K bölümləri yükləmək üçün bütün fayllara giriş tələb edir. Bura klikləyin, sonra \"Bütün faylları idarə etmək üçün girişə icazə verin\" funksiyasını aktivləşdirin.</string>
     <string name="manga">Manga</string>
     <string name="comic">Komiks</string>
-    <string name="webtoon">Webtoon</string>
     <string name="in_progress">Davam edir</string>
     <string name="not_started">Başlamadı</string>
     <string name="read">Oxunub</string>

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

@@ -85,7 +85,6 @@
     <string name="left_to_right_viewer">От ляво надясно</string>
     <string name="right_to_left_viewer">От дясно наляво</string>
     <string name="vertical_viewer">Вертикално</string>
-    <string name="webtoon">Уебкомикс</string>
     <string name="scale_type">Увеличение</string>
     <string name="fit_screen">Запълване</string>
     <string name="stretch">Разтегляне</string>
@@ -325,12 +324,12 @@
     <string name="unpin">Откачи</string>
     <string name="view_chapters">Преглед на глави</string>
     <string name="always_show_chapter_transition">Винаги показвай прехода между главите</string>
-    <string name="pref_webtoon_side_padding">Странично разстояние</string>
-    <string name="webtoon_side_padding_0">Никакво</string>
-    <string name="webtoon_side_padding_10">10%</string>
-    <string name="webtoon_side_padding_15">15%</string>
-    <string name="webtoon_side_padding_20">20%</string>
-    <string name="webtoon_side_padding_25">25%</string>
+    <string name="pref_long_strip_side_padding">Странично разстояние</string>
+    <string name="long_strip_side_padding_0">Никакво</string>
+    <string name="long_strip_side_padding_10">10%</string>
+    <string name="long_strip_side_padding_15">15%</string>
+    <string name="long_strip_side_padding_20">20%</string>
+    <string name="long_strip_side_padding_25">25%</string>
     <string name="chapters_">Глави %1$s</string>
     <string name="remove_from_library">Премахни от библиотеката</string>
     <string name="refresh_tracking">Обнови проследяването</string>
@@ -560,7 +559,6 @@
     <string name="sort_by">Сортиране по</string>
     <string name="auto_refresh_covers_summary">Обновяване на кориците в библиотеката и при актуализиране на библиотеката</string>
     <string name="last_read_">Последно прочетено %1$s</string>
-    <string name="crop_borders_webtoon">Изрязване на граници (Webtoon)</string>
     <string name="remove_tracking">Премахнете проследяването от приложението</string>
     <string name="about_this_">Относно това %1$s</string>
     <string name="start_reading">Започнете да четете</string>
@@ -601,7 +599,6 @@
     <string name="extensions_miui_warning">Оптимизацията на MIUI трябва да е деактивирана, за да се инсталират разширения.</string>
     <string name="reader_settings">Настройки на четеца</string>
     <string name="reading_">Четене на %1$s</string>
-    <string name="webtoon_style">като уебтуун</string>
     <string name="save_combined_pages">Запазване на комбинирани страници</string>
     <string name="page_preload_amount">Количество на предварително зареждане на страницата</string>
     <string name="set_second_page_as_cover">Задайте втората страница като корица</string>
@@ -966,7 +963,7 @@
     <string name="pref_library_update_manga_restriction">Ограничения за актуализиране на библиотеката</string>
     <string name="pref_update_only_completely_read">С непрочетени глави</string>
     <string name="tap_to_see_details">Вижте пълните подробности за грешката</string>
-    <string name="webtoon_side_padding_5">5%</string>
+    <string name="long_strip_side_padding_5">5%</string>
     <string name="auto_download_while_reading">Автоматично изтегляне при четене</string>
     <string name="on_hiatus">В хиатус</string>
     <string name="cancelled">Отменена</string>

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

@@ -94,7 +94,6 @@
     <string name="left_to_right_viewer">বাম থেকে ডানে</string>
     <string name="right_to_left_viewer">ডান থেকে বামে</string>
     <string name="vertical_viewer">উল্লম্ব</string>
-    <string name="webtoon">ওয়েবটুন</string>
     <string name="scale_type">স্কেল ধরণ</string>
     <string name="fit_screen">সম্পূর্ণ স্ক্রিন</string>
     <string name="stretch">ছড়ানো</string>
@@ -296,12 +295,12 @@
     <string name="continuous_vertical">একটানা উল্লম্ব</string>
     <string name="paged">পেজড</string>
     <string name="always_show_chapter_transition">সবসময় অধ্যায় পরিবর্তন দেখান</string>
-    <string name="pref_webtoon_side_padding">পার্শ্ব প্যাডিং</string>
-    <string name="webtoon_side_padding_0">কিছুই না</string>
-    <string name="webtoon_side_padding_10">১০%</string>
-    <string name="webtoon_side_padding_15">১৫%</string>
-    <string name="webtoon_side_padding_20">২০%</string>
-    <string name="webtoon_side_padding_25">২৫%</string>
+    <string name="pref_long_strip_side_padding">পার্শ্ব প্যাডিং</string>
+    <string name="long_strip_side_padding_0">কিছুই না</string>
+    <string name="long_strip_side_padding_10">১০%</string>
+    <string name="long_strip_side_padding_15">১৫%</string>
+    <string name="long_strip_side_padding_20">২০%</string>
+    <string name="long_strip_side_padding_25">২৫%</string>
     <string name="chapters_">অধ্যায়গুলি %1$s</string>
     <string name="remove_from_library">সংগ্রহশালা থেকে অপসারণ করুন</string>
     <string name="refresh_tracking">ট্র্যাকিং হালনাগাদ করুন</string>
@@ -461,7 +460,6 @@
     <string name="smart_by_theme">স্মার্ট (থিম অনুসারে)</string>
     <string name="smart_by_page">স্মার্ট (পৃষ্ঠা অনুসারে)</string>
     <string name="enable_zoom_out">জুম আউট সক্ষম করুন</string>
-    <string name="webtoon_style">ওয়েবটুন স্টাইল</string>
     <string name="reading_">পড়া হচ্ছে %1$s</string>
     <string name="set_as_default_for_all">সবার জন্য ডিফল্ট হিসাবে সেট করা হলো</string>
     <string name="extension_updates">এক্সটেনশন আপডেট</string>
@@ -791,7 +789,6 @@
     <string name="amount_of_pages_to_preload">পড়ার সময় প্রিলোড করা পৃষ্ঠার পরিমাণ। উচ্চতর মান উচ্চ ক্যাশে এবং নেটওয়ার্ক ব্যবহারের খরচে একটি মসৃণ পড়ার অভিজ্ঞতার ফলে।</string>
     <string name="split_double_pages_portrait">প্রতিকৃতিতে দ্বিগুণ পৃষ্ঠা বিভক্ত করুন</string>
     <string name="crop_borders_paged">সীমানা ক্রপ কর (পৃষ্ঠাযুক্ত)</string>
-    <string name="crop_borders_webtoon">সীমানা ক্রপ কর (ওয়েবটুন)</string>
     <string name="remove_crop">ক্রপ সরাও</string>
     <string name="split_double_pages">দ্বিগুণ পৃষ্ঠা বিভক্ত করুন</string>
     <string name="switch_to_double">দ্বিগুণ পৃষ্ঠাতে স্যুইচ কর</string>