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

Added hint about importing Gmail accounts

This commit is contained in:
M66B 2021-07-23 18:26:01 +02:00
parent 241533d99b
commit 23f92af107
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -49,6 +49,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.core.view.GravityCompat;
import androidx.documentfile.provider.DocumentFile;
import androidx.drawerlayout.widget.DrawerLayout;
@ -1329,8 +1330,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
TextView tvCaption = dview.findViewById(R.id.tvCaption);
etPassword1 = dview.findViewById(R.id.tilPassword1);
etPassword2 = dview.findViewById(R.id.tilPassword2);
TextView tvExportHint = dview.findViewById(R.id.tvExportHint);
TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
Group grpExport = dview.findViewById(R.id.grpExport);
Group grpImport = dview.findViewById(R.id.grpImport);
tvCaption.setText(export ? R.string.title_setup_export : R.string.title_setup_import);
@ -1340,8 +1341,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
tvExportHint.setVisibility(export ? View.VISIBLE : View.GONE);
tvImportHint.setVisibility(export ? View.GONE : View.VISIBLE);
grpExport.setVisibility(export ? View.VISIBLE : View.GONE);
grpImport.setVisibility(export ? View.GONE : View.VISIBLE);
return new AlertDialog.Builder(getContext())
.setView(dview)

23
app/src/main/res/layout/dialog_password.xml
View File

@ -94,5 +94,28 @@
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvImportGmail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_import_gmail"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImportHint" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpExport"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvExportHint" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpImport"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvImportHint,tvImportGmail" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>

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

@ -241,6 +241,7 @@
</string>
<string name="title_setup_export_do">The export file will contain all settings and data, but won\'t contain messages</string>
<string name="title_setup_import_do">Imported accounts will be added without overwriting any existing ones</string>
<string name="title_setup_import_gmail">Gmail accounts set up with the quick setup wizard will only be imported if the corresponding account is present on the device</string>
<string name="title_setup_password">Password</string>
<string name="title_setup_password_chars">Password contains control or whitespace characters</string>
<string name="title_setup_password_repeat">Repeat password</string>