From 9b32ae04a1a67ce43bea28acce69690fb9554c02 Mon Sep 17 00:00:00 2001
From: koyu <me@koyu.space>
Date: Thu, 20 May 2021 16:12:15 +0200
Subject: [PATCH] Bump 3.1

---
 app/build.gradle                                       | 10 +++++-----
 app/src/husky/res/values-de/strings.xml                |  2 +-
 .../com/keylesspalace/tusky/EditProfileActivity.kt     |  2 +-
 .../tusky/components/preference/PreferencesFragment.kt |  2 +-
 build.gradle                                           |  2 +-
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 59ba3cca..164684cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId APP_ID
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 3000
-        versionName '3.0'
+        versionCode 3100
+        versionName '3.1'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
@@ -182,9 +182,9 @@ dependencies {
 
     implementation "com.github.connyduck:sparkbutton:4.1.0"
 
-    implementation 'com.github.piasy:BigImageViewer:1.7.0'
-    implementation 'com.github.piasy:GlideImageLoader:1.7.0'
-    implementation 'com.github.piasy:GlideImageViewFactory:1.7.0'
+    implementation 'com.github.piasy:BigImageViewer:1.8.0'
+    implementation 'com.github.piasy:GlideImageLoader:1.8.0'
+    implementation 'com.github.piasy:GlideImageViewFactory:1.8.0'
 
     implementation "com.mikepenz:materialdrawer:$materialdrawerVersion"
     implementation "com.mikepenz:materialdrawer-iconics:$materialdrawerVersion"
diff --git a/app/src/husky/res/values-de/strings.xml b/app/src/husky/res/values-de/strings.xml
index 8cfaca50..1d30b97f 100644
--- a/app/src/husky/res/values-de/strings.xml
+++ b/app/src/husky/res/values-de/strings.xml
@@ -39,7 +39,7 @@
     <string name="send_toot_notification_saved_content">Eine Kopier des Beitrages wurde in den Entwurfen gesichert</string>
     <string name="status_share_content">Inhalt des Beitrages teilen</string>
     <string name="action_unreblog">Wiederholung entfernen</string>
-    <string name="action_access_scheduled_toot">Geplante Beiträe</string>
+    <string name="action_access_scheduled_toot">Geplante Beiträge</string>
     <string name="dialog_redraft_toot_warning">Löschen und Beitrag neu verfassen\?</string>
     <string name="notification_boost_description">Benachrichtigungen, wenn deine Beiträge wiederholt werden</string>
     <string name="status_boosted_format">%s wiederholte</string>
diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
index f9b2c5a2..d71d6f38 100644
--- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
@@ -64,7 +64,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
         private const val AVATAR_PICK_RESULT = 1
         private const val HEADER_PICK_RESULT = 2
         private const val PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 1
-        private const val MASTODON_MAX_ACCOUNT_FIELDS = 4
+        private const val MASTODON_MAX_ACCOUNT_FIELDS = 8
 
         private const val BUNDLE_CURRENTLY_PICKING = "BUNDLE_CURRENTLY_PICKING"
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
index 8474047a..14144e6d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
@@ -183,7 +183,7 @@ class PreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 }
                 
                 switchPreference {
-                    setDefaultValue(true)
+                    setDefaultValue(false)
                     key = PrefKeys.BIG_EMOJIS
                     setTitle(R.string.pref_title_enable_big_emojis)
                     isSingleLineTitle = false
diff --git a/build.gradle b/build.gradle
index af233cd5..b0774b5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 33682bbb..1f3fdbc5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists