Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,092 Commits 1 Branch 60 Tags
Commit Graph

56 Commits

Author SHA1 Message Date
arkon
fe9f022363 Fix cut off labels in reader sheet toggles 
(cherry picked from commit f9754f4f587449f6d9c3a31a99b5c39269d561ac)
 2023-10-01 15:58:53 -04:00
arkon
4b3efac857 Tweak reading mode and orientation sheet designs 
(cherry picked from commit 8824c7dbe392d586b24234f8e4c0a1c944a77328)
 2023-10-01 15:58:42 -04:00
arkon
d8158af43a Switch to different ktlint plugin 
Should be better at incremental builds.
To format, run `./gradlew ktlintFormat`.

(cherry picked from commit d29b7c4e5735dc137d578d3bcb3da1f0a02573e8)

# Conflicts:
#	buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts
#	data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
#	domain/src/main/java/tachiyomi/domain/library/model/LibrarySortMode.kt
#	domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
#	domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt
 2023-09-04 12:15:09 -04:00
Jobobby04
119d3ef56e Revert "Update Compose" 
This reverts commit 4b4e432ef6416f964a4344ebea4034d65fa6401a.
 2023-08-13 15:11:07 -04:00
arkon
4b4e432ef6 Update Compose 
Also remove workaround for preventing keyboard showing up for SelectItems.

(cherry picked from commit efa7a3a167219e9e23ee9b29d9cabe3ca8eb088a)
 2023-08-13 12:26:31 -04:00
arkon
781ec229b7 Remove relative timestamps setting 
(cherry picked from commit fe90546821092ce8916445ce515ba51404617d62)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
 2023-08-12 14:49:02 -04:00
