From ced88b6c9845130601190dd246a02edf42105db9 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 6 Sep 2019 19:32:11 +0200 Subject: [PATCH] Less prominent banner, small layout improvements --- .../java/eu/faircode/email/FragmentMessages.java | 6 +++--- app/src/main/res/layout/fragment_folders.xml | 16 ++++------------ app/src/main/res/layout/fragment_messages.xml | 10 +++------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 7a0752ec5c..dbf33fad98 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2376,8 +2376,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if ("pro".equals(key)) { boolean pro = prefs.getBoolean(key, false); grpSupport.setVisibility( - viewType == AdapterMessage.ViewType.THREAD || pro - ? View.GONE : View.VISIBLE); + !pro && viewType == AdapterMessage.ViewType.UNIFIED + ? View.VISIBLE : View.GONE); } } @@ -2531,7 +2531,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. ibSeen.setImageResource(filter_seen ? R.drawable.baseline_drafts_24 : R.drawable.baseline_mail_24); ibUnflagged.setImageResource(filter_unflagged ? R.drawable.baseline_star_border_24 : R.drawable.baseline_star_24); - ibSnoozed.setImageResource(filter_snoozed ? R.drawable.baseline_timelapse_24: R.drawable.baseline_timer_off_24); + ibSnoozed.setImageResource(filter_snoozed ? R.drawable.baseline_timelapse_24 : R.drawable.baseline_timer_off_24); boolean folder = (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER); diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml index 8b8f681463..c6c9bb2a61 100644 --- a/app/src/main/res/layout/fragment_folders.xml +++ b/app/src/main/res/layout/fragment_folders.xml @@ -19,14 +19,11 @@ android:id="@+id/tvHintActions" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="6dp" - android:layout_marginTop="6dp" - android:layout_marginEnd="6dp" android:gravity="center_vertical" - android:minHeight="33dp" + android:minHeight="36dp" + android:padding="6dp" android:text="@string/title_hint_folder_actions" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toStartOf="@+id/ibHintActions" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -45,7 +42,6 @@ android:id="@+id/vSeparatorActions" android:layout_width="match_parent" android:layout_height="1dp" - android:layout_marginTop="6dp" android:background="?attr/colorSeparator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvHintActions" /> @@ -54,14 +50,11 @@ android:id="@+id/tvHintSync" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="6dp" - android:layout_marginTop="6dp" - android:layout_marginEnd="6dp" android:gravity="center_vertical" - android:minHeight="33dp" + android:minHeight="36dp" + android:padding="6dp" android:text="@string/title_hint_folder_sync" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toStartOf="@+id/ibHintSync" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/vSeparatorActions" /> @@ -80,7 +73,6 @@ android:id="@+id/vSeparatorSync" android:layout_width="match_parent" android:layout_height="1dp" - android:layout_marginTop="6dp" android:background="?attr/colorSeparator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvHintSync" /> diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml index e38f1096d6..c0737d06c3 100644 --- a/app/src/main/res/layout/fragment_messages.xml +++ b/app/src/main/res/layout/fragment_messages.xml @@ -23,7 +23,6 @@ android:padding="6dp" android:text="@string/title_pro_support" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -41,11 +40,10 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:gravity="center_vertical" - android:minHeight="33dp" + android:minHeight="36dp" android:padding="6dp" android:text="@string/title_hint_support" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toStartOf="@+id/ibHintSupport" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" /> @@ -73,11 +71,10 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:gravity="center_vertical" - android:minHeight="33dp" + android:minHeight="36dp" android:padding="6dp" android:text="@string/title_hint_message_actions" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toStartOf="@+id/ibHintSwipe" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" /> @@ -105,11 +102,10 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:gravity="center_vertical" - android:minHeight="33dp" + android:minHeight="36dp" android:padding="6dp" android:text="@string/title_hint_message_selection" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="?android:attr/textColorPrimary" app:layout_constraintEnd_toStartOf="@+id/ibHintSelect" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSwipe" />