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

Add different menu copy for clearing the enabled chat filter.

main
Alex Hart 2023-01-27 10:11:40 -04:00 zatwierdzone przez Greyson Parrelli
rodzic 36dfa19aec
commit 9600d6f6a9
3 zmienionych plików z 14 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -549,7 +549,12 @@ public class ConversationListFragment extends MainFragment implements ActionMode
public void onPrepareOptionsMenu(Menu menu) { public void onPrepareOptionsMenu(Menu menu) {
menu.findItem(R.id.menu_insights).setVisible(Util.isDefaultSmsProvider(requireContext())); menu.findItem(R.id.menu_insights).setVisible(Util.isDefaultSmsProvider(requireContext()));
menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(requireContext())); menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(requireContext()));
menu.findItem(R.id.menu_filter_unread_chats).setVisible(FeatureFlags.chatFilters());
ConversationFilterRequest request = viewModel.getConversationFilterRequest().getValue();
boolean isChatFilterEnabled = request != null && request.getFilter() == ConversationFilter.UNREAD;
menu.findItem(R.id.menu_filter_unread_chats).setVisible(FeatureFlags.chatFilters() && !isChatFilterEnabled);
menu.findItem(R.id.menu_clear_unread_filter).setVisible(FeatureFlags.chatFilters() && isChatFilterEnabled);
} }
@Override @Override
@ -573,6 +578,8 @@ public class ConversationListFragment extends MainFragment implements ActionMode
handleNotificationProfile(); return true; handleNotificationProfile(); return true;
case R.id.menu_filter_unread_chats: case R.id.menu_filter_unread_chats:
handleFilterUnreadChats(); return true; handleFilterUnreadChats(); return true;
case R.id.menu_clear_unread_filter:
onClearFilterClick(); return true;
} }
return false; return false;

4
app/src/main/res/menu/text_secure_normal.xml
Wyświetl plik

@ -16,6 +16,10 @@
<item android:title="@string/text_secure_normal__filter_unread_chats" <item android:title="@string/text_secure_normal__filter_unread_chats"
android:id="@+id/menu_filter_unread_chats" /> android:id="@+id/menu_filter_unread_chats" />
<item android:title="@string/text_secure_normal__clear_unread_filter"
android:id="@+id/menu_clear_unread_filter"
android:visible="false" />
<item android:title="@string/text_secure_normal__menu_settings" <item android:title="@string/text_secure_normal__menu_settings"
android:id="@+id/menu_settings" /> android:id="@+id/menu_settings" />

2
app/src/main/res/values/strings.xml
Wyświetl plik

@ -3170,6 +3170,8 @@
<string name="text_secure_normal__invite_friends">Invite friends</string> <string name="text_secure_normal__invite_friends">Invite friends</string>
<!-- Overflow menu entry to filter unread chats --> <!-- Overflow menu entry to filter unread chats -->
<string name="text_secure_normal__filter_unread_chats">Filter unread chats</string> <string name="text_secure_normal__filter_unread_chats">Filter unread chats</string>
<!-- Overflow menu entry to disable unread chats filter -->
<string name="text_secure_normal__clear_unread_filter">Clear unread filter</string>
<!-- verify_display_fragment --> <!-- verify_display_fragment -->
<string name="verify_display_fragment_context_menu__copy_to_clipboard">Copy to clipboard</string> <string name="verify_display_fragment_context_menu__copy_to_clipboard">Copy to clipboard</string>