From 4cbe36613c64b68b0faf1ebe75ec77e94300a1d2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 5 Mar 2020 12:15:48 +0100
Subject: [PATCH] Cleanup

---
 .../main/java/eu/faircode/email/FragmentBase.java  |  2 --
 .../eu/faircode/email/FragmentOptionsBehavior.java | 12 +-----------
 .../main/res/layout/fragment_options_behavior.xml  | 14 +-------------
 app/src/main/res/values/strings.xml                |  1 -
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 4a1c8ee3e5..2a190552ab 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -27,7 +27,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.IntentSender;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
@@ -49,7 +48,6 @@ import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.preference.PreferenceManager;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
index 3af441ce29..fd0ea65857 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
@@ -43,7 +43,6 @@ import androidx.preference.PreferenceManager;
 public class FragmentOptionsBehavior extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
     private SwitchCompat swDoubleBack;
     private SwitchCompat swPull;
-    private SwitchCompat swHideActionBar;
     private SwitchCompat swAutoScroll;
     private SwitchCompat swDoubleTap;
     private SwitchCompat swSwipeNav;
@@ -66,7 +65,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
     private NumberPicker npDefaultSnooze;
 
     private final static String[] RESET_OPTIONS = new String[]{
-            "double_back", "pull", "hide_actionbar", "autoscroll", "doubletap", "swipenav", "volumenav", "reversed",
+            "double_back", "pull", "autoscroll", "doubletap", "swipenav", "volumenav", "reversed",
             "autoexpand", "expand_all", "expand_one", "collapse_multiple",
             "autoclose", "onclose", "quick_filter", "quick_scroll",
             "autoread", "flag_snoozed", "autounflag", "auto_important", "reset_importance", "discard_delete",
@@ -85,7 +84,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
 
         swDoubleBack = view.findViewById(R.id.swDoubleBack);
         swPull = view.findViewById(R.id.swPull);
-        swHideActionBar = view.findViewById(R.id.swHideActionBar);
         swAutoScroll = view.findViewById(R.id.swAutoScroll);
         swDoubleTap = view.findViewById(R.id.swDoubleTap);
         swSwipeNav = view.findViewById(R.id.swSwipeNav);
@@ -130,13 +128,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
             }
         });
 
-        swHideActionBar.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("hide_actionbar", checked).apply();
-            }
-        });
-
         swAutoScroll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -339,7 +330,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
 
         swDoubleBack.setChecked(prefs.getBoolean("double_back", true));
         swPull.setChecked(prefs.getBoolean("pull", true));
-        swHideActionBar.setChecked(prefs.getBoolean("hide_actionbar", false));
         swAutoScroll.setChecked(prefs.getBoolean("autoscroll", true));
         swDoubleTap.setChecked(prefs.getBoolean("doubletap", false));
         swSwipeNav.setChecked(prefs.getBoolean("swipenav", true));
diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml
index 2900432917..bdc8876bf0 100644
--- a/app/src/main/res/layout/fragment_options_behavior.xml
+++ b/app/src/main/res/layout/fragment_options_behavior.xml
@@ -40,18 +40,6 @@
             app:layout_constraintTop_toBottomOf="@id/swDoubleBack"
             app:switchPadding="12dp" />
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/swHideActionBar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_advanced_hide_actionbar"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swPull"
-            app:switchPadding="12dp" />
-
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swAutoScroll"
             android:layout_width="0dp"
@@ -61,7 +49,7 @@
             android:text="@string/title_advanced_autoscroll"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swHideActionBar"
+            app:layout_constraintTop_toBottomOf="@id/swPull"
             app:switchPadding="12dp" />
 
         <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46c27f1af9..5bfbeb2194 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -344,7 +344,6 @@
 
     <string name="title_advanced_double_back">Double \'back\' to exit</string>
     <string name="title_advanced_pull_refresh">Pull down to refresh</string>
-    <string name="title_advanced_hide_actionbar">Hide action bar on scrolling down</string>
     <string name="title_advanced_autoscroll">Scroll to top on receiving new messages</string>
     <string name="title_advanced_double_tap">Double tap to mark message read/unread</string>
     <string name="title_advanced_swipenav">Swipe left/right to go to next/previous conversation</string>