63338a139a
refactor(filter-predicate): move client filters to its own function. Also allows for Client filters to completely hide posts
2023-09-30 19:05:50 -03:00
49c2365120
feat(notification-filter): only show on everything tab
2023-09-30 19:05:50 -03:00
3b74a183f8
Merge pull request #267 from Henry-Hiles/patch-1
...
Fix typo
2023-09-30 15:51:10 -03:00
41a639bb02
Fix typo
2023-09-30 14:33:21 -04:00
8a6c9881e4
fix(translate-button): fix button opacity when loading translation
...
cc: @sk22
2023-09-30 14:25:41 -03:00
d0c5a2ed2e
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/res/layout/display_item_poll_option.xml
# mastodon/src/main/res/menu/profile_own.xml
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# mastodon/src/main/res/values/strings_sk.xml
2023-09-30 14:11:39 -03:00
3fceeec362
fix: make hashtag timeline header work properly
2023-09-30 14:10:12 -03:00
cbee0fe72e
fix: show individual chips ( #838 )
2023-09-30 19:04:04 +02:00
6d085ae6f0
fix: show multiline poll options ( #837 )
...
* fix: show multiline poll options
* fix resources not found exception
* don't force height on poll options
---------
Co-authored-by: sk <sk22@mailbox.org>
2023-09-30 19:03:17 +02:00
12cbb7518f
fix: make app not crash when opening a hashtag
2023-09-30 13:44:49 -03:00
5220a98082
fix: make app compile again
2023-09-30 13:39:54 -03:00
b9bf1e6601
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/menu/hashtag_timeline.xml
# mastodon/src/main/res/values/styles.xml
2023-09-30 13:32:50 -03:00
4de7211523
Fix notifications replies visibility/language not being consistent with replied status ( #831 )
...
* fix(notifications): make reply visibility consistent with status being replied to
* fix(notifications): make reply language consistent with status being replied to
2023-09-30 18:30:53 +02:00
05f7a44bd5
fix(timeline/gap): use plurals for time ( #829 )
...
Co-authored-by: sk <sk22@mailbox.org>
2023-09-30 18:30:18 +02:00
1079f600bc
Revert "Fix media layout with unknown sizes" ( #827 )
...
This reverts commit a014fe9443
2023-09-30 18:25:52 +02:00
72580dadd0
feat: display blocks and mutes list ( #821 )
...
* feat: add mutes fragment
* feat: add blocks fragment
* refactor: add query params
* rename "mutes" and "blocks"
---------
Co-authored-by: sk <sk22@mailbox.org>
2023-09-30 18:24:24 +02:00
16e04a5a0e
feat(notification-filters): basically done with the UI
...
Its still missing the under the hood implementation though
2023-09-30 13:08:10 -03:00
098b0885a2
feat(notification-filters): start implementing this
...
i am pushing to master because I am THUG LIFE. Jk, its because I wanna throw these strings on weblate
2023-09-29 21:47:34 -03:00
e8631e432a
fix: fix toolbar oopsie
2023-09-29 19:15:53 -03:00
03cb0b3c47
fix: fix missing app icon for stable builds
2023-09-29 17:14:39 -03:00
53c454a59b
build: fix oopsie where I forgot to increase the version code as well
2023-09-29 16:57:43 -03:00
f2f8620312
fix menu item icons and state
2023-09-29 21:45:41 +02:00
d21ae9d94e
build: bump version
2023-09-29 16:35:23 -03:00
453f082822
Merge remote-tracking branch 'megalodon_weblate/main'
...
# Conflicts:
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# metadata/ar/short_description.txt
# metadata/id/changelogs/67.txt
2023-09-29 16:29:16 -03:00
23843e9002
fix: use built-in appkit empty view styles entry and remove hack to apply colors to the empty view texts
2023-09-29 16:23:33 -03:00
232d2e7e6d
build: upgrade to appkit 1.2.14
2023-09-29 16:23:33 -03:00
e9d73cbe32
build(CI): use LucasGGamerM's appkit repo
2023-09-29 16:17:14 -03:00
4ee229ea79
Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream
2023-09-29 20:59:12 +02:00
c261214e49
implement new translation
2023-09-29 18:46:26 +02:00
4bb0597edf
Merge remote-tracking branch 'mastodon/master'
...
# Conflicts:
# mastodon/build.gradle
2023-09-29 07:56:14 -03:00
a00afd5d7f
Same crash fix in 2 more places ugh
2023-09-29 03:20:58 +03:00
796bdf2893
Merge pull request #264 from Xen4n/master
...
Posts divider brightness fix (now looks like in settings and profile)
2023-09-28 19:25:11 -03:00
5b7868b44e
Posts divider brightness fix (now looks like in settings and profile)
2023-09-28 23:52:35 +02:00
66e67231c8
build: revert appkit to 1.2.9 and gson to 2.9.0 for app stability's sake
2023-09-28 15:31:31 -03:00
58be2214a4
Merge remote-tracking branch 'mastodon/master'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
2023-09-28 15:19:32 -03:00
72a370aa84
fix(nord-theme): fix nord theme pill color
2023-09-28 14:20:14 -03:00
9a41a2d6fb
Merge branch 'l10n_master'
2023-09-28 20:14:21 +03:00
2629e0039c
chore: remove untested privacy settings category
2023-09-28 14:11:43 -03:00
2cd98a6620
More crash fixes
2023-09-28 20:11:43 +03:00
24048a677f
fix: make app compile again (again)
2023-09-28 14:07:31 -03:00
283b56be5b
Finally fix the mysterious RecyclerView crash
2023-09-28 19:56:25 +03:00
debf8c52a1
Merge remote-tracking branch 'mastodon/master'
...
# Conflicts:
# fastlane/metadata/android/fi-FI/full_description.txt
# fastlane/metadata/android/th-TH/full_description.txt
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.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/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/values/styles.xml
2023-09-28 13:52:48 -03:00
7fdea9710f
fix: make app compile again
2023-09-28 13:52:04 -03:00
d2de62ee55
Probably fix #703
2023-09-28 13:33:59 -03:00
d706768112
Fix #682
2023-09-28 13:29:16 -03:00
1614213aae
Fix #683
2023-09-28 13:27:20 -03:00
3045fe0357
Probably need to set this too
2023-09-28 13:27:20 -03:00
5a35be0ebd
Specify LED color for notifications
...
closes #695
2023-09-28 13:27:20 -03:00
22b1cd0d0b
Crash fixes
2023-09-28 13:26:06 -03:00
49f10bacb3
New translations strings.xml (Turkish)
2023-09-28 13:24:59 -03:00
LucasGGamerM
LucasGGamerM
Henry Hiles
FineFindus
Jacoco
sk
LucasGGamerM
Grishka
Xen4n
Eugen Rochko