From 9af95477cc79f9ca20e96d858150ef6cab7a95b5 Mon Sep 17 00:00:00 2001 From: luvletter2333 Date: Tue, 1 Nov 2022 15:00:24 +0800 Subject: [PATCH] revert to baseline icons --- .../ui/Adapters/DrawerLayoutAdapter.java | 145 +++++++++--------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java index c3de85001..5ae1d0551 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java @@ -285,81 +285,84 @@ public class DrawerLayoutAdapter extends RecyclerListView.SelectionAdapter imple if (!UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) { return; } - int eventType = Theme.getEventType(); - int newGroupIcon; - int newSecretIcon; - int newChannelIcon; - int contactsIcon; - int callsIcon; - int savedIcon; - int settingsIcon; - int inviteIcon; - int helpIcon; - int peopleNearbyIcon; - if (eventType == 0) { - newGroupIcon = R.drawable.msg_groups_ny; - //newSecretIcon = R.drawable.msg_secret_ny; - //newChannelIcon = R.drawable.msg_channel_ny; - contactsIcon = R.drawable.msg_contacts_ny; - callsIcon = R.drawable.msg_calls_ny; - savedIcon = R.drawable.msg_saved_ny; - settingsIcon = R.drawable.msg_settings_ny; - inviteIcon = R.drawable.msg_invite_ny; - helpIcon = R.drawable.msg_help_ny; - peopleNearbyIcon = R.drawable.msg_nearby_ny; - } else if (eventType == 1) { - newGroupIcon = R.drawable.msg_groups_14; - //newSecretIcon = R.drawable.msg_secret_14; - //newChannelIcon = R.drawable.msg_channel_14; - contactsIcon = R.drawable.msg_contacts_14; - callsIcon = R.drawable.msg_calls_14; - savedIcon = R.drawable.msg_saved_14; - settingsIcon = R.drawable.msg_settings_14; - inviteIcon = R.drawable.msg_secret_ny; - helpIcon = R.drawable.msg_help; - peopleNearbyIcon = R.drawable.msg_secret_14; - } else if (eventType == 2) { - newGroupIcon = R.drawable.msg_groups_hw; - //newSecretIcon = R.drawable.msg_secret_hw; - //newChannelIcon = R.drawable.msg_channel_hw; - contactsIcon = R.drawable.msg_contacts_hw; - callsIcon = R.drawable.msg_calls_hw; - savedIcon = R.drawable.msg_saved_hw; - settingsIcon = R.drawable.msg_settings_hw; - inviteIcon = R.drawable.msg_invite_hw; - helpIcon = R.drawable.msg_help_hw; - peopleNearbyIcon = R.drawable.msg_secret_hw; - } else { - newGroupIcon = R.drawable.msg_groups; - //newSecretIcon = R.drawable.msg_secret; - //newChannelIcon = R.drawable.msg_channel; - contactsIcon = R.drawable.msg_contacts; - callsIcon = R.drawable.msg_calls; - savedIcon = R.drawable.msg_saved; - settingsIcon = R.drawable.msg_settings_old; - inviteIcon = R.drawable.msg_invite; - helpIcon = R.drawable.msg_help; - peopleNearbyIcon = R.drawable.msg_nearby; - } - UserConfig me = UserConfig.getInstance(UserConfig.selectedAccount); - if (me != null && me.isPremium()) { - if (me.getEmojiStatus() != null) { - items.add(new Item(15, LocaleController.getString("ChangeEmojiStatus", R.string.ChangeEmojiStatus), 0, R.raw.emoji_status_change_to_set)); - } else { - items.add(new Item(15, LocaleController.getString("SetEmojiStatus", R.string.SetEmojiStatus), 0, R.raw.emoji_status_set_to_change)); - } - items.add(null); // divider - } +// int eventType = Theme.getEventType(); +// int newGroupIcon; +// int newSecretIcon; +// int newChannelIcon; +// int contactsIcon; +// int callsIcon; +// int savedIcon; +// int settingsIcon; +// int inviteIcon; +// int helpIcon; +// int peopleNearbyIcon; +// if (eventType == 0) { +// newGroupIcon = R.drawable.msg_groups_ny; +// //newSecretIcon = R.drawable.msg_secret_ny; +// //newChannelIcon = R.drawable.msg_channel_ny; +// contactsIcon = R.drawable.msg_contacts_ny; +// callsIcon = R.drawable.msg_calls_ny; +// savedIcon = R.drawable.msg_saved_ny; +// settingsIcon = R.drawable.msg_settings_ny; +// inviteIcon = R.drawable.msg_invite_ny; +// helpIcon = R.drawable.msg_help_ny; +// peopleNearbyIcon = R.drawable.msg_nearby_ny; +// } else if (eventType == 1) { +// newGroupIcon = R.drawable.msg_groups_14; +// //newSecretIcon = R.drawable.msg_secret_14; +// //newChannelIcon = R.drawable.msg_channel_14; +// contactsIcon = R.drawable.msg_contacts_14; +// callsIcon = R.drawable.msg_calls_14; +// savedIcon = R.drawable.msg_saved_14; +// settingsIcon = R.drawable.msg_settings_14; +// inviteIcon = R.drawable.msg_secret_ny; +// helpIcon = R.drawable.msg_help; +// peopleNearbyIcon = R.drawable.msg_secret_14; +// } else if (eventType == 2) { +// newGroupIcon = R.drawable.msg_groups_hw; +// //newSecretIcon = R.drawable.msg_secret_hw; +// //newChannelIcon = R.drawable.msg_channel_hw; +// contactsIcon = R.drawable.msg_contacts_hw; +// callsIcon = R.drawable.msg_calls_hw; +// savedIcon = R.drawable.msg_saved_hw; +// settingsIcon = R.drawable.msg_settings_hw; +// inviteIcon = R.drawable.msg_invite_hw; +// helpIcon = R.drawable.msg_help_hw; +// peopleNearbyIcon = R.drawable.msg_secret_hw; +// } else { +// newGroupIcon = R.drawable.msg_groups; +// //newSecretIcon = R.drawable.msg_secret; +// //newChannelIcon = R.drawable.msg_channel; +// contactsIcon = R.drawable.msg_contacts; +// callsIcon = R.drawable.msg_calls; +// savedIcon = R.drawable.msg_saved; +// settingsIcon = R.drawable.msg_settings_old; +// inviteIcon = R.drawable.msg_invite; +// helpIcon = R.drawable.msg_help; +// peopleNearbyIcon = R.drawable.msg_nearby; +// } +// UserConfig me = UserConfig.getInstance(UserConfig.selectedAccount); +// if (me != null && me.isPremium()) { +// if (me.getEmojiStatus() != null) { +// items.add(new Item(15, LocaleController.getString("ChangeEmojiStatus", R.string.ChangeEmojiStatus), 0, R.raw.emoji_status_change_to_set)); +// } else { +// items.add(new Item(15, LocaleController.getString("SetEmojiStatus", R.string.SetEmojiStatus), 0, R.raw.emoji_status_set_to_change)); +// } +// items.add(null); // divider +// } // TODO: NekoX: Fix icon here -// int contactsIcon = R.drawable.baseline_perm_contact_calendar_24; -// int savedIcon = R.drawable.baseline_bookmark_24; -// int settingsIcon = R.drawable.baseline_settings_24; -// int callsIcon = R.drawable.baseline_call_24; + int newGroupIcon = R.drawable.baseline_group_24; +// int newSecretIcon = R.drawable.baseline_lock_24; +// int newChannelIcon = R.drawable.baseline_chat_bubble_24; + int contactsIcon = R.drawable.baseline_perm_contact_calendar_24; + int savedIcon = R.drawable.baseline_bookmark_24; + int settingsIcon = R.drawable.baseline_settings_24; + int callsIcon = R.drawable.baseline_call_24; items.add(new Item(2, LocaleController.getString("NewGroup", R.string.NewGroup), newGroupIcon)); - //items.add(new Item(3, LocaleController.getString("NewSecretChat", R.string.NewSecretChat), newSecretIcon)); - //items.add(new Item(4, LocaleController.getString("NewChannel", R.string.NewChannel), newChannelIcon)); +// items.add(new Item(3, LocaleController.getString("NewSecretChat", R.string.NewSecretChat), newSecretIcon)); +// items.add(new Item(4, LocaleController.getString("NewChannel", R.string.NewChannel), newChannelIcon)); items.add(new Item(6, LocaleController.getString("Contacts", R.string.Contacts), contactsIcon)); items.add(new Item(11, LocaleController.getString("SavedMessages", R.string.SavedMessages), savedIcon)); items.add(new Item(8, LocaleController.getString("Settings", R.string.Settings), settingsIcon));