Commit Graph

2312 Commits

Author SHA1 Message Date
sk
231f19d113 ugly workaround for sk22#520
it's really, really ugly :(
2023-05-28 22:14:03 +02:00
Grishka
31c7116a15 Merge branch 'master' into m3_redesign
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
2023-05-28 20:58:27 +03:00
sk
9939d99c4b Merge branch 'fix/hashtags-crash-akkoma' 2023-05-28 19:54:39 +02:00
sk
8053e8bb05 fix hashtag search crash on akkoma servers
closes mastodon#468
closes sk22#523
2023-05-28 19:51:29 +02:00
sk
b7e9380bc4 enable unspecified as default formatting option
closes sk22#521
2023-05-28 14:55:53 +02:00
Jacoco
83600087e1 Fix images being stretched on Pleroma (#522)
Closes sk22#488

* Update image bounds after load when metadata is null

* Fix broken image layout in some scenarios

* Transition when image dimensions update

* Replace blurhash with accent color on Pleroma

* fall back to solid color regardless of server

* use fragment's context instead of passing it down

---------

Co-authored-by: sk <sk22@mailbox.org>
2023-05-28 14:44:23 +02:00
LucasGGamerM
08023a104c fix: fix wrong window insets on instance rules and block list fragment 2023-05-27 09:54:58 -03:00
LucasGGamerM
fd97cc6e87 Merge pull request #203 from FineFindus/feat/instance-info-improvements
fix(instance-info): hide menu until loaded
2023-05-27 09:44:34 -03:00
LucasGGamerM
78e5f0f011 Merge pull request #202 from FineFindus/feat/filter-warning-click
feat: reveal filter warning on click
2023-05-27 09:41:02 -03:00
LucasGGamerM
73944675fa fix: fix compilation errors 2023-05-27 09:40:04 -03:00
LucasGGamerM
c6ded3d505 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/res/layout/display_item_file.xml
2023-05-27 09:31:27 -03:00
LucasGGamerM
45b97de615 feat: don't show changelog headers if changelog is empty 2023-05-27 09:16:58 -03:00
LucasGGamerM
ec11a5e8e3 feat: update visual appearance settings icon 2023-05-27 09:10:24 -03:00
LucasGGamerM
d71d17e5af feat: update mention reblogger automatically settings icon 2023-05-27 09:07:25 -03:00
LucasGGamerM
84ba4ea999 feat: use correct background colors in settings 2023-05-27 08:46:04 -03:00
sk
c38eb545b1 use matched filter for determining warning title
fixes a bug where, when multiple filters apply, the
WarningFilteredStatusDisplayItem would not check if the warning applies to the
current context. now, matched filter is determined through the predicate
(though not exactly what a predicate is supposed to do, i guess) and passed
down to the WarningFilteredStatusDisplayItem. cc @LucasGGamerM
2023-05-27 13:09:36 +02:00
Grishka
5c480b37b3 Notifications M3 redesign (+ read marker support) 2023-05-27 13:31:01 +03:00
FineFindus
b2d4a5aab0 fix(instance.info): hide menu until loaded 2023-05-27 11:21:09 +02:00
FineFindus
201995849c feat: reveal filter warning on click 2023-05-27 11:12:43 +02:00
sk
1fc2f81dab fix creating posts on other people's account timelines
closes sk22#508
2023-05-27 01:50:10 +02:00
LucasGGamerM
69ddc95c2c fix crash when notification markers are null
This would happen when an account had 0 notifications and received one.
After which, the user would tap on the notification icon on the tab bar
and the app would crash.
2023-05-27 01:40:05 +02:00
sk
a6ac68499c use url as fallback for remote url 2023-05-27 01:37:10 +02:00
sk
c10d7cfee4 use remote url; file name as fallback for alt text 2023-05-27 01:32:49 +02:00
sk
f933bdbc53 button with ripple for files and instance picker 2023-05-27 01:13:32 +02:00
LucasGGamerM
274bca84d9 Add display item for unknown/file attachments
Co-authored-by: LucasGGamerM <lucassggabriel@gmail.com>
2023-05-27 01:11:26 +02:00
FineFindus
724d872491 fix: remove theme transition
Removes the fade effect when changing themes, as took a long time to apply
2023-05-26 20:35:46 +02:00
FineFindus
f1ab6833d3 feat: add content type setting
Re-add settings from 8b502b605c\#diff-29b258979e7004d7e5473b71e91747f57a36af0e0b07e0a119968a1e8e72669f
2023-05-26 20:22:53 +02:00
FineFindus
140395f3cd fix: use autoHideCompose variable 2023-05-26 20:14:21 +02:00
FineFindus
f922e028a7 feat(settings): invert default post-divider value 2023-05-26 20:13:09 +02:00
FineFindus
9aac0c007e feat(settings): invert post-divider setting 2023-05-26 20:13:08 +02:00
FineFindus
e682cae7e7 feat(settings/notifications): improve sub-header title 2023-05-26 20:13:08 +02:00
FineFindus
f14977ba24 feat(settings): add summary to reblog action 2023-05-26 20:13:08 +02:00
FineFindus
e8290e2f78 feat(settings): move reblog notificaiton to notification page 2023-05-26 20:13:08 +02:00
FineFindus
78acb5e7ea feat(settings): invert double tab to swipe setting 2023-05-26 20:12:41 +02:00
FineFindus
a14e864731 feat(settings): allow complete button row to be clicked 2023-05-26 20:12:41 +02:00
FineFindus
28893bc50b refactor(settings): remove unused code 2023-05-26 20:12:34 +02:00
FineFindus
b73ef28f12 feat(settings): move interaction count to timeline page 2023-05-26 20:00:51 +02:00
FineFindus
a71dc7f481 feat(settings): move uniform icon to notifications page 2023-05-26 20:00:51 +02:00
FineFindus
de4e7c1822 refactor(settings/about): use local var 2023-05-26 20:00:51 +02:00
FineFindus
62090475f9 fix(settings): remove duplicated auto-hide compose 2023-05-26 20:00:46 +02:00
FineFindus
3c8715a7c4 feat(settings): add giant header to all subpages 2023-05-26 19:55:17 +02:00
FineFindus
4e188503a2 feat(settings): add summary to ambiguous settings 2023-05-26 19:55:14 +02:00
FineFindus
80c9c591fc feat(settings): add updater 2023-05-26 19:54:36 +02:00
FineFindus
992fb5fefe feat(settings): add giant header 2023-05-26 19:54:35 +02:00
FineFindus
f7c76f7503 feat(settings): add summary label to button 2023-05-26 19:54:32 +02:00
FineFindus
1fab3d3743 feat(settings): add summary label to switch 2023-05-26 19:54:05 +02:00
FineFindus
35477055a9 refactor(settings): add red header item 2023-05-26 19:54:05 +02:00
FineFindus
e585f1df29 refactor(settings): move about to about page 2023-05-26 19:54:05 +02:00
FineFindus
6311d18751 refactor: move account and instance setttings to account page 2023-05-26 19:54:05 +02:00
FineFindus
d29eef51ca refactor: move miscellanious settings 2023-05-26 19:54:05 +02:00