LucasGGamerM
|
b1b03a3ada
|
Merge pull request #355
fix: use correct hashtag text to prevent crash
|
2024-03-17 13:26:19 -03:00 |
|
LucasGGamerM
|
6b5344bd11
|
Merge pull request #356
feat: display custom emoji in reply button
|
2024-03-17 13:23:17 -03:00 |
|
LucasGGamerM
|
4a13398801
|
feat(profile): make the new decentralization sheet appear only when holding the instance button
|
2024-03-17 10:37:02 -03:00 |
|
FineFindus
|
685e6e947f
|
feat: display custom emoji in reply button
|
2024-03-17 14:18:20 +01:00 |
|
LucasGGamerM
|
1dd46df540
|
feat(profile): add the upstream handle thingys
|
2024-03-17 10:11:40 -03:00 |
|
FineFindus
|
c73fa2dd6b
|
fix: use correct hashtag text
Fixes a regression introduced in 0af8dbf09b, taht caused the app to crash when long pressing on a hastag to copy it
|
2024-03-17 14:11:32 +01:00 |
|
LucasGGamerM
|
ad1de60968
|
fix(extended-footer): make it appear on top of the standard post footer
|
2024-03-17 09:49:56 -03:00 |
|
LucasGGamerM
|
47473a6372
|
Merge pull request #353
fix(remote-info): remove null check
|
2024-03-17 09:21:38 -03:00 |
|
LucasGGamerM
|
25f9e60527
|
fix(mentions-tab): make mentions tab actually show only mentions
|
2024-03-17 09:16:35 -03:00 |
|
FineFindus
|
a7b51095fb
|
fix(remote-info): remove null check
Fixes a regression introduced in 76867a971b, that caused remote info to be permanently disabled
|
2024-03-17 00:29:33 +01:00 |
|
LucasGGamerM
|
3939fc9795
|
chore(make-app-compile-again): just what the actual fuck did I just do
|
2024-03-16 18:23:11 -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
|
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
|
71dd974d19
|
chore: readd all the new bottom sheet code
|
2024-03-04 16:29:57 -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
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
LucasGGamerM
|
3bf63e1090
|
fix: a possible crash that might happen when the acestor descendant is null
Wtf java, also cc @sk22
|
2023-12-08 09:55:18 -03:00 |
|
LucasGGamerM
|
3d48443a23
|
fix: possibly fixes a crash where inReplyToId is null in a ThreadFragment
cc: @sk22
Btw check the commit before this one, because there is a fix that applies for Megalodon there as well
|
2023-12-08 09:45:18 -03:00 |
|
LucasGGamerM
|
b42862dd9b
|
feat: add alt text translation to previewlessMedia items
|
2023-12-06 16:23:09 -03:00 |
|
LucasGGamerM
|
533032ca75
|
fix: fixes crashes when adding a hashtag timeline
Closes #308
|
2023-12-06 15:20:22 -03:00 |
|
Grishka
|
5d7c37262e
|
Info sheet in media viewer (AND-109)
|
2023-12-04 21:33:25 +03:00 |
|
Grishka
|
b08cd1eb4b
|
Crash fixes
|
2023-12-04 06:22:21 +03:00 |
|
Grishka
|
a2ea8e76fb
|
Improve follow recommendations screen (AND-101)
|
2023-11-29 02:09:59 +03:00 |
|
LucasGGamerM
|
2ef3e7eab7
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
|
2023-11-28 14:31:42 -03:00 |
|