Grishka
ef23734b22
Fix #842
2024-05-22 15:34:05 -03:00
FineFindus
28c851a630
refactor: remove StatusFilterPredicate
...
Removes the deprecated StatusFilterPredicate class, as it has been
replaced upstream. Client-side filters are now directly applied in the
when building a StatusDisplayItem.
2024-05-08 16:43:33 +02:00
LucasGGamerM
51a9c7c58e
Merge branch 'fix/double_push'
2024-03-29 18:00:02 -03:00
lyyn
8e00b04f71
Fix missing case for STATUS notification title
2024-03-29 17:53:48 -03:00
LucasGGamerM
0931702802
fix(custom-local-timelines): revert 629262c266 and fix the crash for good
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2024-03-24 15:13:24 -03:00
LucasGGamerM
629262c266
fix(custom-local-timelines): crash whenever a mention is shown
...
I don't know what caused this. Probably the HTML parser, but its now fixed forever, hopefully this thing does not happen again :)
2024-03-22 15:25:06 -03:00
LucasGGamerM
06a26d308f
Merge branch 'merge-upstream'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
# mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
# mastodon/src/main/java/org/joinmastodon/android/events/ListDeletedEvent.java
# mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedCreatedEvent.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/CustomLocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
# mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/ActionModeHelper.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java
# mastodon/src/main/res/drawable/fg_link_card.xml
# mastodon/src/main/res/drawable/ic_arrow_drop_down_24px.xml
# mastodon/src/main/res/drawable/ic_arrow_right_24px.xml
# mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml
# mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml
# mastodon/src/main/res/drawable/ic_boost_24px.xml
# mastodon/src/main/res/drawable/ic_boost_private.xml
# mastodon/src/main/res/drawable/ic_help_24px.xml
# mastodon/src/main/res/drawable/ic_info_fill1_24px.xml
# mastodon/src/main/res/drawable/ic_m3_cancel.xml
# mastodon/src/main/res/layout/display_item_extended_footer.xml
# mastodon/src/main/res/layout/display_item_link_card.xml
# mastodon/src/main/res/layout/fragment_onboarding_follow_suggestions.xml
# mastodon/src/main/res/layout/fragment_onboarding_profile_setup.xml
# mastodon/src/main/res/layout/home_toolbar.xml
# mastodon/src/main/res/layout/item_discover_account.xml
# mastodon/src/main/res/layout/item_generic_list_content.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-ar-rSA/strings.xml
# mastodon/src/main/res/values-be-rBY/strings.xml
# mastodon/src/main/res/values-ca-rES/strings.xml
# mastodon/src/main/res/values-cs-rCZ/strings.xml
# mastodon/src/main/res/values-da-rDK/strings.xml
# mastodon/src/main/res/values-eu-rES/strings.xml
# mastodon/src/main/res/values-fa-rIR/strings.xml
# mastodon/src/main/res/values-fi-rFI/strings.xml
# mastodon/src/main/res/values-fil-rPH/strings.xml
# mastodon/src/main/res/values-fr-rFR/strings.xml
# mastodon/src/main/res/values-gd-rGB/strings.xml
# mastodon/src/main/res/values-gl-rES/strings.xml
# mastodon/src/main/res/values-hu-rHU/strings.xml
# mastodon/src/main/res/values-hy-rAM/strings.xml
# mastodon/src/main/res/values-in-rID/strings.xml
# mastodon/src/main/res/values-is-rIS/strings.xml
# mastodon/src/main/res/values-it-rIT/strings.xml
# mastodon/src/main/res/values-ja-rJP/strings.xml
# mastodon/src/main/res/values-kab/strings.xml
# mastodon/src/main/res/values-ko-rKR/strings.xml
# mastodon/src/main/res/values-nl-rNL/strings.xml
# mastodon/src/main/res/values-pl-rPL/strings.xml
# mastodon/src/main/res/values-pt-rBR/strings.xml
# mastodon/src/main/res/values-pt-rPT/strings.xml
# mastodon/src/main/res/values-ro-rRO/strings.xml
# mastodon/src/main/res/values-ru-rRU/strings.xml
# mastodon/src/main/res/values-sl-rSI/strings.xml
# mastodon/src/main/res/values-sv-rSE/strings.xml
# mastodon/src/main/res/values-tr-rTR/strings.xml
# mastodon/src/main/res/values-uk-rUA/strings.xml
# mastodon/src/main/res/values-zh-rCN/strings.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/styles.xml
2024-03-16 18:21:22 -03:00
LucasGGamerM
76867a971b
chore(merge-upstream): more conflict solving tomfoolery
2024-02-16 20:21:38 -03:00
LucasGGamerM
0af8dbf09b
chore(merging-upstream): bunch of conflicts to solve
2024-02-14 21:08:16 -03:00
S1m
c8604ad68e
Fix NullPointerException with double push
2024-02-06 09:14:31 +01:00
LucasGGamerM
e0ff1f6725
fix( #307 ): use longs instead of ints in Pleroma/Akkoma instance poll configs
...
Who the hell had the idea to use longs for this >:C
2023-12-26 18:05:48 -03:00
Grishka
a200701e4c
Link card improvements (AND-115)
...
closes #651
2023-11-29 07:51:11 +03:00
Grishka
a2ea8e76fb
Improve follow recommendations screen (AND-101)
2023-11-29 02:09:59 +03:00
LucasGGamerM
6c94eb50ea
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
2023-11-27 16:39:44 -03:00
FineFindus
70b9d08830
fix: hide link card to akkoma hastags ( #939 )
...
* fix: hide link card to akkoma hastags
* generify method name
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-11-27 19:07:43 +01:00
LucasGGamerM
1ee96f3703
chore: make app compile again
2023-11-17 16:08:03 -03:00
LucasGGamerM
da5186c7b5
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.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/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/res/drawable/bg_note_edit.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# metadata/uk/full_description.txt
2023-11-17 16:02:23 -03:00
Grishka
e5506d952c
Onboarding: replace fields with discoverability toggle (AND-100)
2023-11-16 12:15:17 +03:00
Grishka
cbe243fc9e
Open link in browser when a post/account links to itself
...
closes #739
2023-11-15 18:17:08 +03:00
Grishka
a438f633be
Pre-reply sheets
2023-11-15 18:05:38 +03:00
Jacoco
6b234209c6
Previewing posts on Akkoma ( #933 )
...
* Previewing posts on Akkoma
* move preview property into status
* clean up code
* revert imm-related changes
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-11-15 15:17:29 +01:00
Jacoco
786ce78b08
Translations for Akkoma ( #934 )
...
* Translations for Akkoma
* simplify akkoma translation code
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-11-15 14:32:56 +01:00
sk
ee82772fee
weather icons :)
2023-11-13 21:30:06 +01:00
sk
70328217c6
add bookmarks and favorites as timelines
...
closes sk22#908
2023-11-13 21:10:33 +01:00
Jacoco
a8dcb11094
feature: Display post that's being quoted on Akkoma ( #927 )
...
* Displaying Akkoma quote status
* Dummy display items for quote posts
* Only remove quote-inline with RE:
* fix null reference (reply-to instead of quote status)
* fix text bottom padding in quote
* Postprocess status quote
* fix rounded bottom for quoted media
closes sk22#929
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-11-13 18:46:15 +01:00
FineFindus
47b13384a8
feat(status/translation): support translating spoiler
2023-11-10 22:04:07 +01:00
FineFindus
be5f3b18af
feat(status): translate poll options
2023-11-10 22:00:47 +01:00
FineFindus
d5d12a7ce5
fix(status/translation): do not require all fields
2023-11-10 22:00:47 +01:00
FineFindus
0cd0d37eff
feat(status): translate media attachments
2023-11-10 21:07:24 +01:00
FineFindus
c85af5502d
feat: translate media attachments and poll options ( #916 )
...
* feat(status): translate media attachments
* feat(status): translate poll options
* fix(status/translation): do not require all fields
* feat(status/translation): support translating spoiler
2023-11-10 20:44:06 +01:00
FineFindus
06698d3c52
feat: display edit history diff ( #922 )
...
* build: add google's diff-match-patch
Copied from 62f2e689f4/java/src/name/fraser/neil/plaintext/diff_match_patch.javahttps://github.com/sk22/megalodon/issues/789
* fix(status/edit-history): add fake poll id
* code style adjustments
* don't diff if only formatting changed
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-11-10 20:40:34 +01:00
sk
295cb74287
don't show translate for empty decoding
2023-11-10 16:30:46 +01:00
FineFindus
b1f7f3e351
Merge remote-tracking branch 'origin/feat/translate-media' into feat/merge-commits
2023-11-08 18:42:18 +01:00
FineFindus
47549fa88c
feat(status/translation): support translating spoiler
2023-11-01 20:44:24 +01:00
FineFindus
be2b290300
fix(status/translation): do not require all fields
2023-11-01 19:56:59 +01:00
FineFindus
6c9db5ce0d
feat(status): translate poll options
2023-11-01 19:52:45 +01:00
FineFindus
24677ea239
feat(status): translate media attachments
2023-11-01 19:23:09 +01:00
LucasGGamerM
828d07d6b5
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# metadata/uk/changelogs/56.txt
2023-10-25 20:10:41 -03:00
sk
9f0ff2dcd4
fix editing scheduled/drafted polls
...
closes sk22#894
2023-10-22 21:44:02 +02:00
Grishka
f5b10b516c
Show all followers when creating a list
2023-10-22 05:14:21 +03:00
LucasGGamerM
894c8cacd6
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
2023-10-21 09:32:19 -03:00
sk
387b31193f
hopefully unfuck removing statuses and reblogs
2023-10-19 21:42:17 +02:00
LucasGGamerM
28e816fd89
chore: fix build issues
2023-10-19 15:17:35 -03:00
LucasGGamerM
77081f6cc9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/res/menu/profile_own.xml
2023-10-19 15:01:22 -03:00
sk
5db44cbf9d
don't save bidi-safe string in account
...
also support custom emoji in account switcher
closes sk22#859
2023-10-19 01:01:53 +02:00
sk
ed24e89a96
don't compare newly fetched posts to created post
...
closes sk22#866
2023-10-18 21:48:11 +02:00
sk
09577074a9
merge settings changes
2023-10-18 20:26:20 +02:00
LucasGGamerM
c5a61c3916
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/menu/profile.xml
# metadata/cy/full_description.txt
2023-10-18 08:21:03 -03:00
Grishka
1f7155a932
Reorder notification tabs and remember selection (AND-82)
2023-10-17 03:00:05 +03:00
sk
5840c94395
isolate bi-directional text in display name
2023-10-17 01:03:06 +02:00
