mirror of https://github.com/M66B/FairEmail.git
Small layout improvement
This commit is contained in:
parent
34fbdfde30
commit
ca23b0dd85
|
@ -88,19 +88,23 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
|||
private View vwColor;
|
||||
private ImageView ivState;
|
||||
private ImageView ivReadOnly;
|
||||
|
||||
private View vwLevel;
|
||||
private ImageView ivExpander;
|
||||
|
||||
private ImageView ivUnified;
|
||||
private ImageView ivNotify;
|
||||
private ImageView ivSubscribed;
|
||||
private TextView tvName;
|
||||
private TextView tvMessages;
|
||||
private ImageView ivMessages;
|
||||
|
||||
private ImageView ivType;
|
||||
private ImageView ivUnified;
|
||||
private TextView tvType;
|
||||
private TextView tvTotal;
|
||||
private TextView tvAfter;
|
||||
private ImageView ivSync;
|
||||
|
||||
private TextView tvKeywords;
|
||||
private TextView tvError;
|
||||
|
||||
|
@ -113,19 +117,23 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
|||
vwColor = itemView.findViewById(R.id.vwColor);
|
||||
ivState = itemView.findViewById(R.id.ivState);
|
||||
ivReadOnly = itemView.findViewById(R.id.ivReadOnly);
|
||||
|
||||
vwLevel = itemView.findViewById(R.id.vwLevel);
|
||||
ivExpander = itemView.findViewById(R.id.ivExpander);
|
||||
|
||||
ivUnified = itemView.findViewById(R.id.ivUnified);
|
||||
ivNotify = itemView.findViewById(R.id.ivNotify);
|
||||
ivSubscribed = itemView.findViewById(R.id.ivSubscribed);
|
||||
tvName = itemView.findViewById(R.id.tvName);
|
||||
tvMessages = itemView.findViewById(R.id.tvMessages);
|
||||
ivMessages = itemView.findViewById(R.id.ivMessages);
|
||||
|
||||
ivType = itemView.findViewById(R.id.ivType);
|
||||
ivUnified = itemView.findViewById(R.id.ivUnified);
|
||||
tvType = itemView.findViewById(R.id.tvType);
|
||||
tvTotal = itemView.findViewById(R.id.tvTotal);
|
||||
tvAfter = itemView.findViewById(R.id.tvAfter);
|
||||
ivSync = itemView.findViewById(R.id.ivSync);
|
||||
|
||||
tvKeywords = itemView.findViewById(R.id.tvKeywords);
|
||||
tvError = itemView.findViewById(R.id.tvError);
|
||||
}
|
||||
|
@ -194,6 +202,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
|||
? View.VISIBLE : View.INVISIBLE);
|
||||
|
||||
if (listener == null) {
|
||||
ivUnified.setVisibility(account > 0 && folder.unified ? View.VISIBLE : View.GONE);
|
||||
ivNotify.setVisibility(folder.notify ? View.VISIBLE : View.GONE);
|
||||
ivSubscribed.setVisibility(subscriptions && folder.subscribed != null && folder.subscribed ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
@ -226,8 +235,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
|||
ivType.setImageResource(EntityFolder.getIcon(folder.type));
|
||||
|
||||
if (listener == null) {
|
||||
ivUnified.setVisibility(account > 0 && folder.unified ? View.VISIBLE : View.GONE);
|
||||
|
||||
if (account < 0)
|
||||
tvType.setText(folder.accountName);
|
||||
else {
|
||||
|
|
|
@ -26,19 +26,19 @@
|
|||
android:layout_height="24dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:contentDescription="@string/title_legend_connection_state"
|
||||
app:srcCompat="@drawable/baseline_cloud_off_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvName"
|
||||
app:layout_constraintStart_toEndOf="@id/vwColor"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName" />
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName"
|
||||
app:srcCompat="@drawable/baseline_cloud_off_24" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivReadOnly"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_marginStart="6dp"
|
||||
app:srcCompat="@drawable/baseline_visibility_24"
|
||||
app:layout_constraintStart_toEndOf="@id/vwColor"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType" />
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType"
|
||||
app:srcCompat="@drawable/baseline_visibility_24" />
|
||||
|
||||
<View
|
||||
android:id="@+id/vwLevel"
|
||||
|
@ -57,21 +57,10 @@
|
|||
android:contentDescription="@string/title_legend_expander"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp"
|
||||
app:srcCompat="@drawable/expander"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
|
||||
app:layout_constraintStart_toEndOf="@+id/vwLevel"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivType"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/title_legend_folder_type"
|
||||
android:paddingEnd="6dp"
|
||||
app:srcCompat="@drawable/baseline_inbox_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvType"
|
||||
app:layout_constraintStart_toEndOf="@id/ivExpander"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/expander" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivUnified"
|
||||
|
@ -79,10 +68,10 @@
|
|||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/title_unified_folder"
|
||||
android:paddingEnd="6dp"
|
||||
app:srcCompat="@drawable/baseline_folder_special_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvType"
|
||||
app:layout_constraintStart_toEndOf="@id/ivType"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType" />
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvName"
|
||||
app:layout_constraintStart_toEndOf="@id/ivExpander"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName"
|
||||
app:srcCompat="@drawable/baseline_folder_special_24" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivNotify"
|
||||
|
@ -90,10 +79,10 @@
|
|||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/title_legend_notify"
|
||||
android:paddingEnd="6dp"
|
||||
app:srcCompat="@drawable/baseline_notifications_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvName"
|
||||
app:layout_constraintStart_toEndOf="@id/ivExpander"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName" />
|
||||
app:layout_constraintStart_toEndOf="@id/ivUnified"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName"
|
||||
app:srcCompat="@drawable/baseline_notifications_24" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivSubscribed"
|
||||
|
@ -101,10 +90,10 @@
|
|||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/title_legend_notify"
|
||||
android:paddingEnd="6dp"
|
||||
app:srcCompat="@drawable/baseline_bookmark_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvName"
|
||||
app:layout_constraintStart_toEndOf="@id/ivNotify"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName" />
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName"
|
||||
app:srcCompat="@drawable/baseline_bookmark_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvName"
|
||||
|
@ -140,10 +129,21 @@
|
|||
android:layout_height="24dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:contentDescription="@string/title_legend_count"
|
||||
app:srcCompat="@drawable/baseline_mail_outline_24"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvName"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName" />
|
||||
app:layout_constraintTop_toTopOf="@+id/tvName"
|
||||
app:srcCompat="@drawable/baseline_mail_outline_24" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivType"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="24dp"
|
||||
android:contentDescription="@string/title_legend_folder_type"
|
||||
android:paddingEnd="6dp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tvType"
|
||||
app:layout_constraintStart_toEndOf="@id/ivExpander"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType"
|
||||
app:srcCompat="@drawable/baseline_inbox_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvType"
|
||||
|
@ -156,7 +156,7 @@
|
|||
android:text="type"
|
||||
android:textAppearance="@android:style/TextAppearance.Small"
|
||||
android:textStyle="italic"
|
||||
app:layout_constraintStart_toEndOf="@id/ivUnified"
|
||||
app:layout_constraintStart_toEndOf="@id/ivType"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvName" />
|
||||
|
||||
<TextView
|
||||
|
@ -194,10 +194,10 @@
|
|||
android:layout_height="24dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:contentDescription="@string/title_legend_sync_state"
|
||||
app:srcCompat="@drawable/baseline_sync_24"
|
||||
app:layout_constraintBottom_toBottomOf="@id/tvType"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType" />
|
||||
app:layout_constraintTop_toTopOf="@+id/tvType"
|
||||
app:srcCompat="@drawable/baseline_sync_24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvKeywords"
|
||||
|
|
Loading…
Reference in New Issue