Added Gmail/OAuth hint

pull/210/head
M66B 2 years ago
parent dac2576484
commit 2b4e822bec

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

@ -185,6 +185,17 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailHint" /> 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 <TextView
android:id="@+id/tvErrorTitle" android:id="@+id/tvErrorTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -194,7 +205,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginHint" /> app:layout_constraintTop_toBottomOf="@id/tvGmailLoginMax" />
<TextView <TextView
android:id="@+id/tvError" android:id="@+id/tvError"

@ -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_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_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_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_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_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> <string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>

Loading…
Cancel
Save