arkon
2e9c265a45 Bump dependencies 
(cherry picked from commit b6620434b3e1899dfd789594b8ca9dcddc43902f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
 2023-08-12 14:12:52 -04:00
arkon
ccf4b90bff Remove some uses of color resources 
(cherry picked from commit ee26d6dffd8c77115683ea242c3ab729c70f7ea6)

# Conflicts:
#	app/src/main/res/drawable/ic_tachi.xml
#	presentation-core/src/main/res/values/colors.xml
 2023-08-12 13:53:17 -04:00
arkon
a447b011d0 Clean up preference extensions/items a bit 
(cherry picked from commit cf14831fbe6d3b6b07d0fe185194d27d6ac6ae17)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
#	app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
#	app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
 2023-08-12 13:34:39 -04:00
arkon
db2cf166b7 Bump dependencies 
(cherry picked from commit ac306547a0ccd28f45882cba8e3b0138f6d6aedc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	domain/src/main/java/tachiyomi/domain/category/interactor/CreateCategoryWithName.kt
#	gradle/libs.versions.toml
 2023-08-12 13:19:48 -04:00
arkon
d95d4a87cd Constrain reader sheet to max 75% of height 
(cherry picked from commit a3a3f44056fbcacd3a9b7e68bf7643099d18f0bf)
 2023-08-12 12:20:19 -04:00
arkon
1fa687f7ac Replace reader sheet dropdowns with chips 
(cherry picked from commit 22c6dbda3f55d864665228b43954b8decb5dda1f)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
#	app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt
 2023-08-12 12:20:07 -04:00
arkon
9a9675c16b Use Material3 chips 
(cherry picked from commit 34f7caa0fc4a0d9b4fcc4dfd69dc9cb52f11bf38)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2023-08-12 12:15:44 -04:00
arkon
8b090bca49 Replace some reader sheet settings with FlowRow of Chips 
(cherry picked from commit 09e4b5a9cd753a7a3a64fa8d3a868ac68dfa767f)
 2023-07-15 20:08:54 -04:00
arkon
ef343107fe Use segmented buttons for reader background setting in sheet 
(cherry picked from commit 1cf7f9be54fda2385953f7b2dd91191bc01b21ba)
 2023-07-15 19:58:24 -04:00
arkon
28001588b6 Address some build warnings 
(cherry picked from commit a629db2884c19a0910eacfe0bc5bde33e838e15b)
 2023-07-15 19:02:13 -04:00
arkon
4a4c7f9003 Prevent keyboard when using SelectItem in filters 
Closes #9703

(cherry picked from commit f01a312c235e23eac4d02c7a5f701a42e72069b1)
 2023-07-15 19:01:26 -04:00
arkon
662609cd20 Move SettingsItems composables to presentation-core 
(cherry picked from commit 87bdee59908c73f340c892e43b522727e07b33d2)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
#	app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
#	domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
#	domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt
 2023-07-15 18:24:00 -04:00
Ivan Iskandar
f7299c0c6e Remove scrollable animation workaround (#9690) 
Reverts ba93060e591fccf3c85995b50f496bc937ae8ae4
Related https://android-review.googlesource.com/c/platform/frameworks/support/+/2239762

(cherry picked from commit 0759936226ca3fbc09be17d8bc779ffa1beb676d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
 2023-07-15 17:39:09 -04:00
Ivan Iskandar
53fb54127b AdaptiveSheet: Migrate deprecated swipeable (#9642) 
(cherry picked from commit 7c90fe0f7d9667809d80fdb3c547a19620ce5f31)
 2023-07-15 15:46:20 -04:00
arkon
eb298df72c Migrate ReaderColorFilterSettings to Compose 
It'll eventually be a tab with the other settings again once the other tabs are also
migrated over so it's just a single Compose sheet.

(cherry picked from commit fe82cdb9c85274e0c9b904ec6b37fac97d01ea37)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt
#	app/src/main/res/layout/reader_activity.xml
 2023-06-24 15:43:30 -04:00
arkon
832e765a22 Refactor grid size slider composable for reuse 
(cherry picked from commit b354e37cc34e1b713a0d19818fd030294985f109)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
 2023-06-24 15:33:23 -04:00
arkon
273951188c Migrate ReaderPageSheet to Compose 
(cherry picked from commit f2b0d74b4cd6740b708e587f18c6cc798287dbe8)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/res/layout/reader_page_sheet.xml
 2023-06-24 15:26:45 -04:00
Ivan Iskandar
434b8d3ae8 composed Modifier changes (#9631) 
Referring at the examples and other internal usages, the
resulting stateful Modifier should be separated from
all the previous Modifier chain.

(cherry picked from commit 25b0458930b3de21340cdc201e7e5e46501dbda1)
 2023-06-24 14:19:43 -04:00
Ivan Iskandar
9f1b349960 Use lite compose-ui-tooling module on release builds (#9630) 
The size reduction is minuscule but it's there.

(cherry picked from commit 6808fbbb21acaac4e866b5023146a97b86a9d68e)
 2023-06-24 14:19:35 -04:00
Ivan Iskandar
d00bf25149 Update Compose BOM v2023.06.00-alpha01 (#9628) 
(cherry picked from commit b8af1621b52e3c2a47d9ed4f40051413e51b238b)
 2023-06-24 14:18:13 -04:00
Ivan Iskandar
ff9b7a1325 ReaderProgressIndicator: Convert to Compose (#9574) 
(cherry picked from commit 39e456846094abd623f84d642721a2d97bd803a4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2023-06-24 11:23:55 -04:00
arkon
7c9398f9d5 Address minor build warnings 
(cherry picked from commit 431f8772f8ad2f30d71bb6565ec2644e4e56c691)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
 2023-06-24 11:21:18 -04:00
arkon
88d4087642 Fix some crashes 
(cherry picked from commit 46efd4c13430881d8593d4fc3cb899dfd3deacdd)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
 2023-06-24 10:42:27 -04:00
arkon
491cfafddb Use primitive state holders 
(cherry picked from commit dfd38db7e33bd708ccb688f3fe02d4e0105083f2)
 2023-06-24 10:40:44 -04:00
Ivan Iskandar
2a921d008e Bump Compose BOM version 2023.04.00-beta01.1 (#9548) 
(cherry picked from commit 0189fc1f6677bf7b203609cc4f76fdf61a84b757)
 2023-06-24 10:40:37 -04:00
arkon
3c741c13a4 Upgrade Compose 
Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
(cherry picked from commit 5a9889b562583c0112b90e1c5b2622336965963d)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
 2023-06-24 10:34:23 -04:00
Ivan Iskandar
7ea6f685bf Replace our custom Pager (#9494) 
Turns out that changing the pagerSnapDistance
is enough to achieve the same result.

(cherry picked from commit 96defd6b054101c540dc62907e43f4aa5db1ef6c)
 2023-05-13 13:35:43 -04:00
AntsyLich
3d6a7509ce Add an icon to "Item Per Row" on library sheet (#9414) 
Also cleanup `SettingsItems.kt`

(cherry picked from commit c21813a8b5fa58412e88b5ece494598840e9ce71)

# Conflicts:
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt
 2023-05-06 12:45:08 -04:00
arkon
4f134f90ce Move library columns settings to library sheet 
Closes #3969. Dialog-ception.

(cherry picked from commit c6ac9927985bc33a63f49e3280dc63f9f7e8d5de)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
 2023-04-15 23:19:38 -04:00
arkon
18546e0410 Move worker info screen into debug info menu 
No need to translate anything for debug info. Dunno what else will end up in that menu in the future.

(cherry picked from commit 4bcd6238293e0583cdcc082711128358c5ae2069)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
 2023-04-15 23:06:04 -04:00
Ivan Iskandar
0724536b2a WheelPicker: Add manual input (#9338) 
(cherry picked from commit 60d86508600736099f389035d3ebef591a36fd14)
 2023-04-15 23:04:39 -04:00
Ivan Iskandar
17de9bce9a WheelPicker: Add haptic feedback (#9322) 
(cherry picked from commit a2627d70afabecc95b7be824dd027e8d9d530e57)
 2023-04-15 23:04:21 -04:00
0x7673
dcd403d0a2 Remove horizontal padding of actions row in empty screen (#9332) 
(cherry picked from commit 6662a97b2f928d608cc7a90b18bbb972ea829add)
 2023-04-15 23:04:14 -04:00
arkon
0b72722afa Sample updates to scrollbars 
(cherry picked from commit bc0b9e536a2c4a7059809dd8c1f31b0dce7f10bd)
 2023-04-09 18:49:44 -04:00
Ivan Iskandar
7a1026dd06 Adjust SearchToolbar soft keyboard behavior (#9282) 
* Show soft keyboard when the text field is composed (a redo)
* Clear focus on text field when soft keyboard is hidden
* Request focus on text field and show soft keyboard
when clear button is clicked

(cherry picked from commit 7a1b599462498f6be8faf08cbd2814a04863f3ef)
 2023-04-09 18:49:37 -04:00
arkon
279bddee29 Ensure EmptyScreen is scrollable 
Also fix padding for loading/empty states in BrowseSourceScreen

(cherry picked from commit 1dd62af188b49586413ad41857be456c856c17dd)
 2023-04-09 18:49:30 -04:00
Ivan Iskandar
4e1f74d24b AdaptiveSheet: Wrap inside Dialog (#9279) 
Because of Compose issue, the style of the sheet surface is adjusted as
a workaround

Ref https://issuetracker.google.com/issues/246909281

(cherry picked from commit 6f1099b7103ab7838e999e787f4e81344978a091)
 2023-04-09 18:49:22 -04:00
Ivan Iskandar
7e81fa6723 Adjust tab indicator visual (#9219) 
Now behaves like the non-compose indicator by showing the swipe progress too

(cherry picked from commit 18e55aa25fe7ea63e66a99d1373fbdb449a358d7)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
#	presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
 2023-03-20 17:54:33 -04:00
arkon
bbb18319c2 Use Compose icons instead of drawables 
Using:
- https://github.com/DevSrSouza/compose-icons
- https://github.com/DevSrSouza/compose-icons/blob/master/simple-icons/DOCUMENTATION.md

(cherry picked from commit e917349bb7e1fb37b5cf58a130a33d13e1872093)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
 2023-03-14 23:36:39 -04:00
Ivan Iskandar
fd95de016d TrackDateSelectorScreen: Use M3 date picker (#9138) 
(cherry picked from commit ec3ce74af8d6f16b58b368e78acf72f929f3f9e6)
 2023-03-14 20:48:01 -04:00
arkon
314a740906 Migrate source filter sheet to Compose (#9135) 
(cherry picked from commit 92132c59f5417ef81a7bbba6849be849282fc25e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/components/SettingsItems.kt
#	app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
#	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/browse/source/browse/SourceFilterSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/GroupItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/SectionItems.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/listener/IgnoreFirstSpinnerListener.kt
#	app/src/main/res/drawable/empty_drawable_32dp.xml
#	app/src/main/res/drawable/ic_check_box_24dp.xml
#	app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml
#	app/src/main/res/drawable/ic_check_box_x_24dp.xml
#	app/src/main/res/layout/navigation_view_checkbox.xml
#	app/src/main/res/layout/navigation_view_checkedtext.xml
#	app/src/main/res/layout/navigation_view_group.xml
#	app/src/main/res/layout/navigation_view_radio.xml
#	app/src/main/res/layout/navigation_view_spinner.xml
#	app/src/main/res/layout/navigation_view_text.xml
#	app/src/main/res/layout/source_filter_sheet.xml
 2023-03-14 20:38:57 -04:00
arkon
798de2d71b Consolidate all theme colors to presentation-core module 
(cherry picked from commit 92bd98e45f4132d3f0eb937d39c5df5d43a772a7)
 2023-03-05 19:41:46 -05:00
Ivan Iskandar
c787ccb84d Use non-stable Compose BOM (#9120) 
(cherry picked from commit 60a3ba5a5c1d09e3c3cb56f808a95b239cb0624e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
 2023-03-05 18:49:18 -05:00
arkon
2e1c83442e Move more components to presentation-core module 
(cherry picked from commit 10d734950659ce5e6ede82a98b89be107912f927)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreen.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/MigrateSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
 2023-03-05 18:00:20 -05:00