LucasGGamerM
3db74fb958
refactor: fixes 2 crashes
...
I dont wanna write a decent commit message today
2023-08-24 08:07:15 -03:00
LucasGGamerM
be56a6dd64
feat: color translation is done on all xmls
2023-08-20 17:47:21 -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
3a87e83974
fix: fix CW's "Touch to show" button text not being the correct color
...
cc: @sk22
2023-07-08 20:31:07 -03: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
dc75882cee
slightly adjust margin
...
closes sk22#585
2023-06-21 10:32:41 +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
LucasGGamerM
ee9bd3dd4b
Merge remote-tracking branch 'megalodon_main/main'
2023-06-16 13:00:42 -03:00
sk
50360059ce
fix margins
2023-06-15 20:38:47 +02:00
LucasGGamerM
63bcef990b
feat: use correct coloring for new exclusive list explanation
...
cc: @sk22
2023-06-15 20:34:51 +02:00
LucasGGamerM
2bbcae9fc6
feat: use correct coloring for new exclusive list explanation
...
cc: @sk22
2023-06-15 15:19:20 -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
sk
6595a088fb
support exclusive lists
...
closes sk22#576
2023-06-15 19:21:26 +02: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
08dc122b6b
tweak min/max heights
2023-06-13 10:07:30 +02:00
LucasGGamerM
7ca4f2ab2c
feat: remove singleLine statement from Button settings items
...
cc: @sk22
2023-06-12 18:42:48 -03:00
sk
6cf214f127
fix header disappearing in some cases
...
closes sk22#570
2023-06-12 15:39:38 +02:00
LucasGGamerM
ccfa614dc7
fix(boost-button): fix it not updating its state on non-boostable items
2023-06-10 10:26:54 -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
LucasGGamerM
161c19b628
fix(account-sheet): fix wrong coloring for add account drawawble
2023-06-07 21:26:15 -03:00
LucasGGamerM
2baf51616c
fix(settings): update max lines number in settings items
...
This fixes the bug where settings secondary text would go missing if a screen was too small. This addresses that. It's also something for you @sk22
2023-06-06 19:25:51 -03:00
sk
d4fbb298c1
use sp for reply line inline icons
2023-06-04 22:57:06 +02:00
sk
2aeb5f03d6
remove unused sp drawables
2023-06-04 22:32:54 +02:00
sk
6522403c37
fix footer text margins
2023-06-04 22:12:45 +02:00
sk
f090ca7f75
use sp for scaled footer
2023-06-04 21:08:45 +02:00
LucasGGamerM
6881651ce7
feat: even denser AccountSwitcherSheet
2023-06-04 10:53:29 -03:00
LucasGGamerM
04aadf48f2
feat: use secondary text color for username in AccountSwitcherSheet
2023-06-04 10:43:24 -03:00
sk
5432f2590c
fine-tune footer layout
2023-06-04 05:00:48 +02:00
sk
bc717f5b10
tweak footer margins and hitboxes
2023-06-04 04:08:38 +02:00
sk
486eef21dd
responsive footer width
2023-06-04 02:16:47 +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
798a43906f
denser account switcher
...
this one's for @experiencersinternational
2023-06-01 18:46:53 +02:00
LucasGGamerM
addb6e06bf
feat(settings): add horizontal padding to SettingsFooterItem
...
This addresses a minor annoyance where the version name would be glued to the sides of the display
2023-06-01 11:55:31 -03:00
sk
de3a252884
not as huge share sheet heading
2023-05-31 10:12:12 +02:00
sk
10dfe0327e
use new account switcher
2023-05-30 22:42:56 +02:00
LucasGGamerM
e9e491c0b0
feat: redesign account picker sheet
2023-05-30 16:25:04 +02:00
sk
7849c34d1f
fix account list alignment
2023-05-29 13:25:14 +02:00
sk
bba5aba22d
settings icons not important for accessibility
2023-05-29 12:56:36 +02:00
LucasGGamerM
9e6723be41
fix: fixes wrong margin on Settings Button views
...
This addresses a visual bug where a button item without an icon appears to be glued to the left side of the screen. This commit addresses that
cc: @sk22
2023-05-27 13:00:54 -03:00
LucasGGamerM
c6ded3d505
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/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/res/layout/display_item_file.xml
2023-05-27 09:31:27 -03:00
LucasGGamerM
2d4fc2166a
feat: increase top padding in theme item for consistency
2023-05-27 08:55:04 -03:00
sk
c10d7cfee4
use remote url; file name as fallback for alt text
2023-05-27 01:32:49 +02:00
sk
f933bdbc53
button with ripple for files and instance picker
2023-05-27 01:13:32 +02:00
LucasGGamerM
274bca84d9
Add display item for unknown/file attachments
...
Co-authored-by: LucasGGamerM <lucassggabriel@gmail.com >
2023-05-27 01:11:26 +02:00
FineFindus
6fb7e97f13
feat(settings): use secondary text color for summary
2023-05-26 19:54:36 +02:00
FineFindus
f7c76f7503
feat(settings): add summary label to button
2023-05-26 19:54:32 +02:00
FineFindus
e94364ecf6
feat(settings): use default text size for switch summary
2023-05-26 19:54:05 +02:00
FineFindus
1fab3d3743
feat(settings): add summary label to switch
2023-05-26 19:54:05 +02:00
LucasGGamerM
03612fcf64
feat: add settings category view holder
...
Also adds a small proof of concept
2023-05-26 19:41:13 +02:00
LucasGGamerM
85d971242e
feat: use less margin on compose screen bottom view
...
This is due to the new option to use post content types uses a new icon in there, making it cram the post button into the side. Which is not good
2023-05-23 20:20:14 -03:00
