From dd04426be2a3ada94b9fbb77ad90d4cf022934d8 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 29 Dec 2019 13:02:08 +0100 Subject: [PATCH] Rearrange --- .../java/eu/faircode/email/AdapterFolder.java | 2 +- app/src/main/res/layout/fragment_accounts.xml | 4 ++-- app/src/main/res/layout/fragment_answers.xml | 2 +- .../main/res/layout/fragment_certificates.xml | 2 +- app/src/main/res/layout/fragment_folders.xml | 4 ++-- .../main/res/layout/fragment_identities.xml | 2 +- app/src/main/res/layout/fragment_messages.xml | 20 +++++++++---------- app/src/main/res/layout/fragment_rules.xml | 2 +- .../res/layout/include_message_addresses.xml | 18 ++++++++--------- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java index ee2e5b7cda..669a025568 100644 --- a/app/src/main/java/eu/faircode/email/AdapterFolder.java +++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java @@ -200,7 +200,7 @@ public class AdapterFolder extends RecyclerView.Adapter @@ -79,9 +79,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_add" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_add" - android:contentDescription="@string/title_add" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_add_24" /> diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml index 436287f3cc..1d2f39718f 100644 --- a/app/src/main/res/layout/fragment_answers.xml +++ b/app/src/main/res/layout/fragment_answers.xml @@ -48,9 +48,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_add" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_add" - android:contentDescription="@string/title_add" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_add_24" /> diff --git a/app/src/main/res/layout/fragment_certificates.xml b/app/src/main/res/layout/fragment_certificates.xml index 9bd0a1dc8b..0761679a0a 100644 --- a/app/src/main/res/layout/fragment_certificates.xml +++ b/app/src/main/res/layout/fragment_certificates.xml @@ -45,9 +45,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_add" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_add" - android:contentDescription="@string/title_add" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_add_24" /> diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml index cd651bac6d..59b246ec46 100644 --- a/app/src/main/res/layout/fragment_folders.xml +++ b/app/src/main/res/layout/fragment_folders.xml @@ -130,9 +130,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_add" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_add" - android:contentDescription="@string/title_add" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_create_new_folder_24" /> @@ -142,9 +142,9 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_compose" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_compose" - android:contentDescription="@string/title_compose" app:backgroundTint="?attr/colorWarning" app:srcCompat="@drawable/baseline_warning_24" /> diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml index 34b28f80c4..e34d662e49 100644 --- a/app/src/main/res/layout/fragment_identities.xml +++ b/app/src/main/res/layout/fragment_identities.xml @@ -57,9 +57,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_add" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_add" - android:contentDescription="@string/title_add" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_add_24" /> diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml index 4216c81eb0..71b9b1e8e1 100644 --- a/app/src/main/res/layout/fragment_messages.xml +++ b/app/src/main/res/layout/fragment_messages.xml @@ -193,8 +193,8 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" - android:tint="?attr/colorFabForeground" android:contentDescription="@string/title_reply" + android:tint="?attr/colorFabForeground" app:backgroundTint="?attr/colorFabBackground" app:layout_constraintBottom_toTopOf="@+id/sbThread" app:layout_constraintEnd_toEndOf="parent" @@ -205,9 +205,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" + android:contentDescription="@string/title_accessibility_scroll_down" android:padding="12dp" android:tint="?attr/colorSeparator" - android:contentDescription="@string/title_accessibility_scroll_down" app:layout_constraintBottom_toTopOf="@+id/sbThread" app:layout_constraintEnd_toStartOf="@+id/ibUp" app:layout_constraintHorizontal_chainStyle="packed" @@ -219,9 +219,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" + android:contentDescription="@string/title_accessibility_scroll_up" android:padding="12dp" android:tint="?attr/colorSeparator" - android:contentDescription="@string/title_accessibility_scroll_up" app:layout_constraintBottom_toTopOf="@+id/sbThread" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="packed" @@ -233,9 +233,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" + android:contentDescription="@string/title_accessibility_filter_out_seen" android:padding="12dp" android:tint="?attr/colorSeparator" - android:contentDescription="@string/title_accessibility_filter_out_seen" app:layout_constraintBottom_toTopOf="@+id/bottom_navigation" app:layout_constraintEnd_toStartOf="@id/ibUnflagged" app:layout_constraintHorizontal_chainStyle="packed" @@ -247,9 +247,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" + android:contentDescription="@string/title_accessibility_filter_out_unflagged" android:padding="12dp" android:tint="?attr/colorSeparator" - android:contentDescription="@string/title_accessibility_filter_out_unflagged" app:layout_constraintBottom_toTopOf="@+id/bottom_navigation" app:layout_constraintEnd_toEndOf="@+id/ibSnoozed" app:layout_constraintStart_toEndOf="@id/ibSeen" @@ -260,9 +260,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" + android:contentDescription="@string/title_accessibility_filter_out_snoozed" android:padding="12dp" android:tint="?attr/colorSeparator" - android:contentDescription="@string/title_accessibility_filter_out_snoozed" app:layout_constraintBottom_toTopOf="@+id/bottom_navigation" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/ibUnflagged" @@ -328,9 +328,9 @@ android:layout_gravity="end|bottom" android:layout_marginEnd="@dimen/fab_padding" android:layout_marginBottom="90dp" + android:contentDescription="@string/title_more" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_more" - android:contentDescription="@string/title_more" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_more_vert_24" /> @@ -340,9 +340,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_search_server" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_search_server" - android:contentDescription="@string/title_search_server" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_youtube_searched_for_24" /> @@ -352,9 +352,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_compose" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_compose" - android:contentDescription="@string/title_compose" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_edit_24" /> @@ -364,9 +364,9 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_legend_section_folders" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_compose" - android:contentDescription="@string/title_legend_section_folders" app:backgroundTint="?attr/colorWarning" app:srcCompat="@drawable/baseline_warning_24" /> diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml index d7676087ff..b12e7a1cc5 100644 --- a/app/src/main/res/layout/fragment_rules.xml +++ b/app/src/main/res/layout/fragment_rules.xml @@ -48,9 +48,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_padding" + android:contentDescription="@string/title_add" android:tint="?attr/colorFabForeground" android:tooltipText="@string/title_add" - android:contentDescription="@string/title_add" app:backgroundTint="?attr/colorFabBackground" app:srcCompat="@drawable/baseline_add_24" /> diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml index adea721f35..1fe789a371 100644 --- a/app/src/main/res/layout/include_message_addresses.xml +++ b/app/src/main/res/layout/include_message_addresses.xml @@ -100,10 +100,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvFromEx" android:text="@string/title_from" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvFromEx" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier_action" /> @@ -125,10 +125,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvTo" android:text="@string/title_to" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvTo" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvFromEx" /> @@ -150,10 +150,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvReplyTo" android:text="@string/title_reply_to" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvReplyTo" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvTo" /> @@ -175,10 +175,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvCc" android:text="@string/title_cc" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvCc" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvReplyTo" /> @@ -200,10 +200,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvBcc" android:text="@string/title_bcc" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvBcc" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvCc" /> @@ -225,10 +225,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvIdentity" android:text="@string/title_via_identity" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvIdentity" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvBcc" /> @@ -250,10 +250,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvSent" android:text="@string/title_sent" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvSent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvIdentity" /> @@ -275,10 +275,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvReceived" android:text="@string/title_received" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvReceived" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvSent" /> @@ -300,10 +300,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="6dp" + android:labelFor="@+id/tvSizeEx" android:text="@string/title_size" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="bold" - android:labelFor="@+id/tvSizeEx" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvReceived" />