Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conversation select menu options not showing.

Browse Source 
Also fix unpin option being shown incorrectly.
This commit is contained in:
Rashad Sookram
2021-12-09 11:11:49 -05:00
committed by Cody Henthorne
parent d6a42daef7
commit 5b49be47f9
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt
View File

@@ -11,7 +11,6 @@ import android.view.animation.AnimationUtils
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import androidx.core.view.isGone
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.util.ViewUtil
@@ -64,12 +63,7 @@ class SignalBottomActionBar(context: Context, attributeSet: AttributeSet) : Line
}
private fun present(items: List<ActionItem>) {
if (isGone) {
return
}
if (width == 0) {
post { present(items) }
return
}

3
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View File

@@ -1328,7 +1328,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode
items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds)));
if (hasUnmuted) {
items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations())));
} else {
@@ -1337,7 +1336,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
items.add(new ActionItem(R.drawable.ic_select_24, getString(R.string.ConversationListFragment_select_all), viewModel::onSelectAllClick));
// bottomActionBar.setItems(items);
bottomActionBar.setItems(items);
}
protected Toolbar getToolbar(@NonNull View rootView) {