mirror of https://github.com/M66B/FairEmail.git
Collapse message more
This commit is contained in:
parent
08f8f7e761
commit
15be205f15
|
@ -415,8 +415,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
private ImageButton ibTrash;
|
private ImageButton ibTrash;
|
||||||
private ImageButton ibJunk;
|
private ImageButton ibJunk;
|
||||||
private ImageButton ibInbox;
|
private ImageButton ibInbox;
|
||||||
private ImageButton ibTools;
|
|
||||||
private ImageButton ibMore;
|
private ImageButton ibMore;
|
||||||
|
private ImageButton ibTools;
|
||||||
private TextView tvSignedData;
|
private TextView tvSignedData;
|
||||||
|
|
||||||
private TextView tvBody;
|
private TextView tvBody;
|
||||||
|
@ -616,8 +616,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibTrash = vsBody.findViewById(R.id.ibTrash);
|
ibTrash = vsBody.findViewById(R.id.ibTrash);
|
||||||
ibJunk = vsBody.findViewById(R.id.ibJunk);
|
ibJunk = vsBody.findViewById(R.id.ibJunk);
|
||||||
ibInbox = vsBody.findViewById(R.id.ibInbox);
|
ibInbox = vsBody.findViewById(R.id.ibInbox);
|
||||||
ibTools = vsBody.findViewById(R.id.ibTools);
|
|
||||||
ibMore = vsBody.findViewById(R.id.ibMore);
|
ibMore = vsBody.findViewById(R.id.ibMore);
|
||||||
|
ibTools = vsBody.findViewById(R.id.ibTools);
|
||||||
tvSignedData = vsBody.findViewById(R.id.tvSignedData);
|
tvSignedData = vsBody.findViewById(R.id.tvSignedData);
|
||||||
|
|
||||||
tvBody = vsBody.findViewById(R.id.tvBody);
|
tvBody = vsBody.findViewById(R.id.tvBody);
|
||||||
|
@ -706,8 +706,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibTrash.setOnClickListener(this);
|
ibTrash.setOnClickListener(this);
|
||||||
ibJunk.setOnClickListener(this);
|
ibJunk.setOnClickListener(this);
|
||||||
ibInbox.setOnClickListener(this);
|
ibInbox.setOnClickListener(this);
|
||||||
ibTools.setOnClickListener(this);
|
|
||||||
ibMore.setOnClickListener(this);
|
ibMore.setOnClickListener(this);
|
||||||
|
ibTools.setOnClickListener(this);
|
||||||
|
|
||||||
ibDownloading.setOnClickListener(this);
|
ibDownloading.setOnClickListener(this);
|
||||||
ibTrashBottom.setOnClickListener(this);
|
ibTrashBottom.setOnClickListener(this);
|
||||||
|
@ -793,8 +793,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibTrash.setOnClickListener(null);
|
ibTrash.setOnClickListener(null);
|
||||||
ibJunk.setOnClickListener(null);
|
ibJunk.setOnClickListener(null);
|
||||||
ibInbox.setOnClickListener(null);
|
ibInbox.setOnClickListener(null);
|
||||||
ibTools.setOnClickListener(null);
|
|
||||||
ibMore.setOnClickListener(null);
|
ibMore.setOnClickListener(null);
|
||||||
|
ibTools.setOnClickListener(null);
|
||||||
|
|
||||||
ibDownloading.setOnClickListener(null);
|
ibDownloading.setOnClickListener(null);
|
||||||
ibTrashBottom.setOnClickListener(null);
|
ibTrashBottom.setOnClickListener(null);
|
||||||
|
@ -1287,8 +1287,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibTrash.setVisibility(View.GONE);
|
ibTrash.setVisibility(View.GONE);
|
||||||
ibJunk.setVisibility(View.GONE);
|
ibJunk.setVisibility(View.GONE);
|
||||||
ibInbox.setVisibility(View.GONE);
|
ibInbox.setVisibility(View.GONE);
|
||||||
ibTools.setVisibility(View.GONE);
|
|
||||||
ibMore.setVisibility(View.GONE);
|
ibMore.setVisibility(View.GONE);
|
||||||
|
ibTools.setVisibility(View.GONE);
|
||||||
tvSignedData.setVisibility(View.GONE);
|
tvSignedData.setVisibility(View.GONE);
|
||||||
|
|
||||||
tvNoInternetBody.setVisibility(View.GONE);
|
tvNoInternetBody.setVisibility(View.GONE);
|
||||||
|
@ -1417,8 +1417,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibTrash.setVisibility(View.GONE);
|
ibTrash.setVisibility(View.GONE);
|
||||||
ibJunk.setVisibility(View.GONE);
|
ibJunk.setVisibility(View.GONE);
|
||||||
ibInbox.setVisibility(View.GONE);
|
ibInbox.setVisibility(View.GONE);
|
||||||
|
ibMore.setVisibility(View.GONE);
|
||||||
ibTools.setVisibility(View.GONE);
|
ibTools.setVisibility(View.GONE);
|
||||||
ibMore.setVisibility(EntityFolder.OUTBOX.equals(message.folderType) ? View.GONE : View.VISIBLE);
|
|
||||||
tvSignedData.setVisibility(View.GONE);
|
tvSignedData.setVisibility(View.GONE);
|
||||||
|
|
||||||
// Message text
|
// Message text
|
||||||
|
@ -1546,6 +1546,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
ibTrash.setVisibility(tools && trash ? View.VISIBLE : View.GONE);
|
ibTrash.setVisibility(tools && trash ? View.VISIBLE : View.GONE);
|
||||||
ibJunk.setVisibility(tools && junk ? View.VISIBLE : View.GONE);
|
ibJunk.setVisibility(tools && junk ? View.VISIBLE : View.GONE);
|
||||||
ibInbox.setVisibility(tools && inbox ? View.VISIBLE : View.GONE);
|
ibInbox.setVisibility(tools && inbox ? View.VISIBLE : View.GONE);
|
||||||
|
ibMore.setVisibility(!tools || outbox ? View.GONE : View.VISIBLE);
|
||||||
ibTools.setImageLevel(tools ? 0 : 1);
|
ibTools.setImageLevel(tools ? 0 : 1);
|
||||||
ibTools.setVisibility(View.VISIBLE);
|
ibTools.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
@ -2757,12 +2758,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
case R.id.ibInbox:
|
case R.id.ibInbox:
|
||||||
onActionInbox(message);
|
onActionInbox(message);
|
||||||
break;
|
break;
|
||||||
case R.id.ibTools:
|
|
||||||
onActionTools(message);
|
|
||||||
break;
|
|
||||||
case R.id.ibMore:
|
case R.id.ibMore:
|
||||||
onActionMore(message);
|
onActionMore(message);
|
||||||
break;
|
break;
|
||||||
|
case R.id.ibTools:
|
||||||
|
onActionTools(message);
|
||||||
|
break;
|
||||||
|
|
||||||
case R.id.ibDownloading:
|
case R.id.ibDownloading:
|
||||||
Helper.viewFAQ(context, 15);
|
Helper.viewFAQ(context, 15);
|
||||||
|
|
|
@ -23,19 +23,6 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator" />
|
app:layout_constraintTop_toBottomOf="@id/vSeparator" />
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/ibMore"
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="36dp"
|
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
|
||||||
android:contentDescription="@string/title_more"
|
|
||||||
android:padding="6dp"
|
|
||||||
android:scaleType="fitCenter"
|
|
||||||
android:tooltipText="@string/title_more"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
|
||||||
app:srcCompat="@drawable/baseline_more_horiz_24" />
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/ibTools"
|
android:id="@+id/ibTools"
|
||||||
android:layout_width="36dp"
|
android:layout_width="36dp"
|
||||||
|
@ -45,10 +32,23 @@
|
||||||
android:padding="6dp"
|
android:padding="6dp"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
android:tooltipText="@string/title_legend_expander"
|
android:tooltipText="@string/title_legend_expander"
|
||||||
app:layout_constraintStart_toEndOf="@+id/ibMore"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
||||||
app:srcCompat="@drawable/expander_hor" />
|
app:srcCompat="@drawable/expander_hor" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/ibMore"
|
||||||
|
android:layout_width="36dp"
|
||||||
|
android:layout_height="36dp"
|
||||||
|
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||||
|
android:contentDescription="@string/title_more"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
|
android:tooltipText="@string/title_more"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/ibTools"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/vSeparator"
|
||||||
|
app:srcCompat="@drawable/baseline_more_horiz_24" />
|
||||||
|
|
||||||
<androidx.constraintlayout.helper.widget.Flow
|
<androidx.constraintlayout.helper.widget.Flow
|
||||||
android:id="@+id/ibFlow"
|
android:id="@+id/ibFlow"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
app:flow_horizontalStyle="packed"
|
app:flow_horizontalStyle="packed"
|
||||||
app:flow_wrapMode="chain"
|
app:flow_wrapMode="chain"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/ibVerify"
|
app:layout_constraintEnd_toStartOf="@+id/ibVerify"
|
||||||
app:layout_constraintStart_toEndOf="@+id/ibTools"
|
app:layout_constraintStart_toEndOf="@+id/ibMore"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparator" />
|
app:layout_constraintTop_toBottomOf="@id/vSeparator" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
|
|
Loading…
Reference in New Issue