Commit Graph

3825 Commits

Author SHA1 Message Date
LucasGGamerM f4007dba90
Merge pull request #117
fix(custom-timelines): lookup profile by url
2023-03-15 21:10:20 -03:00
sk c5e8460516 change notification action names 2023-03-16 01:02:33 +01:00
Jacoco f852dac1e5
Improvements for Pleroma/Akkoma (#445)
* Reply Visibility on Plemora

* Sort statuses in thread

* Get default visibility and language from account if preferences fail

* Fix for Mentions tab in notifications on Pleroma

* Mark status as sensitive if not already when spoilertext is present

* Integrating Pleroma quoting for new posts

* move string to strings_sk

* use null instead of empty string

* change string

* fix crash due to null value

* update string

---------

Co-authored-by: sk <sk22@mailbox.org>
2023-03-16 00:49:11 +01:00
sk 374626cb32 Merge branch 'main' into pr/FineFindus/449 2023-03-15 23:42:02 +01:00
sk aefa0b89ae Merge branch 'main' into pr/FineFindus/439 2023-03-15 23:38:33 +01:00
sk 9cc8b2668c fix show thread not working for reposts 2023-03-15 23:31:51 +01:00
sk 94b862a3ff improve reblog/reply line render 2023-03-15 23:27:43 +01:00
sk f71bb6b78c use pre draw listener instead of post
hopefully fixes sk22#422
2023-03-15 22:36:30 +01:00
sk 499ac8f727 improve compact reply/reblog header 2023-03-15 22:30:57 +01:00
sk 938ae97cac remove click handler for reply line 2023-03-15 21:26:41 +01:00
sk e2193e8e3c reply line below, compact above 2023-03-15 21:24:25 +01:00
FineFindus d687abcdc1
fix(custom-timelines): lookup profile by url
Closes #107. Instead of using the (wrong) profileID on CustomTimelines, use the URL, which will be correctly resolved.
2023-03-15 20:05:16 +01:00
sk 16f907c91f show thread reply line 2023-03-15 19:23:20 +01:00
sk 584700225c reply line below avatar 2023-03-15 17:36:07 +01:00
sk bad72985cb bump version 2023-03-15 12:49:09 +01:00
sk 56b24420d1 add local-only string 2023-03-14 15:37:06 +01:00
sk 92beac8dff fuck it, indented header line
closes #448
2023-03-14 15:34:05 +01:00
sk ed1fdba9a5 Merge remote-tracking branch 'upstream/master' 2023-03-14 15:01:30 +01:00
sk 5e194e3079 display both reply and reblog
re: sk22#448
2023-03-14 14:59:11 +01:00
sk 27c2791d6c add reblogged account to known accounts 2023-03-14 14:58:21 +01:00
Grishka d6bcc9c156 Fix button color 2023-03-14 07:31:01 +03:00
sk 4c85fd4387 use custom string for anonymous reply 2023-03-13 20:06:05 +01:00
sk 80d529d503 display reply header for unknown original poster
re: mastodon#342
2023-03-13 20:00:56 +01:00
sk c5a19a2334 fix duplicate notification status header 2023-03-13 19:29:40 +01:00
sk 16857bebd9 add tooltip
closes sk22#436
2023-03-13 19:05:22 +01:00
sk 1c340b7c66 fix extra text padding in compose 2023-03-13 18:56:06 +01:00
sk 7d9d8f0aae Merge remote-tracking branch 'upstream/master' 2023-03-13 18:52:52 +01:00
sk 21fc35230c Merge remote-tracking branch 'upstream/master' 2023-03-13 18:51:26 +01:00
Grishka fc67c82040 Fix #544 2023-03-13 20:46:29 +03:00
Eugen Rochko a9b828001c New translations strings.xml (Burmese) 2023-03-13 15:08:41 +01:00
Eugen Rochko be050abf7e New translations strings.xml (Burmese) 2023-03-13 14:01:13 +01:00
Eugen Rochko 2d071ca252 New translations strings.xml (Burmese) 2023-03-13 12:53:22 +01:00
Eugen Rochko abf94e1e70 New translations strings.xml (Burmese) 2023-03-13 10:01:18 +01:00
Eugen Rochko 2991c7421c New translations strings.xml (Burmese) 2023-03-13 08:59:13 +01:00
Eugen Rochko 834f84f995 New translations strings.xml (Burmese) 2023-03-13 07:58:41 +01:00
Eugen Rochko 6bf713c96c New translations strings.xml (Polish) 2023-03-13 00:35:08 +01:00
Eugen Rochko 72b16be297 New translations strings.xml (Swedish) 2023-03-12 21:53:57 +01:00
Eugen Rochko 0c7f27b3ac New translations strings.xml (Swedish) 2023-03-12 20:47:06 +01:00
LucasGGamerM 6fa930aa9f Revert "feat: add android 14s predictive back gesture. Fixes #116"
This reverts commit 736ec4dbf9.
2023-03-11 20:18:27 -03:00
LucasGGamerM 736ec4dbf9 feat: add android 14s predictive back gesture. Fixes #116 2023-03-11 20:14:58 -03:00
LucasGGamerM 04ed9e76f2 feat: increase corner radius of search box and login box 2023-03-11 20:01:58 -03:00
LucasGGamerM 811304c0c7 fix: login with some pleroma instances. Fixes #114 2023-03-11 19:47:29 -03:00
Eugen Rochko ca101748eb New translations strings.xml (Belarusian) 2023-03-11 23:37:17 +01:00
Eugen Rochko 3584c123d6 New translations strings.xml (Belarusian) 2023-03-11 22:33:13 +01:00
LucasGGamerM 9a991b8f33 fix: make show alt text indicator settings toggle work 2023-03-11 12:10:19 -03:00
Eugen Rochko 675c49a922 New translations strings.xml (Urdu (India)) 2023-03-11 14:05:46 +01:00
FineFindus 4d04741fe0
feat(welcome): use URI InputType (#454) 2023-03-11 13:01:11 +01:00
FineFindus 5c7fe9dcb5
fix: disable group divider on EMUI (#453)
Fixes an issues, where the forth menu item does not show up, when the divider is enabled on EMUI devices
2023-03-11 13:00:36 +01:00
LucasGGamerM b28b70c6b8 feat: add different debug icon and label 2023-03-10 16:43:58 -03:00
LucasGGamerM c2c5b08659 refactor: remove duplicate function in UiUtils 2023-03-10 16:07:22 -03:00
LucasGGamerM 7460b24fb0 Merge remote-tracking branch 'FineFindus/fix/home-overflow-menu-visibility'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
2023-03-10 16:06:01 -03:00
FineFindus 2efdf09333
fix: disable group divider on EMUI
Fixes an issues, where the forth menu item does not show up, when the divider is enabled on EMUI devices
2023-03-10 19:41:45 +01:00
FineFindus 30582bf8e3
fix: apply URI InputType correctly 2023-03-10 19:08:45 +01:00
Eugen Rochko 654e3eb36b New translations strings.xml (Japanese) 2023-03-09 23:29:35 +01:00
LucasGGamerM 67e3244655 refactor: remove missing alt text indicator setting until upstream reimplements it 2023-03-09 17:30:16 -03:00
LucasGGamerM f793bbc711 Merge remote-tracking branch 'mastodon/l10n_master'
# Conflicts:
#	fastlane/metadata/android/ja-JP/full_description.txt
#	fastlane/metadata/android/ru-RU/full_description.txt
#	fastlane/metadata/android/ru-RU/short_description.txt
#	fastlane/metadata/android/tr-TR/full_description.txt
2023-03-09 17:29:40 -03:00
LucasGGamerM 94634781c4 style: add comma 2023-03-09 15:18:07 -03:00
LucasGGamerM 0fbbdb6621 refactor: remove a broken layout import 2023-03-09 15:17:33 -03:00
LucasGGamerM d3f2049c7d Merge remote-tracking branch 'mastodon/master'
# Conflicts:
#	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/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.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/text/ClickableLinksDelegate.java
#	mastodon/src/main/res/layout/display_item_gifv.xml
#	mastodon/src/main/res/layout/display_item_photo.xml
#	mastodon/src/main/res/layout/display_item_video.xml
2023-03-09 15:14:14 -03:00
LucasGGamerM 134b1edb19 fix: make reply by notification visibility consistent with Unlisted by default setting 2023-03-09 15:06:00 -03:00
LucasGGamerM 2489b57e42 refactor: change Unlisted by Default settings item icon to an open lock 2023-03-09 15:02:05 -03:00
LucasGGamerM ee56ad07e9
Merge pull request #112 from FineFindus/patch-1
fix(translation/de): replace indefinite
2023-03-09 15:00:43 -03:00
LucasGGamerM ee79916104 fix(#113): disableAltTextReminder setting being reset 2023-03-09 14:59:05 -03:00
Eugen Rochko f62ba685d1 New translations strings.xml (Japanese) 2023-03-09 14:07:24 +01:00
Grishka c3aa3af650 Fix #540 2023-03-08 22:46:24 +03:00
Eugen Rochko 8cc5678b38 New translations strings.xml (Japanese) 2023-03-08 11:02:08 +01:00
Eugen Rochko 592eb2d589 New translations strings.xml (Japanese) 2023-03-08 02:55:58 +01:00
FineFindus 84713eb3b7
fix(translation/de): replace indefinite 2023-03-07 19:44:48 +01:00
LucasGGamerM b41b2c8f3c build: bump version 2023-03-07 15:17:34 -03:00
LucasGGamerM 289dc4bf86 Merge remote-tracking branch 'weblate/master'
# Conflicts:
#	mastodon/src/main/res/values-de-rDE/strings_mo.xml
#	mastodon/src/main/res/values-pt-rBR/strings_mo.xml
#	mastodon/src/main/res/values-zh-rCN/strings_mo.xml
2023-03-07 14:52:54 -03:00
CDN18 729680df8c
Translated using Weblate (Chinese (Simplified))
Currently translated at 97.3% (37 of 38 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/zh_Hans/
2023-03-07 17:52:01 +00:00
LucasGGamerM b85b578ddd
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (38 of 38 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
2023-03-07 17:52:01 +00:00
dontobi 8a7d2df7b8
Translated using Weblate (German)
Currently translated at 100.0% (38 of 38 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
2023-03-07 17:52:01 +00:00
poesty 79d0ab311b
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/zh_Hans/
2023-03-07 17:52:01 +00:00
LucasGGamerM 79f7df089e
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
2023-03-07 17:52:01 +00:00
gallegonovato 32464f8552
Translated using Weblate (Spanish)
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
2023-03-07 17:52:01 +00:00
dontobi 7ce96a2311
Translated using Weblate (German)
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
2023-03-07 17:52:01 +00:00
LucasGGamerM 8848b75325 Merge remote-tracking branch 'weblate/master' 2023-03-07 14:51:16 -03:00
LucasGGamerM 2eb04a3835 Merge remote-tracking branch 'megalodon_weblate/main' 2023-03-07 14:51:06 -03:00
LucasGGamerM 52392c9ed9 feat: add toggle for defaulting to unlisted replies 2023-03-07 14:29:48 -03:00
LucasGGamerM 4b35ac6ad8 refactor(settings-page): move Disable Swipe setting between tabs to behavior section 2023-03-07 14:03:02 -03:00
LucasGGamerM a56b603c5c refactor(settings-page): change the order of the sections 2023-03-07 14:00:38 -03:00
LucasGGamerM 48bd277769 refactor(mute-user-timer): add bottom padding for design consistency 2023-03-06 21:07:48 -03:00
LucasGGamerM 04101eb31b refactor(settings-page): adding new sections and reorganizing settings 2023-03-06 20:52:58 -03:00
poesty b5f82261b0
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/zh_Hans/
2023-03-06 23:39:04 +00:00
LucasGGamerM b9a5db7ea4
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
2023-03-06 23:39:04 +00:00
gallegonovato 64cb6e52a8
Translated using Weblate (Spanish)
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
2023-03-06 23:39:04 +00:00
dontobi 6e96e8929f
Translated using Weblate (German)
Currently translated at 100.0% (26 of 26 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
2023-03-06 23:39:04 +00:00
LucasGGamerM 4bf19adc8e chore: add new strings 2023-03-06 20:38:51 -03:00
LucasGGamerM bb9ff3c33f feat(unlisted-replies-by-default-toggle): add relevant string 2023-03-06 20:24:05 -03:00
LucasGGamerM ae11e78d78 refactor: increase border radius of inline buttons 2023-03-06 20:20:52 -03:00
LucasGGamerM 222c3a2526 refactor(add-mute-timer): change of the mute timer popup layout 2023-03-06 20:19:21 -03:00
LucasGGamerM 08aa64a666 fix(strings): fix typo in "day" 2023-03-06 20:00:51 -03:00
LucasGGamerM f10c157598 Merge branch 'master' of https://github.com/LucasGGamerM/moshidon 2023-03-06 19:54:08 -03:00
FineFindus 4152179dea
fix(request/mute): add correct body on unmute 2023-03-06 22:00:49 +01:00
FineFindus 3619be71ab
feat: add mute timer 2023-03-06 21:55:32 +01:00
Eugen Rochko 0bf31de1f1 New translations strings.xml (Japanese) 2023-03-06 21:23:36 +01:00
Eugen Rochko 7fd32cab3d New translations strings.xml (Japanese) 2023-03-06 19:38:06 +01:00
Grishka 4a695b2a83 Use a single display item for the image attachment grid 2023-03-06 02:25:13 +03:00
Grishka f79fc66578 Fix 2023-03-05 22:33:18 +03:00
AiOO 25cff94665
Translated using Weblate (Korean)
Currently translated at 100.0% (262 of 262 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
2023-03-05 15:08:20 +00:00
Eugen Rochko 0c63b99e6c New translations strings.xml (Japanese) 2023-03-05 02:15:44 +01:00
Eugen Rochko 5881f5fa05 New translations strings.xml (Japanese) 2023-03-05 01:20:11 +01:00
LucasGGamerM 0e08209f4c style: remove unused imports on CustomLocalTimelineFragment.java 2023-03-04 10:33:07 -03:00
LucasGGamerM 672cfe58d6 fix(notification-actions): replies done within the notification actions now respect the status language and visibility, and also automatically add a mention to the replied account at the end of the reply status. 2023-03-04 10:13:03 -03:00
LucasGGamerM 338e164143 refactor: moving "notification_action_replied" string to strings_mo.xml 2023-03-04 10:07:28 -03:00
LucasGGamerM e964b76302 refactor: re-using strings in the notification actions instead of new ones 2023-03-04 10:03:53 -03:00
LucasGGamerM 8dedc77ff8
Merge pull request #108
feat(notification): add reply action
2023-03-04 09:44:14 -03:00
FineFindus 1124bab96b
style(notifications-actions/reply): clean-up 2023-03-04 13:16:27 +01:00
FineFindus cbcdf09bfe
Merge branch 'feat/notification-actions' 2023-03-04 13:16:17 +01:00
FineFindus 59941fc867
style(notifications-actions/reply): clean-up 2023-03-03 23:49:45 +01:00
FineFindus 50601853f5
feat(notifications/actions): add reply action
Closes https://github.com/LucasGGamerM/moshidon/issues/104
2023-03-03 23:45:07 +01:00
Eugen Rochko 575ca6251c New translations strings.xml (Arabic) 2023-03-03 20:35:51 +01:00
LucasGGamerM bfaa732544 refactor: Increasing the corner radius of statuses and accounts in the notification section 2023-03-03 16:30:19 -03:00
Eugen Rochko 9c83a5aaeb New translations strings.xml (Portuguese, Brazilian) 2023-03-02 15:21:36 +01:00
Eugen Rochko bc3e46eae1 New translations strings.xml (Portuguese, Brazilian) 2023-03-02 14:20:26 +01:00
LucasGGamerM 1b7a257a48
Merge pull request #106 from FineFindus/feat/notification-badge
Feat(tabs): add unread badge to notification tab
2023-03-01 18:12:40 -03:00
LucasGGamerM 4d40fad10d fix: Notifcations not refreshing without manually doing so. Fixes #105 2023-03-01 18:11:07 -03:00
FineFindus 49015f3e3e
style: remove unnecessary imports 2023-03-01 22:06:31 +01:00
LucasGGamerM 77b5819c65
Merge pull request #102 from FineFindus/feat/notification-actions
Feat: Add actions to notifications
2023-03-01 18:01:43 -03:00
FineFindus ac5615497b
refactor(notifications-tab/badge): use improved implementation
Removes the now unecessary network call, by hooking into the notification reciever instead.
2023-03-01 22:00:49 +01:00
FineFindus 4ecd525f13
feat(tabs/notifications): add unread badge 2023-03-01 21:44:11 +01:00
FineFindus 6756b36e87
style(notifications/action): fix whitespaces 2023-03-01 21:02:09 +01:00
FineFindus 36808e4e8e
fix(notifications/action): remove unused string 2023-03-01 21:02:09 +01:00
FineFindus 1c38570609
fix(notifications/action): remove notification after tapping action 2023-03-01 21:02:09 +01:00
FineFindus 2dc6deb93a
fix(notifications/action): use radom request code
Fixes the issue with pendingIntents overwriting each other. Probability of equal same request code should be near 0 with 2^32 ints available
2023-03-01 21:02:09 +01:00
FineFindus 0b58d19811
feat(notifications/action): remove notfication after action 2023-03-01 21:02:09 +01:00
FineFindus 50362d630b
feat(notifications/action): add unboost action 2023-03-01 21:02:08 +01:00
FineFindus bfcd67cbaf
feat(notifications/action): only show actions if necessary 2023-03-01 21:02:08 +01:00
FineFindus ea190c0597
feat(notifications/action): use string titles 2023-03-01 21:02:08 +01:00
FineFindus e68160800d
feat(notifications/action): add boost action 2023-03-01 21:02:08 +01:00
FineFindus 73481f4a1f
Merge branch 'feat/notification-actions' 2023-03-01 20:59:54 +01:00
Eugen Rochko 0303e59fc1 New translations strings.xml (Bengali) 2023-02-28 16:38:40 +01:00
Eugen Rochko 0c0d36da62 New translations strings.xml (Bengali) 2023-02-28 13:32:43 +01:00
Eugen Rochko e7e0b8841c New translations strings.xml (Bengali) 2023-02-28 12:21:52 +01:00
LucasGGamerM ba44aa57d7 build: bump version number 2023-02-27 20:34:43 -03:00
LucasGGamerM a70647da44
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (25 of 25 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
2023-02-27 23:33:29 +00:00
LucasGGamerM f97aafe374
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (25 of 25 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
2023-02-27 23:28:58 +00:00
FineFindus b38a460a02
style(notifications/action): fix whitespaces 2023-02-27 21:20:02 +01:00
FineFindus bddf024ba0
fix(notifications/action): remove unused string 2023-02-27 21:18:51 +01:00
FineFindus be7a7acadd
fix(notifications/action): remove notification after tapping action 2023-02-27 21:15:28 +01:00
FineFindus d05c90ca7f
fix(notifications/action): use radom request code
Fixes the issue with pendingIntents overwriting each other. Probability of equal same request code should be near 0 with 2^32 ints available
2023-02-27 20:24:09 +01:00
Eugen Rochko 684fbc0050 New translations strings.xml (Turkish) 2023-02-27 17:26:39 +01:00
Eugen Rochko 03973d41be New translations strings.xml (Turkish) 2023-02-27 16:25:31 +01:00
FineFindus 4187da9168
feat(notifications/action): remove notfication after action 2023-02-26 21:56:18 +01:00
FineFindus a051e636e6
feat(notifications/action): add unboost action 2023-02-26 20:50:03 +01:00
Torge Rosendahl 4144639b75 docu 2023-02-26 13:59:39 -05:00
FineFindus 360cd7b5df
feat(notifications/action): only show actions if necessary 2023-02-26 19:15:31 +01:00
FineFindus 55d2ca4a93
feat(notifications/action): use string titles 2023-02-26 15:23:38 +01:00
FineFindus c7f61291ed
feat(notifications/action): add boost action 2023-02-26 15:21:52 +01:00