From d476fa57206b256fe0b9e641dccf15016e28670f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 22 Jan 2019 15:15:21 +0000
Subject: [PATCH] Made signatures free

---
 README.md                                     |  1 -
 .../eu/faircode/email/FragmentIdentity.java   | 24 -------------------
 app/src/main/res/layout/fragment_identity.xml | 12 +---------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 8e4c7ed769..4b1e17f186 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,6 @@ This app starts a foreground service with a low priority status bar notification
 
 ## Pro features
 
-* Signatures
 * Account/identity colors
 * Notifications per account
 * Notifications with message preview (requires Android 7 Nougat or later)
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 6072409bb2..54df401970 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -49,7 +49,6 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -88,7 +87,6 @@ public class FragmentIdentity extends FragmentBase {
     private View vwColor;
     private ImageView ibColorDefault;
     private EditText etSignature;
-    private ImageButton ibPro;
     private Button btnHtml;
 
     private Button btnAdvanced;
@@ -151,7 +149,6 @@ public class FragmentIdentity extends FragmentBase {
         vwColor = view.findViewById(R.id.vwColor);
         ibColorDefault = view.findViewById(R.id.ibColorDefault);
         etSignature = view.findViewById(R.id.etSignature);
-        ibPro = view.findViewById(R.id.ibPro);
         btnHtml = view.findViewById(R.id.btnHtml);
 
         btnAdvanced = view.findViewById(R.id.btnAdvanced);
@@ -296,16 +293,6 @@ public class FragmentIdentity extends FragmentBase {
             }
         });
 
-        ibPro.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                fragmentTransaction.hide(FragmentIdentity.this);
-                fragmentTransaction.add(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
-                fragmentTransaction.commit();
-            }
-        });
-
         btnHtml.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -767,17 +754,6 @@ public class FragmentIdentity extends FragmentBase {
 
                 setColor(color);
 
-                boolean pro = Helper.isPro(getContext());
-                etSignature.setHint(pro ? R.string.title_optional : R.string.title_pro_feature);
-                etSignature.setEnabled(pro);
-                if (pro) {
-                    ViewGroup.LayoutParams lp = ibPro.getLayoutParams();
-                    lp.height = 0;
-                    lp.width = 0;
-                    ibPro.setLayoutParams(lp);
-                }
-                btnHtml.setEnabled(pro);
-
                 cbPrimary.setEnabled(cbSynchronize.isChecked());
 
                 pbWait.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 4de55f03ff..2cbb34395c 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -147,20 +147,10 @@
             android:hint="@string/title_optional"
             android:inputType="textCapSentences|textMultiLine"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toStartOf="@+id/ibPro"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSignature" />
 
-        <ImageButton
-            android:id="@+id/ibPro"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:src="@drawable/baseline_info_24"
-            app:layout_constraintBottom_toBottomOf="@id/etSignature"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/etSignature" />
-
         <Button
             android:id="@+id/btnHtml"
             style="@style/buttonStyleSmall"