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

Added Gmail/OAuth hint

This commit is contained in:
M66B 2022-12-31 10:23:53 +01:00
parent dac2576484
commit 2b4e822bec
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View File

@ -125,6 +125,7 @@ public class FragmentOAuth extends FragmentBase {
private TextView tvConfiguring;
private TextView tvGmailHint;
private TextView tvGmailLoginHint;
private TextView tvGmailLoginMax;
private TextView tvError;
private TextView tvOfficeAuthHint;
@ -180,6 +181,7 @@ public class FragmentOAuth extends FragmentBase {
tvConfiguring = view.findViewById(R.id.tvConfiguring);
tvGmailHint = view.findViewById(R.id.tvGmailHint);
tvGmailLoginHint = view.findViewById(R.id.tvGmailLoginHint);
tvGmailLoginMax = view.findViewById(R.id.tvGmailLoginMax);
tvError = view.findViewById(R.id.tvError);
tvOfficeAuthHint = view.findViewById(R.id.tvOfficeAuthHint);
@ -271,6 +273,7 @@ public class FragmentOAuth extends FragmentBase {
tvConfiguring.setVisibility(View.GONE);
tvGmailHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
tvGmailLoginHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
tvGmailLoginMax.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
hideError();
etName.setText(personal);

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

@ -185,6 +185,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailHint" />
<TextView
android:id="@+id/tvGmailLoginMax"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_gmail_max"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic|bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginHint" />
<TextView
android:id="@+id/tvErrorTitle"
android:layout_width="wrap_content"
@ -194,7 +205,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginHint" />
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginMax" />
<TextView
android:id="@+id/tvError"

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

@ -224,6 +224,7 @@
<string name="title_setup_gmail_rationale">Please grant permissions to select an account and read your name</string>
<string name="title_setup_gmail_permissions">Google will ask for permissions to read, compose, send and permanently delete all your email. FairEmail will never delete your messages without your explicit consent.</string>
<string name="title_setup_gmail_login">If Chrome is signed in to an account, a new account can only be added through Android. This can be avoided by logging out of Chrome via the Chrome sync settings.</string>
<string name="title_setup_gmail_max">In case of the error message \"You\'re signed in to the maximum number of accounts\", you need to log out the browser from all Google accounts.</string>
<string name="title_setup_gmail_on_device">Why do I need to select an on-device account?</string>
<string name="title_setup_gmail_password">I want to authorize an account with a password instead of an on-device account</string>
<string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>