LucasGGamerM
10aa67bbde
feat: make the relocated publish button be colored right
2023-08-26 19:04:26 -03:00
LucasGGamerM
239a78888b
feat:make the relocated publishButton actually centered
...
Pain
2023-08-26 18:59:02 -03:00
LucasGGamerM
21ea604bcd
fix: fix draft button not being an ImageButton
2023-08-24 15:12:01 -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
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
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
665a0176b9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/layout/fragment_splash.xml
2023-04-14 14:27:42 -03:00
sk
2dae662333
fix username displacement in compose
2023-04-13 23:03:07 +02: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
sk
5434325fa8
fix header alignments… again
2023-04-07 16:30:49 +02:00
LucasGGamerM
0019f2183a
style: add some tabs in fragment_compose.xml
2023-03-26 10:27:16 -03:00
LucasGGamerM
68f77a6c8a
fix: wrong padding values for the schedule icon in ComposeFragment
2023-03-26 10:26:44 -03:00
LucasGGamerM
0589612df9
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/api/session/AccountSessionManager.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/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.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/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.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/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
sk
584700225c
reply line below avatar
2023-03-15 17:36:07 +01:00
sk
1c340b7c66
fix extra text padding in compose
2023-03-13 18:56:06 +01:00
LucasGGamerM
33b62cf9aa
Merge remote-tracking branch 'megalodon_weblate/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/values-ca-rES/strings_sk.xml
# mastodon/src/main/res/values-de-rDE/strings.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# mastodon/src/main/res/values-sl-rSI/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# metadata/ca/full_description.txt
# metadata/cy/full_description.txt
# metadata/es/changelogs/65.txt
# metadata/es/changelogs/67.txt
# metadata/es/full_description.txt
# metadata/id/full_description.txt
# metadata/ko/full_description.txt
# metadata/pl/full_description.txt
# metadata/sl/changelogs/65.txt
# metadata/sl/changelogs/67.txt
# metadata/sv/full_description.txt
# metadata/uk/full_description.txt
# metadata/zh-Hans/full_description.txt
2023-02-13 15:38:28 -03:00
LucasGGamerM
312437fb5c
Update add attachment icon
2023-02-13 15:31:01 -03:00
sk
c55703f0ba
fix layout inconsistency
...
closes sk22#427
2023-02-13 16:28:51 +01:00
FineFindus
3520ebafc9
fix(compose): remove marginEnd
2023-02-05 19:56:31 +01:00
sk
1af82fde61
implement local-only posting
2023-01-27 15:20:47 -03:00
LucasGGamerM
84d412645f
decrease margin between items in the compose bottom bar
2023-01-27 15:05:09 -03:00
sk
49cff20785
bigger hitbox for items in compose toolbar
2023-01-27 14:51:36 -03:00
sk
65232b3b1e
change add media icon
...
closes sk22#351
2023-01-27 14:50:39 -03:00
sk
d49733695d
add back file opener
...
closes sk22#328
2023-01-27 14:46:49 -03:00
sk
2358d3c602
implement local-only posting
2023-01-24 16:04:17 +01:00
LucasGGamerM
d7004824fb
Decoupling moshidon strings from megalodon
2023-01-23 18:47:07 -03:00
sk
626614c03d
Merge branch 'improve-compose-toolbar-hitbox'
2023-01-23 15:32:02 +01:00
sk
32a8d38edf
bigger hitbox for items in compose toolbar
2023-01-23 14:54:39 +01:00
sk
82534f7c4a
change add media icon
...
closes sk22#351
2023-01-23 14:42:05 +01:00
sk
3a6ace53d5
add back file opener
...
closes sk22#328
2023-01-22 01:06:49 +01:00
LucasGGamerM
885f559092
Revert "Revert "click "replying to" to scroll up""
...
This reverts commit 77af7ceae3
2023-01-20 11:01:39 -03:00
sk
77af7ceae3
Revert "click "replying to" to scroll up"
...
This reverts commit cd0cfba7
2023-01-20 11:00:53 -03:00
sk
b666048603
add missing margin
2023-01-18 13:29:48 -03:00
LucasGGamerM
25460191b0
Merge pull request #44
...
feat(compose): move charCounter to action bar if relocatePublishButto…
2023-01-10 12:09:44 -03:00
FineFindus
1206ce6efc
feat(compose): move charCounter to action bar if relocatePublishButton is enabled
2023-01-10 15:43:26 +01:00
sk
1fa42fd20f
scale text according to system
...
closes #244
2023-01-10 11:13:04 -03:00
sk
f157313d9a
click "replying to" to scroll up
...
closes #241
2023-01-10 11:11:28 -03:00
sk
cbcbaaa9fa
add missing margin
2023-01-10 09:13:15 +01:00
FineFindus
ddc4512116
feat(accessibility): add contentDesc/toolTip to poll options
2023-01-09 17:22:33 +01:00
sk
f78c6978cf
scale text according to system
...
closes #244
2023-01-09 11:11:00 +01:00
sk
cd0cfba7c0
click "replying to" to scroll up
...
closes #241
2023-01-09 10:44:51 +01:00
FineFindus
bed3e987b7
feat(compose/poll): add contentDescription to addPoll
2023-01-07 11:38:00 +01:00
FineFindus
7cdddf06bc
feat(compose/add-poll): add contentLabel for more option
2023-01-05 16:24:44 +01:00
LucasGGamerM
f4c573a95e
Readding the relocated publish button
2023-01-01 16:28:04 -03:00
LucasGGamerM
d58247d996
Editing the padding and making the 3 dot menu invisible
2023-01-01 10:49:34 -03:00
sk
247669644c
display original post when replying
...
closes sk22#193
2022-12-31 20:00:05 -03:00
sk
6eedb0e156
move and refine scheduling and drafting
2022-12-31 19:57:22 -03:00
sk
519894a461
Adding a whole lot of stuff
2022-12-31 19:55:53 -03:00
sk
fe3052a359
schedule/draft in overflow menu
2022-12-31 19:53:50 -03:00
