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
1ada4c9f46
Still in the need to Frankenstein the add menu
2023-02-20 13:33:04 -03:00
sk
b9a997730a
move edit timelines option
2023-01-27 14:48:18 -03:00
sk
d79c4ad650
rearrange home menus
2023-01-27 14:46:16 -03:00
sk22
b63c0010a9
Pinnable timelines ( #338 )
...
* implement draggable list
* implement pinning timelines
* fix TimelineDefinition equals not working
* implement removing timelines
* implement pinned lists/hashtags
* per-account pinned timelines
* implement pin button
* fix issues with pinning
* improve pin button
* improve pinning timelines
* implement custom icons
* fix home switcher menu
* make hashtags pinnable
* edit timelines in options menu
2023-01-27 14:32:04 -03:00
sk22
b7ccf1144c
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
Thanks @sk22!
2023-01-20 17:30:11 -03:00
LucasGGamerM
060745869b
Revert "New home layout with public timelines ( #288 )"
...
This reverts commit 78d0add808
2023-01-20 11:19:20 -03:00
sk22
78d0add808
New home layout with public timelines ( #288 )
...
* add dummy popup menu
* add pager to home fragment
* reduce pager sensitivity
* remove timelines from discover fragment
* add fabs to timelines
* change info banner color
* add back toolbar functionality
* update icons on navigate
* handle back press
* add lists and hashtags
* use tabs
* improve timeline title
* tweak switcher behavior
* fix show new posts button appearance
* hide show new posts button on reload
* tweak show new posts animations
* work around crash theme switch
* enable disabling federated timeline
2023-01-20 11:17:26 -03:00
sk
d0ce157069
Merge branch 'feature/posts-notifications-tab' into fork
2022-11-19 20:13:16 +01:00
sk
be7d65989d
add posts notifications tab
...
closes #38
2022-11-19 20:12:52 +01:00
sk
9283ca8878
Merge branch 'list-timeline-views' into fork
2022-11-11 03:06:55 +01:00
obstsalatschuessel
21a526dda9
Add list timelines view
...
* get accounts list timelines from API
* display available lists in discover view tab
* display list timeline
2022-11-03 09:03:34 +01:00
sk
0318169b74
Merge branch 'feature/pin-posts' into fork
2022-05-06 19:24:58 +02:00
sk
a3bea6ad24
add profile tab for pinned toots
2022-05-06 18:09:00 +02:00
sk
318d271127
add federation tab and change tab order
2022-05-02 18:31:29 +02:00
Grishka
61d537779b
Local timeline
2022-04-24 13:51:03 +03:00
Grishka
37bef85f6a
Notifications
2022-03-05 12:59:27 +03:00
Grishka
9f0b55918d
Discover stuff
2022-03-02 12:38:14 +03:00
Grishka
a91538582a
Fix state save/restore and move colors to attrs
2022-02-13 16:16:20 +03:00
Grishka
42d5f52ff5
Initial
2022-01-14 15:02:10 +03:00
