Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix folder item layout issue

Browse Source
This commit is contained in:
M66B
2025-02-06 11:36:43 +01:00
parent 3327cde920
commit ffde5bb5f6
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@@ -52,6 +52,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.fragment.app.Fragment;
@@ -123,7 +125,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private static final int DENSE_ITEMS_THRESHOLD_MANY = 50;
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private View view;
private ConstraintLayout view;
private View vwColor;
private ImageView ivState;
@@ -459,6 +461,17 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (btnHelp != null)
btnHelp.setVisibility(folder.error == null ? View.GONE : View.VISIBLE);
ConstraintSet constraintSet = new ConstraintSet();
constraintSet.clone(view);
if (show_flagged && !show_compact) {
constraintSet.connect(R.id.ibSync, ConstraintSet.END, R.id.tvFlaggedEnd, ConstraintSet.START);
constraintSet.connect(R.id.ibMessages, ConstraintSet.END, R.id.tvFlaggedEnd, ConstraintSet.START);
} else {
constraintSet.connect(R.id.ibSync, ConstraintSet.END, view.getId(), ConstraintSet.END);
constraintSet.connect(R.id.ibMessages, ConstraintSet.END, view.getId(), ConstraintSet.END);
}
constraintSet.applyTo(view);
grpFlagged.setVisibility(show_flagged && show_compact ? View.VISIBLE : View.GONE);
grpFlaggedEnd.setVisibility(show_flagged && !show_compact ? View.VISIBLE : View.GONE);
grpExtended.setVisibility(show_compact ? View.GONE : View.VISIBLE);

4
app/src/main/res/layout/item_folder.xml
View File

@@ -152,12 +152,12 @@
android:id="@+id/ibMessages"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_accessibility_unseen"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintEnd_toStartOf="@+id/tvFlaggedEnd"
app:layout_constraintTop_toTopOf="@+id/tvName"
app:layout_goneMarginEnd="6dp"
app:srcCompat="@drawable/twotone_mail_outline_24" />
<ImageButton
@@ -230,12 +230,12 @@
android:id="@+id/ibSync"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/tile_synchronize"
app:layout_constraintBottom_toBottomOf="@id/tvType"
app:layout_constraintEnd_toStartOf="@+id/tvFlaggedEnd"
app:layout_constraintTop_toTopOf="@+id/tvType"
app:layout_goneMarginEnd="6dp"
app:srcCompat="@drawable/twotone_sync_24" />
<TextView