Merge branch 'main' into fork

# Conflicts: # README.md # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/color/button_text_primary_light_on_dark.xml # mastodon/src/main/res/drawable/logo.xml # mastodon/src/main/res/layout/item_settings_color_picker.xml # mastodon/src/main/res/menu/color_picker.xml # mastodon/src/main/res/values-night/styles.xml # mastodon/src/main/res/values-v27/colors.xml # mastodon/src/main/res/values/colors.xml # mastodon/src/main/res/values/strings.xml # mastodon/src/main/res/values/styles.xml
2022-12-09 19:08:35 -03:00
parent de97493e6a 06cd80a352
commit 2ccbffa165
189 changed files with 3412 additions and 902 deletions
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -32,9 +32,11 @@ android {
 		githubRelease{
 			initWith release
 		}
-		noFederatedRelease{
+		playRelease{
 			initWith release
-			versionNameSuffix '-nofederated'
+			minifyEnabled true
+			shrinkResources true
+			versionNameSuffix '-play'
 		}
 	}
 	compileOptions {