From db71150969a5de62c8b31b1423a138f640f18f27 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 18 Nov 2020 08:46:43 -0600
Subject: [PATCH] Add sync settings summary, rearrange acct dialog

---
 .../fragments/MainSettingsFragment.kt         |  5 ++++
 .../java/org/tasks/sync/AddAccountDialog.kt   | 24 +++++++------------
 app/src/main/res/values/arrays.xml            |  6 ++---
 app/src/main/res/values/keys.xml              |  1 -
 app/src/main/res/xml/preferences.xml          |  1 +
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt b/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt
index 1830ea3e5..fcc5d6f2b 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt
@@ -25,6 +25,11 @@ class MainSettingsFragment : InjectingPreferenceFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        findPreference(R.string.synchronization).summary =
+                resources
+                        .getStringArray(R.array.synchronization_services)
+                        .joinToString(getString(R.string.list_separator_with_space))
+
         viewModel.lastBackup.observe(this) { updateBackupWarning() }
         viewModel.lastAndroidBackup.observe(this) { updateBackupWarning() }
         viewModel.lastDriveBackup.observe(this) { updateBackupWarning() }
diff --git a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt
index ba1a0fd07..50ec83d4c 100644
--- a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt
+++ b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt
@@ -14,7 +14,6 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity
 import dagger.hilt.android.AndroidEntryPoint
-import org.tasks.BuildConfig
 import org.tasks.R
 import org.tasks.auth.SignInActivity
 import org.tasks.caldav.CaldavAccountSettingsActivity
@@ -48,7 +47,7 @@ class AddAccountDialog : DialogFragment() {
                 view.findViewById<TextView>(R.id.text2).text = descriptions[position]
                 val icon = view.findViewById<ImageView>(R.id.image_view)
                 icon.setImageDrawable(DrawableUtil.getWrapped(context, icons[position]))
-                if (position == 2) {
+                if (position == 3) {
                     icon.drawable.setTint(context.getColor(R.color.icon_tint))
                 }
                 return view
@@ -59,27 +58,20 @@ class AddAccountDialog : DialogFragment() {
                 .setTitle(R.string.choose_synchronization_service)
                 .setSingleChoiceItems(adapter, -1) { dialog, which ->
                     when (which) {
-                        0 -> if (BuildConfig.FLAVOR == "generic") {
-                            dialogBuilder
-                                    .newDialog(R.string.github_sponsor_login)
-                                    .setPositiveButton(R.string.ok, null)
-                                    .show()
-                        } else {
-                            activity?.startActivityForResult(
-                                    Intent(activity, SignInActivity::class.java),
-                                    REQUEST_TASKS_ORG)
-                        }
+                        0 -> activity?.startActivityForResult(
+                                Intent(activity, SignInActivity::class.java),
+                                REQUEST_TASKS_ORG)
                         1 -> activity?.startActivityForResult(
                                 Intent(activity, GtasksLoginActivity::class.java),
                                 REQUEST_GOOGLE_TASKS)
-                        2 -> activity?.startActivityForResult(
+                        2 -> activity?.startActivity(
+                                Intent(ACTION_VIEW, Uri.parse(getString(R.string.url_davx5))))
+                        3 -> activity?.startActivityForResult(
                                 Intent(activity, CaldavAccountSettingsActivity::class.java),
                                 REQUEST_CALDAV_SETTINGS)
-                        3 -> activity?.startActivityForResult(
+                        4 -> activity?.startActivityForResult(
                                 Intent(activity, EteSyncAccountSettingsActivity::class.java),
                                 REQUEST_CALDAV_SETTINGS)
-                        4 -> activity?.startActivity(
-                                Intent(ACTION_VIEW, Uri.parse(getString(R.string.url_davx5))))
                     }
                     dialog.dismiss()
                 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 157fc0d87..2cb88b1c9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -188,25 +188,25 @@
   <string-array name="synchronization_services">
     <item>@string/tasks_org</item>
     <item>@string/gtasks_GPr_header</item>
+    <item>@string/davx5</item>
     <item>@string/caldav</item>
     <item>@string/etesync</item>
-    <item>@string/davx5</item>
   </string-array>
 
   <string-array name="synchronization_services_description">
     <item>@string/tasks_org_sync_description</item>
     <item>@string/google_tasks_selection_description</item>
+    <item>@string/davx5_selection_description</item>
     <item>@string/caldav_selection_description</item>
     <item>@string/etesync_selection_description</item>
-    <item>@string/davx5_selection_description</item>
   </string-array>
 
   <array name="synchronization_services_icons">
     <item>@drawable/ic_round_icon</item>
     <item>@drawable/ic_google</item>
+    <item>@drawable/ic_davx5_icon_green_bg</item>
     <item>@drawable/ic_webdav_logo</item>
     <item>@drawable/ic_etesync</item>
-    <item>@drawable/ic_davx5_icon_green_bg</item>
   </array>
 
   <string-array name="chip_styles">
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index ecab9dca1..a7916ce41 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -44,7 +44,6 @@
   <string name="upgrade_balance">Your remaining balance will apply to your new subscription</string>
   <string name="upgrade_cancel">Cancel at any time</string>
   <string name="upgrade_benefits_retained">benefits are retained until the end of your billing period</string>
-  <string name="github_sponsor_login">Login for Github Sponsors coming soon!</string>
 
   <string name="p_date_shortcut_morning">date_shortcut_morning</string>
   <string name="p_date_shortcut_afternoon">date_shortcut_afternoon</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5934e6a37..914bb3e0b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -13,6 +13,7 @@
     app:title="@string/notifications" />
 
   <Preference
+    android:key="@string/synchronization"
     app:fragment="org.tasks.preferences.fragments.Synchronization"
     app:icon="@drawable/ic_outline_cloud_24px"
     app:title="@string/synchronization" />