mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added remark about setup/back

This commit is contained in:
M66B 2019-09-29 11:30:43 +02:00
parent fa2af15369
commit c5848917a6
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -62,6 +62,7 @@ public class FragmentSetup extends FragmentBase {
private Button btnHelp; private Button btnHelp;
private Button btnQuick; private Button btnQuick;
private TextView tvQuickRemark;
private TextView tvAccountDone; private TextView tvAccountDone;
private Button btnAccount; private Button btnAccount;
@ -106,6 +107,7 @@ public class FragmentSetup extends FragmentBase {
btnHelp = view.findViewById(R.id.btnHelp); btnHelp = view.findViewById(R.id.btnHelp);
btnQuick = view.findViewById(R.id.btnQuick); btnQuick = view.findViewById(R.id.btnQuick);
tvQuickRemark = view.findViewById(R.id.tvQuickRemark);
tvAccountDone = view.findViewById(R.id.tvAccountDone); tvAccountDone = view.findViewById(R.id.tvAccountDone);
btnAccount = view.findViewById(R.id.btnAccount); btnAccount = view.findViewById(R.id.btnAccount);
@ -249,6 +251,8 @@ public class FragmentSetup extends FragmentBase {
}); });
// Initialize // Initialize
tvQuickRemark.setVisibility(View.GONE);
tvAccountDone.setText(null); tvAccountDone.setText(null);
tvAccountDone.setCompoundDrawables(null, null, null, null); tvAccountDone.setCompoundDrawables(null, null, null, null);
tvNoPrimaryDrafts.setVisibility(View.GONE); tvNoPrimaryDrafts.setVisibility(View.GONE);
@ -325,6 +329,8 @@ public class FragmentSetup extends FragmentBase {
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();
tvQuickRemark.setVisibility(done ? View.VISIBLE : View.GONE);
tvAccountDone.setText(done ? R.string.title_setup_done : R.string.title_setup_to_do); tvAccountDone.setText(done ? R.string.title_setup_done : R.string.title_setup_to_do);
tvAccountDone.setTextColor(done ? textColorPrimary : colorWarning); tvAccountDone.setTextColor(done ? textColorPrimary : colorWarning);
tvAccountDone.setCompoundDrawablesWithIntrinsicBounds(done ? check : null, null, null, null); tvAccountDone.setCompoundDrawablesWithIntrinsicBounds(done ? check : null, null, null, null);

13
app/src/main/res/layout/fragment_setup.xml
View File

@ -106,6 +106,17 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuick" /> app:layout_constraintTop_toBottomOf="@id/tvQuick" />
<TextView
android:id="@+id/tvQuickRemark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_wizard_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnQuick" />
<!-- account --> <!-- account -->
<View <View
@ -116,7 +127,7 @@
android:background="?attr/colorSeparator" android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnQuick" /> app:layout_constraintTop_toBottomOf="@id/tvQuickRemark" />
<ImageView <ImageView
android:id="@+id/one" android:id="@+id/one"

1
app/src/main/res/values/strings.xml
View File

@ -135,6 +135,7 @@
<string name="title_setup_quick_smtp">SMTP server to send messages</string> <string name="title_setup_quick_smtp">SMTP server to send messages</string>
<string name="title_setup_go">Go</string> <string name="title_setup_go">Go</string>
<string name="title_setup_wizard">Wizard</string> <string name="title_setup_wizard">Wizard</string>
<string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>
<string name="title_setup_gmail" translatable="false">Gmail</string> <string name="title_setup_gmail" translatable="false">Gmail</string>
<string name="title_setup_other">Other provider</string> <string name="title_setup_other">Other provider</string>
<string name="title_setup_gmail_support">Authorizing Google accounts will work in official versions only because Android checks the app signature</string> <string name="title_setup_gmail_support">Authorizing Google accounts will work in official versions only because Android checks the app signature</string>