From f82978c683630c1a7da609d6302eeca7900b0c48 Mon Sep 17 00:00:00 2001 From: luvletter2333 Date: Sun, 25 Apr 2021 15:40:52 +0800 Subject: [PATCH] Refine pressTitleToOpenAllChats --- .../ui/Components/FilterTabsView.java | 2 +- .../java/org/telegram/ui/DialogsActivity.java | 32 ++++++++----------- .../settings/NekoChatSettingsActivity.java | 1 + 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java index 2b9e955dc..c88e2376e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/FilterTabsView.java @@ -1555,7 +1555,7 @@ public class FilterTabsView extends FrameLayout { return listView; } - public boolean showAllChatsTab = false; + public boolean showAllChatsTab = !NekoConfig.hideAllTab; public void toggleAllTabs(boolean show) { if (show == showAllChatsTab) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java index adb65cdd0..1582df676 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java @@ -2099,15 +2099,13 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter. actionBar.setTitle(LocaleController.getString("SelectChat", R.string.SelectChat)); } actionBar.setBackgroundColor(Theme.getColor(Theme.key_actionBarDefault)); - if (NekoConfig.hideAllTab) { - actionBar.setOnLongClickListener(v -> { - if (NekoConfig.pressTitleToOpenAllChats && filterTabsView != null && filterTabsView.getCurrentTabId() != Integer.MAX_VALUE) { - filterTabsView.toggleAllTabs(true); - filterTabsView.selectFirstTab(); - } - return false; - }); - } + actionBar.setOnLongClickListener(v -> { + if (NekoConfig.hideAllTab && NekoConfig.pressTitleToOpenAllChats && filterTabsView != null && filterTabsView.getCurrentTabId() != Integer.MAX_VALUE) { + filterTabsView.toggleAllTabs(true); + filterTabsView.selectFirstTab(); + } + return false; + }); } else { if (searchString != null || folderId != 0) { actionBar.setBackButtonDrawable(backDrawable = new BackDrawable(false)); @@ -2119,15 +2117,13 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter. actionBar.setTitle(LocaleController.getString("ArchivedChats", R.string.ArchivedChats)); } else { actionBar.setTitle(LocaleController.getString("NekoX", R.string.NekoX)); - if (NekoConfig.hideAllTab) { - actionBar.setOnLongClickListener(v -> { - if (NekoConfig.pressTitleToOpenAllChats && filterTabsView != null && filterTabsView.getCurrentTabId() != Integer.MAX_VALUE) { - filterTabsView.toggleAllTabs(true); - filterTabsView.selectFirstTab(); - } - return false; - }); - } + actionBar.setOnLongClickListener(v -> { + if (NekoConfig.hideAllTab && NekoConfig.pressTitleToOpenAllChats && filterTabsView != null && filterTabsView.getCurrentTabId() != Integer.MAX_VALUE) { + filterTabsView.toggleAllTabs(true); + filterTabsView.selectFirstTab(); + } + return false; + }); } if (folderId == 0) { actionBar.setSupportsHolidayImage(true); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java index baffb7b74..ab0bd070b 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java @@ -211,6 +211,7 @@ public class NekoChatSettingsActivity extends BaseFragment implements Notificati if (view instanceof TextCheckCell) { ((TextCheckCell) view).setChecked(NekoConfig.pressTitleToOpenAllChats); } + getNotificationCenter().postNotificationName(NotificationCenter.dialogFiltersUpdated); } else if (position == tabsTitleTypeRow) { PopupBuilder builder = new PopupBuilder(view);