Commit Graph

5308 Commits

Author SHA1 Message Date
LucasGGamerM
24be1c68ad fix(restriction-confirmation-sheet): make secondary button appear on top of primary button
This is the first part of the chore to readd the mute timer thing
2024-04-07 08:42:36 -03:00
LucasGGamerM
9a28d23be0 fix(photo-viewer-sheet): make alt text selectable again 2024-03-30 07:56:14 -03:00
lyyn
8e00b04f71 Fix missing case for STATUS notification title 2024-03-29 17:53:48 -03:00
LucasGGamerM
14f260d6a1 fix(#359): use upstream ripple overlay alpha value 2024-03-24 14:49:40 -03:00
LucasGGamerM
8d6593e12c feat(search): add back bot indicator to account search results preview 2024-03-20 17:20:19 -03:00
LucasGGamerM
72cf5c3b59 fix(profile-fragment): add a margin to the domain button in the profile 2024-03-20 16:02:46 -03:00
LucasGGamerM
b018b817e8 Merge pull request #362
fix(profile): display username icons after server
2024-03-20 15:46:11 -03:00
FineFindus
daa391a877 fix: increase boost button witdth 2024-03-20 13:42:15 +01:00
FineFindus
1fedfce00d fix(profile): display username icons after server 2024-03-20 13:23:00 +01:00
LucasGGamerM
ad4423526d fix(extended-footer): readd "last edit"'s button icon 2024-03-17 20:01:30 -03:00
LucasGGamerM
445bf28e94 fix(extended-footer): make bottom padding smaller 2024-03-17 19:57:00 -03:00
LucasGGamerM
e694715dae Merge branch 'bugfix/965'
# Conflicts:
#	mastodon/src/main/AndroidManifest.xml
2024-03-17 16:25:49 -03:00
LucasGGamerM
8f69358d34 Merge pull request #357
feat: use PhotoViewerInfoSheet buttons
2024-03-17 13:39:25 -03:00
FineFindus
4d91ff3866 feat(DecentralizationExplainerSheet): add button to open about page 2024-03-17 15:55:14 +01:00
FineFindus
7773c08387 fix(sheet-photo-viewer-info): increase button width 2024-03-17 15:30:03 +01:00
LucasGGamerM
1dd46df540 feat(profile): add the upstream handle thingys 2024-03-17 10:11:40 -03:00
LucasGGamerM
d8a88d1803 fix(extended-footer-icons): makes them look good again 2024-03-17 09:46:30 -03:00
LucasGGamerM
f29a9b6748 Revert "feat(extended-footer): use lighter background color"
This reverts commit 7c8d0cb459.
2024-03-17 09:38:29 -03:00
FineFindus
75f14371d5 feat(extended-footer): add icons to boost/fav btns 2024-03-17 00:07:57 +01:00
FineFindus
7c8d0cb459 feat(extended-footer): use lighter background color 2024-03-17 00:07:36 +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
d1656a525e fix: make action button text on account card look decent again 2024-03-16 17:59:17 -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
0d7e10ca8a fix(status-header): use correct icon for manage user lists menu entry 2024-03-03 16:46:03 -03:00
LucasGGamerM
fa31b0f2d6 fix(status-header): use correct name for manage user lists and remove duplicate copy link menu entrys 2024-03-03 16:44:06 -03:00
LucasGGamerM
a91e08fe1a fix(onboarding-follow-suggestions): use the tabbar background drawable there
This makes the fragment look good
2024-03-03 16:43:22 -03:00
LucasGGamerM
f880d4b7b6 fix(snackbars): add the required colors to pallete to make them look good 2024-03-03 12:03:57 -03:00
LucasGGamerM
f5514e35e1 fix(extended-footer): use proper colors for extended footer 2024-03-03 11:50:44 -03:00
LucasGGamerM
193ef88814 fix(extended-footer): readd visibility indicator 2024-03-03 11:43:13 -03:00
LucasGGamerM
7de58a5e35 fix(extended-footer): make everything align 2024-03-03 11:35:38 -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
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
efb8cd565b Update locales 2024-02-12 21:40:28 +03:00
Grishka
1f5bdb975b Merge branch 'l10n_master' 2024-02-12 21:38:00 +03:00
Grishka
22dfc33974 Update strings 2024-02-12 21:37:44 +03:00
Grishka
ad2ef39ace AND-122 Mute, block, and domain block confirmation screens 2024-02-09 03:27:05 +03:00
Eugen Rochko
3cff655e6f New translations strings.xml (Persian) 2024-02-08 14:34:47 +01:00
Eugen Rochko
ed86a5a3e8 New translations strings.xml (Russian) 2024-02-07 19:48:30 +01:00
Eugen Rochko
f329435f51 New translations strings.xml (Catalan) 2024-02-06 18:19:58 +01:00
Eugen Rochko
6a6a80bcd7 New translations strings.xml (Belarusian) 2024-02-03 17:27:48 +01:00
Eugen Rochko
62e4983f02 New translations strings.xml (Hindi) 2024-02-03 09:56:54 +01:00
Eugen Rochko
6dfd991e87 New translations strings.xml (Hindi) 2024-02-03 08:52:38 +01:00
Eugen Rochko
b9b08c5ea7 New translations strings.xml (Hindi) 2024-02-03 07:47:33 +01:00
Eugen Rochko
84b058873d New translations strings.xml (Hindi) 2024-02-03 06:46:30 +01:00
Eugen Rochko
fcf5c0822e New translations strings.xml (Hindi) 2024-02-03 05:07:26 +01:00
Eugen Rochko
53c3da6a3d New translations strings.xml (Hindi) 2024-02-02 18:19:31 +01:00