mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-03 10:16:45 +00:00
Code Issues Releases Wiki Activity

Made signatures free

Browse source
This commit is contained in:
M66B 2019-01-22 15:15:21 +00:00
parent 2f7de17ac9
commit d476fa5720
3 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -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)

24
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View file

@ -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);

12
app/src/main/res/layout/fragment_identity.xml
View file

@ -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"