LucasGGamerM
|
bfaa732544
|
refactor: Increasing the corner radius of statuses and accounts in the notification section
|
2023-03-03 16:30:19 -03:00 |
|
LucasGGamerM
|
f836361644
|
fix: NPE in HeaderStatusDisplayItem when clicking on a "User followed you" avatar header in notifications fragment
|
2023-02-25 20:58:10 -03:00 |
|
LucasGGamerM
|
ed301cafe0
|
fix(custom-local-timelines): Profile lookup now is more robust and doesn't call the the user's instance unless a click happens
|
2023-02-25 14:27:21 -03:00 |
|
LucasGGamerM
|
5e97adcd3b
|
fix(custom-local-timelines): Removing the get account by handle function for each status, and interactions now are fully working.
|
2023-02-25 14:18:27 -03:00 |
|
LucasGGamerM
|
9e9ff07eaf
|
Fixing indentation because why not
|
2023-02-17 19:46:55 -03:00 |
|
LucasGGamerM
|
f377dca63c
|
Merge pull request #92
fix(star-animation): re-enable star animation
|
2023-02-17 19:40:57 -03:00 |
|
FineFindus
|
3074100432
|
fix(favourite): re-enable star animation
|
2023-02-17 22:36:34 +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 |
|
LucasGGamerM
|
2b7f325332
|
removing rotating star animation until I manage to fix it
|
2023-02-16 11:53:10 -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
|
df233eb1e2
|
fix headers not filtered in notifications list
|
2023-02-13 16:51:55 +01:00 |
|
Grishka
|
64fbbb2f07
|
Minor onboarding stuff
|
2023-02-10 21:09:06 +03:00 |
|
LucasGGamerM
|
d04b09f75f
|
Making thy necessary adjustments for the thing to compile
|
2023-02-07 18:25: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
|
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
|
a2f687898c
|
fix wrong time in edited notifications
closes sk22#387
|
2023-02-07 13:34:52 +01:00 |
|
sk
|
fc1bd14f70
|
tweak collapse button
|
2023-02-06 13:44:57 +01:00 |
|
sk
|
bd39ed3754
|
fix notifications crashing with collapse button
closes sk22#410
|
2023-02-06 13:26:56 +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 |
|
LucasGGamerM
|
fde44e61bc
|
Revert "Now the filter context finally makes sense!"
This reverts commit 0ee99fa709.
|
2023-02-04 15:35:14 -03:00 |
|
sk
|
ec9d41fbbd
|
collapse long posts
|
2023-02-03 23:40:20 +01:00 |
|
LucasGGamerM
|
0ee99fa709
|
Now the filter context finally makes sense!
|
2023-02-03 15:24:36 -03: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 |
|
LucasGGamerM
|
d6ad1cbfbf
|
Maybe adding filter contexts. Needs testing
|
2023-02-02 15:51:00 -03:00 |
|
LucasGGamerM
|
2c8ecbd996
|
Reverting broken images
|
2023-02-02 15:01:39 -03:00 |
|
LucasGGamerM
|
90aa8c5762
|
Clicking on filtered items will show them like expected (It previously showed another warning when you clicked it)
|
2023-02-02 13:35:44 -03:00 |
|
sk
|
e22cb07d63
|
Revert "enable selecting text via alt badge"
This reverts commit 14e639aa8a.
|
2023-02-02 13:41:49 +01:00 |
|
LucasGGamerM
|
286b642101
|
Merge branch 'feature/filters_again'
|
2023-02-01 21:46:50 -03:00 |
|
LucasGGamerM
|
27ed78c293
|
Merge branch 'feature/filters'
|
2023-02-01 21:44:35 -03: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
|
14e639aa8a
|
enable selecting text via alt badge
re: sk22#400
|
2023-02-01 10:36:14 +01:00 |
|
sk
|
423e919e16
|
fix crash
|
2023-02-01 10:25:24 +01:00 |
|
LucasGGamerM
|
ad2895e297
|
Doing a bit of cleanup. Man, I still dont believe what i have done
|
2023-01-31 20:36:01 -03:00 |
|
LucasGGamerM
|
dae2632c18
|
IT WORKS, now i need to polish it :)
|
2023-01-31 20:30:05 -03:00 |
|
sk
|
e282d54f99
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-31 00:00:56 +01:00 |
|
sk
|
29ad08f2ea
|
fix crashes
closes sk22#393
closes sk22#394
|
2023-01-30 23:46:32 +01:00 |
|
Gregory K
|
5c2f72a706
|
Merge pull request #521 from FineFindus/fix/typos
fix: typos
|
2023-01-30 01:54:30 +03:00 |
|
Grishka
|
b153a64373
|
Signup flow redesign WIP
|
2023-01-30 01:54:13 +03:00 |
|
LucasGGamerM
|
ede4137935
|
It now hides everything! It still doesnt pop up though :D
|
2023-01-29 18:46:39 -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 |
|
sk22
|
c3567bcbff
|
It finally compiles! Though I need to fix some stuff before releasing
|
2023-01-27 15:51:00 -03:00 |
|
sk
|
cbb10ac480
|
use regular lock in boost menu
closes sk22#375
|
2023-01-27 15:38:27 -03:00 |
|
sk
|
0fd2894a8b
|
update comment
|
2023-01-27 15:37:48 -03:00 |
|