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

Less prominent banner, small layout improvements

Browse Source
pull/162/head
M66B 6 years ago
parent a3b7a5d19c
commit ced88b6c98
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -2376,8 +2376,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if ("pro".equals(key)) { if ("pro".equals(key)) {
boolean pro = prefs.getBoolean(key, false); boolean pro = prefs.getBoolean(key, false);
grpSupport.setVisibility( grpSupport.setVisibility(
viewType == AdapterMessage.ViewType.THREAD || pro !pro && viewType == AdapterMessage.ViewType.UNIFIED
? View.GONE : View.VISIBLE); ? 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); 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); 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); boolean folder = (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER);

16
app/src/main/res/layout/fragment_folders.xml
Unescape View File

@ -19,14 +19,11 @@
android:id="@+id/tvHintActions" android:id="@+id/tvHintActions"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="33dp" android:minHeight="36dp"
android:padding="6dp"
android:text="@string/title_hint_folder_actions" android:text="@string/title_hint_folder_actions"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibHintActions" app:layout_constraintEnd_toStartOf="@+id/ibHintActions"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -45,7 +42,6 @@
android:id="@+id/vSeparatorActions" android:id="@+id/vSeparatorActions"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="6dp"
android:background="?attr/colorSeparator" android:background="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHintActions" /> app:layout_constraintTop_toBottomOf="@id/tvHintActions" />
@ -54,14 +50,11 @@
android:id="@+id/tvHintSync" android:id="@+id/tvHintSync"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="33dp" android:minHeight="36dp"
android:padding="6dp"
android:text="@string/title_hint_folder_sync" android:text="@string/title_hint_folder_sync"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibHintSync" app:layout_constraintEnd_toStartOf="@+id/ibHintSync"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorActions" /> app:layout_constraintTop_toBottomOf="@id/vSeparatorActions" />
@ -80,7 +73,6 @@
android:id="@+id/vSeparatorSync" android:id="@+id/vSeparatorSync"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="6dp"
android:background="?attr/colorSeparator" android:background="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHintSync" /> app:layout_constraintTop_toBottomOf="@id/tvHintSync" />

10
app/src/main/res/layout/fragment_messages.xml
Unescape View File

@ -23,7 +23,6 @@
android:padding="6dp" android:padding="6dp"
android:text="@string/title_pro_support" android:text="@string/title_pro_support"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -41,11 +40,10 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="33dp" android:minHeight="36dp"
android:padding="6dp" android:padding="6dp"
android:text="@string/title_hint_support" android:text="@string/title_hint_support"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibHintSupport" app:layout_constraintEnd_toStartOf="@+id/ibHintSupport"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" /> app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" />
@ -73,11 +71,10 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="33dp" android:minHeight="36dp"
android:padding="6dp" android:padding="6dp"
android:text="@string/title_hint_message_actions" android:text="@string/title_hint_message_actions"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibHintSwipe" app:layout_constraintEnd_toStartOf="@+id/ibHintSwipe"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" /> app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" />
@ -105,11 +102,10 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="33dp" android:minHeight="36dp"
android:padding="6dp" android:padding="6dp"
android:text="@string/title_hint_message_selection" android:text="@string/title_hint_message_selection"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toStartOf="@+id/ibHintSelect" app:layout_constraintEnd_toStartOf="@+id/ibHintSelect"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSwipe" /> app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSwipe" />

Write Preview
Loading…
Cancel
Save