LucasGGamerM
|
ae11e78d78
|
refactor: increase border radius of inline buttons
|
2023-03-06 20:20:52 -03:00 |
|
FineFindus
|
4ecd525f13
|
feat(tabs/notifications): add unread badge
|
2023-03-01 21:44:11 +01:00 |
|
LucasGGamerM
|
1e2dd3dec6
|
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/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
|
2023-02-17 17:40:06 -03:00 |
|
sk
|
6b9b6710cf
|
enable remote-following accounts
closes sk22#431
|
2023-02-16 19:44:39 +01:00 |
|
sk
|
c05d0b600e
|
default role color if not provided
fixes sk22#430
|
2023-02-16 16:42:47 +01:00 |
|
LucasGGamerM
|
3d4192b679
|
Updating launcher icon
|
2023-02-16 11:37:07 -03: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 |
|
sk
|
0c1fd22253
|
Merge remote-tracking branch 'upstream'
|
2023-02-13 17:26:26 +01:00 |
|
sk
|
61caec4060
|
fix wrong icon
closes sk22#421
|
2023-02-13 16:53:26 +01:00 |
|
Grishka
|
64fbbb2f07
|
Minor onboarding stuff
|
2023-02-10 21:09:06 +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
|
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
|
defd038064
|
display roles in profile
|
2023-02-06 19:41:36 +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 |
|
sk
|
ec9d41fbbd
|
collapse long posts
|
2023-02-03 23:40:20 +01:00 |
|
sk
|
e282d54f99
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-31 00:00:56 +01:00 |
|
LucasGGamerM
|
97f09d4569
|
Adding missing drawables?
|
2023-01-30 19:13:20 -03:00 |
|
Grishka
|
b153a64373
|
Signup flow redesign WIP
|
2023-01-30 01:54:13 +03:00 |
|
sk22
|
c3567bcbff
|
It finally compiles! Though I need to fix some stuff before releasing
|
2023-01-27 15:51:00 -03:00 |
|
sk
|
e1b1ae717f
|
adapt upstream changes
|
2023-01-27 15:37:51 -03:00 |
|
sk
|
e647b37143
|
replace visibility icons
|
2023-01-27 15:37:31 -03:00 |
|
sk
|
d94c3e3d9b
|
change list icon
|
2023-01-27 15:37:25 -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 |
|
sk
|
eb0fcda3cc
|
support akkoma local visibility
|
2023-01-27 15:28:17 -03:00 |
|
Grishka
|
acf1988827
|
Update onboarding
|
2023-01-27 15:24:48 -03:00 |
|
LucasGGamerM
|
3822263b1c
|
Making it compile again
|
2023-01-27 15:24:17 -03:00 |
|
sk
|
a726bf6101
|
add option to disable show new posts button
|
2023-01-27 15:18:52 -03:00 |
|
sk
|
0008b07072
|
tweak no alt indicator background
|
2023-01-27 15:18:13 -03:00 |
|
sk
|
0604326f3f
|
add indicator for missing alt texts
closes sk22#355
|
2023-01-27 15:06:52 -03:00 |
|
sk
|
65232b3b1e
|
change add media icon
closes sk22#351
|
2023-01-27 14:50:39 -03:00 |
|
sk
|
73db5907fe
|
display header for followed hashtags
closes sk22#323
|
2023-01-27 14:50:18 -03:00 |
|
sk
|
862a23af5d
|
add a few icons
|
2023-01-27 14:46:53 -03:00 |
|
sk
|
d49733695d
|
add back file opener
closes sk22#328
|
2023-01-27 14:46:49 -03:00 |
|
sk
|
0fcbf02a2c
|
notifications for edited posts
closes sk22#331
|
2023-01-27 14:41:54 -03:00 |
|
sk
|
9df738831f
|
work around crash onHidden
re: mastodon#512
|
2023-01-27 14:37:28 -03:00 |
|
sk
|
7939380172
|
different icon for post notifs
|
2023-01-27 14:34:04 -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 |
|
sk
|
c66e576461
|
adapt upstream changes
|
2023-01-26 01:09:08 +01:00 |
|
sk
|
17e1cd1fe9
|
replace visibility icons
|
2023-01-25 23:51:42 +01:00 |
|
sk
|
d7aceffc8f
|
change list icon
|
2023-01-25 23:41:07 +01:00 |
|
sk
|
c12a6eaee6
|
support admin notifications
|
2023-01-25 18:32:07 +01:00 |
|
sk
|
86e781cdea
|
tweak no alt indicator
|
2023-01-25 15:32:51 +01:00 |
|
sk
|
0d30cd973e
|
support akkoma local visibility
|
2023-01-25 12:54:35 +01:00 |
|
sk
|
5ed80ca40a
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-25 10:44:10 +01:00 |
|
Grishka
|
a1798b6666
|
Update onboarding
|
2023-01-24 23:43:56 +03:00 |
|
sk
|
35a1de7888
|
add option to disable show new posts button
|
2023-01-24 10:53:11 +01:00 |
|
sk
|
6fc850b5ba
|
tweak no alt indicator background
|
2023-01-24 10:08:03 +01:00 |
|