From 023ad9a2df8a695596183c4a5433543ba3a87ac4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 12 Sep 2019 20:58:21 +0200
Subject: [PATCH] Added hint about ActiveSync support

---
 .../eu/faircode/email/FragmentAccount.java    | 11 ++++++++++
 app/src/main/res/layout/fragment_account.xml  | 21 +++++++++++++++++--
 .../main/res/layout/fragment_options_misc.xml |  7 ++++---
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 5934f4c6a9..17ef710f47 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -85,6 +85,7 @@ public class FragmentAccount extends FragmentBase {
     private ContentLoadingProgressBar pbAutoConfig;
 
     private TextView tvPopSupport;
+    private TextView tvActiveSyncSupport;
     private EditText etHost;
     private RadioGroup rgEncryption;
     private CheckBox cbInsecure;
@@ -180,6 +181,7 @@ public class FragmentAccount extends FragmentBase {
         pbAutoConfig = view.findViewById(R.id.pbAutoConfig);
 
         tvPopSupport = view.findViewById(R.id.tvPopSupport);
+        tvActiveSyncSupport = view.findViewById(R.id.tvActiveSyncSupport);
         etHost = view.findViewById(R.id.etHost);
         etPort = view.findViewById(R.id.etPort);
         rgEncryption = view.findViewById(R.id.rgEncryption);
@@ -284,6 +286,15 @@ public class FragmentAccount extends FragmentBase {
             }
         });
 
+        tvActiveSyncSupport.setPaintFlags(tvActiveSyncSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvActiveSyncSupport.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Uri uri = Uri.parse(Helper.FAQ_URI + "#user-content-frequently-requested-features");
+                Helper.view(getContext(), uri, false);
+            }
+        });
+
         etDomain.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 44f0f4ee1c..dd50c41589 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -113,12 +113,27 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
+                android:drawableEnd="@drawable/baseline_open_in_new_24"
+                android:drawablePadding="6dp"
                 android:text="@string/title_pop3_support"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorLink"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvImap" />
 
+            <TextView
+                android:id="@+id/tvActiveSyncSupport"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:drawableEnd="@drawable/baseline_open_in_new_24"
+                android:drawablePadding="6dp"
+                android:text="@string/title_activesync_support"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?android:attr/textColorLink"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvPopSupport" />
+
             <!-- host -->
 
             <TextView
@@ -129,7 +144,7 @@
                 android:text="@string/title_host"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvPopSupport" />
+                app:layout_constraintTop_toBottomOf="@id/tvActiveSyncSupport" />
 
             <EditText
                 android:id="@+id/etHost"
@@ -253,6 +268,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
+                android:drawableEnd="@drawable/baseline_open_in_new_24"
+                android:drawablePadding="6dp"
                 android:text="@string/title_oauth_support"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorLink"
@@ -797,7 +814,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="
                 tvDomain,tvDomainHint,etDomain,btnAutoConfig,
-                tvImap,tvPopSupport,tvHost,etHost,rgEncryption,cbInsecure,tvPort,etPort" />
+                tvImap,tvPopSupport,tvActiveSyncSupport,tvHost,etHost,rgEncryption,cbInsecure,tvPort,etPort" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/grpAuthorize"
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index e336497fef..0ea3b2f35a 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -113,13 +113,14 @@
 
             <TextView
                 android:id="@+id/tvExperimentsHint"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="48dp"
+                android:layout_marginTop="6dp"
+                android:drawableEnd="@drawable/baseline_open_in_new_24"
+                android:drawablePadding="6dp"
                 android:text="@string/title_advanced_experiments_hint"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textColor="?android:attr/textColorLink"
-                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swExperiments" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a962dedcd7..41086e302f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -410,6 +410,7 @@
     <string name="title_edit_html">Edit as HTML</string>
     <string name="title_last_connected">Last connected: %1$s</string>
     <string name="title_pop3_support">POP3 is not supported</string>
+    <string name="title_activesync_support">ActiveSync is not supported</string>
     <string name="title_oauth_support">OAuth is not supported</string>
 
     <string name="title_synchronize_now">Synchronize now</string>