Commit Graph

1458 Commits

Author SHA1 Message Date
LucasGGamerM
9e9ff07eaf Fixing indentation because why not 2023-02-17 19:46:55 -03:00
LucasGGamerM
f377dca63c Merge pull request #92
fix(star-animation): re-enable star animation
2023-02-17 19:40:57 -03:00
FineFindus
3074100432 fix(favourite): re-enable star animation 2023-02-17 22:36:34 +01:00
LucasGGamerM
da5f3a9094 Fixing merge conflicts 2023-02-17 18:35:29 -03:00
FineFindus
f6a35e92c7 fix(fab): completly hide in profile page 2023-02-17 22:28:18 +01:00
LucasGGamerM
1e2dd3dec6 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.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/ui/utils/UiUtils.java
2023-02-17 17:40:06 -03:00
sk22
d20f8669e8 Auto-hide FAB on scroll (#435)
* feat(composeButton): hide fab on scroll
* feat(composeButton): hide when scrolling in profile fragment
* refactor(compose-fab): show fab after small scroll distance
* refactor(compose-fab): code cleanup
* feat(composeButton): hide when scrolling in profile
* fix: duplicate fab var
* feat(fab): show when scrolled to top
* add option to turn it off

---------

Co-authored-by: FineFindus <63370021+FineFindus@users.noreply.github.com>
2023-02-17 13:20:22 +01:00
sk
6b9b6710cf enable remote-following accounts
closes sk22#431
2023-02-16 19:44:39 +01:00
LucasGGamerM
d07d714641 Rolling back to the megalodon push notification style 2023-02-16 13:33:53 -03:00
sk
b07858a66d don't crash when language array empty 2023-02-16 17:04:56 +01:00
sk
c05d0b600e default role color if not provided
fixes sk22#430
2023-02-16 16:42:47 +01:00
LucasGGamerM
2b7f325332 removing rotating star animation until I manage to fix it 2023-02-16 11:53:10 -03:00
Torge Rosendahl
0a8d73dc0b cleanup, resolved some warnings 2023-02-15 20:19:10 -05:00
Torge Rosendahl
fd99f3caa1 changed url longclick implementation to GestureListener 2023-02-15 20:16:20 -05:00
Torge Rosendahl
794c4e5227 removed longClickHandler and moved to view itself 2023-02-15 19:54:08 -05:00
Torge Rosendahl
f5df8225d1 whitespace corrections 2023-02-15 18:20:02 -05:00
Torge Rosendahl
42c6446125 refactoring: moved runnable and made it private, added copy toast localization. 2023-02-15 18:04:52 -05:00
Torge Rosendahl
e3486ebf7c added clickable link type switch for copy, to not copy hashtags and user IDs 2023-02-15 18:00:45 -05:00
Torge Rosendahl
c0115f068c implemented copy service 2023-02-15 17:40:43 -05:00
Torge Rosendahl
41682d1147 added press-and-hold listener to ClickableLinks 2023-02-15 17:30:31 -05:00
LucasGGamerM
3edb8f7a23 Moving the setting for the reminder to add alt text setting around 2023-02-14 18:38:12 -03:00
LucasGGamerM
32ae1d095d The process of making the fab appear when at the top is much more robust now. It should work wonderfully 2023-02-14 18:34:41 -03:00
LucasGGamerM
70c10b3df3 Fixing another minor fab issue 2023-02-14 13:40:33 -03:00
LucasGGamerM
33b62cf9aa Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/values-ca-rES/strings_sk.xml
#	mastodon/src/main/res/values-de-rDE/strings.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-gl-rES/strings_sk.xml
#	mastodon/src/main/res/values-ko-rKR/strings_sk.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values-sl-rSI/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-zh-rCN/strings_sk.xml
#	metadata/ca/full_description.txt
#	metadata/cy/full_description.txt
#	metadata/es/changelogs/65.txt
#	metadata/es/changelogs/67.txt
#	metadata/es/full_description.txt
#	metadata/id/full_description.txt
#	metadata/ko/full_description.txt
#	metadata/pl/full_description.txt
#	metadata/sl/changelogs/65.txt
#	metadata/sl/changelogs/67.txt
#	metadata/sv/full_description.txt
#	metadata/uk/full_description.txt
#	metadata/zh-Hans/full_description.txt
2023-02-13 15:38:28 -03:00
LucasGGamerM
04952a0bee Adding setting to disable the reminder to add alt text 2023-02-13 15:28:26 -03:00
LucasGGamerM
002edc8890 Fixing the fab still being active after scrolling 2023-02-13 15:17:32 -03:00
sk
0c1fd22253 Merge remote-tracking branch 'upstream' 2023-02-13 17:26:26 +01:00
sk
466c489b4d get edit image drawable with theme
closes sk22#401
2023-02-13 17:07:27 +01:00
sk
625f715e26 clarify spectator mode name 2023-02-13 16:57:18 +01:00
sk
61caec4060 fix wrong icon
closes sk22#421
2023-02-13 16:53:26 +01:00
sk
df233eb1e2 fix headers not filtered in notifications list 2023-02-13 16:51:55 +01:00
Grishka
634408b8cb Minor onboarding tweaks 2023-02-12 14:25:03 +03:00
Grishka
8e9531b718 Fix #528 2023-02-12 03:58:24 +03:00
LucasGGamerM
d716891453 It is now impossible to delete the current editable item in the roles view in the profile page. Fixing #89 2023-02-10 16:12:40 -03:00
LucasGGamerM
a4e3774739 Making it so that the fab is always visible at the top of the recyclerView
Fixing #88
2023-02-10 15:51:53 -03:00
Grishka
64fbbb2f07 Minor onboarding stuff 2023-02-10 21:09:06 +03:00
LucasGGamerM
c8580979e8 Fixing #87 2023-02-10 14:29:48 -03:00
LucasGGamerM
0aac29545f Adding the option to enable notification deletion. Fixing #71 2023-02-09 15:07:36 -03:00
LucasGGamerM
043526f883 Fixing the compilation errors and redoing some stuff 2023-02-09 14:37:29 -03:00
LucasGGamerM
ac1e000645 Merge pull request #82
Feat/fab moshidon
2023-02-08 20:38:21 -03:00
LucasGGamerM
caf07a60ea Removing megalodon naming stuff 2023-02-08 19:56:34 -03:00
FineFindus
a26c835134 Merge branch 'master' into feat/fab-moshidon 2023-02-08 20:57:11 +01:00
FineFindus
363ceed2ad fix: duplicate fab var 2023-02-08 20:52:20 +01:00
FineFindus
46c9bd9807 merge branch main 2023-02-08 19:43:54 +01:00
LucasGGamerM
facde9ea15 Readding the posts notifications tab 2023-02-07 18:41:30 -03:00
LucasGGamerM
d04b09f75f Making thy necessary adjustments for the thing to compile 2023-02-07 18:25:46 -03:00
LucasGGamerM
ec0f6edc41 Merge branch 'main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.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/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
#	mastodon/src/main/res/values/strings.xml
2023-02-07 18:09:13 -03:00
McKris
a900c79e2c Fixing duplicate stuff after merging 2023-02-07 16:11:51 -03:00
LucasGGamerM
f07e0906dd Merge branch 'main'
# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.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/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.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/discover/DiscoverFragment.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/onboarding/AccountActivationFragment.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/SignupFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.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/LinkCardStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.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/ic_fluent_arrow_forward_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
#	mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
#	mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
#	mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
#	mastodon/src/main/res/layout/compose_action.xml
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/layout/fragment_compose.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	mastodon/src/main/res/layout/header_welcome_custom.xml
#	mastodon/src/main/res/layout/item_list_header_simple.xml
#	mastodon/src/main/res/layout/item_settings_text.xml
#	mastodon/src/main/res/layout/item_settings_update.xml
#	mastodon/src/main/res/layout/item_text.xml
#	mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
#	mastodon/src/main/res/menu/color_palettes.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/menu/profile.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-in-rID/strings_sk.xml
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-v31/colors.xml
#	mastodon/src/main/res/values/attrs.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/ids.xml
#	mastodon/src/main/res/values/palettes.xml
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/strings_sk.xml
#	mastodon/src/main/res/values/styles.xml
#	metadata/ca/changelogs/50.txt
#	metadata/ca/changelogs/51.txt
#	metadata/ca/full_description.txt
#	metadata/de-DE/full_description.txt
#	metadata/en-US/changelogs/50.txt
#	metadata/en-US/changelogs/51.txt
#	metadata/en-US/changelogs/56.txt
#	metadata/en-US/full_description.txt
#	metadata/en-US/images/phoneScreenshots/1.jpg
#	metadata/en-US/images/phoneScreenshots/2.jpg
#	metadata/en-US/images/phoneScreenshots/3.jpg
#	metadata/en-US/images/phoneScreenshots/4.jpg
#	metadata/en-US/images/phoneScreenshots/5.jpg
#	metadata/en-US/images/phoneScreenshots/6.jpg
#	metadata/en-US/short_description.txt
#	metadata/en-US/title.txt
#	metadata/es/changelogs/50.txt
#	metadata/es/changelogs/51.txt
#	metadata/es/full_description.txt
#	metadata/fr-FR/full_description.txt
#	metadata/gl-ES/short_description.txt
#	metadata/gl-ES/title.txt
#	metadata/id/full_description.txt
#	metadata/nl-NL/short_description.txt
#	metadata/nl-NL/title.txt
#	metadata/pt-BR/full_description.txt
#	metadata/sl/short_description.txt
#	metadata/sl/title.txt
#	metadata/sv/full_description.txt
2023-02-07 16:04:28 -03:00
sk
333c38c64d add alt badge to video/gifs
closes sk22#409
2023-02-07 15:44:40 +01:00