merge: update to latest master

2023-01-09 21:18:43 +01:00
parent 047e72ce9c 3a1b71e95c
commit 871c17cbe2
13 changed files with 121 additions and 11 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
@@ -311,7 +311,11 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			favorite.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
 				if (item.status.favourited) {
-					v.startAnimation(animSet);
+					if(GlobalUserPreferences.reduceMotion){
+						v.startAnimation(opacityIn);
+					}else{
+						v.startAnimation(animSet);
+					}
 				} else {
 					v.startAnimation(opacityIn);
 				}