mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-10 12:47:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,054 Commits 8 Branches 14 Tags 52 MiB
3b91ee0280
Commit Graph

1954 Commits

Author SHA1 Message Date
Docile-Alligator
7422098734 Add a FloatingActionButton in ViewMultiRedditDetailActivity. 2022-03-25 17:34:57 +08:00
Docile-Alligator
8ac8ea3d8b Fix getRedditUriByPath in LinkResolverActivity. 2022-03-25 16:48:35 +08:00
Docile-Alligator
c87b724a24 Fix captions and urls hidden by the navigation bar in ViewRedditGalleryImageorGifFragment. 2022-03-24 14:00:44 +08:00
Docile-Alligator
2bbba42e38 Version 5.1.9. 2022-03-17 22:10:38 +08:00
Docile-Alligator
59ed4c53ff Prevent WebView from reloading the website after orientation change in WebViewActivity. 2022-03-17 21:22:26 +08:00
Docile-Alligator
b4915859da Check if PostFragment is detached before initializing PostViewModel. 2022-03-17 14:23:06 +08:00
Docile-Alligator
7405e19c2e Fix clicking the back button on the toolbar does not finish FullMarkdownActivity. 2022-03-17 14:05:27 +08:00
Docile-Alligator
c0ad8ed27a Fix unable to update anonymous multireddits. 2022-03-17 13:57:09 +08:00
Docile-Alligator
cfd295aea8 Version 5.1.9-beta2. Optimize AppBarStateChangeListener. 2022-03-14 14:15:44 +08:00
Docile-Alligator
3cae2b0dba Load image after the AspectRatioGifImageView's height is determined in PostRecyclerViewAdapter to prevent blurry images. 2022-03-11 17:00:23 +08:00
Docile-Alligator
20e4798d34 Fix image loading issue. 2022-03-11 12:15:07 +08:00
Docile-Alligator
aab502238d Fix navigation drawer issues. 2022-03-11 12:10:35 +08:00
Docile-Alligator
53755d4381 Version 5.1.9-beta1. Fix low resolution post previews when showing them for the first time in PostDetailRecyclerViewAdapter. 2022-03-06 15:09:57 +08:00
Docile-Alligator
141abc654a New option: Settings->Miscellaneous->Post Feed Preview Max Resolution. Fix low resolution post previews when showing them for the first time. Tweak themed icon. 2022-03-06 10:41:02 +08:00
Docile-Alligator
dc9725735b Fix preview issue in PostCompactBaseViewHolder in PostRecyclerViewAdapter. 2022-03-05 11:33:07 +08:00
Docile-Alligator
023cef76ad Themed icon for Android. Very ugly right now. 2022-03-05 11:02:16 +08:00
20captainx12
af120ded09
Added adaptive icons (#646) 
Start adding adaptive icons for Android Tiramisu.
 2022-03-04 11:46:11 +08:00
Docile-Alligator
40078880af Try fixing Parcelable implementation issues. 2022-02-28 23:55:49 +08:00
Docile-Alligator
f0589ada3e Show and open r/u_ style subreddits in comments. 2022-02-28 18:12:13 +08:00
Docile-Alligator
2e67298813 Show and open r/u_ style subreddits in posts. 2022-02-28 18:01:30 +08:00
Docile-Alligator
405317b4cb Fix changing default post layout not working. 2022-02-28 16:45:30 +08:00
Docile-Alligator
5e0b2662d7 New fonts: Atkinson Hyperlegible and Atkinson Hyperlegible Bold. 2022-02-25 18:23:40 +08:00
Docile-Alligator
679820b96e Submitting poll posts is available. 2022-02-21 22:52:22 +08:00
Docile-Alligator
3a69e02867 New option: Settings->Interface->Post Details->Hide Upvote Ratio. 2022-02-21 15:38:17 +08:00
Docile-Alligator
4b3e11c62d Fix https://github.com/Docile-Alligator/Infinity-For-Reddit/issues/667 2022-02-21 12:23:13 +08:00
Docile-Alligator
fbc0006a4f Use ConcatAdapter for the navigation drawer. 2022-02-20 18:09:54 +08:00
Docile-Alligator
d76abc8c3e Minor bugs fixed. 2022-02-19 12:16:31 +08:00
Docile-Alligator
f508132f32 New option: Interface->Comment->Always show the number of child comments. Fix notification icon. Tweak the app icon. 2022-02-18 19:48:00 +08:00
Docile-Alligator
b933c9d08b Fixed a typo: Hide Author Avatar -> Show Author Avatar. 2022-02-18 17:28:40 +08:00
Alex Ning
c64b6ef229 Version 5.1.8. Add Reddit User Agreement to settings. Move Privacy Policy option from About to main settings page. 2022-02-12 22:05:22 +08:00
Alex Ning
79cc6ddf1e Don't autoplay spoiler videos. 2022-02-05 15:32:01 +08:00
Alex Ning
c265bbecf9 New option: Settings->Interface->Comment->Hide Author Avatar. Fix Application ClassCastException in MainActivity. Don't show the number of child comments in expanded comments. 2022-02-05 15:19:18 +08:00
Alex Ning
101525ae33 Minor bugs fixed. 2022-02-04 11:26:45 +08:00
Alex Ning
5713982e8f Version 5.1.7. 2022-01-29 11:42:55 +08:00
Alex Ning
5a5011f19e New option: Settings->Interface->Comment->Show Fewer Toolbar Options Starting From. 2022-01-29 11:11:36 +08:00
Alex Ning
2569742e1c Set caption and url when submitting gallery posts. 2022-01-28 12:58:16 +08:00
Alex Ning
fd0e95dbac Show author icon in CommentFullyCollapsedViewHolder. 2022-01-21 22:22:37 +08:00
Alex Ning
db48b940d7 Update translation. 2022-01-21 22:03:02 +08:00
Alex Ning
f33cf68624 New option: Hide Comment Awards. 2022-01-21 20:37:31 +08:00
Alex Ning
e68f8ed4bc Show author avatars in comments. 2022-01-21 19:52:31 +08:00
Alex Ning
de105359f9 Fix views in comment toolbar overlapping each other. 2022-01-21 15:44:49 +08:00
Alex Ning
c6f5e3c8f6 Version 5.1.6. 2022-01-20 15:08:36 +08:00
Alex Ning
25fff4064c New option: Hide Text Post Content. 2022-01-20 15:00:26 +08:00
Alex Ning
5eaf4ab8fe Show child reply count in comments. 2022-01-17 17:30:56 +08:00
Alex Ning
9ab1e6904c Fix IllegalStateException in ViewPostDetailFragment. 2022-01-17 12:01:12 +08:00
Alex Ning
85a51d7dc8 New option: Fixed height preview in card. 2022-01-16 15:19:55 +08:00
Alex Ning
44ed414f28 Go back to top of the feed after changing sort type or refreshing. 2022-01-16 09:49:07 +08:00
Alex Ning
94f08d616a Version 5.1.6-beta1. 2022-01-15 14:53:10 +08:00
Giovanni Palmieri
aaa3e91b82
added "Open in browser" button to internal browser (#622) 2022-01-15 12:25:07 +08:00
Alex Ning
af3447419a Load custom fonts. 2022-01-15 12:03:18 +08:00
Alex Ning
4d0b8b4672 Add options to set custom fonts. 2022-01-14 20:57:16 +08:00
Alex Ning
6f1cd194cb Continue adding support for custom font. 2022-01-13 23:30:55 +08:00
Alex Ning
e0c849e135 Start adding custom font support. 2022-01-05 13:32:09 +08:00
Alex Ning
b11a568169 Version 5.1.5. 2021-12-22 20:36:52 +08:00
Alex Ning
a83640f01a Fix NSFW download location option not working. Hide options in Data Saving Mode settings if Data Saving Mode is off. 2021-12-20 22:16:33 +08:00
Alex Ning
dc4fa2e6b8 Handle Streamable and Imgur videos when parsing v.redd.it videos in ViewVideoActivity. 2021-12-20 21:50:26 +08:00
scria1000
7150ac6981
Mutually exclusive toggling behaviour for DataSavingMode (#603) 
Mutually exclusive toggling behavior for DataSavingMode.
 2021-12-20 21:21:26 +08:00
scria1000
a7b58cf0a4
Support imgur gifv with audio (#602) 
Support imgur gifv videos with audio.
 2021-12-20 21:18:40 +08:00
MetalNeo
34127032de
Added Setting for Separate NSFW Download Folder (#584) 
Add an option to separate NSFW media downloads
 2021-12-20 21:13:08 +08:00
Alex Ning
21e7dad1b0 Search subscribed users and multireddits. 2021-12-20 21:07:46 +08:00
Alex Ning
053773741e Search subscribed subreddits. 2021-12-20 20:25:31 +08:00
Alex Ning
f8a5dc9d61 Fix app crashes when fetching gfycat videos failed for autoplay. 2021-12-20 18:54:29 +08:00
Alex Ning
f8694309d3 Version 5.1.4. 2021-12-16 19:50:12 +08:00
Alex Ning
59fadbb0e0 Use Executor to fetch removed comments. 2021-12-15 22:52:31 +08:00
scria1000
f3b0a04f3c
Fix markdown headers sometimes not rendering in About (#592) 
Fix markdown headers sometimes not rendering in subreddit About section
 2021-12-15 21:46:04 +08:00
scria1000
e90a3b674e
Add Reveddit fallback for retrieving deleted comments (#591) 2021-12-15 21:43:55 +08:00
scria1000
e4c64668db
Add support for parsing inline static emotes (#589) 2021-12-15 21:43:01 +08:00
scria1000
ae63e20764
Fix link previews not showing (#587) 
Fix link previews not showing
 2021-12-13 22:04:35 +08:00
scria1000
5ec29e0c96
Retrieve subreddit data for subscribed private subs (#586) 
Fetch active user count, subreddit icon etc. for subscribed private subs
 2021-12-13 20:47:45 +08:00
scria1000
9ef1b4decd
Fix autoplay video continuing in background (#585) 
Fix autoplay video continuing in background
 2021-12-13 20:46:22 +08:00
Alex Ning
228cc4bb75 Fix post parsing logic for Gfycat, Redgifs and Streamable videos. 2021-12-12 22:32:58 +08:00
Alex Ning
f97e01ed66 Merge branch 'master' of github.com:Docile-Alligator/Infinity-For-Reddit 2021-12-12 22:09:34 +08:00
Alex Ning
8c445fb766 Streamable videos autoplay. 2021-12-12 22:09:09 +08:00
scria1000
c934bc7740
Undo superscript parser changes for now (#577) 
Undo superscript parser changes
 2021-12-12 20:51:43 +08:00
Alex Ning
a2c6685dd8 Treat streamable link posts as video posts. 2021-12-12 20:48:23 +08:00
Alex Ning
1abc703d7e Support Streamable. 2021-12-09 21:29:35 +08:00
Docile-Alligator
35cbd24318
Merge pull request #575 from scria1000/markdown-enhancements 
Markdown enhancements
 2021-12-09 21:24:46 +08:00
scria1000
97fc6d2873
Fix reduntant line 2021-12-09 12:04:37 +00:00
scria1000
87ab68217d Some more spoiler parsing optimizations 
Don't bother trying to parse a text if it doesn't have spoiler opening.
 2021-12-09 14:54:25 +03:00
scria1000
d101cddf0f Make Superscript parsing proper 
Do this without relying converting to <sup> tags.
 2021-12-09 13:23:02 +03:00
scria1000
089faf0cbc
Correct typo in replaceAll 
oops
 2021-12-08 08:01:14 +00:00
Docile-Alligator
99c096e111
Merge pull request #573 from scria1000/patch-3 
Fix observer being triggered twice on SubredditDetail
 2021-12-07 21:19:42 +08:00
Docile-Alligator
57ab519333
Merge pull request #572 from scria1000/spoiler-optimize 
Optimize spoiler parser
 2021-12-07 21:13:18 +08:00
Docile-Alligator
8fea6f688a
Merge pull request #571 from scria1000/patch-2 
Add null check for GALLERY_DATA_KEY
 2021-12-07 21:11:20 +08:00
scria1000
3350b31d21 Fix observer being triggered twice on SubredditDetail 
Fix observer being triggered twice on ViewSubredditDetailActivity and SidebarFragment.
 2021-12-07 15:46:41 +03:00
scria1000
281d6aec50 Correct newline behaviour, again 2021-12-05 22:15:59 +03:00
scria1000
dea22c8f7e Optimize spoiler parser 
Should take 3-4x less milliseconds, on average
 2021-12-05 18:40:37 +03:00
scria1000
619d6b846a Add null check for GALLERY_DATA_KEY 
Without this null check, viewing a deleted comment whose OP also had a deleted gallery will cause the Parsing to fail.
 2021-12-04 18:23:48 +03:00
scria1000
1f8d9e6a7d Statically compile frequently used Regex pattern 2021-12-04 10:41:23 +03:00
scria1000
c9e7b11379
Fix gif not found for downsized Giphy gifs 2021-12-03 21:06:45 +00:00
Alex Ning
0d80bee501 Fix refreshing in ViewPostDetailFragment too easily in two-pane layout. 2021-12-03 21:26:05 +08:00
Alex Ning
45f4fae786 Fix gallery post preview still shows in ViewPostDetailActivity when Disable Image Preview in Data Saving Mode is enabled. 2021-12-03 21:16:15 +08:00
Alex Ning
c809de6350 Minor bugs fixed in ParsePost. 2021-12-03 21:04:19 +08:00
Docile-Alligator
b0d9a15dfd
Merge pull request #564 from scria1000/patch-2 
Make switches and checkboxes more consistent on Dark Mode
 2021-12-02 20:40:37 +08:00
Docile-Alligator
2381826165
Merge pull request #565 from scria1000/search-filter-fix-1 
Recover from no result after switching sort mode
 2021-12-02 20:32:18 +08:00
Docile-Alligator
49e0df2980
Merge pull request #561 from scria1000/master 
Download unprocessed gallery picture
 2021-12-02 19:39:03 +08:00
scria1000
68db5a670d Recover from no result after switching sort mode 
Resolves #563
 2021-12-01 21:35:41 +03:00
scria1000
ceeade6f19
Make switches and checkboxes more consistent on Dark Mode 2021-12-01 14:28:36 +00:00
Alex Ning
f39f608cde Minor layout tweaks. 2021-12-01 21:33:46 +08:00
scria1000
951024f086
Merge branch 'master' into master 2021-12-01 11:04:48 +00:00
Docile-Alligator
e2964893da
Merge pull request #522 from scria1000/gallery-captions-feature 
Initial support for gallery captions
 2021-12-01 18:45:36 +08:00
scria1000
a70950baf9 Download unprocessed gallery picture 
Resolves #558
 2021-11-30 19:47:15 +03:00
scria1000
a663359f9a Revert "Download unprocessed gallery picture" 
This reverts commit 886eb68341.
 2021-11-30 19:13:08 +03:00
scria1000
886eb68341 Download unprocessed gallery picture 
Resolves #558
 2021-11-30 19:10:31 +03:00
Alex Ning
3b365dfe5d Version 5.1.3. Fix bottom navigation bar option count not applied to anonymous mode. 2021-11-29 21:16:15 +08:00
Docile-Alligator
a145f6d6cd
Merge pull request #511 from ratabb/rbb/proguard 
keep class CrashReportsFragment
 2021-11-29 19:27:05 +08:00
scria1000
1eb1562dfd Adjust caption layout 
Set caption max length

Set link ellipsis
 2021-11-28 19:15:47 +03:00
scria1000
9f31b1007d Process subreddit links inside Wiki extra 2021-11-28 11:40:05 +03:00
scria1000
f848dad466 Don't pass reduntant View arguments to linkify 
When used as a plugin for Markwon; BetterLinkMovement iterates TextViews under the ViewGroup at the setMarkdown stage, so there is no need to for this argument.

Don't give a whole Activity as  an argument to this method, this causes bugs.
 2021-11-28 03:27:35 +03:00
scria1000
fa772c1d20 Fix conflict 2021-11-27 21:28:49 +03:00
scria1000
a399200be2
Merge branch 'master' into gallery-captions-feature 2021-11-27 17:10:50 +00:00
scria1000
90a9b1033f Make caption text copyable with long press 
Use native way to theme ViewRedditGalleryActivity
 2021-11-27 20:04:45 +03:00
Alex Ning
d8f6572262 Version 5.1.2. 2021-11-27 20:47:46 +08:00
Docile-Alligator
32150165d4
Merge pull request #538 from scria1000/single-scroll-fix 
Make scroll button work on single comment mode
 2021-11-27 20:26:10 +08:00
Docile-Alligator
806fcf397b
Merge pull request #549 from scria1000/gallery-destroy-fix 
Don't cancel all ImageLoader instances
 2021-11-27 20:21:51 +08:00
scria1000
86d9761f09 Don't cancel all ImageLoader instances 2021-11-26 14:49:12 +03:00
scria1000
209a874f57 Minor tweaks 2021-11-25 21:54:08 +03:00
scria1000
8423a18071 Return early if not spoiler 2021-11-25 20:59:18 +03:00
scria1000
e481980480 Check if spoiler was found before setting markdown 2021-11-25 19:22:32 +03:00
scria1000
d1096f1f76 Fix typo 2021-11-25 19:07:15 +03:00
scria1000
b0134984ca Add a non-regex solution for parsing spoilers 
Add a non-regex solution for parsing spoilers that can also handle code blocks

Add a custom BlockQuoteParser to prevent spoilers from being consumed as block quotes without the need for html escaping

Make revealed spoiler backgrounds slightly darker
 2021-11-25 19:04:34 +03:00
scria1000
ea1501b5a4
Merge branch 'Docile-Alligator:master' into more-regex-fix 2021-11-24 13:01:31 +00:00
Alex Ning
1b39925cf8 Version 5.1.1. Fix anonymous subreddits and multireddits do not show in MainActivity TabLayout. Fix changing tab names not working in anonymous mode. 2021-11-22 20:35:14 +08:00
Alex Ning
841fec87dc Fix TrackSelectionDialog button color. Do not automatically show control view in autoplaying videos. 2021-11-22 19:27:45 +08:00
Alex Ning
50a2db2a39 Implement SaveMemoryCenterInsideDownsampleStrategy to smartly downsample images in PostRecyclerViewAdapter and PostDetailRecyclerViewAdapter. 2021-11-21 22:55:58 +08:00
Alex Ning
725921dac1 Fix dark theme issue when selecting playback speed. Minor bugs fixed. 2021-11-21 20:59:01 +08:00
Alex Ning
fd1b6fa6fe Fix cannot open media in Gallery layout. 2021-11-21 19:38:49 +08:00
scria1000
b106e0677a Make scroll button work on single comment mode 2021-11-17 02:18:31 +03:00
scria1000
d5770599f5 Refactor spoiler parsing into its own class 
Reuse spoiler pattern otherwise we match markdown like: `>!`   lots of new lines and text  <!

And some other minor changes.
 2021-11-16 22:53:56 +03:00
Alex Ning
04cc769ccf Version 5.1.0. 2021-11-16 08:54:03 +08:00
Docile-Alligator
22457af98a
Merge pull request #533 from scria1000/regex-fix 
Don't leave out single character
 2021-11-15 19:08:58 +08:00
Alex Ning
f94bd5039c Don't start MaterialYouService if Material You is not enabled. 2021-11-15 19:06:05 +08:00
scria1000
b8f33cb682
Don't leave out single character 
oops

>!
match this!<


>!match
this!<

>!
match this!<

>!don't
match
this<!

>!
match this
!<

>!match
this
!<

>!
match 
this!<

>!
O!<

>!
O
!<

>!
X

!<

>!
DON'TMATCH

!<

>!O!<

>!
O
O!<

>!!<
 2021-11-15 08:42:07 +00:00
Docile-Alligator
2e0725e25e
Merge pull request #526 from scria1000/markdown-disable-html 
More fixes related to markdown rendering
 2021-11-15 08:47:32 +08:00
scria1000
550706d2d7 Revert changes made in refactor 
We need the original superscript markdown for when we edit posts!
 2021-11-14 21:48:11 +03:00
scria1000
a52342b336 Refactor 2021-11-14 17:21:59 +03:00
scria1000
ef1bdf2fa5 Optimize spoiler regex 
Optimize spoiler regex to allow at least one new line.

>!
match this!<

>!match
this!<

>!
match this!<

>!don't
match
this<!

>!
match this
!<

>!match
this
!<
 2021-11-14 16:34:50 +03:00
scria1000
839325efbe Don't handle unescaped bracket links for now 
Until there is a better solution that can also handle `[Title]: https://link.com` type links and others.
 2021-11-14 14:52:07 +03:00
Alex Ning
d0f0647bc8 Version 5.1.0-beta3. 2021-11-13 22:11:56 +08:00
scria1000
e3976248cc Disable BangInlineProcessor 
Don't process ! bangs before links since reddit markdown does not support it. Now links inside spoilers can be rendered correctly.
 2021-11-13 15:58:55 +03:00
scria1000
5fae42c210 Try to handle unescaped space inside link blocks 
* Commonmark spec does not parse links with unescaped spaces in the link query
* Maybe we can do the parsing ourselves by extending 'InlineProcessor', instead of using slow regex
* Reuse `fixSuperScript`
 2021-11-13 01:34:28 +03:00
Alex Ning
f8c15e03af Contact mods. 2021-11-12 09:10:21 +08:00
scria1000
1960bb5ea1 Add custom superscript processor 2021-11-12 01:51:54 +03:00
scria1000
2cdf523eff More fixes related to markdown rendering 2021-11-11 18:41:24 +03:00
Alex Ning
d6d6ed5407 UI changes in EditProfileActivity. 2021-11-11 20:37:28 +08:00
scria1000
96b9b51b6d
Missed this one 2021-11-11 08:00:40 +00:00
scria1000
2e0ef26d03 Fix markdown not rendering in some comments 2021-11-11 01:21:18 +03:00
Alex Ning
24f5682bf8 Some UI tweaks. 2021-11-10 21:25:32 +08:00
scria1000
17df9d41ca Fix bottom url menu not being themed accordingly 
Use linkify for in-gallery caption url
 2021-11-10 15:37:11 +03:00
scria1000
91c457bfe3
Merge branch 'Docile-Alligator:master' into gallery-captions-feature 2021-11-10 09:34:26 +03:00
Alex Ning
973c468a7c Fix https://github.com/Docile-Alligator/Infinity-For-Reddit/issues/327. 2021-11-10 08:35:37 +08:00
scria1000
b8e2d44638 Initial support for gallery captions 2021-11-09 17:11:02 +03:00
Alex Ning
70cbadfb3b Fix clicking spoiler invokes OnClickListener on TextView in comments. Render profile description in markdown. 2021-11-09 21:12:31 +08:00
Alex Ning
eb34cfecce Fix clicking tab text does not change page in ViewUserDetailActivity, ViewSubredditDetailActivity or AccoundSavedThingActivity. 2021-11-07 14:43:34 +08:00
Alex Ning
23368c89a8 Minor bugs fixed. 2021-11-07 12:09:54 +08:00
Alex Ning
b059b2d503 Version 5.1.0-beta2. Fix crash when hiding read posts. 2021-11-04 22:43:21 +08:00
Alex Ning
9e19b6f092 Wait 2 seconds before automatically applying Material You. 2021-11-04 22:30:23 +08:00
Alex Ning
71e382acb0 Minor layout tweaks. 2021-11-04 22:26:01 +08:00
Alex Ning
e6bb87a9cc Fix Material Design 3 issue. 2021-11-04 22:13:59 +08:00
Alex Ning
7c8bde7e99 Tweak Material You amoled theme on Android 12. 2021-11-03 22:19:22 +08:00
Alex Ning
c2e9ef62e7 Tweak Material You dark theme on Android 12. 2021-11-03 22:12:28 +08:00
Alex Ning
6df1b1f954 Tweak Material You light theme on Android 12. 2021-11-03 21:54:56 +08:00
ratabb
8902797b29 keep class CrashReportsFragment 2021-11-03 05:45:53 +07:00
Docile-Alligator
ef870f93fc
Merge pull request #500 from wulkanat/master 
feat: "real" Material You implementation
 2021-11-02 22:39:45 +08:00
Alex Ning
8716eefb47 Minor changes in EditProfileActivity. 2021-11-02 22:39:08 +08:00
Wieland Schöbl
0a0e1fa46a cleanup 2021-11-02 15:15:44 +01:00
Wieland Schöbl
412b78912b feat: re-enable manual material you for older platforms 2021-11-02 15:13:54 +01:00
Docile-Alligator
3a8c6b0a28
Merge pull request #507 from ratabb/rbb/edit_profile 
feat: add Edit Profile
 2021-11-02 22:06:38 +08:00
Alex Ning
90419413b9 Try optimizing image loading in PostRecyclerViewAdapter. 2021-11-02 21:35:28 +08:00
Alex Ning
be9bc8d014 Optimize some layouts. 2021-11-01 21:46:37 +08:00
Alex Ning
d6a66749d3 Continue migrating to Material Design 3. 2021-10-30 22:12:30 +08:00
Alex Ning
4ab8f037f2 Start migrating to Material Design 3. Try optimizing image loading in PostRecyclerViewAdapter. 2021-10-30 21:20:48 +08:00
ratabb
b1d8ad5c76 feat: add Edit Profile 2021-10-30 14:19:35 +07:00
Wieland Schöbl
7fcc1890fe feat: "real" Material You implementation 2021-10-20 18:16:50 +02:00
Alex Ning
efd5f61889 Version 5.1.0-beta1. Update translation. New languages: Czech and Romanian. Fix anonymous multireddit cannot be loaded in MainActivity. Fix database migration issue. Fix some subreddits cannot be shown in SubscribedSubredditsRecyclerViewAdapter. Fix anonymous subscribed subreddits cannot be shown in SubscribedSubredditsRecyclerViewAdapter in SubredditSelectionActivity. 2021-10-17 22:24:30 +08:00
Alex Ning
4e2b09b079 New options in post filter: Title: contains keywords, Title: contains regex, Contain domains. 2021-10-16 15:28:35 +08:00
Alex Ning
4395384586 Fix no multireddits found in MultiredditSelectionActivity in anonymous mode. Do not sync multireddits in anonymous mode in MultiredditSelectionActivity. 2021-10-16 14:50:18 +08:00
Alex Ning
1d7fbe3a99 Add a button to directly select subreddit, user or multireddit in CustomizeMainPageTabsFragment. 2021-10-16 14:46:01 +08:00
Alex Ning
1d18e2c75b Fix post filter issue in anonymous mode. 2021-10-16 11:53:15 +08:00
Alex Ning
6910947dee Fix FilteredPostsActivity problem in anonymous mode. 2021-10-16 11:34:03 +08:00
Alex Ning
ddfc478e0e Restore more data. 2021-10-16 11:20:48 +08:00
Alex Ning
f1dfadecb6 Backup anonymously subscribed users and multireddits. Backup post filters. 2021-10-16 10:06:47 +08:00
Alex Ning
192de06e16 Backup custom themes and anonymous subscribed subreddits. 2021-10-15 22:03:42 +08:00
Alex Ning
4c2f1f3f70 Set EditText cursor color in CustomizePostFilterActivity. 2021-10-15 21:21:23 +08:00
Alex Ning
3b0ba561b2 Fix some issues related to media indicator icon and themeing. 2021-10-15 20:28:37 +08:00
Alex Ning
2fd0e2e0e5 Apply custom colors to media indicator. 2021-10-15 09:04:44 +08:00
Alex Ning
a129c918a0 New theme options: Media Indicator Icon Color and Media Indicator Background Color. 2021-10-14 21:32:47 +08:00
Alex Ning
a8f21a94b0 New option: Pinch to Zoom Video. 2021-10-14 20:57:22 +08:00
Alex Ning
c8c3c23093 Zoomable ViewVideoActivity. 2021-10-14 19:46:28 +08:00
Alex Ning
bc9cfc8183 Sort recent searches by search time. 2021-10-14 09:16:15 +08:00
Alex Ning
31d7592964 Legacy autoplay video controller UI. 2021-10-13 21:00:24 +08:00
Alex Ning
230f49ae18 Fix wrong values in customize bottom navigation bar settings page in anonymous mode. 2021-10-13 09:18:32 +08:00
Alex Ning
a60c9360a1 Separate anonymous and normal accounts' bottom navigation bar settings. 2021-10-12 23:40:38 +08:00
Alex Ning
d3d8fd66be Customize bottom navigation bar in anonymous mode. 2021-10-12 22:48:51 +08:00
Alex Ning
0f7b10fa14 Change flotaing action button options in anonymous mode. 2021-10-12 19:35:50 +08:00
Alex Ning
9054cd6590 Customize main page tabs for anonymous mode. 2021-10-11 20:22:09 +08:00
Alex Ning
9e5b5c78e2 Refresh in WebViewActivity. 2021-10-10 22:12:31 +08:00
Alex Ning
43b9abd6ee New option: Link Handler. Removed option: Open Link In App. 2021-10-10 21:51:10 +08:00
Alex Ning
d40b81d799 New option: Default Playback Speed. 2021-10-10 20:36:25 +08:00
Alex Ning
a30421e73b Set playback speed in other ViewImgurVideoFragment and ViewRedditGalleryVideoFragment. 2021-10-10 20:20:14 +08:00
Alex Ning
4de457cd02 Loop video option is available for autoplaying videos. 2021-10-09 22:08:48 +08:00
Alex Ning
f12dea156f New option: loop video. 2021-10-09 21:43:55 +08:00
Alex Ning
abd57e23a6 Change playback speed. 2021-10-09 21:22:18 +08:00
Alex Ning
e02f5a28b3 Smooth scrolling in EditCommentActivity. 2021-10-09 20:11:35 +08:00
Alex Ning
68e94fa928 Maximize bottom sheet fragments. 2021-10-09 19:09:34 +08:00
Alex Ning
ff69387221 Filter posts option in toolbar. 2021-10-09 18:54:09 +08:00
Docile-Alligator
7feb78f133
Merge pull request #480 from Blatzar/master 
Fixed visual swiping bug
 2021-10-08 20:24:31 +08:00
Alex Ning
723f1c0713 New option: Main Page Back Button Action. It replaces Confirm to Exit. 2021-10-08 20:21:08 +08:00
Alex Ning
f5a333e2ac Show a dialog before closing CustomizeThemeActivity. 2021-10-08 20:19:50 +08:00
Alex Ning
bac1dca855 Give back lazy mode control to PostFragment instead of activities. 2021-09-29 20:34:37 +08:00
Alex Ning
5b5bc1c5b8 RPAN and trending available to anonymous mode. 2021-09-29 19:41:58 +08:00
LagradOst
2f842889ae
Update ViewImageOrGifActivity.java 2021-09-28 16:10:19 +02:00
Alex Ning
f5f6213733 Hide visibility option when creating or editing anonymous multireddit. 2021-09-28 21:17:49 +08:00
Alex Ning
1896b971cd Delete anonymous multireddit in ViewMultiredditDetailActivity. 2021-09-28 21:13:06 +08:00
Alex Ning
d5f3761973 Fix subreddits disappear in anonymous multireddit after favoriting it. 2021-09-28 20:25:58 +08:00
Alex Ning
82db567fdc Edit anonymous multireddit. 2021-09-28 20:05:47 +08:00
Alex Ning
426db4c069 Delete anonymous multireddit. 2021-09-28 19:23:34 +08:00
Alex Ning
10cccb5b93 Disable refreshing in SubscribedThingListingActivity in anonymous mode. 2021-09-27 20:01:55 +08:00
Docile-Alligator
191023301d
Merge pull request #479 from andrewrasch/folding-phone-support 
Enable folding phone support for card view
 2021-09-27 19:34:41 +08:00
Alex Ning
2f64942584 Enable subreddit multiselection in anonymous mode. 2021-09-27 19:32:57 +08:00
Andrew Rasch
8fdbf37613 Added strings.xml entry for switchpref. 2021-09-26 20:14:44 -04:00
Andrew Rasch
0d93d7c996 Enable folding phone support for card view 
Updated card view to allow for separate column numbers for folded vs unfolded state. Organized strings.xml.
 2021-09-26 20:10:12 -04:00
Alex Ning
50de5bb44a Fix ViewVideoActivity crash. 2021-09-26 21:43:22 +08:00
Alex Ning
76feb81c6b Load anonymous multireddit posts. 2021-09-26 21:37:54 +08:00
Alex Ning
39835c587a Favorite anonymous multireddits. 2021-09-26 20:45:01 +08:00
Alex Ning
9a0067d714 Fix anonymous multireddits not shown. 2021-09-26 20:37:37 +08:00
Alex Ning
ad99238ed9 Create multireddits in anonymous mode. 2021-09-26 20:35:03 +08:00
Docile-Alligator
e3457069a4
Merge pull request #471 from andmizyk/master 
Added Ukrainian translation
 2021-09-26 19:10:20 +08:00
Docile-Alligator
fa645f932d
Merge pull request #474 from andrewrasch/intent-filter-cleanup 
Cleanup on intent filters.
 2021-09-26 19:08:21 +08:00
andrewrasch
0b9e347cfb Cleanup on intent filters. 
Separated google amp links from reddit links to fix false positives. Simplified schemes and duplicate hosts.
 2021-09-26 00:08:45 -04:00
TacoTheDank
424b1c27e0 Use Java 11 2021-09-24 21:28:42 -04:00
TacoTheDank
d1740f77d1 Fix some deprecations 2021-09-24 21:28:33 -04:00
TacoTheDank
a5ca6ac2bc Use FragmentContainerView 2021-09-24 21:28:22 -04:00
TacoTheDank
14a09c725f Use NotificationChannelCompat features 2021-09-24 21:28:11 -04:00
TacoTheDank
c78cc8aaec Update AndroidX Appcompat and Lifecycle 2021-09-24 21:12:20 -04:00
TacoTheDank
2b17931628 Use some empty implementations of listeners 2021-09-24 21:10:59 -04:00
TacoTheDank
92c76f2e12 Update a bunch of libraries 2021-09-24 21:10:15 -04:00
TacoTheDank
e464082964 Migrate from JCenter where possible 2021-09-24 21:08:09 -04:00
TacoTheDank
0f4ced5669 Update AGP, reorganize libraries 2021-09-24 21:07:26 -04:00
Andrij Mizyk
b2c8233835 Added Ukrainian translation 2021-09-24 22:34:36 +03:00
Alex Ning
5d6a56aae0 Show subscribed users for the anonymous account. 2021-09-24 20:52:58 +08:00
Alex Ning
6215311186 Prepare to support anonymous multireddit. 2021-09-24 20:42:00 +08:00
Alex Ning
cfab68ecd6 Favorite and unfavorite users for the anonymous user. 2021-09-24 19:16:35 +08:00
Alex Ning
20053881f1 Anonymous user subscription. 2021-09-23 20:54:54 +08:00
Alex Ning
643d9395a4 Merge branch 'master' of github.com:Docile-Alligator/Infinity-For-Reddit 2021-09-23 20:18:56 +08:00
Alex Ning
3482ab36e9 Add null check in tryMarkingPostAsRead() in ViewPostDetailFragment. 2021-09-23 20:18:07 +08:00
Docile-Alligator
ccd80a3e15
Merge branch 'master' into go-to-top-of-page-button 2021-09-23 20:02:10 +08:00
Docile-Alligator
f2fd163375
Merge branch 'master' into link-handling-fixes 2021-09-23 20:00:42 +08:00
Docile-Alligator
64f0c73360
Merge pull request #470 from andrewrasch/fix-wiki-pages 
Fix Wiki Page Handling
 2021-09-23 19:57:04 +08:00
Alex Ning
5f4ecbbe88 Fix posts not marked as read in ViewPostDetailActivity if swipe between posts is enabled. 2021-09-22 21:02:31 +08:00
Alex Ning
cc9952525b Only save read post ids in PostFragment. Add read post ids to readPosts in PostFragment. 2021-09-22 20:17:33 +08:00
andrewrasch
cac32b4394 Added path patterns to other links 
Fixes bug where only google amp links open in Infinity
 2021-09-22 01:00:53 -04:00
andrewrasch
0ca6bc25af Added link to wiki in subreddit 
Subreddit details menu now has a link to its wiki. Subs without a wiki will show the "this subreddit has no wiki" page.
 2021-09-22 00:04:21 -04:00
andrewrasch
2d5829830e Fixed handling of wiki pages 
LinkResolverActivity now handles wiki pages other than index and their subpages.
 2021-09-21 23:50:30 -04:00
andrewrasch
97d630392c Change the go to top icon 
Changed to use a double up arrow icon
 2021-09-21 23:29:49 -04:00
andrewrasch
5cfe8a6016 Added API call for generic wiki page. 
Updated old wiki-only call to cascade to new generic.
 2021-09-21 23:01:17 -04:00
andrewrasch
1fb3ba6e3f Update link handling for amp and v.redd.it 
Added manifest entries for google.com amp links (reddit only) and v.redd.it. Updated handling of google amp links in LinkResolverActivity.
 2021-09-21 22:10:38 -04:00
andrewrasch
a651935fa5 Added go to top of page option. 
Added Main + Other Activity bottom bar option to go to the top of a page.
 2021-09-21 20:37:41 -04:00
Alex Ning
d6c3bfddd7 Fix marking posts as read on scroll. 2021-09-17 22:07:03 +08:00
Alex Ning
474b3cf32f Fix hiding read posts automatically. 2021-09-17 21:06:53 +08:00
Alex Ning
5dda05d7fa Fix opening the same media multiple times by clicking it repeatedly. 2021-09-17 20:49:50 +08:00
Alex Ning
48a8076fc0 Rewrite code related to hiding read posts. 2021-09-17 20:47:21 +08:00
Alex Ning
50a3572679 No need to pass a HashSet to hide read posts. 2021-09-16 23:26:56 +08:00
Alex Ning
1d73231a82 Remove unused API. 2021-09-16 22:52:13 +08:00
Alex Ning
6aaef3820c Fix no post message not shown in PostFragment. 2021-09-16 22:44:15 +08:00
Alex Ning
7f44b6a8de Fix the same value, null, was passed as the nextKey in two sequential Pages loaded from a PagingSource. 2021-09-16 19:25:58 +08:00
Alex Ning
8a10733d8c Use Transformations.map and PagingDataTransforms.filter to remove read posts. It is an ugly design but I cannot think of a better way. 2021-09-15 22:44:34 +08:00
Alex Ning
1d0ab483d1 Fix gfycat videos cannot be downloaded. 2021-09-08 21:11:15 +08:00
Alex Ning
5fddea1362 Fix onPostUpdateEvent and onNeedForPostListFromPostRecyclerViewAdapterEvent in PostFragment. 2021-09-07 19:18:18 +08:00
Alex Ning
91d24e1e0c Unlock Account Section -> Unlock in LockScreenActivity. 2021-09-06 23:33:23 +08:00
Alex Ning
ecb891748d Remove PostViewModel, PostDataSource and PostDataSourceFactory. NewPostViewModel is renamed to PostViewModel. 2021-09-06 23:31:18 +08:00
Alex Ning
01e1103d3d Remove unused variables. 2021-09-06 23:19:13 +08:00
Alex Ning
0b8e8076fc Remove retryLoadingMore in NewPostViewModel. 2021-09-06 23:14:36 +08:00
Alex Ning
a239eec17c Remove code related to NetworkState in PostRecyclerViewAdapter. 2021-09-06 23:09:37 +08:00
Alex Ning
a725f7eb3a Use withLoadStateFooter to show load state. 2021-09-06 22:59:05 +08:00
Alex Ning
1f02fcd0da Remove PostPaging3Repository. 2021-09-06 21:22:27 +08:00
Alex Ning
09e1711e78 Refreshing, changing sort type and post filter are now working in PostFragment. 2021-09-06 21:02:06 +08:00
Alex Ning
ba2c12d45d Start migrating to Paging 3 library. 2021-09-05 23:42:53 +08:00
Alex Ning
38caf7365a Fix a bug which causes the ViewModel not retain its state after orientation change. 2021-09-05 11:11:01 +08:00
Alex Ning
6dc0521e8e Testing Paging 3 library. 2021-09-04 23:41:44 +08:00
Alex Ning
f13012d21c Save last foreground time instead of last unlock time. 2021-09-03 21:07:25 +08:00
Alex Ning
0559176a8b New options: App Lock and App Lock Timeout. 2021-09-03 16:57:12 +08:00
Alex Ning
c37d372b81 Update Credits page. 2021-09-03 15:15:44 +08:00
Alex Ning
39b5beb5c5 Start implementing app lock feature. 2021-09-03 14:52:59 +08:00
Alex Ning
c0c89fb16a Sidebar -> About. 2021-09-03 10:47:25 +08:00
Alex Ning
0107bba62a Fix showing wrong post feed in the second tab in MainActivity. 2021-09-02 22:45:10 +08:00
Alex Ning
56d82d133f Use PostFragment to handle loading subreddit or user icons for PostRecyclerViewAdapter. 2021-09-02 20:58:27 +08:00
Alex Ning
01304ee7dc Null check when fetching v.redd.it in ViewVideoActivity. 2021-08-29 20:43:50 +08:00
Docile-Alligator
7adde523e4
Merge pull request #331 from curche/time-format-arrays 
Make time format strings less ambiguous
 2021-08-29 19:29:48 +08:00
Alex Ning
e66faaa9be Version 5.0.4. 2021-08-26 20:29:40 +08:00
Alex Ning
e8386b0c4a Tweak the video autoplay control UI. Set show_timeout to 1s to video autoplay control UI. 2021-08-26 20:27:19 +08:00
Alex Ning
79a7e0f6f6 Fix ClassCastException. 2021-08-26 20:01:24 +08:00
Alex Ning
9c9ca1cb3a Version 5.0.3. 2021-08-25 22:20:17 +08:00
Alex Ning
e301f73024 Set a null OnClickListener to the search panel card view in ViewPostDetailActivity. 2021-08-25 20:38:31 +08:00
Alex Ning
fffc5b9eb4 Fix clicking a subreddit in subreddit suggestions goes to the subreddit page instead of returning the subreddit name in several activities. 2021-08-25 20:34:08 +08:00
Alex Ning
de8df061ed Try to fix java.lang.IndexOutOfBoundsException in com.google.android.material.appbar.HeaderScrollingViewBehavior.layoutChild and com.google.android.material.appbar.HeaderScrollingViewBehavior.onMeasureChild. 2021-08-24 22:54:30 +08:00
Alex Ning
386b6e22ca Fix an ArrayIndexOutOfBoundsException in CommentsRecyclerViewAdapter. 2021-08-24 20:59:32 +08:00
Alex Ning
79e4b13c82 Version v5.0.2. 2021-08-20 13:13:45 +08:00
Alex Ning
6e6788d96c Remove animateLayoutChanges in video autoplay views. 2021-08-20 13:07:32 +08:00
Alex Ning
c7fdef7a58 Add animateLayoutChanges to item_post_compact_right_thumbnail. 2021-08-20 13:03:52 +08:00
Alex Ning
5dd1e2d7eb Version 5.0.1. 2021-08-19 21:53:51 +08:00
Alex Ning
54785beede Try fixing IllegalArgumentException at androidx.viewpager.widget.ViewPager.onInterceptTouchEvent. 2021-08-19 21:50:36 +08:00
Alex Ning
b3eb20862a Try fixing IllegalStateException at androidx.viewpager2.widget.ScrollEventAdapter.updateScrollEventValues in ViewUserDetailActivity. 2021-08-19 21:11:44 +08:00
Alex Ning
cc1e4794c9 Catch SecurityException when getting network type. 2021-08-19 20:59:24 +08:00
Alex Ning
e2cca45f55 Fix error when adding a subreddit to a multireddit. 2021-08-19 20:34:57 +08:00
Alex Ning
75d7cc30ae Version 5.0.0. 2021-08-18 21:51:27 +08:00
Alex Ning
e4ef26adb6 New languages: Portuguese and Somali. Update translation. 2021-08-18 21:46:20 +08:00
Alex Ning
6b874cc25d Use discard instead of yes in several dialogs. 2021-08-18 21:23:44 +08:00
Alex Ning
9870c592eb Minor bugs fixed. 2021-08-18 19:56:44 +08:00
Alex Ning
fdf15fcd0e Version 5.0.0-beta5. 2021-08-13 21:37:21 +08:00
Alex Ning
c1862f334e Disable video autoplay when separating post and comments in post detail page is enabled. 2021-08-11 23:44:43 +08:00
Alex Ning
dc248735c7 Try fixing ViewPager2's IllegalStateException. 2021-08-11 23:12:37 +08:00
Alex Ning
a5197d5e94 Use ViewPager2 in InboxActivity. 2021-08-11 22:06:47 +08:00
Alex Ning
4565aa2011 Temporarily disable uploading images in markdown editor because the image will expire after some days. 2021-08-11 21:30:21 +08:00
Alex Ning
a288c70c59 Secure mode is available. 2021-08-11 21:00:57 +08:00
Alex Ning
31a7c2be3a Version 5.0.0-beta4. Revert changes that limit the max height of images in PostRecyclerViewAdapter and PostDetailRecyclerViewAdapter. 2021-08-07 12:06:07 +08:00
Alex Ning
7b6f9339e7 Version 5.0.0-beta3. 2021-08-06 21:07:04 +08:00
Alex Ning
22c47fd10b Set max image height to 2000px in PostRecyclerViewAdapter and PostDetailRecyclerViewAdapter. 2021-08-06 20:59:13 +08:00
Alex Ning
326cbd4064 Fix Applying Material You notification cannot be dismissed. 2021-08-06 19:48:08 +08:00
Alex Ning
43dc0409ac Version 5.0.0-beta2. 2021-08-04 18:28:35 +08:00
Alex Ning
da7abe1959 Change MaterialYouService to foreground service. 2021-08-04 18:03:39 +08:00
Alex Ning
51f6a9613f Tweak autoplay control. 2021-08-04 17:29:49 +08:00
Alex Ning
d0341f9be1 Set title to bottom app bar in other media fragments and activities. 2021-08-04 14:49:33 +08:00
Alex Ning
eca3d91c8b Set title to bottom app bar in ViewVideoActivity. 2021-08-04 14:18:48 +08:00
Alex Ning
5ecb2b7f14 Use bottom toolbar in ViewVideoActivity is available. 2021-08-04 14:15:28 +08:00
Alex Ning
085eaa8505 Use bottom toolbar in ViewRedditGalleryVideoFragment is available. 2021-08-04 14:07:15 +08:00
Alex Ning
27173031a1 Use bottom toolbar in ViewImgurVideoFragment is available. 2021-08-04 14:01:42 +08:00
Alex Ning
123898c946 Use bottom toolbar in ViewRedditGalleryImageOrGifFragment is available. 2021-08-04 13:18:30 +08:00
Alex Ning
f0c275e9ad Use bottom toolbar in ViewImgurImageFragment is available. 2021-08-04 11:58:48 +08:00
Alex Ning
7fe451b7e1 Use bottom toolbar in ViewImageOrGifActivity is available. 2021-08-03 22:03:45 +08:00
Alex Ning
7987dd684a Minor UI tweaks. 2021-08-03 15:44:52 +08:00
Alex Ning
e9944242e8 Optimize item_comment.xml. 2021-08-03 15:17:26 +08:00
Alex Ning
b34ff90bd1 Copy subreddit description raw text. 2021-08-03 12:26:55 +08:00
Alex Ning
c5b32494b7 Copy markdown in sidebar. 2021-08-03 12:21:38 +08:00
Alex Ning
9564515d21 Show subreddit description in markdown. 2021-08-03 12:09:30 +08:00
Alex Ning
5b29d2c841 Swipe to refresh in WikiActivity. 2021-08-02 17:43:17 +08:00
Alex Ning
722760254f Show error message in WikiActivity. 2021-08-02 17:34:44 +08:00
Alex Ning
c84f8ed2a3 Support wiki links in r/subreddit/w form. 2021-08-02 17:17:46 +08:00
Alex Ning
2a6afa8783 Support viewing subreddit wiki in app. 2021-08-02 17:12:33 +08:00
Alex Ning
305ae1c13c New options: separate post and comments in post details page. 2021-08-02 15:26:14 +08:00
Alex Ning
a3b4c54ec2 Fix showing duplicate progress bar when refreshing in ViewPostDetailFragment. 2021-08-02 14:54:51 +08:00
Alex Ning
4e0af16094 Implement customizations for post details page. 2021-08-02 13:46:46 +08:00
Alex Ning
bd7766f529 Continue adding support for post details customization. 2021-07-30 18:25:04 +08:00
Alex Ning
2cc02d4e5f Remove unused variables in PostDetailRecyclerViewAdapter. 2021-07-30 18:23:18 +08:00
Alex Ning
028cd84cba Fix issues in PostCard2VideoAutoplayViewHolder. 2021-07-30 18:08:48 +08:00
Alex Ning
720aa0b6bd Prepare to implement customization options for post details page. 2021-07-30 18:00:42 +08:00
Alex Ning
e660da55f0 Remove duplicate settings in VideoPreferenceFragment. 2021-07-28 20:33:48 +08:00
Alex Ning
a8dff0bcda Actually it is v5.0.0-beta1. 2021-07-22 21:34:36 +08:00
Alex Ning
9f9611212b Version 5.0.0-beta1. 2021-07-22 21:13:46 +08:00
Alex Ning
9bb5bb9938 Hide keyboard when clicking cancel button in dialogs for going to subreddit and user. 2021-07-22 20:12:21 +08:00