Maddie Witman
|
2ea488bff5
|
Rework Duplicate Dialog and Allow Migration (#492)
* (Mostly) Working Manga screen migration via duplicate dialog
* Fully working migrate from Browse Search
* Small tweaks for Antsy
* Update app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
* Update app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
---------
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit c0a888807b78891b28c6f6b9f16b719e24b03de1)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
|
2024-03-27 16:21:57 -04:00 |
|
arkon
|
d13f08ca7a
|
Minor cleanup/address lint warnings
(cherry picked from commit 6bb77bcf1aabfcad2c4a9dd73854f3fcc6c52c89)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
|
2023-12-30 18:06:11 -05:00 |
|
arkon
|
82098460ff
|
Replace remaining Android-specific strings
Also renaming the helper composables so it's a bit easier to find/replace everything
in forks.
(cherry picked from commit 0d1bced1226878336f8156671ae0c224c02f2604)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
# app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
# app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt
# app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
|
2023-12-23 20:31:05 -05:00 |
|
arkon
|
1eccf9fad8
|
Migrate to multiplatform string resources (#10147)
* Migrate to multiplatform string resources
* Move plurals translations into separate files
* Fix lint check on generated files
(cherry picked from commit 46e734fc8eefb8c06a880194e702559ca3fa769d)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
# app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
# app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt
# app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
# build.gradle.kts
# i18n/build.gradle.kts
# i18n/src/commonMain/resources/MR/base/strings_sy.xml
# i18n/src/commonMain/resources/MR/fr/strings_sy.xml
# i18n/src/commonMain/resources/MR/in/strings_sy.xml
# i18n/src/commonMain/resources/MR/pt-rBR/strings_sy.xml
# i18n/src/commonMain/resources/MR/ru/strings_sy.xml
# i18n/src/commonMain/resources/MR/zh-rCN/strings_sy.xml
# i18n/src/commonMain/resources/MR/zh-rTW/strings_sy.xml
|
2023-12-23 20:28:29 -05:00 |
|
arkon
|
8bf75e1d20
|
Avoid badly wrapped buttons in DuplicateMangaDialog
Fixes #9767
(cherry picked from commit db788d519de65fab1dd73f02cf05688714fbccb5)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
|
2023-08-12 14:56:56 -04:00 |
|
arkon
|
586068d720
|
Move more components
(cherry picked from commit dd71c76a8f0b760ec806e71be77998bbc2da61a3)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
|
2023-03-05 16:44:36 -05:00 |
|