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

Revised setup

Browse Source
pull/192/head
M66B 4 years ago
parent e19f8448e8
commit a6652350e6
5 changed files with 208 additions and 404 deletions
Show Stats Download Patch File Download Diff File

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

@ -137,7 +137,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
};
private final static String[] RESET_QUESTIONS = new String[]{
"welcome", "first", "app_support", "notify_archive", "message_swipe", "message_select", "folder_actions", "folder_sync",
"first", "app_support", "notify_archive", "message_swipe", "message_select", "folder_actions", "folder_sync",
"crash_reports_asked", "review_asked", "review_later", "why",
"reply_hint", "html_always_images", "open_full_confirmed", "print_html_confirmed", "reformatted_hint",
"selected_folders", "move_1_confirmed", "move_n_confirmed",

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

@ -57,18 +57,12 @@ import java.util.List;
public class FragmentSetup extends FragmentBase {
private ViewGroup view;
private TextView tvWelcome;
private ImageButton ibWelcome;
private ImageButton ibHelp;
private Button btnQuick;
private TextView tvQuickNew;
private TextView tvQuickRemark;
private TextView tvAccountDone;
private Button btnAccount;
private TextView tvIdentityDone;
private Button btnIdentity;
private TextView tvIdentityWhat;
private TextView tvNoComposable;
@ -85,7 +79,6 @@ public class FragmentSetup extends FragmentBase {
private Button btnInbox;
private Group grpWelcome;
private Group grpDataSaver;
private int textColorPrimary;
@ -104,18 +97,13 @@ public class FragmentSetup extends FragmentBase {
view = (ViewGroup) inflater.inflate(R.layout.fragment_setup, container, false);
// Get controls
tvWelcome = view.findViewById(R.id.tvWelcome);
ibWelcome = view.findViewById(R.id.ibWelcome);
ibHelp = view.findViewById(R.id.ibHelp);
btnQuick = view.findViewById(R.id.btnQuick);
tvQuickNew = view.findViewById(R.id.tvQuickNew);
tvQuickRemark = view.findViewById(R.id.tvQuickRemark);
tvAccountDone = view.findViewById(R.id.tvAccountDone);
btnAccount = view.findViewById(R.id.btnAccount);
tvIdentityDone = view.findViewById(R.id.tvIdentityDone);
btnIdentity = view.findViewById(R.id.btnIdentity);
tvIdentityWhat = view.findViewById(R.id.tvIdentityWhat);
tvNoComposable = view.findViewById(R.id.tvNoComposable);
@ -132,7 +120,6 @@ public class FragmentSetup extends FragmentBase {
btnInbox = view.findViewById(R.id.btnInbox);
grpWelcome = view.findViewById(R.id.grpWelcome);
grpDataSaver = view.findViewById(R.id.grpDataSaver);
PackageManager pm = getContext().getPackageManager();
@ -140,17 +127,6 @@ public class FragmentSetup extends FragmentBase {
// Wire controls
tvWelcome.setText(getString(R.string.title_setup_welcome)
.replaceAll("^\\s+", "").replaceAll("\\s+", " "));
ibWelcome.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
prefs.edit().putBoolean("welcome", false).apply();
grpWelcome.setVisibility(View.GONE);
}
});
ibHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -309,13 +285,6 @@ public class FragmentSetup extends FragmentBase {
});
// Initialize
tvQuickRemark.setVisibility(View.GONE);
tvAccountDone.setText(null);
tvAccountDone.setCompoundDrawables(null, null, null, null);
tvIdentityDone.setText(null);
tvIdentityDone.setCompoundDrawables(null, null, null, null);
btnIdentity.setEnabled(false);
tvNoComposable.setVisibility(View.GONE);
@ -328,8 +297,6 @@ public class FragmentSetup extends FragmentBase {
btnInbox.setEnabled(false);
boolean welcome = prefs.getBoolean("welcome", true);
grpWelcome.setVisibility(welcome ? View.VISIBLE : View.GONE);
grpDataSaver.setVisibility(View.GONE);
setContactsPermission(hasPermission(Manifest.permission.READ_CONTACTS));
@ -379,12 +346,6 @@ public class FragmentSetup extends FragmentBase {
public void onChanged(@Nullable List<EntityAccount> accounts) {
done = (accounts != null && accounts.size() > 0);
tvQuickRemark.setVisibility(done ? View.VISIBLE : View.GONE);
tvAccountDone.setText(done ? R.string.title_setup_done : R.string.title_setup_to_do);
tvAccountDone.setTextColor(done ? textColorPrimary : colorWarning);
tvAccountDone.setCompoundDrawablesWithIntrinsicBounds(done ? check : null, null, null, null);
btnIdentity.setEnabled(done);
btnInbox.setEnabled(done);
@ -396,9 +357,6 @@ public class FragmentSetup extends FragmentBase {
@Override
public void onChanged(@Nullable List<TupleIdentityEx> identities) {
boolean done = (identities != null && identities.size() > 0);
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);
tvNoComposable.setVisibility(done ? View.GONE : View.VISIBLE);
}
});

32
app/src/main/res/layout/dialog_setup.xml
Unescape View File

@ -20,17 +20,17 @@
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/three"
android:id="@+id/two"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="24dp"
android:contentDescription="3"
android:contentDescription="2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvMessage"
app:srcCompat="@drawable/twotone_looks_3_24" />
app:srcCompat="@drawable/twotone_looks_two_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/title3"
android:id="@+id/title2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
@ -39,22 +39,22 @@
android:text="@string/title_setup_permissions"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/three"
app:layout_constraintBottom_toBottomOf="@id/two"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/three" />
app:layout_constraintStart_toEndOf="@id/two" />
<ImageView
android:id="@+id/four"
android:id="@+id/three"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="24dp"
android:contentDescription="4"
android:contentDescription="3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/three"
app:srcCompat="@drawable/twotone_looks_4_24" />
app:layout_constraintTop_toBottomOf="@id/two"
app:srcCompat="@drawable/twotone_looks_3_24" />
<eu.faircode.email.FixedTextView
android:id="@+id/title4"
android:id="@+id/title3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
@ -64,9 +64,9 @@
android:text="@string/title_setup_doze"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/four"
app:layout_constraintBottom_toBottomOf="@id/three"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/four" />
app:layout_constraintStart_toEndOf="@id/three" />
<CheckBox
android:id="@+id/cbNotAgain"
@ -76,18 +76,18 @@
android:text="@string/title_no_ask_again"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/four" />
app:layout_constraintTop_toBottomOf="@id/three" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grp3"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="three,title3" />
app:constraint_referenced_ids="two,title2" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grp4"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="four,title4" />
app:constraint_referenced_ids="three,title3" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>

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

@ -17,59 +17,15 @@
android:layout_height="wrap_content"
android:paddingBottom="24dp">
<eu.faircode.email.FixedTextView
android:id="@+id/tvWelcome"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="33dp"
android:text="@string/title_setup_welcome"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibWelcome"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/ibWelcome"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_close_hint"
app:layout_constraintBottom_toBottomOf="@id/tvWelcome"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvWelcome"
app:srcCompat="@drawable/twotone_close_24" />
<View
android:id="@+id/vSeparatorWelcome"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvWelcome" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:alpha="0.1"
android:background="?attr/colorAccent"
app:layout_constraintBottom_toTopOf="@id/vSeparatorAccount"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorWelcome" />
<ImageView
android:id="@+id/fast"
android:layout_width="30dp"
android:layout_height="30dp"
android:id="@+id/one"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="@string/title_setup_quick"
android:tint="?android:attr/textColorPrimary"
android:contentDescription="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorWelcome"
app:srcCompat="@drawable/twotone_fast_forward_24" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/twotone_looks_one_24" />
<eu.faircode.email.FixedTextView
android:layout_width="0dp"
@ -77,22 +33,12 @@
android:layout_marginStart="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_quick"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:text="@string/title_setup_quick_accounts"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/fast"
app:layout_constraintBottom_toBottomOf="@id/one"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/fast" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_quick_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/fast" />
app:layout_constraintStart_toEndOf="@id/one" />
<ImageButton
android:id="@+id/ibHelp"
@ -120,7 +66,7 @@
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuick" />
app:layout_constraintTop_toBottomOf="@id/one" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuickRemarkMultiple"
@ -133,108 +79,75 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnQuick" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuickNew"
<Button
android:id="@+id/btnInbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_wizard_new"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
android:text="@string/title_setup_inbox"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuickRemarkMultiple" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuickRemark"
android:id="@+id/tvQuickNew"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_wizard_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/title_setup_wizard_new"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuickNew" />
app:layout_constraintTop_toBottomOf="@id/btnInbox" />
<!-- account -->
<!-- permissions -->
<View
android:id="@+id/vSeparatorAccount"
android:id="@+id/vSeparatorPermissions"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuickRemark" />
app:layout_constraintTop_toBottomOf="@id/tvQuickNew" />
<ImageView
android:id="@+id/one"
android:id="@+id/two"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="1"
android:contentDescription="2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount"
app:srcCompat="@drawable/twotone_looks_one_24" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorPermissions"
app:srcCompat="@drawable/twotone_looks_two_24" />
<eu.faircode.email.FixedTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_account"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:text="@string/title_setup_permissions"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/one"
app:layout_constraintEnd_toStartOf="@+id/tvImap"
app:layout_constraintStart_toEndOf="@id/one"
app:layout_constraintTop_toTopOf="@id/one" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvImap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:text="@string/title_imap"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@id/one"
app:layout_constraintEnd_toEndOf="parent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPop3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:text="@string/title_pop3"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@id/two"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/one" />
app:layout_constraintStart_toEndOf="@id/two"
app:layout_constraintTop_toTopOf="@id/two" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvAccount"
android:id="@+id/tvPermissions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_account_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/one" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvAccountHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_account_hint"
android:text="@string/title_setup_permissions_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAccount" />
app:layout_constraintTop_toBottomOf="@id/two" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvAccountDone"
android:id="@+id/tvPermissionsDone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
@ -244,97 +157,64 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAccountHint" />
app:layout_constraintTop_toBottomOf="@id/tvPermissions" />
<Button
android:id="@+id/btnAccount"
style="?android:attr/buttonStyleSmall"
android:id="@+id/btnPermissions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_manage"
android:text="@string/title_setup_grant"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvAccountDone" />
app:layout_constraintTop_toTopOf="@id/tvPermissionsDone" />
<!-- identity -->
<!-- doze -->
<View
android:id="@+id/vSeparatorIdentity"
android:id="@+id/vSeparatorDoze"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnAccount" />
app:layout_constraintTop_toBottomOf="@id/btnPermissions" />
<ImageView
android:id="@+id/two"
android:id="@+id/three"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="2"
android:contentDescription="3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity"
app:srcCompat="@drawable/twotone_looks_two_24" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorDoze"
app:srcCompat="@drawable/twotone_looks_3_24" />
<eu.faircode.email.FixedTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_identity"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:text="@string/title_setup_doze"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/two"
app:layout_constraintEnd_toStartOf="@+id/tvSmtp"
app:layout_constraintStart_toEndOf="@id/two"
app:layout_constraintTop_toTopOf="@id/two" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSmtp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:text="@string/title_smtp"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@id/two"
app:layout_constraintEnd_toEndOf="parent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvAliases"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:text="@string/title_aliases"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="@+id/three"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/two" />
app:layout_constraintStart_toEndOf="@id/three"
app:layout_constraintTop_toTopOf="@id/three" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvIdentity"
android:id="@+id/tvDoze"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_identity_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/two" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvIdentityHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_identity_hint"
android:text="@string/title_setup_doze_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
app:layout_constraintTop_toBottomOf="@id/three" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvIdentityDone"
android:id="@+id/tvDozeDone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
@ -344,272 +224,246 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIdentityHint" />
app:layout_constraintTop_toBottomOf="@id/tvDoze" />
<Button
android:id="@+id/btnIdentity"
style="?android:attr/buttonStyleSmall"
android:id="@+id/btnDoze"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_manage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvIdentityDone" />
app:layout_constraintTop_toTopOf="@id/tvDozeDone" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvIdentityWhat"
android:id="@+id/tvDozeHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_doze_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnDoze" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvBatteryUsage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_identity_what"
android:text="@string/title_setup_doze_battery"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
app:layout_constraintTop_toBottomOf="@id/tvDozeHint" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvNoComposable"
android:id="@+id/tvSyncStopped"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_no_composable"
android:text="@string/title_setup_doze_stopped"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBatteryUsage" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvDataSaver"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_data"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
app:layout_constraintTop_toBottomOf="@id/tvSyncStopped" />
<!-- permissions -->
<Button
android:id="@+id/btnDataSaver"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_manage"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDataSaver" />
<!-- account -->
<View
android:id="@+id/vSeparatorPermissions"
android:id="@+id/vSeparatorAccount"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:layout_marginTop="24dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvNoComposable" />
<ImageView
android:id="@+id/three"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorPermissions"
app:srcCompat="@drawable/twotone_looks_3_24" />
app:layout_constraintTop_toBottomOf="@id/btnDataSaver" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSetupAccount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_permissions"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:text="@string/title_setup_account"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/three"
app:layout_constraintEnd_toStartOf="@+id/tvImap"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvImap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:text="@string/title_imap"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/three"
app:layout_constraintTop_toTopOf="@id/three" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPermissions"
android:id="@+id/tvPop3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_permissions_remark"
android:layout_marginEnd="6dp"
android:text="@string/title_pop3"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImap" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvAccount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_account_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/three" />
app:layout_constraintTop_toBottomOf="@id/tvSetupAccount" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvPermissionsDone"
android:id="@+id/tvAccountHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:drawableStart="@drawable/twotone_check_24"
android:drawablePadding="6dp"
android:text="@string/title_setup_done"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/title_setup_account_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvPermissions" />
app:layout_constraintTop_toBottomOf="@id/tvAccount" />
<Button
android:id="@+id/btnPermissions"
android:id="@+id/btnAccount"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_grant"
android:text="@string/title_setup_manage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvPermissionsDone" />
app:layout_constraintTop_toBottomOf="@id/tvAccountHint" />
<!-- doze -->
<!-- identity -->
<View
android:id="@+id/vSeparatorDoze"
android:id="@+id/vSeparatorIdentity"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnPermissions" />
<ImageView
android:id="@+id/four"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorDoze"
app:srcCompat="@drawable/twotone_looks_4_24" />
app:layout_constraintTop_toBottomOf="@id/btnAccount" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSetupIdentity"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_doze"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:text="@string/title_setup_identity"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/four"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/four"
app:layout_constraintTop_toTopOf="@id/four" />
app:layout_constraintEnd_toStartOf="@+id/tvSmtp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvDoze"
android:id="@+id/tvSmtp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_doze_remark"
android:layout_marginEnd="6dp"
android:text="@string/title_smtp"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/four" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvDozeDone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:drawableStart="@drawable/twotone_check_24"
android:drawablePadding="6dp"
android:text="@string/title_setup_done"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDoze" />
<Button
android:id="@+id/btnDoze"
style="?android:attr/buttonStyleSmall"
android:id="@+id/tvAliases"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_manage"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:text="@string/title_aliases"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvDozeDone" />
app:layout_constraintTop_toBottomOf="@id/tvSmtp" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvDozeHint"
android:id="@+id/tvIdentity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_doze_hint"
android:text="@string/title_setup_identity_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnDoze" />
app:layout_constraintTop_toBottomOf="@id/tvSetupIdentity" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvBatteryUsage"
android:id="@+id/tvIdentityHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_doze_battery"
android:text="@string/title_setup_identity_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDozeHint" />
app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
<Button
android:id="@+id/btnIdentity"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_manage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvIdentityHint" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSyncStopped"
android:id="@+id/tvIdentityWhat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_doze_stopped"
android:text="@string/title_setup_identity_what"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBatteryUsage" />
app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvDataSaver"
android:id="@+id/tvNoComposable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_data"
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/tvSyncStopped" />
<Button
android:id="@+id/btnDataSaver"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_manage"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDataSaver" />
<!-- inbox -->
<View
android:id="@+id/vSeparatorInbox"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:background="?attr/colorSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnDataSaver" />
<ImageView
android:id="@+id/five"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorInbox"
app:srcCompat="@drawable/twotone_looks_5_24" />
<eu.faircode.email.FixedTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/title_setup_inbox"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/five"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/five"
app:layout_constraintTop_toTopOf="@id/five" />
app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
<Button
android:id="@+id/btnInbox"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_go"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/five" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpWelcome"

24
app/src/main/res/values/strings.xml
Unescape View File

@ -156,22 +156,15 @@
<string name="title_setup">Settings</string>
<string name="title_setup_help">Help</string>
<string name="title_setup_welcome">
Receiving and sending messages requires setting up an account and an identity like in any other email app.
The quick setup will create both an account and an identity by just asking for your name, email address, and password.
Accounts and identities (aliases) can be set up manually too if needed.
Non-standard protocols, such as Microsoft Exchange Web Services and Microsoft ActiveSync, are not supported, also see the app description.
</string>
<string name="title_setup_quick">Quick setup</string>
<string name="title_setup_quick_remark">To quickly setup an account and an identity for most providers</string>
<string name="title_setup_quick_accounts">Add accounts</string>
<string name="title_setup_quick_support">Some providers make it difficult to add an account. Please do not blame FairEmail for this, but ask for support instead.</string>
<string name="title_setup_quick_hint">The quick setup will fetch configuration information from autoconfig.thunderbird.net</string>
<string name="title_setup_quick_imap">IMAP server to receive messages</string>0
<string name="title_setup_quick_smtp">SMTP server to send messages</string>0
<string name="title_setup_wizard">Wizard</string>
<string name="title_setup_wizard_multiple">The installation wizard can be used multiple times to set up multiple accounts</string>
<string name="title_setup_wizard_multiple">The wizard can be used multiple times to set up multiple accounts</string>
<string name="title_setup_wizard_new">I need a new email address</string>
<string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>
<string name="title_setup_gmail" translatable="false">Gmail</string>
<string name="title_setup_outlook" translatable="false">Outlook, Live, Hotmail</string>
<string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
@ -193,20 +186,19 @@
<string name="title_setup_select_account">Select account</string>
<string name="title_setup_instructions">Setup instructions</string>
<string name="title_setup_no_settings">No settings found for domain \'%1$s\'</string>
<string name="title_setup_no_settings_hint">Please try setting up an account and identity in setup steps 1 and 2 using the settings provided by your email provider</string>
<string name="title_setup_no_settings_hint">You can try to manually set up an account and identity using the settings provided by your email provider at the bottom of the main setup screen</string>
<string name="title_setup_no_auth_hint">Please double check your email address and password and make sure external access (IMAP/SMTP) is enabled for your account</string>
<string name="title_setup_app_password_hint">This provider requires an app password instead of the account password, please check the instructions of your provider</string>
<string name="title_setup_no_inbox">Inbox not found</string>
<string name="title_setup_advanced_protection">When enrolled in the advanced protection program it is not possible to use a third party email app. This is a restriction imposed by Google.</string>
<string name="title_setup_quick_success">An account and an identity have successfully been added</string>
<string name="title_setup_quick_failed">You can try to configure an account and an identity below too</string>
<string name="title_setup_quick_success">An account has successfully been added</string>
<string name="title_setup_manage">Manage</string>
<string name="title_setup_grant">Grant</string>
<string name="title_setup_grant_again">Grant required permissions</string>
<string name="title_setup_account">Setup accounts</string>
<string name="title_setup_account">Setup accounts manually</string>
<string name="title_setup_account_remark">To receive email</string>
<string name="title_setup_account_hint">To change color, swipe left/right target folder, etc</string>
<string name="title_setup_identity">Setup identities</string>
<string name="title_setup_identity">Setup identities manually</string>
<string name="title_setup_identity_remark">To send email</string>
<string name="title_setup_identity_hint">To change name, color, signature, etc</string>
<string name="title_setup_identity_what">What is an identity?</string>
@ -220,7 +212,7 @@
<string name="title_setup_doze_stopped">Sync stopped?</string>
<string name="title_setup_data">Data saver is enabled</string>
<string name="title_setup_advanced_options">Show advanced options</string>
<string name="title_setup_inbox">Go to messages</string>
<string name="title_setup_inbox">Go to inbox</string>
<string name="title_setup_go">Go</string>
<string name="title_setup_to_do">To do</string>
<string name="title_setup_done">Done</string>
@ -279,7 +271,7 @@
All options have commonly used standard values, which you do not need to change unless you have a different preference.
</string>
<string name="title_advanced_section_main">Principal</string>
<string name="title_advanced_section_main">Main</string>
<string name="title_advanced_section_synchronize">Receive</string>
<string name="title_advanced_section_send">Send</string>
<string name="title_advanced_section_connection">Connection</string>

Write Preview
Loading…
Cancel
Save