From 352f757ede3897fbf010f5403c60d70f135f8bdc Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 20 Aug 2020 23:18:55 +0200 Subject: [PATCH] Refactoring, updated text --- .../eu/faircode/email/FragmentCompose.java | 4 +-- .../java/eu/faircode/email/FragmentSetup.java | 8 +++--- app/src/main/java/eu/faircode/email/Log.java | 2 +- app/src/main/res/layout/dialog_identity.xml | 2 +- app/src/main/res/layout/fragment_setup.xml | 26 +++++++++---------- app/src/main/res/values/strings.xml | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index d72b433559..442f5e54d3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3205,7 +3205,7 @@ public class FragmentCompose extends FragmentBase { data.identities = db.identity().getComposableIdentities(null); if (data.identities == null || data.identities.size() == 0) - throw new IllegalStateException(context.getString(R.string.title_no_identities)); + throw new IllegalStateException(context.getString(R.string.title_no_composable)); data.draft = db.message().getMessage(id); if (data.draft == null || data.draft.ui_hide) { @@ -3315,7 +3315,7 @@ public class FragmentCompose extends FragmentBase { } if (selected == null) - throw new IllegalArgumentException(context.getString(R.string.title_no_identities)); + throw new IllegalArgumentException(context.getString(R.string.title_no_composable)); if (plain_only) data.draft.plain_only = true; diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 9eaf889983..ce1eaad5f3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -71,7 +71,7 @@ public class FragmentSetup extends FragmentBase { private TextView tvIdentityDone; private Button btnIdentity; private TextView tvIdentityWhat; - private TextView tvNoIdentities; + private TextView tvNoComposable; private TextView tvPermissionsDone; private Button btnPermissions; @@ -118,7 +118,7 @@ public class FragmentSetup extends FragmentBase { tvIdentityDone = view.findViewById(R.id.tvIdentityDone); btnIdentity = view.findViewById(R.id.btnIdentity); tvIdentityWhat = view.findViewById(R.id.tvIdentityWhat); - tvNoIdentities = view.findViewById(R.id.tvNoIdentities); + tvNoComposable = view.findViewById(R.id.tvNoComposable); tvPermissionsDone = view.findViewById(R.id.tvPermissionsDone); btnPermissions = view.findViewById(R.id.btnPermissions); @@ -311,7 +311,7 @@ public class FragmentSetup extends FragmentBase { tvIdentityDone.setText(null); tvIdentityDone.setCompoundDrawables(null, null, null, null); btnIdentity.setEnabled(false); - tvNoIdentities.setVisibility(View.GONE); + tvNoComposable.setVisibility(View.GONE); tvPermissionsDone.setText(null); tvPermissionsDone.setCompoundDrawables(null, null, null, null); @@ -393,7 +393,7 @@ public class FragmentSetup extends FragmentBase { tvIdentityDone.setText(done ? R.string.title_setup_done : R.string.title_setup_to_do); tvIdentityDone.setTextColor(done ? textColorPrimary : colorWarning); tvIdentityDone.setCompoundDrawablesWithIntrinsicBounds(done ? check : null, null, null, null); - tvNoIdentities.setVisibility(done ? View.GONE : View.VISIBLE); + tvNoComposable.setVisibility(done ? View.GONE : View.VISIBLE); } }); } diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index 6ed10ca1d3..9c5b879755 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -1049,7 +1049,7 @@ public class Log { List identities = db.identity().getComposableIdentities(null); if (identities == null || identities.size() == 0) - throw new IllegalArgumentException(context.getString(R.string.title_no_identities)); + throw new IllegalArgumentException(context.getString(R.string.title_no_composable)); EntityIdentity identity = identities.get(0); EntityFolder drafts = db.folder().getFolderByType(identity.account, EntityFolder.DRAFTS); diff --git a/app/src/main/res/layout/dialog_identity.xml b/app/src/main/res/layout/dialog_identity.xml index 9ed5ed7817..c4c0ac38ed 100644 --- a/app/src/main/res/layout/dialog_identity.xml +++ b/app/src/main/res/layout/dialog_identity.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:text="@string/title_no_identities" + android:text="@string/title_no_composable" android:textAppearance="@style/TextAppearance.AppCompat.Medium" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cbNotAgain" /> diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml index 1cb6a6e834..631111b3c6 100644 --- a/app/src/main/res/layout/fragment_setup.xml +++ b/app/src/main/res/layout/fragment_setup.xml @@ -240,17 +240,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/tvAccountDone" /> - - + app:layout_constraintTop_toBottomOf="@id/btnAccount" /> + + + app:layout_constraintTop_toBottomOf="@id/tvNoComposable" /> Inbox not found No drafts folder There is no spam folder selected for this account - Sending emails requires at least one identity and a drafts folder + Sending emails requires an identity to be configured, and a drafts folder to be selected in the account settings This provider uses a proprietary email protocol and therefore it is not possible to use third party email clients This provider does not support push messages. This will delay reception of new messages and increase battery usage. This provider does not support UTF-8