From c5848917a6f3244123fb2ca6bbda7a3bcd538216 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 29 Sep 2019 11:30:43 +0200 Subject: [PATCH] Added remark about setup/back --- .../main/java/eu/faircode/email/FragmentSetup.java | 6 ++++++ app/src/main/res/layout/fragment_setup.xml | 13 ++++++++++++- app/src/main/res/values/strings.xml | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index b6dcb6023e..4452c3c2fd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -62,6 +62,7 @@ public class FragmentSetup extends FragmentBase { private Button btnHelp; private Button btnQuick; + private TextView tvQuickRemark; private TextView tvAccountDone; private Button btnAccount; @@ -106,6 +107,7 @@ public class FragmentSetup extends FragmentBase { btnHelp = view.findViewById(R.id.btnHelp); btnQuick = view.findViewById(R.id.btnQuick); + tvQuickRemark = view.findViewById(R.id.tvQuickRemark); tvAccountDone = view.findViewById(R.id.tvAccountDone); btnAccount = view.findViewById(R.id.btnAccount); @@ -249,6 +251,8 @@ public class FragmentSetup extends FragmentBase { }); // Initialize + tvQuickRemark.setVisibility(View.GONE); + tvAccountDone.setText(null); tvAccountDone.setCompoundDrawables(null, null, null, null); tvNoPrimaryDrafts.setVisibility(View.GONE); @@ -325,6 +329,8 @@ public class FragmentSetup extends FragmentBase { getActivity().invalidateOptionsMenu(); + tvQuickRemark.setVisibility(done ? View.VISIBLE : View.GONE); + tvAccountDone.setText(done ? R.string.title_setup_done : R.string.title_setup_to_do); tvAccountDone.setTextColor(done ? textColorPrimary : colorWarning); tvAccountDone.setCompoundDrawablesWithIntrinsicBounds(done ? check : null, null, null, null); diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml index 34822e2a89..0402c47975 100644 --- a/app/src/main/res/layout/fragment_setup.xml +++ b/app/src/main/res/layout/fragment_setup.xml @@ -106,6 +106,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/tvQuick" /> + + + app:layout_constraintTop_toBottomOf="@id/tvQuickRemark" /> SMTP server to send messages Go Wizard + Go \'back\' to go to the inbox Gmail Other provider Authorizing Google accounts will work in official versions only because Android checks the app signature