LucasGGamerM
|
158e9a56eb
|
feat: readd Moshidon specific Display settings
|
2023-08-26 16:52:23 -03:00 |
|
LucasGGamerM
|
89a237ae86
|
feat: readd Moshidon behavior settings
|
2023-08-26 16:07:06 -03:00 |
|
LucasGGamerM
|
9201a883ea
|
feat: swap Megalodon app strings for Moshidon app strings on Settings
|
2023-08-26 15:26:47 -03:00 |
|
LucasGGamerM
|
666a65c118
|
refactor: temporarily remove recentEmojis to avoid crashing.
It will be reimplemented later either by me or @FineFindus
|
2023-08-26 15:21:20 -03:00 |
|
sk
|
ad96031aeb
|
rounded corners for inset images!
|
2023-08-25 23:26:27 +02:00 |
|
sk
|
aa9e66e6a2
|
tweak account card design
closes sk22#731
|
2023-08-25 17:20:54 +02:00 |
|
sk
|
86081654fb
|
remove unused import
|
2023-08-25 17:19:42 +02:00 |
|
sk
|
cac030ffed
|
fix inconsistent avatar border radius
|
2023-08-25 17:19:29 +02:00 |
|
LucasGGamerM
|
f5303eeca2
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
|
2023-08-24 14:20:52 -03:00 |
|
LucasGGamerM
|
b0d75b6120
|
fix: fix wrong navbar color in AccountSwitcherSheet.java
|
2023-08-24 14:20:48 -03:00 |
|
LucasGGamerM
|
546e349229
|
refactor: fix compilation errors in FooterStatusDisplayItem.java and EmojiReactionsStatusDisplayItem.java
|
2023-08-24 08:40:42 -03:00 |
|
sk
|
71f4f089b6
|
scroll to added emoji; improve loading animation
|
2023-08-24 13:26:42 +02:00 |
|
LucasGGamerM
|
afc401c1f2
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# metadata/ru/full_description.txt
|
2023-08-24 08:17:57 -03:00 |
|
sk
|
0f72809342
|
scroll to existing reaction when adding
|
2023-08-24 13:15:53 +02:00 |
|
LucasGGamerM
|
3db74fb958
|
refactor: fixes 2 crashes
I dont wanna write a decent commit message today
|
2023-08-24 08:07:15 -03:00 |
|
sk
|
40a033d692
|
no emoji reactions for akkoma announcements
|
2023-08-24 13:03:24 +02:00 |
|
sk
|
d44df2c23c
|
change behavior when adding reactions
closes sk22#769
|
2023-08-24 13:00:16 +02:00 |
|
LucasGGamerM
|
e8138685a8
|
refactor: swap see for show in SettingsBehaviorFragment.java
Why the fuck does this even happen?
|
2023-08-24 07:42:41 -03:00 |
|
sk
|
47fde1e08b
|
undo spacing "fix"
|
2023-08-24 12:41:17 +02:00 |
|
LucasGGamerM
|
316c660478
|
refactor: fix compilation errors on the HomeTabFragment.java
|
2023-08-24 07:41:11 -03:00 |
|
LucasGGamerM
|
f9b4f9d1b4
|
refactor: use updated m3 colors on AccountSwitcherSheet.java
|
2023-08-24 07:29:53 -03:00 |
|
LucasGGamerM
|
568f249608
|
refactor: remove legacy getDomain method from DiscoverPostsFragment.java
|
2023-08-24 07:26:57 -03:00 |
|
LucasGGamerM
|
c3a671ce90
|
refactor: use updated variable name for notification actions switch
|
2023-08-24 07:21:23 -03:00 |
|
LucasGGamerM
|
887d209b7f
|
refactor: use updated variable name for the discoverFragment
|
2023-08-24 07:19:32 -03:00 |
|
LucasGGamerM
|
b3f3ee1240
|
refactor: removing legacy InstanceBlockListFragment.java
|
2023-08-24 07:17:56 -03:00 |
|
sk
|
0688521ae8
|
make emoji reactions not click-through-able
|
2023-08-24 12:17:15 +02:00 |
|
sk
|
bdf0f21647
|
fix spacing between text and footer
|
2023-08-24 12:13:20 +02:00 |
|
sk
|
6b4ce0ea69
|
hide roles when in edit mode
|
2023-08-23 23:48:42 +02:00 |
|
sk
|
7f0c4860f8
|
clean up code
|
2023-08-23 23:47:06 +02:00 |
|
sk
|
49137273ae
|
clean up code
|
2023-08-23 23:38:45 +02:00 |
|
sk
|
647e3e5e85
|
progress indicator for emoji reactions
|
2023-08-23 23:38:12 +02:00 |
|
sk
|
4920bf63e3
|
oops. accidentally removed a setting
|
2023-08-23 23:12:11 +02:00 |
|
sk
|
0afcdb2cdf
|
emoji reactions for announcements!
|
2023-08-23 22:56:11 +02:00 |
|
sk
|
d96c3c3c8a
|
fix paddings around dummys, text and spoilers
closes sk22#638
|
2023-08-23 22:12:14 +02: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 |
|
sk
|
f5e5408d70
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-23 20:02:06 +02: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 |
|
sk
|
d62899c990
|
fix reaction data and binding inconsistencies
|
2023-08-23 19:49:07 +02: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 |
|
Grishka
|
78d22c670c
|
Fix reporting
|
2023-08-23 00:40:38 +03:00 |
|
sk
|
f50eac02d8
|
move adding reactions to reactions item
|
2023-08-21 22:40:19 +02: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 |
|