From 740559d5315636e0746b852ebcbd1432d0adddbe Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 27 Jan 2019 07:49:25 +0000
Subject: [PATCH] Moved action bar setting

---
 FAQ.md                                       |  1 +
 app/src/main/res/layout/fragment_options.xml | 28 ++++++++++----------
 app/src/main/res/values/strings.xml          |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 9fade384d2..9fb68e14cc 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -225,6 +225,7 @@ In the display section of the advanced settings you can enable or disable:
 * *Show identicons*: to show generated contact avatars
 * *Show message preview*: to show two lines of the message text
 * *Show address details by default*: to collapse the addresses section by default
+* *Conversation action bar*: to disable the bottom navigation bar
 
 Note that messages can be previewed only when the message text was downloaded.
 Larger message texts are not downloaded by default on metered (generally mobile) networks.
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 76b72ca2e2..4ba0ac342f 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -305,6 +305,18 @@
             app:layout_constraintTop_toBottomOf="@id/tvPreviewHint"
             app:switchPadding="12dp" />
 
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/swActionbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="12dp"
+            android:text="@string/title_advanced_actionbar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swAddresses"
+            app:switchPadding="12dp" />
+
         <TextView
             android:id="@+id/tvSectionBehavior"
             android:layout_width="wrap_content"
@@ -314,7 +326,7 @@
             android:text="@string/title_advanced_section_behavior"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swAddresses" />
+            app:layout_constraintTop_toBottomOf="@id/swActionbar" />
 
         <View
             android:id="@+id/vSeparatorBehavior"
@@ -337,18 +349,6 @@
             app:layout_constraintTop_toBottomOf="@id/vSeparatorBehavior"
             app:switchPadding="12dp" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swActionbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginEnd="12dp"
-            android:text="@string/title_advanced_actionbar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swPull"
-            app:switchPadding="12dp" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAutoClose"
             android:layout_width="match_parent"
@@ -358,7 +358,7 @@
             android:layout_marginEnd="12dp"
             android:text="@string/title_advanced_autoclose"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swActionbar"
+            app:layout_constraintTop_toBottomOf="@id/swPull"
             app:switchPadding="12dp" />
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f575d483b..0863894e68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -136,12 +136,12 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_addresses">Show address details by default</string>
+    <string name="title_advanced_actionbar">Conversation action bar</string>
 
     <string name="title_advanced_light">Use notification light</string>
     <string name="title_advanced_sound">Select notification sound</string>
 
     <string name="title_advanced_pull_refresh">Pull down to refresh</string>
-    <string name="title_advanced_actionbar">Conversation action bar</string>
     <string name="title_advanced_autoclose">Automatically close conversations</string>
     <string name="title_advanced_autonext">Automatically go to next conversation on close conversation</string>
     <string name="title_advanced_autoread">Automatically mark messages read on moving messages</string>