Commit Graph

6875 Commits

Author SHA1 Message Date
LucasGGamerM 531ce568c0 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/drawable/ic_fluent_bot_20_filled.xml
#	mastodon/src/main/res/layout/display_item_header.xml
2023-09-04 07:42:25 -03:00
LucasGGamerM c49b25454e refactor(HomeFragment): refactor long click action for cleaner code 2023-09-04 07:35:48 -03:00
LucasGGamerM d39d5c2602
Merge pull request #252
feat: allow doubleTapToSwipe when doubleTapToSearch is disabled
2023-09-04 07:19:54 -03:00
FineFindus a2d0738a68
fix: only call openSearch once without doubleTapToSearch 2023-09-03 21:47:45 +02:00
FineFindus 8cd55fc365
feat: display icon for bots (#793)
* feat(profile): display bot icon for bots

* feat(status): display bot icon

* use 16sp size and 4sp spacing

* don't add lock/bot icon as image spans

---------

Co-authored-by: sk <sk22@mailbox.org>
2023-09-03 21:34:22 +02:00
LucasGGamerM 924d6a9dd9 Merge remote-tracking branch 'weblate/master'
# Conflicts:
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
2023-09-03 16:34:13 -03:00
butterflyoffire 816a307bc0
Translated using Weblate (Arabic (Algeria))
Currently translated at 18.3% (68 of 370 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ar_DZ/
2023-09-03 19:31:20 +00:00
butterflyoffire a947a6ea26
Translated using Weblate (Arabic)
Currently translated at 18.9% (70 of 370 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ar/
2023-09-03 19:31:20 +00:00
LucasGGamerM f14df2bb0f
fix: allows for editing timeline badges again. fixes sk22#800 (#804) 2023-09-03 20:49:29 +02:00
LucasGGamerM b5123ff865 feat: readd recent emoji support 2023-09-03 15:32:35 -03:00
FineFindus ca4630e6e1
feat: always allow longtap to search 2023-09-03 16:00:11 +02:00
FineFindus a8a1c7824d
feat: allow doubleTapToSwipe in discoverfragment 2023-09-03 15:59:19 +02:00
FineFindus 0725c2a741
feat: add setting to disable double tap to search 2023-09-03 15:47:11 +02:00
LucasGGamerM c3f3a9be7e feat: update edit note confirmation button design (again) 2023-09-03 09:23:33 -03:00
butterflyoffire da2a69b4a1
Translated using Weblate (Arabic)
Currently translated at 48.7% (39 of 80 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ar/
2023-09-03 09:20:46 +00:00
butterflyoffire 822a6a3653
Translated using Weblate (French)
Currently translated at 99.7% (369 of 370 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/fr/
2023-09-03 09:20:46 +00:00
butterflyoffire 410f694863
Translated using Weblate (Arabic)
Currently translated at 18.3% (68 of 370 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ar/
2023-09-03 09:20:46 +00:00
butterflyoffire 57b2596d9f
Translated using Weblate (French)
Currently translated at 83.7% (67 of 80 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/fr/
2023-09-03 09:20:45 +00:00
ca caebce897b
Translated using Weblate (Catalan)
Currently translated at 35.0% (28 of 80 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ca/
2023-09-03 09:20:45 +00:00
LucasGGamerM 677fb4e4da fix: readds bot icon to timelines
This was accidentally removed during the great merge, but its back again
2023-09-02 21:02:11 -03:00
LucasGGamerM ce51fc3c0d fix: allows for editing timeline badges again. fixes sk22#800 2023-09-02 20:40:55 -03:00
LucasGGamerM 0dcade767b Merge remote-tracking branch 'megalodon_main/main' 2023-09-02 20:26:22 -03:00
LucasGGamerM f4f4cbe78b fix: fix incorrect m3_overlay alpha values 2023-09-02 20:06:56 -03:00
alextecplayz ebb6897582
Translated using Weblate (Romanian)
Currently translated at 100.0% (370 of 370 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/ro/
2023-09-01 22:53:06 +00:00
gallegonovato 9720a133ba
Translated using Weblate (Spanish)
Currently translated at 100.0% (370 of 370 strings)

Translation: Moshidon/values_sk
Translate-URL: https://translate.codeberg.org/projects/moshidon/values_sk/es/
2023-09-01 22:53:06 +00:00
alextecplayz 29c36e90ab
Translated using Weblate (Romanian)
Currently translated at 100.0% (80 of 80 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/ro/
2023-09-01 22:53:05 +00:00
gallegonovato 1b822676a8
Translated using Weblate (Spanish)
Currently translated at 100.0% (80 of 80 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
2023-09-01 22:53:05 +00:00
Jacoco 53369eb2d4
Fix unreliable Preferences from Account Source (#798)
* Create empty Preferences object on error

* Update prefs from account when preferences fails
2023-09-01 21:28:02 +02:00
LucasGGamerM aeb0aa65a8 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
2023-09-01 14:11:19 -03:00
sk 807010893a support static url for emoji reacts and keyboard 2023-09-01 14:38:55 +02:00
sk ea01b14ffb more options for showing emoji reactions
closes sk22#796
re: sk22#788
2023-09-01 14:23:38 +02:00
arnav 3fd9dc1dcd
Translated using Weblate (Hindi)
Currently translated at 4.3% (16 of 370 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/hi/
2023-08-31 23:18:52 +00:00
sk 02a4a77885 Merge remote-tracking branch 'weblate/main' 2023-09-01 01:18:30 +02:00
sk 651090a504 Merge remote-tracking branch 'upstream/master' 2023-09-01 01:17:18 +02:00
sk 203254c9f4 fix crash in onEmojiReactionsChanged 2023-09-01 01:16:52 +02:00
LucasGGamerM 74db111a4f Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
2023-08-31 14:36:59 -03:00
Gregory K 16ef577a7a
Merge pull request #678 from LucasGGamerM/mastodon-android
fix: fix alt texts not being able to be edited
2023-08-31 20:31:39 +03:00
LucasGGamerM 734b3bced6 fix: fix alt texts not being able to be edited
fixes #70 cc: @sk22
2023-08-31 14:18:32 -03:00
sk e26c641dc7 fix drafts being all on the same-ish day 2023-08-31 18:07:43 +02:00
sk 9295cf4e9c fix emoji reaction spacing not updating
closes sk22#784
2023-08-31 17:24:29 +02:00
sk dd9237e9ca enable emojiReactionsInTimelines by default 2023-08-31 17:20:44 +02:00
sk ea81c1fad6 Merge remote-tracking branch 'upstream/master' 2023-08-31 17:09:18 +02:00
sk d334703c65 adhere to showEmojiReactionsInLists setting
closes sk22#788
2023-08-31 17:04:22 +02:00
LucasGGamerM befa5a9f6d fix: fix alt texts not being able to be edited
fixes #70 cc: @sk22
2023-08-31 11:43:39 -03:00
Gregory K 5f6f3c94c9
Merge pull request #677 from tinsukE/gap-local-filter
When loading gap posts, apply filters before building display items.
2023-08-31 15:06:07 +03:00
Angelo Suzuki 09ba42a974 When loading gap posts, apply filters before building display items.
This will make sure that items that are filtered out don't show up on the interface.
Fixes #675
2023-08-31 14:01:58 +02:00
Oliebol 87a9acd860
Translated using Weblate (Dutch)
Currently translated at 96.2% (77 of 80 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/nl/
2023-08-31 03:53:05 +00:00
ihor_ck b1e43d6f97
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (370 of 370 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
2023-08-30 18:04:05 +00:00
ppnplus ea92a61d13
Translated using Weblate (Thai)
Currently translated at 20.5% (76 of 370 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/th/
2023-08-30 18:04:05 +00:00
Linerly 7fda69a6aa
Translated using Weblate (Indonesian)
Currently translated at 100.0% (370 of 370 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
2023-08-30 18:04:05 +00:00