mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-31 20:25:38 +00:00
Code Issues Releases Wiki Activity

Added hints

Browse source
This commit is contained in:
M66B 2019-12-08 11:41:02 +01:00
parent 3c919a645b
commit 93f30c5f0a
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/res/layout/fragment_gmail.xml
View file

@ -14,7 +14,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvHint"
android:id="@+id/tvGrantHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_gmail_rationale"
@ -31,7 +31,7 @@
android:tag="disable"
android:text="@string/title_setup_grant"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHint" />
app:layout_constraintTop_toBottomOf="@id/tvGrantHint" />
<TextView
android:id="@+id/tvGranted"
@ -84,6 +84,16 @@
app:layout_constraintStart_toEndOf="@id/btnSelect"
app:layout_constraintTop_toTopOf="@id/btnSelect" />
<TextView
android:id="@+id/tvSelectHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_setup_gmail_permissions"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSelect" />
<TextView
android:id="@+id/tvErrorTitle"
android:layout_width="wrap_content"
@ -93,7 +103,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSelect" />
app:layout_constraintTop_toBottomOf="@id/tvSelectHint" />
<TextView
android:id="@+id/tvError"
@ -107,10 +117,21 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvErrorTitle" />
<TextView
android:id="@+id/tvDraftsHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_gmail_drafts"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpError"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvErrorTitle,tvError" />
app:constraint_referenced_ids="tvErrorTitle,tvError,tvDraftsHint" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

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

@ -142,6 +142,8 @@
<string name="title_setup_other">Other provider</string>
<string name="title_setup_gmail_support">Authorizing Google accounts will work in official versions only because Android checks the app signature</string>
<string name="title_setup_gmail_rationale">Please grant permissions to select an account and read your name</string>
<string name="title_setup_gmail_permissions">Google will ask for permissions to read, compose, send and permanently delete all your email. FairEmail will never delete your messages without your approval.</string>
<string name="title_setup_gmail_drafts">If the drafts folder is not accessible by IMAP, this can be fixed in the Gmail label settings</string>
<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>