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
|
e9b6acb92d
|
feat: readd prereply sheets from upstream back into the code
|
2024-03-04 21:00:30 -03:00 |
|
LucasGGamerM
|
75e8d738a4
|
fix: crash when opening other people's profiles
|
2024-03-04 20:42:34 -03:00 |
|
LucasGGamerM
|
ec02aed557
|
feat: add the new block confirmation sheet from upstream
|
2024-03-04 20:25:24 -03:00 |
|
LucasGGamerM
|
20d0acc88c
|
chore: make the mute confirmation dialog work
TODO: Readd the time option
|
2024-03-04 16:40:10 -03:00 |
|
LucasGGamerM
|
71dd974d19
|
chore: readd all the new bottom sheet code
|
2024-03-04 16:29:57 -03:00 |
|
LucasGGamerM
|
3ea8b370bb
|
fix(link-card): use placeholder image when there is no card image
And round off the corners too
|
2024-03-03 16:25:09 -03:00 |
|
LucasGGamerM
|
02eb178443
|
fix(onboarding-follow-suggestions): remove non-wanted code and fix a crash
|
2024-03-03 16:04:42 -03:00 |
|
LucasGGamerM
|
e8b77d0dfa
|
fix(list-members fragment): fix compiler cries and readd some code
|
2024-03-03 15:42:17 -03:00 |
|
LucasGGamerM
|
193ef88814
|
fix(extended-footer): readd visibility indicator
|
2024-03-03 11:43:13 -03:00 |
|
LucasGGamerM
|
633261c16b
|
chore(merge-upstream): commenting out the lines that made the compilation fail
|
2024-03-03 11:02:12 -03:00 |
|
LucasGGamerM
|
e295c8c381
|
chore(merge-upstream): readd has subtitle method to BaseAccountListFragment
|
2024-03-03 10:33:49 -03:00 |
|
LucasGGamerM
|
e71232ad40
|
chore(merge-upstream): use extended footer from upstream for now
|
2024-03-03 10:23:38 -03:00 |
|
Steph Kraemer
|
123ed6c56d
|
Fix for #965 - don't backup accounts.json
|
2024-03-01 20:22:33 -05:00 |
|
LucasGGamerM
|
cf31a1be57
|
chore(merge-upstream): a bunch of stuff is still left to be done :D
|
2024-02-27 20:53:32 -03:00 |
|
LucasGGamerM
|
64e82bdeed
|
chore(merge-upstream): still 21 things to do
|
2024-02-18 14:19:05 -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 |
|
Grishka
|
8dffbff97c
|
Domain badges & info sheet & my fanciest animation yet
|
2024-02-13 07:31:42 +03:00 |
|
FineFindus
|
2071602607
|
feat: display boost timestamp
|
2024-02-10 14:54:58 +01:00 |
|
FineFindus
|
72940832a6
|
fix(ReblogOrReplyLineStatusDisplayItem): only display avatar for bossting
|
2024-02-10 13:55:31 +01:00 |
|
FineFindus
|
8e984a7cad
|
feat: inline avatars for reblogline
|
2024-02-09 23:13:50 +01:00 |
|
Grishka
|
6915d19fb4
|
fix
|
2024-02-09 03:38:00 +03:00 |
|
Grishka
|
ad2ef39ace
|
AND-122 Mute, block, and domain block confirmation screens
|
2024-02-09 03:27:05 +03:00 |
|
S1m
|
c8604ad68e
|
Fix NullPointerException with double push
|
2024-02-06 09:14:31 +01:00 |
|
Grishka
|
e7295aac07
|
Fix #770
|
2024-02-02 15:34:06 +01:00 |
|
JI,XIAOYONG
|
a65d6fbeb3
|
fix: NullPointerException crash while change post language twice
Closes https://github.com/mastodon/mastodon-android/issues/766
|
2024-01-25 15:54:15 +08:00 |
|
LucasGGamerM
|
a1a4c59b83
|
fix(polls): maybe fix on vote poll crash issues
|
2024-01-12 20:51:59 -03:00 |
|
Grishka
|
48f9aabaf7
|
Support for invite links (AND-90)
|
2024-01-03 23:51:35 +03:00 |
|
LucasGGamerM
|
9f29d72212
|
chore: change order of toolbar icons in photoViewer
|
2023-12-27 21:09:29 -03:00 |
|
LucasGGamerM
|
9786e324b7
|
style: fix typo in PhotoViewer error logs
|
2023-12-27 10:34:59 -03:00 |
|
LucasGGamerM
|
a7fef67d48
|
fix: swap saveViaDownloadManager to shareAfterDownloading in failed sharing action
I forgot to change the functions when I wrote it
|
2023-12-27 10:12:32 -03:00 |
|
LucasGGamerM
|
30726cb364
|
feat: allow sharing attachments from PhotoViewer
Addresses #290
|
2023-12-27 09:59:13 -03: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 |
|
LucasGGamerM
|
d8cc578537
|
fix(profile): take away favorites from the topbar icons list
This fixes a thing where the menu entry would just be weird
|
2023-12-24 23:20:48 -03:00 |
|
LucasGGamerM
|
f9f863ea5e
|
fix(profile-note): add noteEdit must not be empty before hiding the note button
|
2023-12-23 15:37:23 -03:00 |
|
LucasGGamerM
|
2efb79f6cb
|
fix(profile-note): hide keyboard when edit note box goes away
|
2023-12-23 10:10:46 -03:00 |
|
LucasGGamerM
|
d534557915
|
fix(profile): throw share button back into 3-dot menu
|
2023-12-23 10:03:06 -03:00 |
|
LucasGGamerM
|
68ebc1aa93
|
feat: swap note button icon
|
2023-12-23 10:01:35 -03:00 |
|
FineFindus
|
ccd313533b
|
feat(profile): add note delete icon
|
2023-12-23 11:54:06 +01:00 |
|
FineFindus
|
f70ea97d9e
|
feat(profile): always show add note and share
|
2023-12-23 11:28:54 +01:00 |
|
FineFindus
|
3c9efdbbf2
|
feat(profile): save note onHidden
|
2023-12-23 11:27:07 +01:00 |
|
FineFindus
|
42946eca44
|
Revert "feat: make profile note box be visible at all times"
This reverts commit d6c05f0850.
|
2023-12-23 11:23:51 +01:00 |
|
LucasGGamerM
|
b2d502ae79
|
feat: add open in browser button to instance about fragment
|
2023-12-22 10:09:28 -03:00 |
|
LucasGGamerM
|
4d9f625ff4
|
refactor(statusDisplayItem): move status hidden filter check to start of method to allow an early return
This optimises things by not computing the list of stuff when the status is simply not going to be rendered
|
2023-12-21 20:01:52 -03:00 |
|
LucasGGamerM
|
18e3fadb26
|
refactor(profile-note): remove save button, automatically save on focus change/exit
|
2023-12-21 19:42:29 -03:00 |
|
LucasGGamerM
|
d6c05f0850
|
feat: make profile note box be visible at all times
|
2023-12-21 18:38:59 -03:00 |
|
LucasGGamerM
|
5cc94fa2b0
|
fix: hopefully this addresses a crash when opening an unsent post with an audio file (again)
Crash fix hopefully
|
2023-12-17 17:20:36 -03:00 |
|
LucasGGamerM
|
08d4c135ea
|
fix: hopefully this addresses a crash when opening an unsent post with an audio file
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2023-12-17 17:04:22 -03:00 |
|
LucasGGamerM
|
6220a20734
|
fix: crash when publishing a scheduled post with the relocated publish button and an error occurs
Goddamnit, at least its fixed
|
2023-12-17 16:48:30 -03:00 |
|