Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,616 Commits 31 Branches 161 Tags 107 MiB
Commit Graph

2935 Commits

Author SHA1 Message Date
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
FineFindus 3520ebafc9
fix(compose): remove marginEnd 2023-02-05 19:56:31 +01:00
LucasGGamerM fde44e61bc Revert "Now the filter context finally makes sense!" 
This reverts commit 0ee99fa709.
 2023-02-04 15:35:14 -03:00
LucasGGamerM 34e072a1b5 Revert "Fixing the last commit" 
This reverts commit 0b9b51294e.
 2023-02-04 15:35:14 -03:00
LucasGGamerM fe244112d4 Revert "Now the filter context things are fixed." 
This reverts commit 3fcf8818c0.
 2023-02-04 15:35:13 -03:00
LucasGGamerM 3fcf8818c0 Now the filter context things are fixed. 2023-02-04 14:52:41 -03:00
LucasGGamerM 0b9b51294e Fixing the last commit 2023-02-04 14:50:30 -03:00
LucasGGamerM 0ee99fa709 Now the filter context finally makes sense! 2023-02-03 15:24:36 -03:00
LucasGGamerM ecfa255d75 Bump version number 2023-02-02 16:07:27 -03:00
LucasGGamerM 979977aec6 Removing som unused functions 2023-02-02 16:07:15 -03:00
LucasGGamerM a487a45828 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
(cherry picked from commit 43c82ed99b)
 2023-02-02 16:05:38 -03:00
LucasGGamerM d6ad1cbfbf Maybe adding filter contexts. Needs testing 2023-02-02 15:51:00 -03:00
LucasGGamerM fd08a1f845 The auto updater is not brokey anymore :) 2023-02-02 15:40:32 -03:00
LucasGGamerM 67b2a82058 Maybe works? 2023-02-02 15:36:14 -03: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 0fcaa08ed0 Readding the pre-releases toggle, not in the self updater yet though 2023-02-02 15:11:25 -03:00
LucasGGamerM 2ce3167db0 Revert "implement pre-release toggle" 
This reverts commit 430dd616
 2023-02-02 15:05:18 -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
LucasGGamerM bb0ca63a03 Revert "Its now a much cleaner transition" 
This reverts commit 562a5aae7d.
 2023-02-02 13:18:14 -03:00
LucasGGamerM 7fe3d97347 Bump version number 2023-02-01 22:01:25 -03:00
poesty 2bdff65c13 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (22 of 22 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/zh_Hans/
(cherry picked from commit 1937864d90f67d1a1df40f15e1b6e900aa55fa8a)
 2023-02-01 22:00:12 -03: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 562a5aae7d Its now a much cleaner transition 2023-02-01 21:42:47 -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
LucasGGamerM 594e49cf64 Fixing a weird bug I found 2023-02-01 20:21:19 -03: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
LucasGGamerM 97f09d4569 Adding missing drawables? 2023-01-30 19:13:20 -03:00
LucasGGamerM cf67175826
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 95.4% (21 of 22 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
 2023-01-30 21:51:47 +00:00
MKCOOL142 dc8f81f447
Translated using Weblate (German) 
Currently translated at 100.0% (22 of 22 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
 2023-01-30 21:51:46 +00:00
ewm 74a28cb881
Translated using Weblate (Polish) 
Currently translated at 90.9% (20 of 22 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pl/
 2023-01-30 19:04:45 +00:00
Oliebol 11d5a65f04
Translated using Weblate (Dutch) 
Currently translated at 81.8% (18 of 22 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/nl/
 2023-01-30 19:04:45 +00:00
ghose 492d9e90b8
Translated using Weblate (Galician) 
Currently translated at 100.0% (22 of 22 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/gl/
 2023-01-30 19:04:45 +00:00
LucasGGamerM 99c2555a88 Bumping version number 2023-01-30 15:59:03 -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 03722868b1 Fixing a crash again 2023-01-29 14:19:38 -03:00
LucasGGamerM a2a0c9801b Fixing #61 2023-01-29 10:40:39 -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
LucasGGamerM e22ea06d28 Bump version number 2023-01-27 21:40:42 -03:00
LucasGGamerM ce3f8ce1b5 Fixing thy icons 2023-01-27 16:08:46 -03:00
LucasGGamerM 7c01809eb3 Changing notif colors back to normal 2023-01-27 16:02:24 -03:00
LucasGGamerM 29cc73e84e Fixing npe in compose fragment, and also rearranging settings items 2023-01-27 16:01:17 -03:00
sk22 c3567bcbff It finally compiles! Though I need to fix some stuff before releasing 2023-01-27 15:51:00 -03:00