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

Layout improvements

Browse Source
pull/147/head
M66B 7 years ago
parent 7ffb44f292
commit ec340c915c
10 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File

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

@ -367,7 +367,7 @@ public class FragmentFolder extends FragmentEx {
protected void onExecuted(Bundle args, EntityFolder folder) { protected void onExecuted(Bundle args, EntityFolder folder) {
if (savedInstanceState == null) { if (savedInstanceState == null) {
etName.setText(folder == null ? null : folder.name); etName.setText(folder == null ? null : folder.name);
etDisplay.setText(folder == null ? null : (folder.display == null ? folder.name : folder.display)); etDisplay.setText(folder == null ? null : folder.display);
etDisplay.setHint(folder == null ? null : folder.name); etDisplay.setHint(folder == null ? null : folder.name);
cbHide.setChecked(folder == null ? false : folder.hide); cbHide.setChecked(folder == null ? false : folder.hide);
cbUnified.setChecked(folder == null ? false : folder.unified); cbUnified.setChecked(folder == null ? false : folder.unified);
@ -386,6 +386,7 @@ public class FragmentFolder extends FragmentEx {
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
Helper.setViewsEnabled(view, true); Helper.setViewsEnabled(view, true);
etName.setEnabled(folder == null); etName.setEnabled(folder == null);
etDisplay.setEnabled(folder == null || !EntityFolder.INBOX.equals(folder.type));
cbPoll.setEnabled(cbSynchronize.isChecked()); cbPoll.setEnabled(cbSynchronize.isChecked());
cbDownload.setEnabled(cbSynchronize.isChecked()); cbDownload.setEnabled(cbSynchronize.isChecked());
btnSave.setEnabled(true); btnSave.setEnabled(true);

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

@ -774,11 +774,11 @@ public class FragmentSetup extends FragmentEx {
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
EditText etPassword1 = dview.findViewById(R.id.etPassword1); TextInputLayout etPassword1 = dview.findViewById(R.id.tilPassword1);
EditText etPassword2 = dview.findViewById(R.id.etPassword2); TextInputLayout etPassword2 = dview.findViewById(R.id.tilPassword2);
String password1 = etPassword1.getText().toString(); String password1 = etPassword1.getEditText().getText().toString();
String password2 = etPassword2.getText().toString(); String password2 = etPassword2.getEditText().getText().toString();
if (TextUtils.isEmpty(password1)) if (TextUtils.isEmpty(password1))
Snackbar.make(view, R.string.title_setup_password_missing, Snackbar.LENGTH_LONG).show(); Snackbar.make(view, R.string.title_setup_password_missing, Snackbar.LENGTH_LONG).show();

1
app/src/main/res/layout/dialog_keyword.xml
Unescape View File

@ -19,6 +19,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Keyword" android:text="Keyword"
android:inputType="text"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvKeyword" /> app:layout_constraintTop_toBottomOf="@id/tvKeyword" />

1
app/src/main/res/layout/dialog_link.xml
Unescape View File

@ -18,6 +18,7 @@
android:id="@+id/etLink" android:id="@+id/etLink"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textUri"
android:text="https://email.faircode.eu/" android:text="https://email.faircode.eu/"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

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

@ -5,42 +5,40 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp"> android:padding="12dp">
<TextView <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tvPassword1" android:id="@+id/tilPassword1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/title_setup_password"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:passwordToggleEnabled="true">
<EditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/etPassword1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="password"
android:hint="@string/title_setup_password"
android:inputType="textPassword" android:inputType="textPassword"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
app:layout_constraintStart_toStartOf="parent" </com.google.android.material.textfield.TextInputLayout>
app:layout_constraintTop_toBottomOf="@id/tvPassword1" />
<TextView <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tvPassword2" android:id="@+id/tilPassword2"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_password_repeat"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etPassword1" /> app:layout_constraintTop_toBottomOf="@id/tilPassword1"
app:passwordToggleEnabled="true">
<EditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/etPassword2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="password"
android:hint="@string/title_setup_password_repeat"
android:inputType="textPassword" android:inputType="textPassword"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
app:layout_constraintStart_toStartOf="parent" </com.google.android.material.textfield.TextInputLayout>
app:layout_constraintTop_toBottomOf="@id/tvPassword2" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -49,5 +47,5 @@
android:text="@string/title_setup_import_do" android:text="@string/title_setup_import_do"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etPassword2" /> app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_account.xml
Unescape View File

@ -248,7 +248,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/title_optional" android:hint="@string/title_optional"
android:inputType="text" android:inputType="textCapSentences"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNameRemark" /> app:layout_constraintTop_toBottomOf="@id/tvNameRemark" />

1
app/src/main/res/layout/fragment_compose.xml
Unescape View File

@ -50,6 +50,7 @@
android:id="@+id/etExtra" android:id="@+id/etExtra"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toStartOf="@+id/tvExtraSuffix" app:layout_constraintEnd_toStartOf="@+id/tvExtraSuffix"
app:layout_constraintStart_toEndOf="@id/tvExtraPrefix" app:layout_constraintStart_toEndOf="@id/tvExtraPrefix"

9
app/src/main/res/layout/fragment_folder.xml
Unescape View File

@ -14,7 +14,7 @@
android:padding="12dp"> android:padding="12dp">
<TextView <TextView
android:id="@+id/tvRename" android:id="@+id/tvName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
@ -27,11 +27,11 @@
android:id="@+id/etName" android:id="@+id/etName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text" android:inputType="textCapSentences"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRename" /> app:layout_constraintTop_toBottomOf="@id/tvName" />
<TextView <TextView
android:id="@+id/tvDisplay" android:id="@+id/tvDisplay"
@ -47,8 +47,7 @@
android:id="@+id/etDisplay" android:id="@+id/etDisplay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/title_optional" android:inputType="textCapSentences"
android:inputType="text"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/fragment_identity.xml
Unescape View File

@ -47,7 +47,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="name" android:autofillHints="name"
android:inputType="textCapSentences" android:inputType="textPersonName"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvName" /> app:layout_constraintTop_toBottomOf="@id/tvName" />
@ -92,7 +92,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autofillHints="name" android:autofillHints="name"
android:hint="@string/title_optional" android:hint="@string/title_optional"
android:inputType="textCapSentences" android:inputType="textPersonName"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDisplay" /> app:layout_constraintTop_toBottomOf="@id/tvDisplay" />

2
app/src/main/res/layout/fragment_setup.xml
Unescape View File

@ -28,7 +28,7 @@
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:autofillHints="name" android:autofillHints="name"
android:hint="@string/title_identity_name" android:hint="@string/title_identity_name"
android:inputType="textCapSentences" android:inputType="textPersonName"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ibHelp" /> app:layout_constraintTop_toBottomOf="@id/ibHelp" />

Write Preview
Loading…
Cancel
Save