From 2b848fe26c71e4f18dda4f2ff50e75f1f0fdfff2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 May 2019 15:03:35 +0200
Subject: [PATCH] Refactoring

---
 .../java/eu/faircode/email/AdapterAccount.java    |  2 +-
 .../java/eu/faircode/email/AdapterFolder.java     |  2 +-
 .../java/eu/faircode/email/AdapterIdentity.java   |  2 +-
 .../java/eu/faircode/email/FragmentOptions.java   |  4 ++--
 ...neral.java => FragmentOptionsSynchronize.java} |  4 ++--
 ...neral.xml => fragment_options_synchronize.xml} | 15 ++++++++++++++-
 app/src/main/res/values/strings.xml               |  6 ++++--
 7 files changed, 25 insertions(+), 10 deletions(-)
 rename app/src/main/java/eu/faircode/email/{FragmentOptionsGeneral.java => FragmentOptionsSynchronize.java} (97%)
 rename app/src/main/res/layout/{fragment_options_general.xml => fragment_options_synchronize.xml} (88%)

diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 957305a0aa..0b5cacb613 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -187,7 +187,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
 
             PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
 
-            popupMenu.getMenu().add(Menu.NONE, 1, 1, R.string.title_advanced_enabled)
+            popupMenu.getMenu().add(Menu.NONE, 1, 1, R.string.title_synchronize_enabled)
                     .setCheckable(true).setChecked(account.synchronize);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 818f12d5d6..be6c456d8c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -387,7 +387,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             popupMenu.getMenu().add(Menu.NONE, action_synchronize_now, 1, R.string.title_synchronize_now);
 
             if (folder.account != null)
-                popupMenu.getMenu().add(Menu.NONE, action_synchronize, 2, R.string.title_advanced_enabled)
+                popupMenu.getMenu().add(Menu.NONE, action_synchronize, 2, R.string.title_synchronize_enabled)
                         .setCheckable(true).setChecked(folder.synchronize);
 
             if (folder.account != null) { // outbox
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index b1fe3ebdb4..7863fa9b76 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -153,7 +153,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
 
             PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, view);
 
-            popupMenu.getMenu().add(Menu.NONE, 1, 1, R.string.title_advanced_enabled)
+            popupMenu.getMenu().add(Menu.NONE, 1, 1, R.string.title_synchronize_enabled)
                     .setCheckable(true).setChecked(identity.synchronize);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 30562478bc..3eb4fef99e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -74,7 +74,7 @@ public class FragmentOptions extends FragmentBase {
         public Fragment getItem(int position) {
             switch (position) {
                 case 0:
-                    return new FragmentOptionsGeneral();
+                    return new FragmentOptionsSynchronize();
                 case 1:
                     return new FragmentOptionsConnection();
                 case 2:
@@ -99,7 +99,7 @@ public class FragmentOptions extends FragmentBase {
         public CharSequence getPageTitle(int position) {
             switch (position) {
                 case 0:
-                    return getString(R.string.title_advanced_section_general);
+                    return getString(R.string.title_advanced_section_synchronize);
                 case 1:
                     return getString(R.string.title_advanced_section_connection);
                 case 2:
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsGeneral.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
similarity index 97%
rename from app/src/main/java/eu/faircode/email/FragmentOptionsGeneral.java
rename to app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
index 8be8f414a4..70770dc0f1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsGeneral.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
@@ -48,7 +48,7 @@ import androidx.preference.PreferenceManager;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-public class FragmentOptionsGeneral extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class FragmentOptionsSynchronize extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
     private SwitchCompat swEnabled;
     private Spinner spPollInterval;
     private SwitchCompat swSchedule;
@@ -65,7 +65,7 @@ public class FragmentOptionsGeneral extends FragmentBase implements SharedPrefer
         setSubtitle(R.string.title_advanced);
         setHasOptionsMenu(true);
 
-        View view = inflater.inflate(R.layout.fragment_options_general, container, false);
+        View view = inflater.inflate(R.layout.fragment_options_synchronize, container, false);
 
         // Get controls
 
diff --git a/app/src/main/res/layout/fragment_options_general.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
similarity index 88%
rename from app/src/main/res/layout/fragment_options_general.xml
rename to app/src/main/res/layout/fragment_options_synchronize.xml
index d375a610eb..cf08a02a4b 100644
--- a/app/src/main/res/layout/fragment_options_general.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -40,6 +40,19 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swEnabled" />
 
+            <TextView
+                android:id="@+id/tvWhen"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="48dp"
+                android:text="@string/title_advanced_when"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?android:attr/textColorPrimary"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvEnabledHint" />
+
             <Spinner
                 android:id="@+id/spPollInterval"
                 android:layout_width="wrap_content"
@@ -47,7 +60,7 @@
                 android:layout_marginTop="6dp"
                 android:entries="@array/pollIntervalNames"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvEnabledHint" />
+                app:layout_constraintTop_toBottomOf="@id/tvWhen" />
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swSchedule"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b18773270..0c3761adf6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,14 +152,15 @@
 
     <string name="title_advanced">Advanced options</string>
 
-    <string name="title_advanced_section_general">General</string>
+    <string name="title_advanced_section_synchronize">Synchronize</string>
     <string name="title_advanced_section_connection">Connection</string>
     <string name="title_advanced_section_display">Display</string>
     <string name="title_advanced_section_behavior">Behavior</string>
     <string name="title_advanced_section_notifications">Notifications</string>
     <string name="title_advanced_section_misc">Miscellaneous</string>
 
-    <string name="title_advanced_enabled">Synchronize</string>
+    <string name="title_advanced_enabled">Enabled</string>
+    <string name="title_advanced_when">When</string>
     <string name="title_advanced_schedule">Schedule</string>
 
     <string name="title_advanced_metered">Use metered connections</string>
@@ -313,6 +314,7 @@
     <string name="title_pop3_support">POP3 is not supported, see also the FAQ</string>
 
     <string name="title_synchronize_now">Synchronize now</string>
+    <string name="title_synchronize_enabled">Synchronize</string>
     <string name="title_delete_local">Delete local messages</string>
     <string name="title_delete_browsed">Delete browsed/searched messages</string>
     <string name="title_empty_trash">Empty trash</string>