owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,461 Commits 32 Branches 206 Tags
3b3d98d549d2c3114d9d71038829426bc49d3266
Commit Graph

3379 Commits

Author SHA1 Message Date
LucasGGamerM
3b3d98d549 feat: readd favorite_selected and bookmark_selected attributes 2023-08-20 12:00:08 -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
c72479d866 feat: fab on true black is true black now 2023-07-09 10:50:21 -03:00
LucasGGamerM
58cf384d39 feat: improve black and white theme grays 2023-07-09 10:22:08 -03:00
LucasGGamerM
8b08d5ddfd feat: add black and white (more like gray) theme 2023-07-08 21:01:03 -03:00
LucasGGamerM
3a87e83974 fix: fix CW's "Touch to show" button text not being the correct color 
cc: @sk22
 2023-07-08 20:31:07 -03:00
LucasGGamerM
bb0b391b67 fix: fix incorrect coloring on disabled boost button 2023-07-08 20:28:23 -03:00
LucasGGamerM
8caabf1794 feat: add colorGray400t as a less strong secondary color for dark mode 2023-07-08 20:26:35 -03:00
waitingmoon
d2b59eeb82 Translated using Weblate (Japanese) 
Currently translated at 87.1% (286 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ja/
 2023-07-07 14:57:13 +00:00
waitingmoon
2414b32cb2 Translated using Weblate (Japanese) 
Currently translated at 86.5% (284 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ja/
 2023-07-07 14:57:13 +00:00
waitingmoon
36ba8cf1a5 Translated using Weblate (Japanese) 
Currently translated at 97.3% (73 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ja/
 2023-07-07 14:57:13 +00:00
waitingmoon
0d7663a37b Translated using Weblate (Japanese) 
Currently translated at 74.6% (245 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ja/
 2023-07-07 14:57:13 +00:00
waitingmoon
3ab2046eff Translated using Weblate (Japanese) 
Currently translated at 81.3% (61 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ja/
 2023-07-07 14:57:12 +00:00
waitingmoon
4663bcb799 Translated using Weblate (Japanese) 
Currently translated at 72.8% (239 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ja/
 2023-07-07 14:57:12 +00:00
waitingmoon
cd50ff2b07 Translated using Weblate (Japanese) 
Currently translated at 68.0% (51 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ja/
 2023-07-07 14:57:12 +00:00
waitingmoon
871ee20f11 Translated using Weblate (Japanese) 
Currently translated at 72.2% (237 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ja/
 2023-07-07 14:57:12 +00:00
waitingmoon
d9d39dcb91 Translated using Weblate (Japanese) 
Currently translated at 61.3% (46 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ja/
 2023-07-07 14:57:12 +00:00
Codeberg Translate
d492036df8 Update translation files 
Updated by "Remove blank strings" hook in Weblate.

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/
 2023-07-07 14:57:12 +00:00
kkrenski
02d158b79e Translated using Weblate (Polish) 
Currently translated at 86.8% (285 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/pl/
 2023-07-07 14:57:12 +00:00
waitingmoon
a4c5cbb43e Translated using Weblate (Japanese) 
Currently translated at 71.9% (236 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ja/
 2023-07-07 14:57:12 +00:00
kkrenski
552246458d Translated using Weblate (Polish) 
Currently translated at 89.3% (67 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pl/
 2023-07-07 14:57:12 +00:00
Eryk Michalak
196f1a9f28 Translated using Weblate (Polish) 
Currently translated at 89.3% (67 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pl/
 2023-07-07 14:57:12 +00:00
waitingmoon
13ebcb6a53 Translated using Weblate (Japanese) 
Currently translated at 56.0% (42 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ja/
 2023-07-07 14:57:12 +00:00
alextecplayz
2ed16be82f Translated using Weblate (Romanian) 
Currently translated at 100.0% (75 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ro/
 2023-07-07 14:57:12 +00:00
Oliebol
81ebe0b0e8 Translated using Weblate (Dutch) 
Currently translated at 90.8% (298 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/nl/
 2023-07-07 14:57:12 +00:00
Andrewblasco
0b0848e908 Translated using Weblate (Spanish) 
Currently translated at 100.0% (328 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
 2023-07-07 14:57:12 +00:00
legiz
de4045d5e1 Translated using Weblate (Russian) 
Currently translated at 100.0% (328 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ru/
 2023-07-07 14:57:12 +00:00
Andrewblasco
848eaf907b Translated using Weblate (Spanish) 
Currently translated at 100.0% (328 of 328 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
 2023-07-07 14:57:12 +00:00
legiz
e8cef26db7 Translated using Weblate (Russian) 
Currently translated at 97.3% (73 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ru/
 2023-07-07 14:57:12 +00:00
Andrewblasco
bf16eea8a8 Translated using Weblate (Spanish) 
Currently translated at 100.0% (75 of 75 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
 2023-07-07 14:57:12 +00:00
Andrewblasco
f7c5ba410b Translated using Weblate (Spanish) 
Currently translated at 100.0% (309 of 309 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
 2023-07-07 14:57:12 +00:00
tuongdai252
d190775700 Translated using Weblate (Vietnamese) 
Currently translated at 68.4% (50 of 73 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/vi/
 2023-07-07 14:57:12 +00:00
Andrewblasco
07a19fb8d4 Translated using Weblate (Spanish) 
Currently translated at 100.0% (73 of 73 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
 2023-07-07 14:57:12 +00:00
legiz
4553429dbb Translated using Weblate (Russian) 
Currently translated at 100.0% (309 of 309 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ru/
 2023-07-07 14:57:12 +00:00
legiz
8d228422a9 Translated using Weblate (Russian) 
Currently translated at 97.2% (71 of 73 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ru/
 2023-07-07 14:57:12 +00:00
Oliebol
7a15ed2a31 Translated using Weblate (Dutch) 
Currently translated at 93.2% (288 of 309 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/nl/
 2023-07-07 14:57:12 +00:00
Andrewblasco
b2ad87c459 Translated using Weblate (Spanish) 
Currently translated at 100.0% (309 of 309 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
 2023-07-07 14:57:12 +00:00
Oliebol
eafebad146 Translated using Weblate (Dutch) 
Currently translated at 95.8% (70 of 73 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/nl/
 2023-07-07 14:57:12 +00:00
gallegonovato
93376325be Translated using Weblate (Spanish) 
Currently translated at 100.0% (309 of 309 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
 2023-07-07 14:57:12 +00:00
Andrewblasco
08ef4dafea Translated using Weblate (Spanish) 
Currently translated at 100.0% (309 of 309 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
 2023-07-07 14:57:12 +00:00
gallegonovato
dd3735a644 Translated using Weblate (Spanish) 
Currently translated at 100.0% (73 of 73 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
 2023-07-07 14:57:12 +00:00
LucasGGamerM
17227cdb7d Merge pull request #214 
feat: Add haptic feedback on boost/favourite/bookmark
 2023-06-26 17:24:23 -03:00
LucasGGamerM
fd0a741ff2 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
 2023-06-21 15:50:10 -03:00
sk
a70d39065c add some new icons 2023-06-21 10:44:54 +02:00
sk
dc75882cee slightly adjust margin 
closes sk22#585
 2023-06-21 10:32:41 +02:00
FineFindus
be425282a6 Hashtag timelines with multiple tags (#584) 
* feat(api/hashtag): add any, all, and none parameter

* feat(timeline/hashtag): load with any, all and none parameter

* feat(timeline/hashtag): save any, all and none in timeline definition

* feat: set hastag parameter in UI

* feat: move strings to string res

* feat: show hint for tags

* refactor: use method for setting up tags text

* improve edit dialog, allow creating hashtag timelines

* add chips for hashtags

* add option for displaying only local posts in hashtag

* improve layout and wording

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-06-21 01:38:51 +02:00
Schuyler Cebulskie
412fe5c303 Change haptic feedback setting description 2023-06-18 01:31:06 -04:00
Schuyler Cebulskie
ede7305fe9 feat: Add haptic feedback on boost/favourite/bookmark 2023-06-16 20:36:10 -04:00
LucasGGamerM
62ac3458b5 Merge remote-tracking branch 'weblate/master' 2023-06-16 13:02:09 -03:00
LucasGGamerM
b9ca0d74cf Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (73 of 73 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
 2023-06-16 16:01:14 +00:00