Merge branch 'emergency_card_settings_fix' into develop

twidere/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "org.mariotaku.twidere"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 289
-        versionName '3.4.27'
+        versionCode 290
+        versionName '3.4.28'
         multiDexEnabled true
 
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'

twidere/src/main/res/values-large/integers.xml

@@ -3,7 +3,6 @@
 
     <integer name="nyan_star_rows">10</integer>
     <integer name="nyan_star_cols">13</integer>
-    <integer name="default_text_size">16</integer>
     <integer name="unread_count_text_size">11</integer>
     <integer name="max_action_buttons">4</integer>
     <integer name="default_live_wallpaper_scale">2</integer>

twidere/src/main/res/values/strings.xml

@@ -923,6 +923,7 @@
     <string name="preference_title_portrait">Portrait</string>
     <string name="preference_title_storage">Storage</string>
     <string name="preference_title_tablet_mode">Tablet mode</string>
+    <string name="preference_title_text_size">Text size</string>
     <string name="preference_title_translate">Translate</string>
     <string name="preference_title_trends_location">Trends location</string>
 

twidere/src/main/res/xml/preferences_cards.xml

@@ -14,11 +14,10 @@
     </org.mariotaku.twidere.preference.TintedPreferenceCategory>
 
     <org.mariotaku.twidere.preference.SeekBarDialogPreference
-        android:defaultValue="@integer/default_text_size"
+        android:defaultValue="15"
         android:key="text_size_int"
         android:order="22"
-        android:summary="@string/text_size_summary"
-        android:title="@string/size"
+        android:title="@string/preference_title_text_size"
         app:max="24"
         app:min="12"
         app:progressTextSuffix="sp">