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

Refactoring, updated text

This commit is contained in:
M66B 2020-08-20 23:18:55 +02:00
parent 78d524ef56
commit 352f757ede
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -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;

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

@ -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);
}
});
}

2
app/src/main/java/eu/faircode/email/Log.java
View File

@ -1049,7 +1049,7 @@ public class Log {
List<TupleIdentityEx> 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);

2
app/src/main/res/layout/dialog_identity.xml
View File

@ -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" />

26
app/src/main/res/layout/fragment_setup.xml
View File

@ -240,17 +240,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvAccountDone" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvNoIdentities"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_no_identities"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnAccount" />
<!-- identity -->
<View
@ -261,7 +250,7 @@
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNoIdentities" />
app:layout_constraintTop_toBottomOf="@id/btnAccount" />
<ImageView
android:id="@+id/two"
@ -360,6 +349,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvNoComposable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_no_composable"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
<!-- permissions -->
<View
@ -370,7 +370,7 @@
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
app:layout_constraintTop_toBottomOf="@id/tvNoComposable" />
<ImageView
android:id="@+id/three"

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

@ -660,7 +660,7 @@
<string name="title_no_inbox">Inbox not found</string>
<string name="title_no_drafts">No drafts folder</string>
<string name="title_no_junk_folder">There is no spam folder selected for this account</string>
<string name="title_no_identities">Sending emails requires at least one identity and a drafts folder</string>
<string name="title_no_composable">Sending emails requires an identity to be configured, and a drafts folder to be selected in the account settings</string>
<string name="title_no_standard">This provider uses a proprietary email protocol and therefore it is not possible to use third party email clients</string>
<string name="title_no_idle">This provider does not support push messages. This will delay reception of new messages and increase battery usage.</string>
<string name="title_no_utf8">This provider does not support UTF-8</string>