sk
|
78225c482f
|
fix overlapping text
closes sk22#428
|
2023-02-13 16:32:52 +01:00 |
|
sk
|
c55703f0ba
|
fix layout inconsistency
closes sk22#427
|
2023-02-13 16:28:51 +01:00 |
|
Grishka
|
634408b8cb
|
Minor onboarding tweaks
|
2023-02-12 14:25:03 +03:00 |
|
Grishka
|
f050e3f22d
|
Fix #500
|
2023-02-12 04:03:09 +03:00 |
|
Grishka
|
64fbbb2f07
|
Minor onboarding stuff
|
2023-02-10 21:09:06 +03:00 |
|
LucasGGamerM
|
02e9c5f577
|
Fixing thy profile page
|
2023-02-07 18:32:46 -03:00 |
|
LucasGGamerM
|
ec0f6edc41
|
Merge branch 'main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# 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/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/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.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/displayitems/WarningFilteredStatusDisplayItem.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/layout/fragment_profile.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/values/strings.xml
|
2023-02-07 18:09:13 -03:00 |
|
LucasGGamerM
|
97dbd3499f
|
Merge branch 'master' of https://github.com/LucasGGamerM/moshidon
|
2023-02-07 16:05:09 -03:00 |
|
LucasGGamerM
|
f07e0906dd
|
Merge branch 'main'
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
# 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/notifications/DismissNotification.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/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.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/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.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/LinkCardStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.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/ColorPalette.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.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/ic_fluent_arrow_forward_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
# mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/header_welcome_custom.xml
# mastodon/src/main/res/layout/item_list_header_simple.xml
# mastodon/src/main/res/layout/item_settings_text.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/item_text.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/menu/color_palettes.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/menu/profile_own.xml
# mastodon/src/main/res/values-fr-rFR/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-ru-rRU/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/strings_sk.xml
# mastodon/src/main/res/values/styles.xml
# metadata/ca/changelogs/50.txt
# metadata/ca/changelogs/51.txt
# metadata/ca/full_description.txt
# metadata/de-DE/full_description.txt
# metadata/en-US/changelogs/50.txt
# metadata/en-US/changelogs/51.txt
# metadata/en-US/changelogs/56.txt
# metadata/en-US/full_description.txt
# metadata/en-US/images/phoneScreenshots/1.jpg
# metadata/en-US/images/phoneScreenshots/2.jpg
# metadata/en-US/images/phoneScreenshots/3.jpg
# metadata/en-US/images/phoneScreenshots/4.jpg
# metadata/en-US/images/phoneScreenshots/5.jpg
# metadata/en-US/images/phoneScreenshots/6.jpg
# metadata/en-US/short_description.txt
# metadata/en-US/title.txt
# metadata/es/changelogs/50.txt
# metadata/es/changelogs/51.txt
# metadata/es/full_description.txt
# metadata/fr-FR/full_description.txt
# metadata/gl-ES/short_description.txt
# metadata/gl-ES/title.txt
# metadata/id/full_description.txt
# metadata/nl-NL/short_description.txt
# metadata/nl-NL/title.txt
# metadata/pt-BR/full_description.txt
# metadata/sl/short_description.txt
# metadata/sl/title.txt
# metadata/sv/full_description.txt
|
2023-02-07 16:04:28 -03:00 |
|
sk
|
333c38c64d
|
add alt badge to video/gifs
closes sk22#409
|
2023-02-07 15:44:40 +01:00 |
|
sk
|
4884667484
|
generify fab button
closes sk22#380
|
2023-02-07 14:10:31 +01:00 |
|
sk
|
defd038064
|
display roles in profile
|
2023-02-06 19:41:36 +01:00 |
|
sk
|
32b459ae77
|
hide expand/collapse to screen reader
|
2023-02-06 16:54:54 +01:00 |
|
sk
|
c1b79da4a7
|
tweak profile fragment
|
2023-02-06 15:25:12 +01:00 |
|
sk
|
65dfd8667d
|
realign post header buttons
|
2023-02-06 15:17:05 +01:00 |
|
sk
|
c51be5f199
|
add missing margin
closes sk22#407
|
2023-02-06 13:53:28 +01:00 |
|
sk
|
fc1bd14f70
|
tweak collapse button
|
2023-02-06 13:44:57 +01:00 |
|
sk
|
e2c907eb10
|
don't hide collapse button
|
2023-02-06 11:04:38 +01:00 |
|
sk
|
937747e11b
|
add collapse button to header
|
2023-02-06 10:42:27 +01:00 |
|
FineFindus
|
3520ebafc9
|
fix(compose): remove marginEnd
|
2023-02-05 19:56:31 +01:00 |
|
sk
|
ec9d41fbbd
|
collapse long posts
|
2023-02-03 23:40:20 +01:00 |
|
sk22
|
618840c76a
|
Display filtered posts with a warning (#406)
* copy changes from @LucasGGamerM
* simplify building filter item
* fix adapter ranges
* change filter item styling
closes sk22#209
Co-authored-by: LucasGGamerM <71328265+LucasGGamerM@users.noreply.github.com>
|
2023-02-03 18:33:15 +01:00 |
|
sk
|
9873e9ede5
|
fix text scaling height and margin issues
|
2023-02-03 16:24:30 +01:00 |
|
sk
|
63dad42bf3
|
auto-orientation counters alignment
closes sk22#381
|
2023-02-03 15:35:36 +01:00 |
|
sk
|
647a7d70cd
|
rearrange profile items
|
2023-02-03 15:24:21 +01:00 |
|
sk
|
f49c7dff00
|
remove about tab
|
2023-02-03 15:07:15 +01:00 |
|
sk
|
72f638c96c
|
move metadata to profile
|
2023-02-03 14:50:06 +01:00 |
|
LucasGGamerM
|
f7ab8bd27e
|
Pulling better button from megalodon, thanks @sk22!
|
2023-02-02 15:20:34 -03:00 |
|
LucasGGamerM
|
5df8318200
|
Unbreak weird switch items thing
|
2023-02-02 15:13:20 -03:00 |
|
LucasGGamerM
|
2ce3167db0
|
Revert "implement pre-release toggle"
This reverts commit 430dd616
|
2023-02-02 15:05:18 -03:00 |
|
sk
|
35e0897869
|
move profile counters down
|
2023-02-02 15:46:26 +01:00 |
|
LucasGGamerM
|
4940eff7f9
|
Its pretty much done i think
|
2023-02-01 21:39:54 -03:00 |
|
LucasGGamerM
|
cfb9854a8e
|
Adding a little bit of polish, and also adding a title to the filters
|
2023-02-01 21:16:47 -03:00 |
|
sk
|
c2df989217
|
fix width misalignment in header
|
2023-02-01 11:05:50 +01:00 |
|
sk
|
31d0bfb434
|
fix footer item hitbox sizes
closes sk22#389
|
2023-02-01 10:59:55 +01:00 |
|
sk
|
e282d54f99
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-31 00:00:56 +01:00 |
|
Grishka
|
b153a64373
|
Signup flow redesign WIP
|
2023-01-30 01:54:13 +03:00 |
|
LucasGGamerM
|
b625ed7aec
|
Now it acctually shows a missing posts warning below every filtered post. Still a long way to go
|
2023-01-29 18:24:34 -03:00 |
|
LucasGGamerM
|
9a55f847b9
|
Its once again almost working
|
2023-01-28 20:19:41 -03:00 |
|
LucasGGamerM
|
0473062bc2
|
Its almost working!
|
2023-01-28 19:30:21 -03:00 |
|
sk
|
e1b1ae717f
|
adapt upstream changes
|
2023-01-27 15:37:51 -03:00 |
|
sk
|
f3ee87a815
|
change missing icons
|
2023-01-27 15:37:36 -03:00 |
|
Grishka
|
9b508bd9ca
|
More onboarding updates
|
2023-01-27 15:36:27 -03:00 |
|
sk
|
7cc791ccd9
|
dividers and alignments
nobody knows the trouble i've seen
|
2023-01-27 15:35:01 -03:00 |
|
sk
|
58dee464e5
|
support admin notifications
|
2023-01-27 15:33:40 -03:00 |
|
sk
|
f8ecbb8936
|
tweak no alt indicator
|
2023-01-27 15:31:07 -03:00 |
|
LucasGGamerM
|
b94e927439
|
support akkoma local visibility / but it still doesnt compile
|
2023-01-27 15:29:44 -03:00 |
|
Grishka
|
acf1988827
|
Update onboarding
|
2023-01-27 15:24:48 -03:00 |
|
sk
|
1af82fde61
|
implement local-only posting
|
2023-01-27 15:20:47 -03:00 |
|
sk
|
27c34461bf
|
add indicator for direct and local-only posts
|
2023-01-27 15:19:19 -03:00 |
|