Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 03:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support remark

Browse Source
This commit is contained in:
M66B
2020-07-12 20:25:22 +02:00
parent 2a3684db91
commit b395fd866a
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/layout/fragment_quick_setup.xml
View File

@@ -150,6 +150,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvErrorRemark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_setup_quick_support"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
<Button
android:id="@+id/btnSupport"
android:layout_width="wrap_content"
@@ -160,7 +171,7 @@
android:textColor="?attr/colorInfoForeground"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
<Button
android:id="@+id/btnHelp"
@@ -172,7 +183,7 @@
android:textColor="?attr/colorInfoForeground"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvInstructions"
@@ -278,6 +289,6 @@
android:id="@+id/grpError"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint" />
app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint,tvErrorRemark" />
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>

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

@@ -152,9 +152,10 @@
</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_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>
<string name="title_setup_quick_smtp">SMTP server to send messages</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_remark">Go \'back\' to go to the inbox</string>