8f4363a2d8
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
...
# Conflicts:
# README.md
# build.gradle
# mastodon/build.gradle
# mastodon/src/main/AndroidManifest.xml
# 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/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.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/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml
# mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
# mastodon/src/main/res/drawable/bg_search_field.xml
# mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/compose_media_thumb.xml
# mastodon/src/main/res/layout/compose_poll_option.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/display_item_header.xml
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/item_instance_category.xml
# mastodon/src/main/res/layout/item_report_choice.xml
# mastodon/src/main/res/layout/item_settings_footer.xml
# mastodon/src/main/res/layout/item_settings_switch.xml
# mastodon/src/main/res/layout/item_settings_theme.xml
# mastodon/src/main/res/layout/item_settings_theme_subitem.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/menu/mute_duration.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fa/strings_sk.xml
# mastodon/src/main/res/values-night/colors.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/styles.xml
# metadata/es/changelogs/83.txt
2023-08-20 11:34:44 -03:00
a8cc0301bf
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
...
# Conflicts:
# README.md
# build.gradle
# mastodon/build.gradle
# mastodon/src/main/AndroidManifest.xml
# 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/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.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/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml
# mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
# mastodon/src/main/res/drawable/bg_search_field.xml
# mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/compose_media_thumb.xml
# mastodon/src/main/res/layout/compose_poll_option.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/display_item_header.xml
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/item_instance_category.xml
# mastodon/src/main/res/layout/item_report_choice.xml
# mastodon/src/main/res/layout/item_settings_footer.xml
# mastodon/src/main/res/layout/item_settings_switch.xml
# mastodon/src/main/res/layout/item_settings_theme.xml
# mastodon/src/main/res/layout/item_settings_theme_subitem.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/menu/mute_duration.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fa/strings_sk.xml
# mastodon/src/main/res/values-night/colors.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/styles.xml
# metadata/es/changelogs/83.txt
2023-08-20 11:34:19 -03:00
2ca34278f9
build: add F-Droid flavor ( #760 )
...
* build: add fdroid flavor
* feat: disable fcm registration in f-droid flavor
2023-08-18 18:15:57 +02:00
a79779f813
Emoji Reactions Support ( #645 )
...
* Display Pleroma emoji reactions
* Interact with existing Pleroma emoji reactions
* Setting for emoji reaction support
* Setting for displaying reactions in timelines
* More horizontal padding on reactions display item
* List accounts who reacted
* Arbitrary emoji reaction from status footer
* Hide custom emoji keyboard when emoji is selected
* Clear preferences before applying
All preferences get written anyways so nothing will be lost
* Reset react visibility state on bind
* Fix custom emoji turning black when reacting
* Load reactions when a new one is added
* Emoji reactions grid
* Load custom emoji in reactions list fragment
* New reaction toast messages and Unicode emoji regex
* Make custom emoji picker for reactions scrollable
* Scroll down to show custom emoji picker when reacting
* Divider after reaction custom emoji picker
* Animate react button opacity back in
* fix plural strings
* re-implement reactions using horizontal recycler view
* update reactions with event
* tweak emoji font size
* tweak button styles (a tiny bit)
* change footer react button behavior
* fix emoji reaction status item padding
* move emoji reactions below content items
* add content description and tooltip
* use custom emoji keyboard to enter unicode emoji
* fix reactions clearing on status counter updates
* fix space next to emoji reactions not clickable
* make compatible with glitch-soc
* Remove now unused EmojiReactionsView class
* improve handling of reaction padding
---------
Co-authored-by: sk <sk22@mailbox.org>
2023-08-18 18:14:33 +02:00
1cdc58378a
Sort Hashtags you follow menu ( #695 )
...
* Sort Hashtags you follow menu
* change sorting method
---------
Co-authored-by: Mark Hansen <mhansen@accusoft.com>
Co-authored-by: sk <sk22@mailbox.org>
2023-08-05 20:43:23 +02:00
584b11fce3
feat: allow playing multiple media ( #755 )
...
* feat: allow playing multiple media
* replace audio overlay icon
---------
Co-authored-by: sk <sk22@mailbox.org>
2023-08-05 20:35:57 +02:00
fe2039062b
fix(remote): send remoteAccount ( #754 )
...
closes sk22#664
* fix(remote): send remoteAccount
* fix(server-about): set adming account as remote
* fix(remote): show remote local accounts as remote
2023-08-05 20:30:41 +02:00
0269756b52
feat: change mute duration ( #751 )
...
* feat: add mute timer
* fix: missing ressources
* refactor(add-mute-timer): change of the mute timer popup layout
* tweak mute dialog
---------
Co-authored-by: LucasGGamerM <lucassggabriel@gmail.com>
Co-authored-by: sk <sk22@mailbox.org>
2023-08-05 20:17:40 +02:00
df1a6cf764
feat(openURL): open about in app ( #750 )
2023-08-05 19:44:18 +02:00
6d2385b6b3
feat: support UnifiedPush notifications ( #749 )
...
* build: add unified push dependency
* feat(notification): allow arbitrary push notification endpoint
* feat(notification/unified-push): show notification
* refactor(unifiedPush): use more consise null check
* feat(settings/notification): add UnifiedPush toggle
* feat(settings/notification): show no distributor message
* feat(settings/notification): disable unifiedpush when no distributor is available
* change icon name
---------
Co-authored-by: sk <sk22@mailbox.org>
2023-08-05 19:42:10 +02:00
44eaa36cef
fix: copy link invisible on EMUI ( #753 )
2023-08-05 19:33:36 +02:00
50b40c4a07
Merge remote-tracking branch 'upstream/master'
2023-08-05 19:32:28 +02:00
c3da15552e
Merge branch 'l10n_master'
2023-08-03 17:22:04 +03:00
a014fe9443
Fix media layout with unknown sizes
2023-08-03 17:21:40 +03:00
92551d4ca3
New translations strings.xml (Portuguese, Brazilian)
2023-08-03 03:27:17 +02:00
8010858e85
New translations strings.xml (Portuguese, Brazilian)
2023-08-03 02:26:22 +02:00
4efb4875b0
New translations strings.xml (Swedish)
2023-08-02 09:16:24 +02:00
c5d041e46d
New translations strings.xml (Portuguese, Brazilian)
2023-08-01 23:11:09 +02:00
53c2223aae
New translations strings.xml (Portuguese, Brazilian)
2023-08-01 21:25:07 +02:00
25034ac0ae
New translations strings.xml (Portuguese, Brazilian)
2023-08-01 01:41:52 +02:00
ac9de72b75
New translations strings.xml (Portuguese, Brazilian)
2023-08-01 00:42:41 +02:00
1f48ad93f2
New translations strings.xml (Portuguese, Brazilian)
2023-07-31 23:46:36 +02:00
38f7f7aa00
New translations strings.xml (Czech)
2023-07-31 14:32:20 +02:00
fe8175c63a
New translations strings.xml (French)
2023-07-30 19:39:54 +02:00
2d9e01bbc1
New translations strings.xml (French)
2023-07-30 18:44:39 +02:00
022a227b08
New translations strings.xml (Turkish)
2023-07-28 00:29:16 +02:00
a2228259f1
New translations full_description.txt (Turkish)
2023-07-27 23:33:53 +02:00
a61af7c56f
New translations strings.xml (Turkish)
2023-07-27 23:33:52 +02:00
5d6a646976
New translations strings.xml (French)
2023-07-27 23:33:51 +02:00
628d0d7492
New translations strings.xml (French)
2023-07-27 22:05:11 +02:00
b76c8745ec
New translations strings.xml (Norwegian)
2023-07-25 22:57:26 +02:00
51e67bc441
New translations strings.xml (Norwegian)
2023-07-25 21:52:29 +02:00
8887f75b70
Merge pull request #655 from nilathedragon/patch-1
...
Do not assume languages array will contain entries
2023-07-25 19:12:56 +03:00
9436a838c0
Do not assume languages array will contain entries
2023-07-25 17:28:41 +02:00
ef120fa36f
New translations strings.xml (Swedish)
2023-07-25 00:55:54 +02:00
8c6385e2c5
New translations strings.xml (Swedish)
2023-07-24 23:57:42 +02:00
0bd85d9905
New translations strings.xml (Persian)
2023-07-24 13:40:53 +02:00
ce0dab7b28
New translations strings.xml (Czech)
2023-07-24 09:55:45 +02:00
bdcebf1576
boop verisom
2023-07-23 22:03:25 +02:00
ddcc5670ce
New translations strings.xml (Bengali)
2023-07-22 17:48:06 +02:00
86afa184e2
New translations strings.xml (Bengali)
2023-07-22 16:26:35 +02:00
77f341f139
New translations strings.xml (German)
2023-07-22 12:27:40 +02:00
918b5d99c2
New translations strings.xml (Swedish)
2023-07-21 22:09:32 +02:00
7a098d6eff
New translations strings.xml (Swedish)
2023-07-21 21:06:04 +02:00
239b6f8202
fix pill-less navigation bar with labels
2023-07-21 11:41:34 +02:00
8404c79148
Re-implement some Akkoma specific things + hide filter settings ( #729 )
...
* Replace missing blurhash with accent color
* Correct Akkoma max account fields
* Skip discover on Akkoma
* Akkoma poll limits
* Hide filter settings on Akkoma
* clear search fragment on back
---------
Co-authored-by: sk <sk22@mailbox.org>
2023-07-21 02:29:38 +02:00
5b2d04e09d
add navigation bar tab labels - with option to hide them
2023-07-21 01:45:08 +02:00
6bd13f99d2
add a readme link to the sauna repo
2023-07-21 01:15:35 +02:00
2e8e12c1c8
add font tracking to label_medium
2023-07-21 01:08:07 +02:00
17929a6b2d
upstream was right about the weird padding
...
see "Navigation bar target size and margins" in
https://m3.material.io/components/navigation-bar/specs
2023-07-21 00:37:05 +02:00
LucasGGamerM
FineFindus
Jacoco
Mark Hansen
sk
Grishka
Eugen Rochko
Nila