Revert "Experiment"

This reverts commit 5360cfcd2b.
pull/213/head
M66B 1 year ago
parent 66acc984e6
commit d2782783e5

@ -265,7 +265,6 @@ public class FragmentMessages extends FragmentBase
private ImageButton ibUp;
private ImageButton ibOutbox;
private TextView tvOutboxCount;
private ImageButton ibSearch;
private ImageButton ibSeen;
private ImageButton ibUnflagged;
private ImageButton ibSnoozed;
@ -576,7 +575,6 @@ public class FragmentMessages extends FragmentBase
ibOutbox = view.findViewById(R.id.ibOutbox);
tvOutboxCount = view.findViewById(R.id.tvOutboxCount);
tvDebug = view.findViewById(R.id.tvDebug);
ibSearch = view.findViewById(R.id.ibSearch);
ibSeen = view.findViewById(R.id.ibSeen);
ibUnflagged = view.findViewById(R.id.ibUnflagged);
ibSnoozed = view.findViewById(R.id.ibSnoozed);
@ -1277,13 +1275,6 @@ public class FragmentMessages extends FragmentBase
}
});
ibSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
onMenuSearch();
}
});
ibSeen.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -1883,7 +1874,6 @@ public class FragmentMessages extends FragmentBase
tvDebug.setVisibility(
BuildConfig.DEBUG && viewType != AdapterMessage.ViewType.THREAD
? View.VISIBLE : View.GONE);
ibSearch.setVisibility(View.GONE);
ibSeen.setVisibility(View.GONE);
ibUnflagged.setVisibility(View.GONE);
ibSnoozed.setVisibility(View.GONE);
@ -5766,8 +5756,6 @@ public class FragmentMessages extends FragmentBase
menu.findItem(R.id.menu_edit_properties).setVisible(viewType == AdapterMessage.ViewType.FOLDER && !outbox);
// In some cases onPrepareOptionsMenu can be called before onCreateView
if (ibSearch == null)
ibSearch = view.findViewById(R.id.ibSearch);
if (ibSeen == null)
ibSeen = view.findViewById(R.id.ibSeen);
if (ibUnflagged == null)
@ -5779,7 +5767,6 @@ public class FragmentMessages extends FragmentBase
ibUnflagged.setImageResource(filter_unflagged ? R.drawable.twotone_star_border_24 : R.drawable.baseline_star_24);
ibSnoozed.setImageResource(filter_snoozed ? R.drawable.twotone_visibility_off_24 : R.drawable.twotone_visibility_24);
ibSearch.setVisibility(quick_filter && folder && BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
ibSeen.setVisibility(quick_filter && folder ? View.VISIBLE : View.GONE);
ibUnflagged.setVisibility(quick_filter && folder ? View.VISIBLE : View.GONE);
ibSnoozed.setVisibility(quick_filter && folder && !drafts ? View.VISIBLE : View.GONE);

@ -398,21 +398,6 @@
app:layout_constraintBottom_toTopOf="@+id/etSearch"
app:layout_constraintStart_toEndOf="@+id/tvOutboxCount" />
<ImageButton
android:id="@+id/ibSearch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.4"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_search"
android:padding="12dp"
app:layout_constraintBottom_toTopOf="@+id/etSearch"
app:layout_constraintEnd_toStartOf="@id/ibSeen"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/twotone_search_24"
app:tint="?attr/colorAccent" />
<ImageButton
android:id="@+id/ibSeen"
android:layout_width="wrap_content"
@ -424,7 +409,7 @@
app:layout_constraintBottom_toTopOf="@+id/etSearch"
app:layout_constraintEnd_toStartOf="@id/ibUnflagged"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/ibSearch"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/twotone_drafts_24"
app:tint="?attr/colorAccent" />

Loading…
Cancel
Save