From c1d83fc6749a5202f260c2f01c07bb5184bb21e7 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 3 Dec 2018 18:27:06 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AB=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=AE=E3=82=BB=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E8=A8=AD=E3=81=91=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jp/juggler/subwaytooter/ActAppSetting.kt  |  4 ++--
 ...moji.xml => act_app_setting_animation.xml} | 19 +++++++++++++++++--
 .../res/layout/act_app_setting_appearance.xml | 15 ---------------
 .../main/res/layout/act_app_setting_post.xml  |  3 +++
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 24 insertions(+), 19 deletions(-)
 rename app/src/main/res/layout/{act_app_setting_emoji.xml => act_app_setting_animation.xml} (67%)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt
index 74f9c59f..f886be6d 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt
@@ -100,8 +100,8 @@ class ActAppSetting : AppCompatActivity() {
 				openChild(it, R.layout.act_app_setting_media_attachment)
 			},
 			
-			genItem(R.string.emoji) {
-				openChild(it, R.layout.act_app_setting_emoji)
+			genItem(R.string.animation) {
+				openChild(it, R.layout.act_app_setting_animation)
 			},
 
 			genItem(R.string.appearance) {
diff --git a/app/src/main/res/layout/act_app_setting_emoji.xml b/app/src/main/res/layout/act_app_setting_animation.xml
similarity index 67%
rename from app/src/main/res/layout/act_app_setting_emoji.xml
rename to app/src/main/res/layout/act_app_setting_animation.xml
index d05ef324..e9938e6f 100644
--- a/app/src/main/res/layout/act_app_setting_emoji.xml
+++ b/app/src/main/res/layout/act_app_setting_animation.xml
@@ -23,6 +23,23 @@
 
         <View style="@style/setting_divider"/>
 
+        <TextView
+            style="@style/setting_row_label"
+            android:text="@string/enable_gif_animation"
+            />
+
+        <LinearLayout style="@style/setting_row_form">
+
+            <Switch
+                android:id="@+id/swEnableGifAnimation"
+                style="@style/setting_horizontal_stretch"
+                android:gravity="center"
+                />
+
+        </LinearLayout>
+
+        <View style="@style/setting_divider"/>
+
         <TextView
             style="@style/setting_row_label"
             android:text="@string/disable_custom_emoji_animation"
@@ -40,7 +57,5 @@
 
         <View style="@style/setting_divider"/>
 
-        <!-- =============================================== -->
-
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_app_setting_appearance.xml b/app/src/main/res/layout/act_app_setting_appearance.xml
index 4e6b489f..3d45bb34 100644
--- a/app/src/main/res/layout/act_app_setting_appearance.xml
+++ b/app/src/main/res/layout/act_app_setting_appearance.xml
@@ -74,22 +74,7 @@
 
         </LinearLayout>
 
-        <View style="@style/setting_divider"/>
 
-        <TextView
-            style="@style/setting_row_label"
-            android:text="@string/enable_gif_animation"
-            />
-
-        <LinearLayout style="@style/setting_row_form">
-
-            <Switch
-                android:id="@+id/swEnableGifAnimation"
-                style="@style/setting_horizontal_stretch"
-                android:gravity="center"
-                />
-
-        </LinearLayout>
 
         <View style="@style/setting_divider"/>
 
diff --git a/app/src/main/res/layout/act_app_setting_post.xml b/app/src/main/res/layout/act_app_setting_post.xml
index 8922a89c..b9b19b2a 100644
--- a/app/src/main/res/layout/act_app_setting_post.xml
+++ b/app/src/main/res/layout/act_app_setting_post.xml
@@ -53,6 +53,7 @@
                 android:id="@+id/etMediaSizeMax"
                 style="@style/setting_horizontal_stretch"
                 android:inputType="number"
+                android:gravity="center"
                 />
 
         </LinearLayout>
@@ -71,6 +72,7 @@
                 android:id="@+id/etMovieSizeMax"
                 style="@style/setting_horizontal_stretch"
                 android:inputType="number"
+                android:gravity="center"
                 />
 
         </LinearLayout>
@@ -174,6 +176,7 @@
                 android:id="@+id/etQuoteNameFormat"
                 style="@style/setting_horizontal_stretch"
                 android:inputType="text"
+                android:gravity="center"
                 />
 
         </LinearLayout>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a0502d8b..a863b042 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -813,5 +813,6 @@
     <string name="quote_renote">引用リノート… (Misskey)</string>
     <string name="blank_cw">(空欄CW)</string>
     <string name="actions_for_instance">タンスへのアクション</string>
+    <string name="animation">アニメーション</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2a9f6aa..d0e1026c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -831,5 +831,6 @@
     <string name="quote_renote">Quoted renote… (Misskey)</string>
     <string name="blank_cw">(blank CW)</string>
     <string name="actions_for_instance">Actions for this instance</string>
+    <string name="animation">Animation</string>
 
 </resources>