LucasGGamerM
e8abc0bbd2
feat: make it compile again
...
I am tired as hell someone donates plz
2023-03-21 20:40:55 -03:00
LucasGGamerM
0589612df9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
LucasGGamerM
af2d951b50
style: suppress lint on addMediaAttachment
2023-03-21 20:03:15 -03:00
Jacoco
132b672441
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-21 20:01:47 -03:00
sk
ffb7cc5c18
don't remove badge if loaded from cache
2023-03-21 19:55:34 -03:00
sk
5a9a3eb140
session-specific notification badge
...
fix sk22#470
2023-03-21 19:55:34 -03:00
sk
5395855775
feat: implement notification badge using markers from @sk22.
...
Thank you a lot man! This improvement is amazing
2023-03-21 19:55:34 -03:00
LucasGGamerM
9d60924512
refactor: removing unused piece of code
2023-03-21 19:54:20 -03:00
LucasGGamerM
1680c635dc
Revert "feat(tabs/notifications): add unread badge"
...
This reverts commit 4ecd525f
2023-03-21 19:47:51 -03:00
LucasGGamerM
898fbcc52b
Revert "refactor(notifications-tab/badge): use improved implementation"
...
This reverts commit ac561549
2023-03-21 19:40:11 -03:00
LucasGGamerM
d0e4578af0
fix: NPE when sharing an image and the URL is null
2023-03-21 18:51:15 -03:00
sk
2d31b726ac
Merge branch 'main' of github.com:sk22/megalodon
2023-03-21 16:04:43 +01:00
sk22
d2f295ef88
Update README.md
2023-03-21 16:03:35 +01:00
sk
d1b53554ce
bump version
2023-03-21 15:59:40 +01:00
sk
ec5db122d0
full text can have emojis, too
2023-03-21 15:56:44 +01:00
sk
0216e22fcc
don't remove badge if loaded from cache
2023-03-21 15:25:01 +01:00
sk
5734b19d8c
remove unused variable
2023-03-21 15:14:25 +01:00
sk
e58aeec097
query notifications on load posts
...
closes sk22#471
2023-03-21 10:22:09 +01:00
sk
58b000927a
session-specific notification badge
...
fix sk22#470
2023-03-21 10:03:31 +01:00
sk
797642b972
fix profile fragment crash
...
closes sk22#469
2023-03-21 09:56:44 +01:00
sk
781856b822
bump version
2023-03-21 00:55:11 +01:00
sk
ff272179e7
implement notification badge using markers
2023-03-21 00:52:20 +01:00
sk
bec47f40f7
colorful swipe-to-refresh spinner
...
closes sk22#455
2023-03-20 23:25:29 +01:00
sk
f9607a434a
use accent color for notif title
...
closes sk22#461
2023-03-20 22:19:15 +01:00
sk
b650ca85bc
Merge remote-tracking branch 'upstream/master'
2023-03-20 21:51:15 +01:00
LucasGGamerM
4ceacae954
refactor: simplify code in 56e5877040
2023-03-20 16:36:42 -03:00
LucasGGamerM
56e5877040
fix(custom-local-timelines): fix NPE in ended polls. Fixes #110
2023-03-20 16:09:06 -03:00
sk
f4365ed163
fix context menu resizing
...
closes sk22#467
2023-03-20 19:17:22 +01:00
Gregory K
b0aaa58fa7
Merge pull request #550 from sk22/fix/header-follow-protected-account
...
Fix following protected account from header
2023-03-20 20:36:11 +03:00
sk
054ab774d5
Merge branch 'fix/header-follow-protected-account'
2023-03-20 18:28:27 +01:00
sk
8ca33b552d
fix following protected account from header
...
closes mastodon#549
2023-03-20 18:23:49 +01:00
sk
6734c2b9f7
add null check for source object
...
closes sk22#460
2023-03-20 14:22:46 +01:00
sk
c484477d6a
persist translation between display items
...
closes sk22#466
2023-03-20 11:24:47 +01:00
sk
d9b5223749
collapse regardless of in timeline
...
re: sk22#462
2023-03-20 10:48:00 +01:00
sk
55856450b3
hopefully fix broken compact reply line
2023-03-20 10:22:43 +01:00
sk
bb28a3bf83
Merge remote-tracking branch 'upstream/master'
2023-03-19 18:51:10 +01:00
LucasGGamerM
c0484de506
feat: add toggle to disable double tap to swipe action
2023-03-19 11:20:46 -03:00
LucasGGamerM
addb1b27bb
Merge remote-tracking branch 'mastodon/master'
2023-03-18 22:39:08 -03:00
LucasGGamerM
96ecdcd33c
fix(custom-local-timelines): translate button now works
2023-03-18 22:36:51 -03:00
LucasGGamerM
e3f445cbed
fix(custom-local-timelines): polls are now votable
2023-03-18 22:21:09 -03:00
LucasGGamerM
8ccb505165
Revert "refactor(account-switcher-sheet): remove duplicated code"
...
This reverts commit 9c01f7a522
2023-03-18 17:03:15 -03:00
LucasGGamerM
98c193ac51
Merge pull request #125
...
Feat: share URL to open
2023-03-18 16:49:52 -03:00
LucasGGamerM
b966d5626b
feat: adding nord to readme
2023-03-18 16:43:37 -03:00
FineFindus
9c01f7a522
refactor(account-switcher-sheet): remove duplicated code
2023-03-18 20:09:07 +01:00
FineFindus
f3c9f52d37
feat(share): add option open URL
2023-03-18 20:02:26 +01:00
LucasGGamerM
1df61780a3
Update README.md
2023-03-18 15:32:57 -03:00
LucasGGamerM
2be3bca70e
Update README.md
2023-03-18 15:31:06 -03:00
LucasGGamerM
18ec63b9b4
fix: add missing red color
2023-03-18 15:09:03 -03:00
LucasGGamerM
6781fb6e25
fix: typo
2023-03-18 15:08:23 -03:00
LucasGGamerM
852bc6ba24
Update README.md
2023-03-18 15:06:21 -03:00
