mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix conversation select menu options not showing. 

Also fix unpin option being shown incorrectly.
fork-5.53.8
Rashad Sookram 2021-12-09 11:11:49 -05:00 zatwierdzone przez Cody Henthorne
rodzic d6a42daef7
commit 5b49be47f9
2 zmienionych plików z 1 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt
Wyświetl plik

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

3
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
Wyświetl plik

@ -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))); items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds)));
if (hasUnmuted) { if (hasUnmuted) {
items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations()))); items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations())));
} else { } 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)); 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) { protected Toolbar getToolbar(@NonNull View rootView) {