LucasGGamerM
28601bd75c
refactor: moving recentEmojis preference to AccountLocalPreferences
...
Also fixes the compilation problems related to both
2023-08-23 14:56:20 -03:00
LucasGGamerM
93818903c8
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:36:16 -03:00
LucasGGamerM
8b08d5ddfd
feat: add black and white (more like gray) theme
2023-07-08 21:01:03 -03:00
Schuyler Cebulskie
75b269fd65
feat: Implement haptics for APIs 23-29
2023-06-26 16:46:27 -04:00
Schuyler Cebulskie
0beb215f1d
Change default for haptic feedback setting to be dependent on Android build
2023-06-18 01:32:46 -04:00
Schuyler Cebulskie
ede7305fe9
feat: Add haptic feedback on boost/favourite/bookmark
2023-06-16 20:36:10 -04:00
LucasGGamerM
e1a262ec5f
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/res/values-it-rIT/strings_sk.xml
# metadata/de-DE/changelogs/83.txt
# metadata/de-DE/changelogs/94.txt
# metadata/en-US/changelogs/94.txt
# metadata/es/changelogs/94.txt
# metadata/fr/title.txt
# metadata/my-MM/title.txt
# metadata/my/short_description.txt
# metadata/pt-PT/changelogs/59.txt
# metadata/pt-PT/changelogs/61.txt
# metadata/pt-PT/full_description.txt
# metadata/pt-PT/short_description.txt
# metadata/pt-PT/title.txt
2023-06-13 14:03:50 -03:00
sk
dd25f3380a
add setting to configure default value for "forward report"
...
closes sk22#565
2023-06-12 01:38:44 +02:00
sk
44154a987d
setting for "re:" reply CW prefix always or only to others
...
re: sk22#567
2023-06-11 19:46:18 +02:00
LucasGGamerM
bc7f614573
refactor: fix compilation problems by refactoring old code
2023-06-09 18:52:08 -03:00
LucasGGamerM
e2c62aa76b
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.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/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.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/values/dimens.xml
2023-06-09 18:09:23 -03:00
sk
35bf858a83
auto-reveal equal spoilers in threads
2023-06-09 14:54:03 +02:00
sk
4258c55b88
implement fetching listings from remote instances
2023-06-06 17:04:29 +02:00
LucasGGamerM
14175a9140
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.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/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.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/ListTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.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/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.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/onboarding/AccountActivationFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/item_account_switcher.xml
# mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-pt-rPT/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/styles.xml
2023-06-03 19:56:16 -03:00
sk
3a2ae1ce71
clean up preferences when removing account
2023-05-29 02:40:15 +02:00
FineFindus
f922e028a7
feat(settings): invert default post-divider value
2023-05-26 20:13:09 +02:00
FineFindus
9aac0c007e
feat(settings): invert post-divider setting
2023-05-26 20:13:08 +02:00
FineFindus
78acb5e7ea
feat(settings): invert double tab to swipe setting
2023-05-26 20:12:41 +02:00
FineFindus
62090475f9
fix(settings): remove duplicated auto-hide compose
2023-05-26 20:00:46 +02:00
LucasGGamerM
65c158391f
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/res/layout/fragment_compose.xml
2023-05-23 19:30:52 -03:00
Jacoco
8b502b605c
Alternative content types ( #516 )
...
* Akkoma content types
* Default content type preference
* per-account content types, compatible with glitch
* disable content types by default, change icon
* persist content type to state
* update string
* fall back to plain text if formatting enabled
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-05-22 17:56:50 +02:00
LucasGGamerM
fe20fe4254
feat(compose): add automatically mentioning Reblogger functionality
...
Fixes #173
2023-04-22 13:44:50 -03:00
LucasGGamerM
7c8698521d
feat: add remote follower and following lookup
...
Clicking the regenerated accounts wont do anything for now though
2023-04-16 15:25:55 -03:00
LucasGGamerM
64e681c227
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# metadata/de-DE/changelogs/83.txt
# metadata/en-US/changelogs/83.txt
2023-04-12 13:04:31 -03:00
LucasGGamerM
d6d6155f2c
refactor: move LatestNotificationID preference away from GlobalUserPreferences
...
This is solely for the purpose of organization, as I think GlobalUserPreferences should only directly contain Global user preferences
2023-04-10 15:14:47 -03:00
sk
0a04c9357c
Revert "display reblog popup by default"
...
This reverts commit 21c4cef397https://floss.social/@megalodon/110157968813469351
2023-04-07 16:20:29 +02:00
sk
21c4cef397
display reblog popup by default
2023-04-07 16:04:35 +02:00
sk
4b2fcd760a
add option to confirm before reblog
...
closes sk22#456
2023-04-07 15:29:43 +02:00
FineFindus
dd4bad706b
fix(notification): saved used ids
2023-04-05 19:54:26 +02:00
LucasGGamerM
bcac023d33
feat: add a toggle for swapping between reblog and bookmark notification actions
2023-04-01 15:32:01 -03:00
LucasGGamerM
7459181fa9
feat: make uniform notification icons setting false by default
...
I set these as true by default when merging because I liked the Mo, now lets make it false by default because Its cooler
2023-04-01 14:22:18 -03:00
LucasGGamerM
e8abc0bbd2
feat: make it compile again
...
I am tired as hell someone donates plz
2023-03-21 20:40:55 -03:00
Jacoco
132b672441
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-21 20:01:47 -03:00
LucasGGamerM
898fbcc52b
Revert "refactor(notifications-tab/badge): use improved implementation"
...
This reverts commit ac561549
2023-03-21 19:40:11 -03:00
LucasGGamerM
c0484de506
feat: add toggle to disable double tap to swipe action
2023-03-19 11:20:46 -03:00
Jacoco
f852dac1e5
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-16 00:49:11 +01:00
sk
499ac8f727
improve compact reply/reblog header
2023-03-15 22:30:57 +01:00
sk
e2193e8e3c
reply line below, compact above
2023-03-15 21:24:25 +01:00
sk
584700225c
reply line below avatar
2023-03-15 17:36:07 +01:00
LucasGGamerM
52392c9ed9
feat: add toggle for defaulting to unlisted replies
2023-03-07 14:29:48 -03:00
FineFindus
ac5615497b
refactor(notifications-tab/badge): use improved implementation
...
Removes the now unecessary network call, by hooking into the notification reciever instead.
2023-03-01 22:00:49 +01:00
FineFindus
4ecd525f13
feat(tabs/notifications): add unread badge
2023-03-01 21:44:11 +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
LucasGGamerM
0aac29545f
Adding the option to enable notification deletion. Fixing #71
2023-02-09 15:07:36 -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
sk
f88b65f479
add spectator mode
...
closes sk22#264
2023-02-06 18:16:41 +01:00
sk
ec9d41fbbd
collapse long posts
2023-02-03 23:40:20 +01:00
LucasGGamerM
0fcaa08ed0
Readding the pre-releases toggle, not in the self updater yet though
2023-02-02 15:11:25 -03:00
