Commit graph

3135 commits

Author SHA1 Message Date
arkon
3ea3b0bf2e Add UnmeteredSource interface
To be included in extension-lib 1.3 (or whatever it's going to be). This applies to sources like Komga or Lanragi, where large numbers of update/download aren't of concern since they're (usually) self-hosted.
2021-11-28 14:41:03 -05:00
jmir1
10ddeeb799
Fix local source cover changing (#6252)
* fix local source cover changing

* Remove unnecessary check for `exists()`

* fix for when there is no thumbnail_url in the db
2021-11-27 12:49:26 -05:00
Ivan Iskandar
3463d6c752
MinMaxNumberPicker: Set IME input to use number only (#6286)
* MinMaxNumberPicker: Set IME input to use number only

* MinMaxNumberPicker: Auto disable keyboard input when needed
2021-11-27 12:48:49 -05:00
Henrik
8acce011b5
fix MAL search novel filter (#6279) 2021-11-25 12:55:52 -05:00
arkon
6cfd2c510b Fix crash in clear database screen (fixes #6271) 2021-11-24 17:34:39 -05:00
arkon
430ff80198 Add tertiary badge in appearance preview (closes #5867) 2021-11-19 17:39:30 -05:00
arkon
46a4b0e0b6 Partially migrate LocalSource to 1.x methods 2021-11-19 16:42:19 -05:00
arkon
bba7372556 Add ability to clear cookies per-extension (closes #3153) 2021-11-19 11:28:59 -05:00
Hunter Nickel
9fe1a7e2ae
Add feature to clear database manga by source (#6241)
* Implement feature to selectively clear manga from database based on it's source

* Code cleanup and refactoring
2021-11-19 11:24:46 -05:00
arkon
98822a39d9 Option to clear chapter cache when MainActivity is closed (closes #5651) 2021-11-19 10:50:52 -05:00
arkon
a2c830b908 Tweak app theme preference selection (closes #5866) 2021-11-19 10:35:48 -05:00
Ivan Iskandar
bdef2cfdfb
Replace Resume FAB reveal animation with container transform (#6250) 2021-11-19 10:16:39 -05:00
Andreas
f229a5e2ec
Tweak relative date function (#6249)
* Tweak relative date function

* Cleanup
2021-11-19 10:05:39 -05:00
Ivan Iskandar
845e061382
Reinstate elevation overlay (#6243)
* Theme default elevation overlay

* Fix app bar elevation overlay

Elevation overlay is disabled when tabs are visible

* Remove custom elevation overlay in tracking sheet item

* upsi
2021-11-18 10:47:24 -05:00
arkon
b4ba56bfb4 Update dependencies 2021-11-18 10:42:09 -05:00
arkon
ad49a02879 Address some Android lint warnings 2021-11-14 11:16:18 -05:00
Andreas
c0d0ff66b6
Fix "Check for updates" not working due to time cooldown (#6232)
* Fix "Check for updates" not working due to time cooldown

* Update AppUpdateChecker.kt

Co-authored-by: arkon <arkon@users.noreply.github.com>
2021-11-14 10:23:12 -05:00
arkon
1e4d7f8c6e Only allow digits in custom download range dialog (closes #6220) 2021-11-13 10:14:55 -05:00
arkon
a8a761aa5f Initial pass of Material 3 styling
Adjustments/fixes to follow.
2021-11-13 10:08:01 -05:00
OncePunchedMan
41952f0215
Added tabletUI option: "Automatic" (#6208)
* added automatic tablet ui option; useful for foldables

* set automatic as default, rename setting

* remove redundant checks

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>

* remove redundant checks

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>

* fix defaultValue

Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
2021-11-11 16:32:28 -05:00
arkon
39722055f5 Don't auto-download chapters if excluded but no categories selected (fixes #6126) 2021-11-11 16:25:38 -05:00
arkon
f85dfa90b8 Remove legacy blue theme
Causing too many theming issues/complexity. This will make the Material 3 transition easier.
2021-11-10 09:15:13 -05:00
arkon
0a4163d236 Default to only updating non-completed manga 2021-11-10 09:09:29 -05:00
Andreas
78de11a9e3
Fix SwipeRefresh initial position in MangaController (#6211)
* Lower position of swipe refresh

* Tweak existing code that sets swipe refresh position
2021-11-07 11:58:45 -05:00
arkon
d2fc6d9f44 Use sw720dp for tablet UI threshold 2021-11-07 11:55:18 -05:00
arkon
abf31f4a79 Fix cutoff ripple for extension install cancel button 2021-11-07 09:49:40 -05:00
arkon
d4aeeadb26 Avoid crashing when notification channels can't be created/deleted
For example, the application may be launched from a service, where channels cannot be deleted.
2021-11-07 09:11:41 -05:00
arkon
7ce0110158 Disable updates badge by default 2021-11-03 09:21:01 -04:00
arkon
7c1e55eb7f Update metadata in same scope as the rest of library update (fixes #5702, probably) 2021-11-02 17:27:25 -04:00
jmir1
27542bc81d
Fix crash when updating library whithout manga to update (#6181) 2021-10-31 14:25:32 -04:00
arkon
9ebbfb2d90 Clean up local source chapter name cleaning (closes #5969) 2021-10-30 18:36:23 -04:00
arkon
701b1ee744 Fix bottom nav sometimes appearing within navbar area 2021-10-30 18:03:29 -04:00
arkon
0edc981cd2 Move app and extension update notifications to new channels/group (closes #6168) 2021-10-30 17:42:06 -04:00
arkon
da5942b398 Remove unused fast scroll bubble drawable and accidentally committed file 2021-10-30 13:14:34 -04:00
arkon
709de81814 Move unread chapters badge setting to General section 2021-10-30 12:48:37 -04:00
Ivan Iskandar
90b312a56e
Extension "Update all" button (#6171)
Disabled for legacy installer
2021-10-30 12:34:26 -04:00
Hunter Nickel
459759bfe5
Add badge to bottom bar Updates tab indicating how many unread chapter updates are available (#5620)
Co-authored-by: arkon <arkon@users.noreply.github.com>
2021-10-30 12:32:51 -04:00
Riztard Lanthorn
33a02b47d5
Hide cutout toggle button if fullscreen is off (#6150) 2021-10-30 12:19:15 -04:00
Tom Briden
f0a5557e60
Fix storing covers for local manga (#6127)
getCoverFile only returns a cover if it already exists, meaning
the block of code to write it from the inputstream never executes.
If getCoverFile returns null, then use previous behaviour of setting
it to cover.jpg so that if the file doesn't exist it's created
2021-10-30 12:16:29 -04:00
FlaminSarge
58a871c8cc
Allow manga titles to update from source if they are not in library (#6177)
The previous rationale for not allowing manga titles to update (at all) was that it would be confusing for users if a manga's title arbitrarily changed when the source changed it. Presumably, users would care less about this arbitrary change for manga that is not in library, so this provides a path for getting a manga's title updated, and prevents incorrect titles from persisting in the DB for manga that get title updates but aren't in library.
2021-10-30 12:15:48 -04:00
arkon
4f56071786 Validate backup during creation 2021-10-28 22:40:53 -04:00
Andreas
8f00d34b0b
Change zoom from 3x to 5x (#6164)
Because some people actually read images with really small text

*I hope they have some extreme high quality pictures else I don't know how they read the raster images*
2021-10-27 23:33:36 -04:00
arkon
593091a5e3 Sync view state with controller on activity resume
Hopefully fixes some weird states where the bottom nav shows up when it shouldn't.
2021-10-23 17:30:56 -04:00
arkon
22ed163c8f Fix what's new link in dialog 2021-10-23 17:29:27 -04:00
arkon
93e2b88d41 Minor cleanup 2021-10-23 17:29:13 -04:00
arkon
7cd54dc8f0 Launch the download warning toast in the UI thread
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
2021-10-23 17:05:34 -04:00
Midyan Hamdoun
ccd7c8df53
Fix double increment when updating covers (#6138)
* Fix double increment when updating covers

* Remove redundant block
2021-10-20 20:10:55 -04:00
arkon
bf1b7f44b6 Change tablet UI threshold to w720dp (closes #6054)
Was previously sw720dp. Now matches J2K.
2021-10-18 11:03:27 -04:00
arkon
538dd60580 Adjust update/download warnings
- Uses toasts now
- Adjusted wording to emphasize effect on sources
- Download warning has a different threshold (15 chapters per source, vs. 60 entries per source for library update)
2021-10-18 10:46:07 -04:00
arkon
bfe7aa1ed2 Minor cleanup 2021-10-18 10:02:25 -04:00
arkon
9e2ef82902 Remove global update intervals below 12 hours, add every 3 day interval
Users with smaller libraries have a lower change of getting updates frequently. "Power users" are actively hurting sources by updating frequently.
2021-10-18 10:02:18 -04:00
arkon
9352e249ee Make tapping library update and backup restore error notifications open log 2021-10-18 09:58:35 -04:00
Midyan Hamdoun
3800065230
Fix crashing when clicking the search icon (#6128) 2021-10-18 09:57:52 -04:00
arkon
ebc2c4f73a Remove paused text when resuming downloads with info hidden (fixes #6119) 2021-10-16 17:40:56 -04:00
arkon
f057440cc1 Use natural ordering when sorting by chapter numbers (fixes #6121) 2021-10-16 17:37:51 -04:00
arkon
8a70c3353f Change global update unmetered connection restriction to connected to Wi-Fi (closes #6117) 2021-10-16 11:10:05 -04:00
arkon
3d8f123e05 Add notification action to open GitHub release page
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
2021-10-16 10:42:14 -04:00
arkon
21e647017b Rename app updating classes
So I stop confusing it for updaters of other things.
2021-10-16 10:21:15 -04:00
Midyan Hamdoun
2a1bb3dc27
Fix reappearing indicator in the History tab (#6105) 2021-10-15 22:14:45 -04:00
Ivan Iskandar
55a3094a65
Fix AppBar lift state when snapped (#6103)
status bar foreground alpha is now handled separately
2021-10-15 22:09:19 -04:00
Andreas
b4490e209b
Fix inset not applying when in landscape (#6104)
Reverts inset change from #5997, was changed due to it not changing the padding when using setPadding
2021-10-15 22:08:37 -04:00
Jays2Kings
9aa676333c Use default source filters in global search (fixes #5583)
Based on 45fbd9d2f5
2021-10-15 22:06:16 -04:00
Hunter Nickel
2c76bc99fc
Add ability to copy a genre/tag to clipboard by long-pressing it's chip (#6084)
* Allow copying a genre by long-pressing it's chip

* Make chip click listeners nullable, and only attach if not-null
2021-10-13 09:23:59 -04:00
Ivan Iskandar
bb06895145
Fix MangaController fast scroller position (#6090) 2021-10-13 09:23:46 -04:00
Ivan Iskandar
684965f3e5
MangaController optimizations (#6089)
* MangaController: Fix ignored stable ids

* MangaController: Replace notifyDataSetChanged

* ChaptersSettingsSheet: Optimizations
2021-10-13 09:23:38 -04:00
Jays2Kings
e621f4e2fa Add migration to add "all" to enabled langauges
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
2021-10-13 09:18:43 -04:00
arkon
718fa25c10 Bump queue warning threshold to 60
Aligns with J2K.
2021-10-13 09:16:19 -04:00
arkon
cb9c5a35cb Minor cleanup 2021-10-13 09:13:38 -04:00
arkon
fadaefeaef Handle HTTP 403 responses with CloudflareInterceptor
Based on 8d34da591e

Co-authored-by: jmir1 <jmir1@users.noreply.github.com>
2021-10-11 16:12:26 -04:00
arkon
b17b882a3b Adjust update/download warning threshold 2021-10-11 16:08:32 -04:00
jmir1
f0f3afd5f1
Fix issues with NSFW sources setting (#6085) 2021-10-11 13:51:20 -04:00
arkon
42026b49bf Allow hiding "All" section in extensions list (closes #6081) 2021-10-11 10:29:08 -04:00
jmir1
3448751e0e
Fix crash when deleting last item in library (#6079) 2021-10-11 10:17:01 -04:00
arkon
c95a269460 Use single layout for grid badges 2021-10-09 17:26:53 -04:00
arkon
f343131802 Require authentication to toggle showing NSFW sources 2021-10-09 17:10:04 -04:00
arkon
ea34ba53b9 Allow searching for multiple extensions at once (closes #5922) 2021-10-09 16:59:18 -04:00
arkon
b8d8cf19d9 Add some info about automatic backups 2021-10-09 16:48:20 -04:00
arkon
082eef708f Add warnings when library and download queues are considered large (closes #5950)
Arbitrarily set at a size of 100 for now. We could adjust this in the future as appropriate if needed.
2021-10-09 14:55:21 -04:00
Ivan Iskandar
9106fc5b94
Grouped chapter download list by source (#5575) 2021-10-09 11:41:45 -04:00
Platiplus
918502742d
[5893] - Implemented Language Badge (#6050)
* Implemented language badge on library items

* Added left margin for better viewing the badge on list view

* Adjusting borders on badges, cleaning string interpolation and cleaning code

* Improving readability on Holders and removing unused background and text on grid items
2021-10-09 11:10:36 -04:00
Ivan Iskandar
f32f1eeaa5
Manga description adjustments (#6011)
* Manga description adjustments

- Animated state changes
- Adjust scrim position to fully show 2 lines when shrunk
- Set minLines to avoid scrim hiding oneliner

* Change icon and adjust animation

* Revert fancy scrim animation
2021-10-09 11:02:45 -04:00
nicki
2d1404d155
Fix Local and Other lang sources showing up in seperate Other Categories (#6024)
* group LocalSource and Other lang source together

* use better kotlin syntactic sugar

* add lang "other" to local

* remove duplicate LocalSource entries in Browse

* linting

* revert unnecessary linting

was a manually adding change

* Revert previous two commit but not the most recent

This reverts commit 30250f2f82
This also reversts commit 359ed5a8cd

* better way to avoid duplicate Local Sources

* more linting by plugin

* `""` lang is no longer used anywhere
2021-10-09 11:01:22 -04:00
arkon
a56997e98c Hide slider tooltip label everywhere 2021-10-09 10:44:08 -04:00
Ivan Iskandar
7e61900cf5
Add new build type for weekly preview (#6067)
This adds new build type for minified non-debuggable preview builds.
"debugFull" is removed and "debug" will be unminified.

**It means preview build action needs to be updated to build "standardPreview"**
2021-10-09 10:28:43 -04:00
Platiplus
e98f90b099
[6059] - Pending downloads count on Download queue screen (#6064)
* Updating the download queue label to account for pending downloads even on paused state

* changing separator

* Created observer to update the TitleBar of the controller to reflect pending downloads

* Reverting changes from MoreController that were made in an another commit

* Refactoring updateTitle method
2021-10-07 22:13:35 -04:00
Ivan Iskandar
2e127dff1f
Replace Timber with Square Logcat and make logging configurable (#6062)
* Replace Timber with Square Logcat

* Configurable logger
2021-10-07 22:12:55 -04:00
Platiplus
828db19e02
[5753] - Add pending downloads count on Download queue (#6049)
* Updating the download queue label to account for pending downloads even on paused state

* changing separator
2021-10-06 22:03:07 -04:00
Andreas
1a568e2961
Fix stuck display mode for when not using per category setting (#6044) 2021-10-05 11:03:51 -04:00
arkon
e863e8c64b Adjust Wi-Fi connection check (related to #6038) 2021-10-04 17:06:24 -04:00
arkon
675c0cefc3 Fix crash in single-page chapters 2021-10-04 11:06:23 -04:00
arkon
1a52385b78 Formatting 2021-10-04 10:50:13 -04:00
Andreas
372e500590
Remove extra padding when using list with Per Category setting (#5997)
* Remove padding when using list with Per Category setting (fixes #5636)

* Add view type to RecyclerViewPagerAdapter

Correctly this time (ノ◕ヮ◕)ノ*:・゚✧

* Minor tweaks
2021-10-04 10:41:20 -04:00
nicki
cc1a317439
enable "ALL" in Browse by default (#6023)
some extensions, including self-hosted ones, have the "ALL" label and
sometimes users get confused with not having enabled "ALL" after
installing new extensions
2021-10-03 15:40:51 -04:00
Ivan Iskandar
6d650518a1
App-wide typography adjustments (#5931)
* Manga detail

Also adjust chapter item layout to accommodate bigger
display/font size

* Library

* Updates

* History

* Browse

* Preferences

* Button

* Navigation view

* category-download

* Google Sans

* Reader

* Chips

* Revert "Google Sans"

This reverts commit 5dd4c41f

* Misc

* Cleanups

* Section header text appearance

* Increase library manga title size

* Revert "Increase library manga title size"

This reverts commit 474be913

* Increase section header letter spacing

* Derps
2021-10-03 12:32:04 -04:00
FourTOne5
7940117577
Sort and remove duplicates in genres (#6021)
* Sort and remove duplicates in genres

Co-authored-by: ivaniskandar <12537387+ivaniskandar@users.noreply.github.com>

* Remove Sort and filter out blank genre

Co-authored-by: ivaniskandar <12537387+ivaniskandar@users.noreply.github.com>
2021-10-03 12:19:37 -04:00
Ivan Iskandar
b0f87fdd21
LicensesController: Move item init to IO thread (#6020) 2021-10-03 12:00:00 -04:00
arkon
dc92ffed87 Switch to Material Slider in color filter settings 2021-10-03 11:58:52 -04:00
Ivan Iskandar
4af578e310
Apply navigation bar insets to fast scroller and settings search list (#6015) 2021-10-03 11:28:20 -04:00
FourTOne5
e22825d818
Check if wifi is connected rather than enabled while downloading. (#5967)
* Fixxy Wixxy

* Downgrade check from Android S to Android Q
2021-10-03 11:27:56 -04:00
arkon
d149017c60 Switch to Material Slider for reader seekbar
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
2021-10-03 11:14:49 -04:00
Ivan Iskandar
ef993515c6
Fix MangaController toolbar title showing when editing category (#6005) 2021-10-01 17:52:06 -04:00
Andreas
ba8abd94a8
Ability to order sources by library count when migrating (#6000)
* order sources by library count when migrating (closes #4703)

* Use plain menu instead of full-on sheet
2021-10-01 17:37:43 -04:00
Andreas
c6d4e4c15f
Move extensions enabled languages on top (closes #5694) (#5998) 2021-10-01 09:15:04 -04:00
Hunter Nickel
7ed25704d6
Add chapter bookmarking feature to Updates screen (#5984) 2021-10-01 08:11:31 -04:00
FourTOne5
2196dac63e
Fix variable name in isOnline (#5991) 2021-10-01 08:09:46 -04:00
arkon
ea97488670 Revert parseAs inline function change
Some people sometimes get compile issues?
2021-09-30 17:52:07 -04:00
arkon
c2255b0a0f Mark installer names as non-translatable 2021-09-25 21:08:31 -04:00
arkon
f754b081ce Use data class to parse extensions list 2021-09-25 14:57:54 -04:00
arkon
690d8e43ae Show message in migrate screen if library is empty 2021-09-25 14:41:35 -04:00
Hunter Nickel
82f14a7d59
Hide soft keyboard after submitting search query throughout app (#5837)
* Clear focus from SearchView when submitting a search query in BrowseSourceController

* Revert "Clear focus from SearchView when submitting a search query"

* Implement SearchView focus clearing in Tachiyomi's subclass to enable feature throughout app

* Add support for keyboard Enter key

Pressing enter on a keyboard (when using the emulator for example) now also submits the query
2021-09-25 14:32:19 -04:00
Ivan Iskandar
b284384f0a
Implement new extension install methods (#5904)
* Implement new extension install methods

* Fixes

* Resolve feedback

* Keep pending status when waiting to install

* Cancellable installation

* Remove auto error now that we have cancellable job
2021-09-25 14:31:52 -04:00
Andreas
1ae0d1b5d0
Reattach after slight delay instead on every db update (#5956) 2021-09-23 18:45:55 -04:00
arkon
9de08c8166 Update dependencies 2021-09-20 14:33:35 -04:00
Ivan Iskandar
a2d007f2a9
Toolbar and bottom nav scroll snap (#5915) 2021-09-18 16:41:23 -04:00
arkon
774f818bbb Fix setting search re-animating on activity recreation (fixes #5882) 2021-09-18 16:28:58 -04:00
arkon
0ec7121b8f Adjust snackbar durations (closes #5932) 2021-09-18 16:17:07 -04:00
arkon
d7d46f4447 Minor cleanup 2021-09-18 16:13:14 -04:00
Andreas
45fad147bf
Remove spaces at end of line before removing multiple new lines (#5928) 2021-09-18 15:16:03 -04:00
Aria Moradi
3664195c71
rewrite getFormat the kotlin way (#5930) 2021-09-18 15:15:38 -04:00
arkon
fce3cd00a1 Remove setting to disable update error notifications and split out notification channel
Users can exclude things from updating if needed, or disable the notification channel from system settings.
2021-09-17 19:14:30 -04:00
arkon
33b3be0d0e Move extension app info button
Aligns with TachiyomiJ2K.
2021-09-16 17:57:41 -04:00
Ivan Iskandar
cfd1b4a6c6
Fix toolbar title alpha (#5910) 2021-09-16 17:39:13 -04:00
Gauthier
d45fefd6f0
handle maxNumberSort from API (#5917) 2021-09-16 17:37:42 -04:00
Ivan Iskandar
f125ab01ee
Change how the bottom navigation is hidden (#5823)
* Change how the bottom navigation is hidden

Modifies the translationY instead of the height.

* Cleanups
2021-09-16 17:37:17 -04:00
Soitora
971d8a7e40
Allow preferences to multi-line (#5905) 2021-09-13 18:39:14 -04:00
arkon
a2cf210a52 Unify NSFW flagging for sources/extensions
Since multisource extensions are no longer a thing, we now simply rely on the flag at the extension level, i.e. the per-Source/SourceFactory `@Nsfw` annotation is no longer checked.
We'll have to remove all of the annotation usages from the existing sources, which will also effectively break the setting for older versions of the app.
2021-09-13 17:49:58 -04:00
FourTOne5
2c495c4119
Don't count "other" as a language. (#5901) 2021-09-13 15:05:12 -04:00
arkon
7c72d6cb7c Fix scroller getting dragged incorrectly in RTL (fixes #5496) 2021-09-12 13:08:21 -04:00
arkon
8362bf0886 Don't show option to delete chapters for local manga (closes #5243) 2021-09-12 13:01:53 -04:00
arkon
1a8155c45b Add link to help translate in about 2021-09-12 12:52:19 -04:00
FourTOne5
3f2f946019
Update ExtensionPresenter.kt (#5895) 2021-09-12 09:34:37 -04:00
arkon
2c14a8dee1 Minor cleanup for download delete exclusion 2021-09-11 18:39:34 -04:00
Ivan Iskandar
746d35b52b
Reuse reader's image view in MangaFullCoverDialog (#5824)
* MangaFullCoverDialog: Support animated drawable

* Scaled zoom duration

* Wrap reader's image view to be reused in MangaFullCoverDialog

* Cleanups

* Forgot animated stuff for webtoon view

* Cleanups

* Oopsie

* Cleanups

* Consistent max scale for SubsamplingScaleImageView

The max scale will be obtained from the default scale times 3 for
consistent 3x zoom scale.
2021-09-11 18:28:54 -04:00
Jace
9a7a03e327
Change ProtoNumber of Backup Models for History and Source to a non-zero digit (#5849)
* Change ProtoNumber of Backup Models for History and Source to non-zero

Changed BackupHistory url and BackupSource name properties

* Provide backwards compatibility to current proto backups

- Added data class for zero-based protoNumber
- Restore both 'new' proto and old ones by mapping old to 'new' proto format
- Thanks to @jobobby04  for providing the initial solution.

* Fix on createBackup missing parameter for brokenSource

* Fix issues on build

* Fix missing import on FullBackupRestore
2021-09-11 18:10:10 -04:00
tobinstultiens
a051079c6a
Allow exclusion on Delete After Read per category (#5857)
* Added the exclude category from delete after being read

* Stopped it from adding a wildcard to the import

* Placed the remove after read to the download manager
2021-09-11 18:09:24 -04:00
Ivan Iskandar
7b3c18bb97
Less hacky way to make sure bottom action toolbar doesn't scroll down (#5871)
* Less hacky way to make sure bottom action toolbar doesn't scroll down

* Fix action toolbar overlapping on landscape

* Disable app bar transparency when ActionMode is present
2021-09-11 10:22:01 -04:00
FlaminSarge
52daf3d58c
During migration, only do MangaController replacement if previous controller is also MangaController (#5869)
If previous controller is instead a MigrationController/other, push the new MangaController onto the stack instead
2021-09-11 10:21:12 -04:00
Ivan Iskandar
f41bde5ee1
MangaController: Fix listeners cancelled when pushing new controller within (#5883) 2021-09-11 10:20:52 -04:00
Gauthier
6151318ac1
use chapter_number instead of ordinal index for syncChaptersWithTrackServiceTwoWay (#5846)
use v2 api for Komga tracker for series
2021-09-09 21:07:16 -04:00
Ivan Iskandar
b45c322729
MangaController: Title fixes (#5879)
* MangaController: Move toolbar's TextView reference to ElevationAppBarLayout

* MangaController: Update title alpha earlier when exiting
2021-09-09 21:05:41 -04:00
FourTOne5
156feb6e8e
Use "isOnline" utils in DownloadService (#5863)
* Use isOnline

* when -> if/else
2021-09-06 12:31:03 -04:00
arkon
e942b8a402 Read from streams for local source manga details and legacy backups 2021-09-06 11:54:00 -04:00
Andreas
abdb67a123
Remove the remaining MotionLayout (#5854)
* Remove the remaining MotionLayout

* Use ImageButton instead of Blank View to handle taps in dead area

And some tweaks
2021-09-06 11:46:38 -04:00
arkon
ee20787c5e Retain GLUtil.maxTextureSize 2021-09-05 14:34:54 -04:00
arkon
ec4e631760 Clean up some companion object usages 2021-09-05 14:34:29 -04:00
Aran Leite
02b430a5bf
Skip bookmark check when cancelling downloads (#5853)
* Skip bookmark check when cancelling downloads

* DownloadManager: simplified filteredChapters declaration

* Completed documentation of DownloadManager's deleteChapters()
2021-09-04 22:43:56 -04:00
arkon
7878053df2 Fix crash in settings search (fixes #5855) 2021-09-04 22:31:25 -04:00
arkon
12a593c3c6 Ensure all fields in new migrated manga are persisted (fixes #5848) 2021-09-04 19:05:43 -04:00
arkon
5ae4621da1 Queue tracking updates when offline (closes #1497)
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
2021-09-04 16:37:35 -04:00
arkon
5ea8d0546e Fix chapters getting deleted when marking as unread from library (fixes #5755) 2021-09-04 15:29:13 -04:00
arkon
8a064c118f Minor cleanup 2021-09-04 15:27:37 -04:00
arkon
2f91c27df2 Don't allow focus on reader containers (closes #5727) 2021-09-04 15:23:00 -04:00
Soitora
763bd54707
Hide language tag when only one language is used (#5834)
* Hide lang tag when only one lang used

* Comment the code

Can't be too useless and do nothing, Ghostbear practically wrote the entire PR for me

* Exclude 'all' from counting as a language

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

* Use existing Preferences directly from Presenter

* Replace regex with an existing value

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
2021-09-04 15:04:40 -04:00
arkon
0de3558ab3 Retain scroll position when selecting app theme preference
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
2021-09-04 11:58:44 -04:00
arkon
069f4e12d8 Rearrange themes, rename "Blue" to "Legacy Blue" 2021-09-04 11:50:00 -04:00
Quang Kieu
ee711dc0fb
Edit mangas' Categories in Library using TriState list (#5422)
* Use QuadState Categories to edit mangas in Library

Add updateMangasToCategories to build build correct Categories list for
  each manga using Common and Mix list
Update QuadState Multi-Choice to either Action or Display List
  Display list would have different state sequece from Action
  Uncheck-> Indeterminate (only if initial so)-> Check

fixup manga categories logic as Windows and push request comments

* fixup: Use QuadStateTextView.State enum

Update function to use  QuadStateTextView.State enum that missed in last change

* fixup: missing closing bracket and type cast

Co-authored-by: quangkieu <quangkieu1993@gmail.com>
2021-09-04 11:13:19 -04:00
arkon
c316e7faab Migrate to flow version of ReactiveNetwork 2021-09-04 10:38:12 -04:00
arkon
7083b3d912 Don't show update progress notifications if job isn't active anymore (closes #5844) 2021-09-04 10:24:55 -04:00
Ivan Iskandar
0df23ab878
Tablet UI override (#5830)
* Tablet UI override

* Tablet UI advanced pref
2021-09-04 10:06:56 -04:00
Soitora
d935e22f0d
Add status icons to manga info (#5832)
* Add icons to manga status

* Slightly better formatting

Mixed in with a dose of syntactic sugar

* Remove unnecessary lines

I think they are, at least

* Change according to review comments

- Fix forgotten Tablet code removal
- Change 'android:background' to 'app:srcCompat'

* Adjust size of icon

Smaller and more fitting to the environment
2021-09-02 17:57:54 -04:00
arkon
0e26abf7a6 Use ShapeableImageView for rounded thumbnails instead of Coil transformations 2021-08-31 22:35:52 -04:00
arkon
b9f7660a91 Added a getting started guide action for when the library is empty
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
2021-08-31 17:51:15 -04:00
Ivan Iskandar
18b5250ed1
Fix MangaController's loading view initial position (#5827)
Make sure the loading view is hidden before updating the offset.
2021-08-31 17:49:57 -04:00
nicki
f683f21ee2
Trim line breaks in manga info only when collapsed (#5818)
* don't trim newlines if summary expanded

* move description trim logic to separate function

* logic error oops

* let's try something

* fix bug on first load

makes it so that, description text is trimmed when entering manga from
library

Co-authored-by: Andreas <andreas.everos@gmail.com>

Co-authored-by: Andreas <andreas.everos@gmail.com>
2021-08-31 17:44:33 -04:00
Ivan Iskandar
bd033db84c
Fix animated image detection (#5826) 2021-08-31 17:43:29 -04:00
Andreas
ab036312a4
Handle small cover better (#5815) 2021-08-29 11:13:48 -04:00
Jays2Kings
634da15191 Update kitsu to not show "null" for empty descriptions
(cherry picked from commit e6ea530532)
2021-08-29 10:03:40 -04:00
arkon
cea1720ea0 Make appearance settings searchable (fixes #5814) 2021-08-29 09:53:36 -04:00
arkon
b77edb2b5b Fix crash when tapping title of "App theme" preference 2021-08-28 17:31:30 -04:00
arkon
1b699bb814 Fix reader action sheet not opening 2021-08-28 17:24:42 -04:00
arkon
333c035fed Clean up reader action sheet layout 2021-08-28 17:22:41 -04:00
Andreas
e7d6dfff53
Replace MotionLayout with full screen dialog (#5806)
* Remove MotionLayout and add full screen dialog for enlarged cover

* Address some of the review comments
2021-08-28 16:53:59 -04:00
arkon
eebfad5a95 Register TachiyomiImageDecoder after built-in Coil decoders
Not sure if this is related to #5702.
2021-08-28 12:29:11 -04:00
arkon
77c0a93ac6 Tweak theme preference item UI 2021-08-28 12:28:15 -04:00
arkon
63a3e126b3 Rename Layout category to Navigation 2021-08-28 12:08:11 -04:00
Ivan Iskandar
3ea84cf0ce
Add IME_FLAG_NO_PERSONALIZED_LEARNING flag to text input when incognito is enabled (#5801)
* Add IME_FLAG_NO_PERSONALIZED_LEARNING flag to text input when incognito is enabled

Tested with Gboard only.

* Revert "Add IME_FLAG_NO_PERSONALIZED_LEARNING flag to text input when incognito is enabled"

This reverts commit 068399db

* Add IME_FLAG_NO_PERSONALIZED_LEARNING flag to text inputs when incognito is enabled

Source preference is not affected.

* Source preference stuff
2021-08-28 12:06:29 -04:00
arkon
7fa80ae556 Only update chapter/viewer flags for library manga instead of everything (addresses #5809) 2021-08-28 12:02:08 -04:00
arkon
925f71af15 Clean up track button changes 2021-08-28 11:19:38 -04:00
OncePunchedMan
c666dd623d
Tracking: replace tick with button (#5768)
* make check only visible after selecting an item

* replace tick with button and send to bottom

* fixed button visibility

* grey btn out

* resolving some bits

* removing the tick from appbar

* remove useless lines, appl insetter
2021-08-28 11:13:09 -04:00
Gauthier
2cd8733212
change Track.last_chapter_read to Float (#5802)
each TrackService can convert it to Int if decimal chapters are not supported
2021-08-28 10:37:45 -04:00
arkon
4b2a9bc621 Clean up imports 2021-08-27 16:45:59 -04:00
Taco
12a9d0575d
Use more Compat utilities (#5786)
* Use ActivityCompat.recreate

* Use more KTX extensions

* Use PackageInfoCompat.getLongVersionCode

* Remove unnecessary compat usages
2021-08-27 16:33:12 -04:00
arkon
edcfa28b0b Tweak theme preference item UI (closes #5805) 2021-08-27 16:25:03 -04:00
arkon
3155829994 Replace Wi-Fi connection check with WifiManager
Previous implementation couldn't detect Wi-Fi connection while using a VPN.
2021-08-27 15:41:47 -04:00
Soitora
d25707554e
Fix shadow behind the Expand Info icon (#5804) 2021-08-27 15:34:41 -04:00
Hunter Nickel
df683375b1
Apply system animation scale to parts of Tachiyomi that don't respect it by default (#5794)
* Add initial code for scaling animations, apply scale to reader nav overlay

* Rename extension function, apply system animator scale to ActionToolbar

* Apply system animator scale to expanding manga cover animation

* Apply system animator scale to image crossfade (also disables animated covers when browsing)

* Add documentation, make MotionScene Transition comment a bit more clear

* Disable animated covers in MangaInfoHeaderAdapter if animator duration scale is 0

* Disable animated covers in Library if animator duration scale is 0

* Convert loadAny listener to extension function
2021-08-27 08:44:09 -04:00
Taco
6922394b8e
Replace NetworkInfo with NetworkCapabilities (#5785) 2021-08-26 22:09:40 -04:00
Taco
24fd82d773
Use NotificationChannelCompat utilities (#5781) 2021-08-26 22:08:27 -04:00
Soitora
57aefcd917
New manga info expander (#5771)
* Replace "More" with Arrows

We used to have arrows but it was set away from the description which took a lot of space.

It was changed to "More" text, but with the recent design changes I think it'd look better to get a mix between them both.

* Properly align icons

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

* Expand support to Tablets

Get it... expand... hehe 😎

* Fix expanded width

Also fixes so that the constraint for the toggleLess is dependant on the right thing

* Give info toggles its own space

Uses its own margin now to push info rather than just being attached as a info margin.

* Remove weird duplicates I did not add

I did not add these but I don't see a reason to keep dupes

* Add bottom scrim

* Change to centered arrow under info

Anyone wanna experiment/build on top off then feel free to tweak

* Add background glow to icon for contrast

Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>

Co-authored-by: Andreas <6576096+ghostbear@users.noreply.github.com>
Co-authored-by: Andreas <andreas.everos@gmail.com>
2021-08-26 22:07:30 -04:00
Ivan Iskandar
b3854ad382
Fix reader crash on Android 9 (#5789)
* Fix failed reader context creation on v28

* Re-apply the reader styles manually after overriding night mode

This commit replaces the ThemeCompat.rebase() call since the private API used is
in dark greylist max target P, thus making it unreachable.

* Revert "Fix failed reader context creation on v28"

This reverts commit 6e2104d7
2021-08-25 17:27:34 -04:00
arkon
0493e77cff Split out appearance settings from general section 2021-08-23 12:24:30 -04:00
arkon
6240fe1dfc Update app theme preference UI
Heavily influenced by TachiyomiJ2K.
2021-08-23 12:11:13 -04:00
arkon
7094fef37f Update tracker services logo layout (closes #5625) 2021-08-22 16:48:08 -04:00
arkon
6c527d52fb Use custom tabs instead of browser (closes #5754) 2021-08-22 14:16:54 -04:00
arkon
b8ea57e097 Minor cleanup 2021-08-22 14:00:07 -04:00
Ivan Iskandar
887b157056
Add haptic feedback to reader page slider (#5763) 2021-08-21 18:05:57 -04:00
nicki
50b282f58b
update Anilist tracking title during refresh (#5760)
Co-authored-by: Andreas <andreas.everos@gmail.com>

Co-authored-by: Andreas <andreas.everos@gmail.com>
2021-08-21 10:51:20 -04:00
arkon
7d2caeb270 Minor cleanup 2021-08-20 22:42:16 -04:00
nicki
708e71a35a
Use user preferred title language in Anilist (#5758)
* Use user preferred title language in Anilist

Since Anilist is only used by authenticated users, the title language
can be set using the `userPreferred` field (defaults to romaji)

Changed wherever `title>romaji` was being used. Shouldn't have missed
any. `userPreferred` is also available for Staff and Character but not
relevant to Tachiyomi for now.

Users might need to go Logout and log back in on Anilist to see the
change. Actual setting can be found at https://anilist.co/settings/media

closes https://github.com/tachiyomiorg/tachiyomi/issues/5757

* correct title in anilist model

indicates the fact that userPreferred title is used

* convert forgotten `type` to `format` as well

leads to NPE when using `findLibManga`.
missed one query in https://github.com/tachiyomiorg/tachiyomi/pull/5741
2021-08-20 18:20:04 -04:00
Ivan Iskandar
4eaccc966e
Hide reader progress indicator right away (#5750)
The image will be drawn over it so the animation won't be visible anyway
2021-08-19 18:12:31 -04:00
Andreas
3670d649b8
Make default category translatable (#5751)
* Make default category translatable

* Replace duplicate strings with common one
2021-08-19 18:10:43 -04:00
Ivan Iskandar
90ab04e81d
Require authentication-confirmation to change biometric lock settings (#5695)
* Requires authentication-confirmation to change biometric lock settings

* Prevent double authentications on older APIs when confirming settings changes

* Use new AuthPrompt API for app lock

With this commit, the app lock will only explicitly require Class 2 biometrics
or screen lock credential. Class 3 biometrics are guaranteed to meet Class 2
requirements thus will also be used when available.

* Use extension toast
2021-08-19 18:10:07 -04:00
Ivan Iskandar
26b8df5354
Partial revert 914b686c8e (#5749)
Didn't mean to remove this line, this fixes resuming to read downloaded chapter.
2021-08-19 11:53:26 -04:00
Ivan Iskandar
11a8046c5f
PagerPageHolder: Move chooseBackground call to IO thread (#5737)
* ImageUtil.chooseBackground: Use built-in decoder

* PagerPageHolder: Move chooseBackground call to IO thread

Also move stuffs and reuse image stream as bytes
2021-08-19 09:15:45 -04:00
Ivan Iskandar
da16110e1c
Edge-to-edge manga details view (#5613)
* Prepare for edge-to-edge MangaController

* Fix derpy liftToScroll with our own implementation

* Edge-to-edge MangaController

Except when legacy blue theme is used.

* Save app bar lift state for controller backstack

* Fix expanded cover position after the view recycled

* Handle overlap changes when incognito mode disabled

* Tablet fixes

* Revert "Handle overlap changes when incognito mode disabled"

This reverts commit 1f492449

Breaks on rotation changes.

* Fix MangaController's swipe refresh position

* All controllers are now doing lift app bar on scroll by default

They are already doing that before so this pretty much just a cleanups.

* TachiyomiCoordinatorLayout: Support ViewPager for app bar lift state check

I'm willing to revert this if this minute detail solution is deemed too hacky xD

* Fix app bar not lifted when scrolled without fling

* Save app bar lift state across configuration changes

* Fix MangaController's swipe refresh position after configuration change

* TachiyomiCoordinatorLayout: Update ViewPager reference when controller is changed
2021-08-19 09:12:52 -04:00
Ivan Iskandar
914b686c8e
ReaderTransitionView: Use context theme color for texts (#5738)
* Put themed reader context in adapter

This avoids creating themed context everytime the page holder is created, this
also allows the transition view to use the same themed context.

* Check against app night mode to create themed reader context

* ReaderTransitionView: Use context theme color for texts

The whole reader will need to be recreated when changing reader background while
webtoon mode is used, because recreating just the RecyclerView without messing
up the scroll position is impossible (I hope I just missed something).
2021-08-19 09:10:05 -04:00
nicki
27133520fc
Label one-shots correctly in anilist track search (#5741)
* use format instead of type in anilist search

As per anilist graphql docs, `type` refers to whether anime/manga and is
redundant (since we already limit it to `MANGA`). What we actually want
is `format` which includes whether the media is a One-shot or Manga

This should help in making search a bit better as one no longer needs to
rely on the Date to figure out if its the One-shot entry or the Manga
entry

* Revert "use format instead of type in anilist search"

This reverts commit 6f0ba48886.

Accidentally changed the wrong query while further testing whoops

* use format instead of type in anilist search

As per anilist graphql docs, `type` refers to whether anime/manga and is
redundant (since we already limit it to `MANGA`). What we actually want
is `format` which includes whether the media is a One-shot or Manga

Changes search query and corresponding JSONALManga structure
2021-08-19 09:08:48 -04:00
Hunter Nickel
24b967ad5c
Fix start/resume fab showing up when entering and then exiting action mode (#5735) 2021-08-17 22:44:35 -04:00
Hunter Nickel
faef35ec47
Add check for current controller before setting extension update tab badge (#5733) 2021-08-16 11:58:30 -04:00
Andreas
326d4c2641
Fix today still being displayed even though relative time is off (#5732) 2021-08-16 10:28:40 -04:00
Riztard Lanthorn
83436c9550
add Theme "Teal & Turquoise" (#5681)
* add Theme "Teal & Turquoise"

* re sorting & change tertiary dark

* use alpha on ripple color & capitalize
2021-08-16 10:15:28 -04:00
arkon
071bad1232 Use separate string for toRelativeString "Today"
Apparently 0 quantity is ignored for some locales...
2021-08-15 17:42:31 -04:00
arkon
ae1a76da2b Use toRelativeString in Updates and History headings 2021-08-15 17:42:06 -04:00
Andreas
57a5862840
Use relative time in ChapterHolder (#5719)
* Use relative time in ChapterHolder

Similar to how J2K does it

* Use custom implementation for relative time

* Changes based on review comments
2021-08-15 17:07:48 -04:00
Arraiment
91fbccdbaa
Allow FilterList to be passed with default values (#5716) 2021-08-15 17:06:32 -04:00
Long
0ab0dd95ae
DNS-over-HTTPS (Adguard) (#5715)
* Update DohProviders.kt

* Update NetworkHelper.kt

* Update SettingsAdvancedController.kt

* fix typo

* Fix typo

* Fix typo
2021-08-15 11:20:52 -04:00
Hunter Nickel
4c8dfd0c0c
Add toggle to invert page color in reader color filter settings (#5713) 2021-08-15 10:58:01 -04:00
Ivan Iskandar
84d546b724
Set expanded cover dimension ratio from the source image (#5721)
Avoids cropping.
2021-08-15 10:53:25 -04:00
arkon
79da33b597 Open tracker page when clicking logo (closes #5624) 2021-08-15 10:38:10 -04:00
arkon
7d67450e58 Always re-setup background jobs on migration runs 2021-08-13 18:28:07 -04:00
arkon
8aa11951bf Do background app/extension checks less frequently
Since the in-app checks occur at least once a day anyway.
2021-08-13 18:24:21 -04:00
arkon
f23f22ab01 Add in-app app update check 2021-08-13 18:18:53 -04:00
Hunter Nickel
d1bb0fdf1d
Apply app theme styling to reader page errors and progress dialog (#5705) 2021-08-13 15:44:42 -04:00
Ivan Iskandar
5e77ae208d
Use correct color for reader loading indicator (#5685)
* Revert "Revert "Use correct color for reader loading indicator (#5645)" (fixes #5669)"

This reverts commit a4eba50c

* Fix crash on older APIs
2021-08-09 17:48:28 -04:00
arkon
1d10d29fa9 Replace AboutLibraries activity with custom controller 2021-08-07 11:50:20 -04:00
Andreas
7907a4fc24
Add ability to tweak auto hide sensitivity in Webtoon Reader (#5650)
* Tweak threshold

* Put setting under Webtoon instead

Because it only affects Webtoon related viewers
2021-08-07 10:34:47 -04:00
arkon
2f94f62a56 Merge branch 'fix-12' into master
# Conflicts:
#	.github/ISSUE_TEMPLATE.md
#	.github/ISSUE_TEMPLATE/report_issue.yml
#	.github/ISSUE_TEMPLATE/request_feature.yml
2021-08-06 17:33:24 -04:00
arkon
a4eba50cfd Revert "Use correct color for reader loading indicator (#5645)" (fixes #5669)
This reverts commit 7a1b6142df.
2021-08-06 17:30:51 -04:00
arkon
03980b2f27 Remove ability to set in-app language differently from system's 2021-08-06 16:45:40 -04:00
arkon
b9736df7e0 Re-enable preview build things 2021-08-06 15:38:16 -04:00
arkon
ab46bd56b0 Remove janky tracker icon UI 2021-08-06 14:55:45 -04:00
Ivan Iskandar
7a1b6142df
Use correct color for reader loading indicator (#5645)
Night theme color will be used when black or gray background color is used.
2021-08-06 14:22:04 -04:00
Andreas
fd45de5c58
Fix weird behaviour in library when switching display mode (#5640) 2021-08-05 17:52:45 -04:00
Ivan Iskandar
bcaa9674fe
Fix forced secure screen disabled after disabling incognito (#5634) 2021-08-05 17:52:20 -04:00
Ivan Iskandar
40aa3b7e18
Fix wonky webtoon layout when image is loaded at the top of the screen (#5660) 2021-08-05 17:51:03 -04:00
Ivan Iskandar
5aea21a194
Remove reader page number inset margin (#5661) 2021-08-05 17:50:37 -04:00
arkon
b5e118e2b4 Group advanced battery optimization setting entries 2021-08-05 17:47:52 -04:00
Ivan Iskandar
ff2a4e6952
Change BottomNavigationView behavior (#5603)
Similar to app bar's scroll behavior
2021-07-31 12:05:24 -04:00
Andreas
7660751f7f
Don't hide menu when scrolling through with ReaderSeekBar (#5611) 2021-07-31 12:04:13 -04:00
Hunter Nickel
41c060e28b
Add functionality to open SettingsMainController when double-tapping the "more" button (#5633) 2021-07-30 18:14:16 -04:00
Ivan Iskandar
a3090e62f5
Fix reader activity not using preferred language (#5630) 2021-07-30 18:13:50 -04:00
Ivan Iskandar
39b7024be0
Fix webtoon page takes up entire screen even if it's smaller (#5622) 2021-07-29 09:16:01 -04:00
Gauthier
20264eecb9
fix regression in cover fetching (#5621)
introduced in https://github.com/tachiyomiorg/tachiyomi/pull/4870
this was previously done here: 7d23fd8ef5/app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaThumbnailModelLoader.kt (L95) as part of https://github.com/tachiyomiorg/tachiyomi/pull/2908

this impacts Komga extension, where server url is manually provided by the user, but due to auto-correct on mobile keyboards the `http` prefix sometimes get capitalized to `Http`.
2021-07-28 08:25:35 -04:00
Ivan Iskandar
cc55453076
ReaderProgressIndicator: Set indeterminate as default state (#5605)
Will also set to indeterminate if progress is 0.
2021-07-27 17:30:35 -04:00
Ivan Iskandar
00ac632d8f
Fix list scrolling on quad-state dialog (#5602) 2021-07-24 12:14:46 -04:00
arkon
649209890d Use chooser intent for sharing saved pages 2021-07-24 11:56:55 -04:00
arkon
f2fca0f13d Remove unnecessary MultiDex library 2021-07-24 11:54:53 -04:00
FlaminSarge
4084d5e69a
Revert changes to last_update behavior from #5436 (#5590) 2021-07-24 11:32:48 -04:00
arkon
0e4ce0f1ae Relax MIUI backup/restore warning 2021-07-24 11:14:39 -04:00
Ivan Iskandar
c42d517f6b
Apply default night mode earlier (#5593) 2021-07-24 11:14:25 -04:00