LucasGGamerM
b3f3ee1240
refactor: removing legacy InstanceBlockListFragment.java
2023-08-24 07:17:56 -03:00
LucasGGamerM
4a73e9cdf7
refactor: fix compilation problems with the CustomLocalTimelineFragment
2023-08-23 15:16:29 -03:00
LucasGGamerM
55df6492b7
refactor: fix compilation problems with the SettingsDisplayFragment
2023-08-23 15:05:57 -03:00
LucasGGamerM
20026fc01a
refactor: fix StatusDisplayItem's compilation errors
2023-08-23 15:05:06 -03:00
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
c67feaac9a
refactor: removing legacy settings fragments
2023-08-23 14:30:09 -03:00
LucasGGamerM
2991815f2f
refactor: just trying to make things compile again, no good commit message this time
2023-08-23 08:46:43 -03:00
LucasGGamerM
b184d6de08
refactor: fix compilation errors in UiUtils.java
2023-08-23 08:35:21 -03:00
LucasGGamerM
c9205b725f
refactor: fix compilation errors in CustomLocalTimelineFragment.java
2023-08-23 08:32:23 -03:00
LucasGGamerM
ac3b6ad43c
refactor: deleting legacy DomainManager.java implementation
...
Remove DomainManager.java in favor of getWebUri
2023-08-23 08:17:18 -03:00
LucasGGamerM
e56263a7c0
refactor: deleting legacy InstanceInfoFragment.java
2023-08-23 08:10:47 -03:00
LucasGGamerM
f261fba995
feat: all errors on the ComposeFragment are gone
2023-08-20 18:20:39 -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
LucasGGamerM
a9ed65cb73
Merge remote-tracking branch 'megalodon_main/main'
2023-07-07 11:54:04 -03:00
FineFindus
d47c4e63d7
fix(hashtag-timeline): add additional tags as separated parameter ( #647 )
2023-07-03 01:32:56 +02:00
LucasGGamerM
e9ed82d471
Merge remote-tracking branch 'megalodon_main/main'
2023-06-30 18:37:33 -03:00
sk
277282d7f5
fix first notifications loaded multiple times
...
closes sk22#616
2023-06-28 01:37:21 +02:00
Schuyler Cebulskie
75b269fd65
feat: Implement haptics for APIs 23-29
2023-06-26 16:46:27 -04:00
LucasGGamerM
17227cdb7d
Merge pull request #214
...
feat: Add haptic feedback on boost/favourite/bookmark
2023-06-26 17:24:23 -03:00
LucasGGamerM
fc445516f5
Merge remote-tracking branch 'megalodon_main/main'
2023-06-26 17:21:29 -03:00
Schuyler Cebulskie
38970a10f5
Fix haptic feedback only applying to remote statuses
2023-06-26 15:14:47 -04:00
FineFindus
06543d5fc2
fix(edit-timelines/hashtags): set tags as list ( #596 )
...
* fix(edit-timelines/hashtags): set tags as list
Fixes https://github.com/sk22/megalodon/issues/595 , by setting the tags a tags and not as a list.
* refactor(edit-timelines/hashtags): set all tag terminator at once
* feat(edit-timelines/hashtags): add comment
2023-06-21 22:34:22 +02:00
LucasGGamerM
fd0a741ff2
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
2023-06-21 15:50:10 -03:00
sk
a70d39065c
add some new icons
2023-06-21 10:44:54 +02:00
sk
e47f253c0e
unset name if hashtag is applied from name
...
closes sk22#588
2023-06-21 10:27:57 +02:00
sk
d05f3932b2
fix empty hashtag when editing
2023-06-21 10:24:50 +02:00
FineFindus
be425282a6
Hashtag timelines with multiple tags ( #584 )
...
* feat(api/hashtag): add any, all, and none parameter
* feat(timeline/hashtag): load with any, all and none parameter
* feat(timeline/hashtag): save any, all and none in timeline definition
* feat: set hastag parameter in UI
* feat: move strings to string res
* feat: show hint for tags
* refactor: use method for setting up tags text
* improve edit dialog, allow creating hashtag timelines
* add chips for hashtags
* add option for displaying only local posts in hashtag
* improve layout and wording
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-06-21 01:38:51 +02: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
412fe5c303
Change haptic feedback setting description
2023-06-18 01:31:06 -04:00
Schuyler Cebulskie
ede7305fe9
feat: Add haptic feedback on boost/favourite/bookmark
2023-06-16 20:36:10 -04:00
LucasGGamerM
ee9bd3dd4b
Merge remote-tracking branch 'megalodon_main/main'
2023-06-16 13:00:42 -03:00
sk
bb4a52f03a
fix threads opened from notification
2023-06-15 22:44:46 +02:00
LucasGGamerM
08866e0bea
feat: add check for if device has a camera before sending out the image capture intent
2023-06-15 15:36:14 -03:00
LucasGGamerM
1beba48b66
Merge remote-tracking branch 'megalodon_weblate/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
2023-06-15 14:58:12 -03:00
LucasGGamerM
e7ce822f7e
feat: merge new forward report switch default setting from megalodon
2023-06-15 14:55:39 -03:00
LucasGGamerM
6ecc6c4621
fix(instance-about): actually fix instance url not being trimmed. Also fixes the pixel launcher url feature
2023-06-15 14:43:21 -03:00
sk
94eb6b5775
one less thing for parceler to complain about
2023-06-15 19:21:44 +02:00
sk
6595a088fb
support exclusive lists
...
closes sk22#576
2023-06-15 19:21:26 +02:00
sk
b463ef65ce
fix parceler complaining about private class member
2023-06-15 18:13:59 +02:00
LucasGGamerM
f197d6f19a
feat: trim instance URL on InstanceInfoFragment
...
This is for the akkoma instances, where the local timeline would be inaccessible due to the https header being there. And it also looks better
2023-06-14 21:29:37 -03:00
LucasGGamerM
45e3cc2d24
feat: add radio checks for color theme options menu
2023-06-14 21:13:37 -03:00
LucasGGamerM
b226fcc128
feat: add pin button to custom local timelines
...
This is now a thing due to the new instance about fragment, where you can see a server's local timeline from there, and from there you should be able to pin it. This commit addresses that
2023-06-14 20:57:20 -03:00
LucasGGamerM
7b4728cff7
feat(instance-about): use consistent refreshLayout coloring
2023-06-14 20:44:38 -03:00
LucasGGamerM
9977d7168a
fix(instance-about): fix menu item icons being not colored correctly
2023-06-14 20:42:42 -03:00
LucasGGamerM
3520018812
fix: fix missing strings
2023-06-13 14:31:49 -03:00
LucasGGamerM
b0353920a3
fix: fix compilation problems
2023-06-13 14:26:15 -03: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
22f5667549
fix javadoc
2023-06-13 11:50:57 +02:00
sk
08dc122b6b
tweak min/max heights
2023-06-13 10:07:30 +02:00
