msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added caption to password dialog

Browse Source
pull/194/head
M66B 4 years ago
parent 064ee0ba48
commit 8c3c160aa8
2 changed files with 71 additions and 52 deletions
Show Stats Download Patch File Download Diff File

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

@ -1308,10 +1308,13 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
final boolean export = getArguments().getBoolean("export"); final boolean export = getArguments().getBoolean("export");
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_password, null); View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_password, null);
TextView tvCaption = dview.findViewById(R.id.tvCaption);
etPassword1 = dview.findViewById(R.id.tilPassword1); etPassword1 = dview.findViewById(R.id.tilPassword1);
etPassword2 = dview.findViewById(R.id.tilPassword2); etPassword2 = dview.findViewById(R.id.tilPassword2);
TextView tvImportHint = dview.findViewById(R.id.tvImportHint); TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
tvCaption.setText(export ? R.string.title_setup_export : R.string.title_setup_import);
if (savedInstanceState != null) { if (savedInstanceState != null) {
etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1")); etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1"));
etPassword2.getEditText().setText(savedInstanceState.getString("fair:password2")); etPassword2.getEditText().setText(savedInstanceState.getString("fair:password2"));

120
app/src/main/res/layout/dialog_password.xml
Unescape View File

@ -1,58 +1,74 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="24dp"> android:padding="24dp"
android:scrollbarStyle="outsideOverlay">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilPassword1" <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" <eu.faircode.email.FixedTextView
app:layout_constraintTop_toTopOf="parent" android:id="@+id/tvCaption"
app:passwordToggleEnabled="true"> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<com.google.android.material.textfield.TextInputEditText android:text="@string/title_setup_export"
android:layout_width="match_parent" android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilPassword1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvCaption"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autofillHints="password"
android:hint="@string/title_setup_password"
android:imeOptions="actionNext"
android:inputType="textPassword"
android:textAppearance="@style/TextAppearance.AppCompat.Medium">
<requestFocus />
</com.google.android.material.textfield.TextInputEditText>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilPassword2"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="password" app:layout_constraintEnd_toEndOf="parent"
android:hint="@string/title_setup_password" app:layout_constraintStart_toStartOf="parent"
android:imeOptions="actionNext" app:layout_constraintTop_toBottomOf="@id/tilPassword1"
android:inputType="textPassword" app:passwordToggleEnabled="true">
android:textAppearance="@style/TextAppearance.AppCompat.Medium">
<com.google.android.material.textfield.TextInputEditText
<requestFocus /> android:layout_width="match_parent"
</com.google.android.material.textfield.TextInputEditText> android:layout_height="wrap_content"
</com.google.android.material.textfield.TextInputLayout> android:autofillHints="password"
android:hint="@string/title_setup_password_repeat"
<com.google.android.material.textfield.TextInputLayout android:imeOptions="actionDone"
android:id="@+id/tilPassword2" android:inputType="textPassword"
android:layout_width="0dp" android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
android:layout_height="wrap_content" </com.google.android.material.textfield.TextInputLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" <eu.faircode.email.FixedTextView
app:layout_constraintTop_toBottomOf="@id/tilPassword1" android:id="@+id/tvImportHint"
app:passwordToggleEnabled="true"> android:layout_width="wrap_content"
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="password" android:layout_marginTop="12dp"
android:hint="@string/title_setup_password_repeat" android:text="@string/title_setup_import_do"
android:imeOptions="actionDone" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:inputType="textPassword" app:layout_constraintStart_toStartOf="parent"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
</com.google.android.material.textfield.TextInputLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>
<eu.faircode.email.FixedTextView
android:id="@+id/tvImportHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_import_do"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
</androidx.constraintlayout.widget.ConstraintLayout>
Write Preview
Loading…
Cancel
Save