Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Layout improvements

Browse Source
This commit is contained in:
M66B
2018-12-31 07:42:53 +00:00
parent 7ffb44f292
commit ec340c915c
10 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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