From ae6cfca8ec692705713498616f03be600b26065f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 3 Jun 2020 15:00:48 -0500
Subject: [PATCH] Move add to top preference to task defaults

---
 .../java/org/tasks/preferences/fragments/Synchronization.kt | 1 -
 app/src/main/java/org/tasks/themes/CustomIcons.kt           | 3 ++-
 app/src/main/res/drawable/ic_vertical_align_top_24px.xml    | 5 +++++
 app/src/main/res/xml/preferences_synchronization.xml        | 6 ------
 app/src/main/res/xml/preferences_task_defaults.xml          | 6 ++++++
 5 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_vertical_align_top_24px.xml

diff --git a/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt b/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt
index fdb4d0ce8..f5116097e 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt
@@ -191,7 +191,6 @@ class Synchronization : InjectingPreferenceFragment() {
         val syncEnabled = hasGoogleAccounts || hasCaldavAccounts
         findPreference(R.string.accounts).isVisible = syncEnabled
         findPreference(R.string.sync_SPr_interval_title).isVisible = syncEnabled
-        findPreference(R.string.p_add_to_top).isVisible = syncEnabled
     }
 
     override fun inject(component: FragmentComponent) = component.inject(this)
diff --git a/app/src/main/java/org/tasks/themes/CustomIcons.kt b/app/src/main/java/org/tasks/themes/CustomIcons.kt
index 953c07dae..6e25fd360 100644
--- a/app/src/main/java/org/tasks/themes/CustomIcons.kt
+++ b/app/src/main/java/org/tasks/themes/CustomIcons.kt
@@ -182,7 +182,8 @@ object CustomIcons {
         1157 to R.drawable.ic_fireplace_24px,
         1158 to R.drawable.ic_outdoor_grill_24px,
         1159 to R.drawable.ic_thumb_up_24px,
-        1160 to R.drawable.ic_thumb_down_24px
+        1160 to R.drawable.ic_thumb_down_24px,
+        1161 to R.drawable.ic_vertical_align_top_24px
     )
 
     @JvmStatic
diff --git a/app/src/main/res/drawable/ic_vertical_align_top_24px.xml b/app/src/main/res/drawable/ic_vertical_align_top_24px.xml
new file mode 100644
index 000000000..1bb7727b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_vertical_align_top_24px.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M8,11h3v10h2V11h3l-4,-4 -4,4zM4,3v2h16V3H4z"/>
+</vector>
diff --git a/app/src/main/res/xml/preferences_synchronization.xml b/app/src/main/res/xml/preferences_synchronization.xml
index 66d35ca9e..c1fd666ff 100644
--- a/app/src/main/res/xml/preferences_synchronization.xml
+++ b/app/src/main/res/xml/preferences_synchronization.xml
@@ -3,12 +3,6 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:key="@string/preference_screen">
 
-  <SwitchPreferenceCompat
-    android:defaultValue="true"
-    android:key="@string/p_add_to_top"
-    android:title="@string/google_tasks_add_to_top"
-    app:isPreferenceVisible="false"/>
-
   <PreferenceCategory
     android:key="@string/accounts"
     android:title="@string/accounts"
diff --git a/app/src/main/res/xml/preferences_task_defaults.xml b/app/src/main/res/xml/preferences_task_defaults.xml
index c1be02ba2..8bae59eff 100644
--- a/app/src/main/res/xml/preferences_task_defaults.xml
+++ b/app/src/main/res/xml/preferences_task_defaults.xml
@@ -2,6 +2,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
+  <SwitchPreferenceCompat
+    android:icon="@drawable/ic_vertical_align_top_24px"
+    android:defaultValue="true"
+    android:key="@string/p_add_to_top"
+    android:title="@string/google_tasks_add_to_top" />
+
   <Preference
     android:icon="@drawable/ic_list_24px"
     android:key="@string/p_default_remote_list"