From d9271d0501e811819055c0a63bbb99ca16448b09 Mon Sep 17 00:00:00 2001 From: NextAlone <12210746+NextAlone@users.noreply.github.com> Date: Thu, 3 Feb 2022 02:37:46 +0800 Subject: [PATCH] feat: change to outline icons --- .../java/org/telegram/ui/ActionBar/Theme.java | 8 +- .../telegram/ui/Adapters/ContactsAdapter.java | 10 +- .../ui/Adapters/DrawerLayoutAdapter.java | 14 +- .../java/org/telegram/ui/ArticleViewer.java | 10 +- .../org/telegram/ui/CacheControlActivity.java | 4 +- .../java/org/telegram/ui/CallLogActivity.java | 6 +- .../telegram/ui/Cells/AccountSelectCell.java | 2 +- .../ui/Cells/PhotoAttachPermissionCell.java | 2 +- .../ui/Cells/ThemesHorizontalListCell.java | 2 +- .../telegram/ui/ChannelAdminLogActivity.java | 4 +- .../java/org/telegram/ui/ChatActivity.java | 269 +++++++++--------- .../org/telegram/ui/ChatEditActivity.java | 4 +- .../org/telegram/ui/ChatLinkActivity.java | 6 +- .../org/telegram/ui/ChatUsersActivity.java | 32 +-- .../telegram/ui/Components/AlertsCreator.java | 10 +- .../ui/Components/AudioPlayerAlert.java | 6 +- .../ui/Components/ChatActivityEnterView.java | 46 +-- .../ui/Components/ChatAttachAlert.java | 6 +- .../ChatAttachAlertPhotoLayout.java | 2 +- .../telegram/ui/Components/ColorPicker.java | 6 +- .../telegram/ui/Components/EditTextEmoji.java | 6 +- .../org/telegram/ui/Components/EmojiView.java | 50 ++-- .../ui/Components/FiltersListBottomSheet.java | 12 +- .../ui/Components/GroupCreateSpan.java | 2 +- .../telegram/ui/Components/ImageUpdater.java | 6 +- .../ui/Components/LinkActionView.java | 10 +- .../ui/Components/PhonebookShareAlert.java | 10 +- .../PhotoViewerCaptionEnterView.java | 4 +- .../ui/Components/SearchViewPager.java | 2 +- .../telegram/ui/Components/ShareAlert.java | 2 +- .../ui/Components/SharedMediaLayout.java | 8 +- .../telegram/ui/Components/StickersAlert.java | 6 +- .../ui/Components/WallpaperUpdater.java | 2 +- .../org/telegram/ui/ContentPreviewViewer.java | 22 +- .../java/org/telegram/ui/DialogsActivity.java | 54 ++-- .../org/telegram/ui/FilterCreateActivity.java | 4 +- .../org/telegram/ui/FilterUsersActivity.java | 2 +- .../org/telegram/ui/FilteredSearchView.java | 2 +- .../org/telegram/ui/FiltersSetupActivity.java | 4 +- .../org/telegram/ui/GroupCallActivity.java | 4 +- .../telegram/ui/InviteContactsActivity.java | 2 +- .../telegram/ui/LanguageSelectActivity.java | 6 +- .../java/org/telegram/ui/LogoutActivity.java | 10 +- .../org/telegram/ui/ManageLinksActivity.java | 10 +- .../NotificationsCustomSettingsActivity.java | 2 +- .../org/telegram/ui/PeopleNearbyActivity.java | 2 +- .../telegram/ui/PhotoAlbumPickerActivity.java | 8 +- .../org/telegram/ui/PhotoPickerActivity.java | 12 +- .../java/org/telegram/ui/PhotoViewer.java | 30 +- .../org/telegram/ui/PrivacyUsersActivity.java | 4 +- .../java/org/telegram/ui/ProfileActivity.java | 120 ++++---- .../org/telegram/ui/StickersActivity.java | 28 +- .../java/org/telegram/ui/WebviewActivity.java | 4 +- .../settings/NekoSettingsActivity.java | 8 +- 54 files changed, 457 insertions(+), 450 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java index 15d7838af8..f452a73409 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java @@ -8109,7 +8109,7 @@ public static void createCommonResources(Context context) { Resources resources = context.getResources(); - avatarDrawables[0] = resources.getDrawable(R.drawable.baseline_bookmark_24); + avatarDrawables[0] = resources.getDrawable(R.drawable.chats_saved); avatarDrawables[1] = resources.getDrawable(R.drawable.ghost); avatarDrawables[2] = resources.getDrawable(R.drawable.folders_private); avatarDrawables[3] = resources.getDrawable(R.drawable.folders_requests); @@ -8585,7 +8585,7 @@ public static void createChatResources(Context context, boolean fontsOnly) { chat_pollCheckDrawable[a] = resources.getDrawable(R.drawable.poll_right).mutate(); chat_pollCrossDrawable[a] = resources.getDrawable(R.drawable.poll_wrong).mutate(); chat_pollHintDrawable[a] = resources.getDrawable(R.drawable.smiles_panel_objects).mutate(); - chat_psaHelpDrawable[a] = resources.getDrawable(R.drawable.baseline_help_24).mutate(); + chat_psaHelpDrawable[a] = resources.getDrawable(R.drawable.msg_psa).mutate(); } calllog_msgCallUpRedDrawable = resources.getDrawable(R.drawable.ic_call_made_green_18dp).mutate(); @@ -8707,8 +8707,8 @@ public static void createChatResources(Context context, boolean fontsOnly) { chat_photoStatesDrawables[12][0] = resources.getDrawable(R.drawable.doc_big).mutate(); chat_photoStatesDrawables[12][1] = resources.getDrawable(R.drawable.doc_big).mutate(); - chat_contactDrawable[0] = createCircleDrawableWithIcon(AndroidUtilities.dp(44), R.drawable.baseline_person_24); - chat_contactDrawable[1] = createCircleDrawableWithIcon(AndroidUtilities.dp(44), R.drawable.baseline_person_24); + chat_contactDrawable[0] = createCircleDrawableWithIcon(AndroidUtilities.dp(44), R.drawable.msg_contact); + chat_contactDrawable[1] = createCircleDrawableWithIcon(AndroidUtilities.dp(44), R.drawable.msg_contact); chat_locationDrawable[0] = resources.getDrawable(R.drawable.msg_location).mutate(); chat_locationDrawable[1] = resources.getDrawable(R.drawable.msg_location).mutate(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java index 6da5f3cd7c..b74ed07620 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java @@ -441,9 +441,9 @@ public void onBindViewHolder(int section, int position, RecyclerView.ViewHolder if (section == 0) { if (needPhonebook) { if (position == 0) { - textCell.setTextAndIcon(LocaleController.getString("InviteFriends", R.string.InviteFriends), R.drawable.baseline_person_add_24, false); + textCell.setTextAndIcon(LocaleController.getString("InviteFriends", R.string.InviteFriends), R.drawable.menu_invite, false); } else if (position == 1) { - textCell.setTextAndIcon(LocaleController.getString("AddPeopleNearby", R.string.AddPeopleNearby), R.drawable.baseline_location_on_24, false); + textCell.setTextAndIcon(LocaleController.getString("AddPeopleNearby", R.string.AddPeopleNearby), R.drawable.menu_location, false); } } else if (isAdmin) { if (isChannel) { @@ -453,11 +453,11 @@ public void onBindViewHolder(int section, int position, RecyclerView.ViewHolder } } else { if (position == 0) { - textCell.setTextAndIcon(LocaleController.getString("NewGroup", R.string.NewGroup), R.drawable.baseline_group_24, false); + textCell.setTextAndIcon(LocaleController.getString("NewGroup", R.string.NewGroup), R.drawable.menu_groups, false); } else if (position == 1) { - textCell.setTextAndIcon(LocaleController.getString("NewSecretChat", R.string.NewSecretChat), R.drawable.baseline_security_24, false); + textCell.setTextAndIcon(LocaleController.getString("NewSecretChat", R.string.NewSecretChat), R.drawable.menu_secret, false); } else if (position == 2) { - textCell.setTextAndIcon(LocaleController.getString("NewChannel", R.string.NewChannel), R.drawable.baseline_bullhorn_24, false); + textCell.setTextAndIcon(LocaleController.getString("NewChannel", R.string.NewChannel), R.drawable.menu_broadcast, false); } } } else { 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 bb36a2f958..7438c3d83e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java @@ -265,16 +265,16 @@ private void resetItems() { if (!UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) { return; } - 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 contactsIcon = R.drawable.menu_contacts; + int savedIcon = R.drawable.menu_saved; + int settingsIcon = R.drawable.menu_settings; + int callsIcon = R.drawable.menu_calls; 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)); items.add(new Item(10, LocaleController.getString("Calls", R.string.Calls), callsIcon)); if (NekoConfig.useProxyItem.Bool() && (!NekoConfig.hideProxyByDefault.Bool() || SharedConfig.proxyEnabled)) { - items.add(new CheckItem(13, LocaleController.getString("Proxy", R.string.Proxy), R.drawable.baseline_security_24, () -> SharedConfig.proxyEnabled, () -> { + items.add(new CheckItem(13, LocaleController.getString("Proxy", R.string.Proxy), R.drawable.menu_policy, () -> SharedConfig.proxyEnabled, () -> { SharedConfig.setProxyEnable(!SharedConfig.proxyEnabled); return true; })); @@ -285,7 +285,7 @@ private void resetItems() { if (NekoXConfig.keepOnlineStatus) { message += " (" + LocaleController.getString("Locked", R.string.Locked) + ")"; } - items.add(new CheckItem(14, message, R.drawable.baseline_visibility_24, () -> online, () -> { + items.add(new CheckItem(14, message, R.drawable.msg_views, () -> online, () -> { MessagesController controller = MessagesController.getInstance(UserConfig.selectedAccount); controller.updateStatus(!online); return true; @@ -371,4 +371,4 @@ public void bindCheck(DrawerActionCheckCell actionCell) { } -} \ No newline at end of file +} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java index a0cd476134..1423d487ff 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java @@ -1205,7 +1205,7 @@ private void showCopyPopup(String urlFinal) { builder.addTitle(urlFinal); builder.addItems( new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("ShareQRCode", R.string.ShareQRCode)}, - new int[]{R.drawable.baseline_open_in_browser_24, R.drawable.baseline_content_copy_24, R.drawable.wallet_qr}, (which, text, cell) -> { + new int[]{R.drawable.msg_openin, R.drawable.msg_copy, R.drawable.wallet_qr}, (which, text, cell) -> { if (parentActivity == null) return Unit.INSTANCE; if (which == 0 || which == 2) { int index; @@ -3559,13 +3559,13 @@ public void toggleSubMenu() { menuButton.setDuplicateParentStateEnabled(false); menuButton.setClickable(true); menuButton.setIcon(R.drawable.ic_ab_other); - menuButton.addSubItem(search_item, R.drawable.baseline_search_24, LocaleController.getString("Search", R.string.Search)); + menuButton.addSubItem(search_item, R.drawable.msg_search, LocaleController.getString("Search", R.string.Search)); transMenu = menuButton.addSubItem(trans_item, R.drawable.ic_translate, LocaleController.getString("Translate", R.string.Translate)); - menuButton.addSubItem(share_item, R.drawable.baseline_share_24, LocaleController.getString("ShareFile", R.string.ShareFile)); - menuButton.addSubItem(open_item, R.drawable.baseline_open_in_browser_24, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); - menuButton.addSubItem(settings_item, R.drawable.baseline_settings_24, LocaleController.getString("Settings", R.string.Settings)); + menuButton.addSubItem(share_item, R.drawable.msg_share, LocaleController.getString("ShareFile", R.string.ShareFile)); + menuButton.addSubItem(open_item, R.drawable.msg_openin, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); + menuButton.addSubItem(settings_item, R.drawable.menu_settings, LocaleController.getString("Settings", R.string.Settings)); menuButton.setBackgroundDrawable(Theme.createSelectorDrawable(Theme.ACTION_BAR_WHITE_SELECTOR_COLOR)); menuButton.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); menuContainer.addView(menuButton, LayoutHelper.createFrame(48, 56)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java index 7fca6a2c96..d1f30425df 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java @@ -571,7 +571,7 @@ protected boolean canDismissWithSwipe() { private void resetData() { BottomBuilder builder = new BottomBuilder(getParentActivity()); builder.addTitle(LocaleController.getString("StorageResetInfo", R.string.StorageResetInfo)); - builder.addItem(LocaleController.getString("CacheClear", R.string.CacheClear), R.drawable.baseline_delete_sweep_24, true, (i) -> { + builder.addItem(LocaleController.getString("CacheClear", R.string.CacheClear), R.drawable.msg_clear, true, (i) -> { if (getParentActivity() == null) { return Unit.INSTANCE; } @@ -604,7 +604,7 @@ private void resetData() { private void clearDatabase() { BottomBuilder builder = new BottomBuilder(getParentActivity()); builder.addTitle(LocaleController.getString("LocalDatabaseClearText", R.string.LocalDatabaseClearText)); - builder.addItem(LocaleController.getString("CacheClear", R.string.CacheClear), R.drawable.baseline_delete_sweep_24, true, (i) -> { + builder.addItem(LocaleController.getString("CacheClear", R.string.CacheClear), R.drawable.msg_clear, true, (i) -> { if (getParentActivity() == null) { return Unit.INSTANCE; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java index 4069be9158..4ce27f079b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java @@ -459,7 +459,7 @@ public void onItemClick(int id) { ActionBarMenu menu = actionBar.createMenu(); otherItem = menu.addItem(10, R.drawable.ic_ab_other); otherItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); - otherItem.addSubItem(delete_all_calls, R.drawable.baseline_delete_sweep_24, LocaleController.getString("DeleteAllCalls", R.string.DeleteAllCalls)); + otherItem.addSubItem(delete_all_calls, R.drawable.msg_delete, LocaleController.getString("DeleteAllCalls", R.string.DeleteAllCalls)); fragmentView = new FrameLayout(context); fragmentView.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundGray)); @@ -695,8 +695,8 @@ private void createActionMode() { actionMode.addView(selectedDialogsCountTextView, LayoutHelper.createLinear(0, LayoutHelper.MATCH_PARENT, 1.0f, 72, 0, 0, 0)); selectedDialogsCountTextView.setOnTouchListener((v, event) -> true); - actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.baseline_delete_24, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete))); - } + actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete))); + } private boolean addOrRemoveSelectedDialog(ArrayList messages, CallCell cell) { if (messages.isEmpty()) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java index 4e7977a5aa..01dfff8f5d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java @@ -83,7 +83,7 @@ public AccountSelectCell(Context context, boolean hasInfo) { textView.setTextColor(Theme.getColor(Theme.key_actionBarDefaultSubmenuItem)); checkImageView = new ImageView(context); - checkImageView.setImageResource(R.drawable.baseline_check_24); + checkImageView.setImageResource(R.drawable.account_check); checkImageView.setScaleType(ImageView.ScaleType.CENTER); checkImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chats_menuItemCheck), PorterDuff.Mode.SRC_IN)); addView(checkImageView, LayoutHelper.createFrame(40, LayoutHelper.MATCH_PARENT, Gravity.RIGHT | Gravity.TOP, 0, 0, 6, 0)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoAttachPermissionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoAttachPermissionCell.java index be4c5af1df..d93c6f125e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoAttachPermissionCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoAttachPermissionCell.java @@ -76,7 +76,7 @@ public void setType(int type) { imageView.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27)); imageView2.setLayoutParams(LayoutHelper.createFrame(44, 44, Gravity.CENTER, 0, 0, 2, 27)); } else { - imageView.setImageResource(R.drawable.baseline_open_in_browser_24); + imageView.setImageResource(R.drawable.msg_openin); imageView2.setVisibility(GONE); textView.setText(LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ThemesHorizontalListCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ThemesHorizontalListCell.java index 5c3a31e48a..8176549891 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ThemesHorizontalListCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ThemesHorizontalListCell.java @@ -436,7 +436,7 @@ public void setTheme(Theme.ThemeInfo theme, boolean last, boolean first) { if (themeInfo.info.document != null) { themeInfo.themeLoaded = false; placeholderAlpha = 1.0f; - loadingDrawable = getResources().getDrawable(R.drawable.baseline_palette_24).mutate(); + loadingDrawable = getResources().getDrawable(R.drawable.msg_theme).mutate(); Theme.setDrawableColor(loadingDrawable, loadingColor = Theme.getColor(Theme.key_windowBackgroundWhiteGrayText7)); if (!fileExists) { String name = FileLoader.getAttachFileName(themeInfo.info.document); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java index bc9d9ae837..da20de3672 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java @@ -1076,7 +1076,7 @@ public void onClick(View view) { searchCalendarButton = new ImageView(context); searchCalendarButton.setScaleType(ImageView.ScaleType.CENTER); - searchCalendarButton.setImageResource(R.drawable.baseline_date_range_24); + searchCalendarButton.setImageResource(R.drawable.msg_calendar); searchCalendarButton.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chat_searchPanelIcons), PorterDuff.Mode.SRC_IN)); searchContainer.addView(searchCalendarButton, LayoutHelper.createFrame(48, 48, Gravity.RIGHT | Gravity.TOP)); searchCalendarButton.setOnClickListener(view -> { @@ -2189,7 +2189,7 @@ public void didPressUrl(ChatMessageCell cell, final CharacterStyle url, boolean builder.addTitle(urlFinal); builder.addItems( new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("ShareQRCode", R.string.ShareQRCode)}, - new int[]{R.drawable.baseline_open_in_browser_24, R.drawable.baseline_content_copy_24, R.drawable.wallet_qr}, (which, text, __) -> { + new int[]{R.drawable.msg_openin, R.drawable.msg_copy, R.drawable.wallet_qr}, (which, text, __) -> { if (which == 0 || which == 2) { if (which == 0) { Browser.openUrl(getParentActivity(), urlFinal); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 804eac3dbf..4475e18bd0 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -2724,7 +2724,7 @@ public void onAutoDeleteHistory(int ttl, int action) { ActionBarMenu menu = actionBar.createMenu(); if (isThreadChat() && threadMessageId != 0 && isComments) { - menu.addItem(nkbtn_view_in_chat, R.drawable.baseline_forum_24); + menu.addItem(nkbtn_view_in_chat, R.drawable.msg_viewreplies); } if (currentEncryptedChat == null && chatMode == 0 && reportType < 0) { @@ -2905,9 +2905,9 @@ public boolean forceShowClear() { headerItem = menu.addItem(0, R.drawable.ic_ab_other, themeDelegate); headerItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); if (currentUser != null) { - headerItem.addSubItem(call, R.drawable.baseline_call_24, LocaleController.getString("Call", R.string.Call), themeDelegate); + headerItem.addSubItem(call, R.drawable.msg_callback, LocaleController.getString("Call", R.string.Call), themeDelegate); if (Build.VERSION.SDK_INT >= 18) { - headerItem.addSubItem(video_call, R.drawable.calls_accept_video, LocaleController.getString("VideoCall", R.string.VideoCall), themeDelegate); + headerItem.addSubItem(video_call, R.drawable.msg_videocall, LocaleController.getString("VideoCall", R.string.VideoCall), themeDelegate); } if (userFull != null && userFull.phone_calls_available) { headerItem.showSubItem(call); @@ -2975,7 +2975,7 @@ public boolean forceShowClear() { } if (searchItem != null) { - headerItem.addSubItem(search, R.drawable.baseline_search_24, LocaleController.getString("Search", R.string.Search), themeDelegate); + headerItem.addSubItem(search, R.drawable.msg_search, LocaleController.getString("Search", R.string.Search), themeDelegate); } boolean allowShowPinned; if (currentChat != null) { @@ -2988,45 +2988,46 @@ public boolean forceShowClear() { allowShowPinned = false; } if (allowShowPinned) { - headerItem.addSubItem(nkheaderbtn_show_pinned, R.drawable.deproko_baseline_pin_24, LocaleController.getString("PinnedMessage", R.string.PinnedMessage)); + headerItem.addSubItem(nkheaderbtn_show_pinned, R.drawable.msg_pin, LocaleController.getString("PinnedMessage", R.string.PinnedMessage)); } if (currentChat != null && !currentChat.creator && !ChatObject.hasAdminRights(currentChat)) { - headerItem.addSubItem(report, R.drawable.baseline_report_24, LocaleController.getString("ReportChat", R.string.ReportChat), themeDelegate); + headerItem.addSubItem(report, R.drawable.msg_report, LocaleController.getString("ReportChat", R.string.ReportChat), themeDelegate); } if (currentChat != null && (currentChat.has_link || (chatInfo != null && chatInfo.linked_chat_id != 0))) { String text; if (!currentChat.megagroup) { text = LocaleController.getString("LinkedGroupChat", R.string.LinkedGroupChat); + headerItem.addSubItem(nkheaderbtn_linked_chat, R.drawable.msg_discussion, text); } else { text = LocaleController.getString("LinkedChannelChat", R.string.LinkedChannelChat); + headerItem.addSubItem(nkheaderbtn_linked_chat, R.drawable.msg_channel, text); } - headerItem.addSubItem(nkheaderbtn_linked_chat, R.drawable.baseline_layers_24, text); } if (currentUser != null) { - addContactItem = headerItem.addSubItem(share_contact, R.drawable.baseline_person_24, "", themeDelegate); + addContactItem = headerItem.addSubItem(share_contact, R.drawable.msg_addcontact, "", themeDelegate); } shareKeyItem = headerItem.addSubItem(nkheaderbtn_share_key, R.drawable.baseline_vpn_key_24, LocaleController.getString("ShareMyKey", R.string.ShareMyKey), themeDelegate); if (currentEncryptedChat != null) { - timeItem2 = headerItem.addSubItem(chat_enc_timer, R.drawable.baseline_timer_24, LocaleController.getString("SetTimer", R.string.SetTimer), themeDelegate); + timeItem2 = headerItem.addSubItem(chat_enc_timer, R.drawable.msg_timer, LocaleController.getString("SetTimer", R.string.SetTimer), themeDelegate); } else if (currentChat == null && !currentUser.self || ChatObject.canUserDoAdminAction(currentChat, ChatObject.ACTION_DELETE_MESSAGES)) { - headerItem.addSubItem(auto_delete_timer, R.drawable.baseline_timer_24, LocaleController.getString("AutoDeleteSetTimer", R.string.AutoDeleteSetTimer)); + headerItem.addSubItem(auto_delete_timer, R.drawable.msg_timer, LocaleController.getString("AutoDeleteSetTimer", R.string.AutoDeleteSetTimer)); } if (!ChatObject.isChannel(currentChat) || currentChat.megagroup && TextUtils.isEmpty(currentChat.username)) { - headerItem.addSubItem(clear_history, R.drawable.baseline_delete_sweep_24, LocaleController.getString("ClearHistory", R.string.ClearHistory), themeDelegate); + headerItem.addSubItem(clear_history, R.drawable.msg_clear, LocaleController.getString("ClearHistory", R.string.ClearHistory), themeDelegate); } if (themeDelegate.isThemeChangeAvailable()) { headerItem.addSubItem(change_colors, R.drawable.msg_colors, LocaleController.getString("ChangeColors", R.string.ChangeColors), themeDelegate); } if (currentUser == null || !currentUser.self) { - muteItem = headerItem.addSubItem(mute, R.drawable.baseline_volume_off_24_white, null, themeDelegate); + muteItem = headerItem.addSubItem(mute, R.drawable.msg_mute, null, themeDelegate); } if (ChatObject.isMegagroup(currentChat) || currentChat != null && !ChatObject.isChannel(currentChat)) { - headerItem.addSubItem(nkheaderbtn_zibi, R.drawable.baseline_delete_24, LocaleController.getString("DeleteAllFromSelf", R.string.DeleteAllFromSelf)); + headerItem.addSubItem(nkheaderbtn_zibi, R.drawable.msg_delete, LocaleController.getString("DeleteAllFromSelf", R.string.DeleteAllFromSelf)); } if (currentChat != null && !ChatObject.isChannel(currentChat) && currentChat.creator) { @@ -3036,24 +3037,24 @@ public boolean forceShowClear() { if (ChatObject.isChannel(currentChat)) { if (!ChatObject.isNotInChat(currentChat)) { if (currentChat.megagroup) { - headerItem.addSubItem(delete_chat, R.drawable.baseline_exit_to_app_24, LocaleController.getString("LeaveMegaMenu", R.string.LeaveMegaMenu), themeDelegate); + headerItem.addSubItem(delete_chat, R.drawable.msg_leave, LocaleController.getString("LeaveMegaMenu", R.string.LeaveMegaMenu), themeDelegate); } else { - headerItem.addSubItem(delete_chat, R.drawable.baseline_exit_to_app_24, LocaleController.getString("LeaveChannelMenu", R.string.LeaveChannelMenu), themeDelegate); + headerItem.addSubItem(delete_chat, R.drawable.msg_leave, LocaleController.getString("LeaveChannelMenu", R.string.LeaveChannelMenu), themeDelegate); } } } else if (!ChatObject.isChannel(currentChat)) { if (currentChat != null) { - headerItem.addSubItem(delete_chat, R.drawable.baseline_exit_to_app_24, LocaleController.getString("DeleteAndExit", R.string.DeleteAndExit), themeDelegate); + headerItem.addSubItem(delete_chat, R.drawable.msg_leave, LocaleController.getString("DeleteAndExit", R.string.DeleteAndExit), themeDelegate); } else { - headerItem.addSubItem(delete_chat, R.drawable.baseline_delete_24, LocaleController.getString("DeleteChatUser", R.string.DeleteChatUser), themeDelegate); + headerItem.addSubItem(delete_chat, R.drawable.msg_delete, LocaleController.getString("DeleteChatUser", R.string.DeleteChatUser), themeDelegate); } } if (currentUser != null && currentUser.self) { - headerItem.addSubItem(add_shortcut, R.drawable.baseline_home_24, LocaleController.getString("AddShortcut", R.string.AddShortcut), themeDelegate); + headerItem.addSubItem(add_shortcut, R.drawable.msg_home, LocaleController.getString("AddShortcut", R.string.AddShortcut), themeDelegate); } if (currentUser != null && currentEncryptedChat == null && currentUser.bot) { - headerItem.addSubItem(bot_settings, R.drawable.baseline_settings_24, LocaleController.getString("BotSettings", R.string.BotSettings), themeDelegate); - headerItem.addSubItem(bot_help, R.drawable.baseline_help_24, LocaleController.getString("BotHelp", R.string.BotHelp), themeDelegate); + headerItem.addSubItem(bot_settings, R.drawable.menu_settings, LocaleController.getString("BotSettings", R.string.BotSettings), themeDelegate); + headerItem.addSubItem(bot_help, R.drawable.menu_help, LocaleController.getString("BotHelp", R.string.BotHelp), themeDelegate); updateBotButtons(); } } @@ -3089,37 +3090,37 @@ public boolean forceShowClear() { actionMode.addView(selectedMessagesCountTextView, LayoutHelper.createLinear(0, LayoutHelper.MATCH_PARENT, 1.0f, 65, 0, 0, 0)); selectedMessagesCountTextView.setOnTouchListener((v, event) -> true); - actionModeViews.add(actionMode.addItemWithWidth(nkactionbarbtn_reply, R.drawable.baseline_reply_24, AndroidUtilities.dp(54), LocaleController.getString("Reply", R.string.Reply))); - actionModeViews.add(actionMode.addItemWithWidth(edit, R.drawable.baseline_edit_24, AndroidUtilities.dp(54), LocaleController.getString("Edit", R.string.Edit))); + actionModeViews.add(actionMode.addItemWithWidth(nkactionbarbtn_reply, R.drawable.msg_reply, AndroidUtilities.dp(54), LocaleController.getString("Reply", R.string.Reply))); + actionModeViews.add(actionMode.addItemWithWidth(edit, R.drawable.msg_edit, AndroidUtilities.dp(54), LocaleController.getString("Edit", R.string.Edit))); actionModeViews.add(actionMode.addItemWithWidth(nkactionbarbtn_selectBetween, R.drawable.ic_select_between, AndroidUtilities.dp(54), LocaleController.getString("SelectBetween", R.string.SelectBetween))); - actionModeViews.add(actionMode.addItemWithWidth(copy, R.drawable.baseline_content_copy_24, AndroidUtilities.dp(54), LocaleController.getString("Copy", R.string.Copy))); + actionModeViews.add(actionMode.addItemWithWidth(copy, R.drawable.msg_copy, AndroidUtilities.dp(54), LocaleController.getString("Copy", R.string.Copy))); actionModeViews.add(actionMode.addItemWithWidth(combine_message, R.drawable.msg_replace, AndroidUtilities.dp(54), LocaleController.getString("CombineMessage", R.string.CombineMessage))); if (currentEncryptedChat == null) { - actionModeViews.add(actionMode.addItemWithWidth(forward, R.drawable.baseline_forward_24, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward))); + actionModeViews.add(actionMode.addItemWithWidth(forward, R.drawable.msg_forward, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward))); } - actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.baseline_delete_24, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete))); + actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete))); actionModeViews.add(actionModeOtherItem = actionMode.addItemWithWidth(nkactionbarbtn_action_mode_other, R.drawable.ic_ab_other, AndroidUtilities.dp(54), LocaleController.getString("MessageMenu", R.string.MessageMenu))); if (currentEncryptedChat == null) { - actionModeOtherItem.addSubItem(forward, R.drawable.baseline_forward_24, LocaleController.getString("Forward", R.string.Forward)); + actionModeOtherItem.addSubItem(forward, R.drawable.msg_forward, LocaleController.getString("Forward", R.string.Forward)); } boolean noforward = getMessagesController().isChatNoForwardsForced(currentChat); if (currentEncryptedChat == null || !noforward) { - actionModeOtherItem.addSubItem(nkbtn_forward_noquote, R.drawable.baseline_fast_forward_24, LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); - actionModeOtherItem.addSubItem(star, R.drawable.baseline_favorite_20, LocaleController.getString("AddToFavorites", R.string.AddToFavorites)); + actionModeOtherItem.addSubItem(nkbtn_forward_noquote, R.drawable.msg_forward_noquote, LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); + actionModeOtherItem.addSubItem(star, R.drawable.msg_fave, LocaleController.getString("AddToFavorites", R.string.AddToFavorites)); actionModeOtherItem.addSubItem(save_to, R.drawable.msg_download, LocaleController.getString("SaveToMusic", R.string.SaveToMusic)); } actionModeOtherItem.addSubItem(nkbtn_translate, R.drawable.ic_translate, LocaleController.getString("Translate", R.string.Translate)); if (NekoConfig.showShareMessages.Bool()) - actionModeOtherItem.addSubItem(nkbtn_sharemessage, R.drawable.baseline_share_24, LocaleController.getString("ShareMessages", R.string.ShareMessages)); - actionModeOtherItem.addSubItem(nkbtn_unpin, R.drawable.deproko_baseline_pin_undo_24, LocaleController.getString("UnpinMessage", R.string.UnpinMessage)); + actionModeOtherItem.addSubItem(nkbtn_sharemessage, R.drawable.share, LocaleController.getString("ShareMessages", R.string.ShareMessages)); + actionModeOtherItem.addSubItem(nkbtn_unpin, R.drawable.msg_unpin, LocaleController.getString("UnpinMessage", R.string.UnpinMessage)); if (!noforward) - actionModeOtherItem.addSubItem(nkbtn_savemessage, R.drawable.baseline_bookmark_24, LocaleController.getString("AddToSavedMessages", R.string.AddToSavedMessages)); + actionModeOtherItem.addSubItem(nkbtn_savemessage, R.drawable.menu_saved, LocaleController.getString("AddToSavedMessages", R.string.AddToSavedMessages)); if (NekoConfig.showRepeat.Bool() && !noforward) actionModeOtherItem.addSubItem(nkbtn_repeat, R.drawable.msg_repeat, LocaleController.getString("Repeat", R.string.Repeat)); if (NekoConfig.showMessageHide.Bool()) { @@ -6323,7 +6324,7 @@ public void setTranslationY(float translationY) { } pinnedListButton = new ImageView(context); - pinnedListButton.setImageResource(R.drawable.baseline_menu_24); + pinnedListButton.setImageResource(R.drawable.menu_pinnedlist); pinnedListButton.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_topPanelClose), PorterDuff.Mode.SRC_IN)); pinnedListButton.setScaleType(ImageView.ScaleType.CENTER); pinnedListButton.setContentDescription(LocaleController.getString("AccPinnedMessagesList", R.string.AccPinnedMessagesList)); @@ -6354,12 +6355,12 @@ public void setTranslationY(float translationY) { } BottomBuilder builder = new BottomBuilder(getParentActivity()); if (allowPin) { - builder.addItem(LocaleController.getString("UnpinMessagesAll", R.string.UnpinMessagesAll), R.drawable.deproko_baseline_pin_undo_24, true, c -> { + builder.addItem(LocaleController.getString("UnpinMessagesAll", R.string.UnpinMessagesAll), R.drawable.msg_unpin, true, c -> { getMessagesController().unpinAllMessages(currentChat, currentUser); return Unit.INSTANCE; }); } - builder.addItem(LocaleController.getString("DismissForYourself", R.string.DismissForYourself), R.drawable.baseline_close_24, c -> { + builder.addItem(LocaleController.getString("DismissForYourself", R.string.DismissForYourself), R.drawable.msg_cancel, c -> { SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount); if (chatInfo != null) { preferences.edit().putInt("pin_" + dialog_id, chatInfo.pinned_msg_id).apply(); @@ -6412,7 +6413,7 @@ public void setTranslationY(float translationY) { } BottomBuilder builder = new BottomBuilder(getParentActivity()); if (allowPin) { - builder.addItem(LocaleController.getString("UnpinMessageX", R.string.UnpinMessageX), R.drawable.deproko_baseline_pin_undo_24, true, c -> { + builder.addItem(LocaleController.getString("UnpinMessageX", R.string.UnpinMessageX), R.drawable.msg_unpin, true, c -> { MessageObject messageObject = pinnedMessageObjects.get(currentPinnedMessageId); if (messageObject == null) { messageObject = messagesDict[0].get(currentPinnedMessageId); @@ -6421,7 +6422,7 @@ public void setTranslationY(float translationY) { return Unit.INSTANCE; }); } - builder.addItem(LocaleController.getString("DismissForYourself", R.string.DismissForYourself), R.drawable.baseline_close_24, c -> { + builder.addItem(LocaleController.getString("DismissForYourself", R.string.DismissForYourself), R.drawable.msg_cancel, c -> { SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount); if (chatInfo != null) { preferences.edit().putInt("pin_" + dialog_id, chatInfo.pinned_msg_id).apply(); @@ -8522,7 +8523,7 @@ protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, i searchCalendarButton = new ImageView(context); searchCalendarButton.setScaleType(ImageView.ScaleType.CENTER); - searchCalendarButton.setImageResource(R.drawable.baseline_date_range_24); + searchCalendarButton.setImageResource(R.drawable.msg_calendar); searchCalendarButton.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_searchPanelIcons), PorterDuff.Mode.SRC_IN)); searchCalendarButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_actionBarActionModeDefaultSelector), 1)); searchContainer.addView(searchCalendarButton, LayoutHelper.createFrame(48, 48, Gravity.LEFT | Gravity.TOP)); @@ -8728,7 +8729,7 @@ protected void onSend(int type, String message) { replyButton.setTextColor(getThemedColor(Theme.key_actionBarActionModeDefaultIcon)); replyButton.setCompoundDrawablePadding(AndroidUtilities.dp(7)); replyButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - Drawable image = context.getResources().getDrawable(R.drawable.baseline_reply_24).mutate(); + Drawable image = context.getResources().getDrawable(R.drawable.msg_reply).mutate(); image.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_actionBarActionModeDefaultIcon), PorterDuff.Mode.SRC_IN)); replyButton.setCompoundDrawablesWithIntrinsicBounds(image, null, null, null); replyButton.setOnClickListener(v -> { @@ -8759,7 +8760,7 @@ protected void onSend(int type, String message) { forwardButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_actionBarActionModeDefaultSelector), 3)); forwardButton.setTextColor(getThemedColor(Theme.key_actionBarActionModeDefaultIcon)); forwardButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - image = context.getResources().getDrawable(R.drawable.baseline_forward_24).mutate(); + image = context.getResources().getDrawable(R.drawable.msg_forward).mutate(); image.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_actionBarActionModeDefaultIcon), PorterDuff.Mode.SRC_IN)); forwardButton.setCompoundDrawablesWithIntrinsicBounds(image, null, null, null); forwardButton.setOnClickListener(v -> { @@ -12251,7 +12252,7 @@ public void showFieldPanel(boolean show, MessageObject messageObjectToReply, Mes showHint = true; } } else { - replyIconImageView.setImageResource(R.drawable.baseline_link_24); + replyIconImageView.setImageResource(R.drawable.msg_link); if (webPage instanceof TLRPC.TL_webPagePending) { replyNameTextView.setText(LocaleController.getString("GettingLinkInfo", R.string.GettingLinkInfo)); replyObjectTextView.setText(pendingLinkSearchString); @@ -14388,9 +14389,9 @@ private void updateTitleIcons() { avatarContainer.setTitleIcons(currentEncryptedChat != null ? getThemedDrawable(Theme.key_drawable_lockIconDrawable) : null, !UserObject.isReplyUser(currentUser) && !isThreadChat() ? rightIcon : null); if (muteItem != null) { if (rightIcon != null) { - muteItem.setTextAndIcon(LocaleController.getString("UnmuteNotifications", R.string.UnmuteNotifications), R.drawable.baseline_bullhorn_24); + muteItem.setTextAndIcon(LocaleController.getString("UnmuteNotifications", R.string.UnmuteNotifications), R.drawable.msg_unmute); } else { - muteItem.setTextAndIcon(LocaleController.getString("MuteNotifications", R.string.MuteNotifications), R.drawable.baseline_volume_off_24_white); + muteItem.setTextAndIcon(LocaleController.getString("MuteNotifications", R.string.MuteNotifications), R.drawable.msg_mute); } } } @@ -21693,24 +21694,24 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if ((selectedObject.type == 0 || selectedObject.isAnimatedEmoji() || getMessageCaption(selectedObject, selectedObjectGroup) != null) && !noforwardsOverride) { items.add(LocaleController.getString("Copy", R.string.Copy)); options.add(OPTION_COPY); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); } items.add(LocaleController.getString("CancelSending", R.string.CancelSending)); options.add(OPTION_CANCEL_SENDING); - icons.add(R.drawable.baseline_delete_24); + icons.add(R.drawable.msg_delete); } else if (type == 0) { items.add(LocaleController.getString("Retry", R.string.Retry)); options.add(OPTION_RETRY); - icons.add(R.drawable.baseline_replay_24); + icons.add(R.drawable.msg_retry); items.add(LocaleController.getString("Delete", R.string.Delete)); options.add(OPTION_DELETE); - icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24); + icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.msg_delete); } else if (type == 1) { if (currentChat != null) { if (allowChatActions) { items.add(LocaleController.getString("Reply", R.string.Reply)); options.add(OPTION_REPLY); - icons.add(R.drawable.baseline_reply_24); + icons.add(R.drawable.msg_reply); } if (!isThreadChat() && chatMode != MODE_SCHEDULED && message.hasReplies() && currentChat.megagroup && message.canViewThread()) { items.add(LocaleController.formatPluralString("ViewReplies", message.getRepliesCount())); @@ -21720,11 +21721,11 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (allowUnpin) { items.add(LocaleController.getString("UnpinMessage", R.string.UnpinMessage)); options.add(OPTION_UNPIN); - icons.add(R.drawable.deproko_baseline_pin_undo_24); + icons.add(R.drawable.msg_unpin); } else if (allowPin) { items.add(LocaleController.getString("PinMessage", R.string.PinMessage)); options.add(OPTION_PIN); - icons.add(R.drawable.deproko_baseline_pin_24); + icons.add(R.drawable.msg_pin); } // if (selectedObject != null && selectedObject.contentType == 0 && (messageText != null && messageText.length() > 0 && !selectedObject.isAnimatedEmoji() && !selectedObject.isDice()) && MessagesController.getGlobalMainSettings().getBoolean("translate_button", false)) { // items.add(LocaleController.getString("TranslateMessage", R.string.TranslateMessage)); @@ -21734,7 +21735,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (message.canEditMessage(currentChat)) { items.add(LocaleController.getString("Edit", R.string.Edit)); options.add(OPTION_EDIT); - icons.add(R.drawable.baseline_edit_24); + icons.add(R.drawable.msg_edit); } // if (selectedObject != null && selectedObject.contentType == 0 && (messageText != null && messageText.length() > 0 && !selectedObject.isAnimatedEmoji() && !selectedObject.isDice()) && MessagesController.getGlobalMainSettings().getBoolean("translate_button", false)) { // items.add(LocaleController.getString("TranslateMessage", R.string.TranslateMessage)); @@ -21745,20 +21746,20 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (selectedObject.contentType == 0 && !selectedObject.isMediaEmptyWebpage() && selectedObject.getId() > 0 && !selectedObject.isOut() && (currentChat != null || currentUser != null && currentUser.bot)) { items.add(LocaleController.getString("ReportChat", R.string.ReportChat)); options.add(OPTION_REPORT_CHAT); - icons.add(R.drawable.baseline_report_24); + icons.add(R.drawable.msg_report); } } } else { if (selectedObject.getId() > 0 && allowChatActions) { items.add(LocaleController.getString("Reply", R.string.Reply)); options.add(OPTION_REPLY); - icons.add(R.drawable.baseline_reply_24); + icons.add(R.drawable.msg_reply); } } if (message.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat) && (threadMessageObjects == null || !threadMessageObjects.contains(message))) { items.add(LocaleController.getString("Delete", R.string.Delete)); options.add(OPTION_DELETE); - icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24); + icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.msg_delete); } } else if (type == 20) { items.add(LocaleController.getString("Retry", R.string.Retry)); @@ -21767,38 +21768,38 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (!noforwardsOverride) { items.add(LocaleController.getString("Copy", R.string.Copy)); options.add(OPTION_COPY); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); } items.add(LocaleController.getString("Delete", R.string.Delete)); options.add(OPTION_DELETE); - icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24); + icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.msg_delete); } else { if (currentEncryptedChat == null) { if (chatMode == MODE_SCHEDULED) { items.add(LocaleController.getString("MessageScheduleSend", R.string.MessageScheduleSend)); options.add(OPTION_SEND_NOW); - icons.add(R.drawable.deproko_baseline_send_24); + icons.add(R.drawable.outline_send); } if (selectedObject.messageOwner.action instanceof TLRPC.TL_messageActionPhoneCall) { TLRPC.TL_messageActionPhoneCall call = (TLRPC.TL_messageActionPhoneCall) message.messageOwner.action; items.add((call.reason instanceof TLRPC.TL_phoneCallDiscardReasonMissed || call.reason instanceof TLRPC.TL_phoneCallDiscardReasonBusy) && !message.isOutOwner() ? LocaleController.getString("CallBack", R.string.CallBack) : LocaleController.getString("CallAgain", R.string.CallAgain)); options.add(OPTION_CALL_AGAIN); - icons.add(R.drawable.baseline_call_24); + icons.add(R.drawable.msg_callback); if (VoIPHelper.canRateCall(call)) { items.add(LocaleController.getString("CallMessageReportProblem", R.string.CallMessageReportProblem)); options.add(OPTION_RATE_CALL); - icons.add(R.drawable.baseline_star_24); + icons.add(R.drawable.msg_fave); } } if (allowChatActions) { items.add(LocaleController.getString("Reply", R.string.Reply)); options.add(8); - icons.add(R.drawable.baseline_reply_24); + icons.add(R.drawable.msg_reply); } if ((selectedObject.type == 0 || selectedObject.isDice() || selectedObject.isAnimatedEmoji() || getMessageCaption(selectedObject, selectedObjectGroup) != null) && !noforwardsOverride) { items.add(LocaleController.getString("Copy", R.string.Copy)); options.add(3); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); } if (!isThreadChat() && chatMode != MODE_SCHEDULED && currentChat != null && (currentChat.has_link || message.hasReplies()) && currentChat.megagroup && message.canViewThread()) { if (message.hasReplies()) { @@ -21807,16 +21808,16 @@ private void createMenu(View v, boolean single, boolean listView, float x, float items.add(LocaleController.getString("ViewThread", R.string.ViewThread)); } options.add(27); - icons.add(R.drawable.baseline_forum_24); + icons.add(R.drawable.msg_viewreplies); } else if (isThreadChat() && chatMode != MODE_SCHEDULED && currentChat != null) { options.add(nkbtn_view_in_chat); - icons.add(R.drawable.baseline_forum_24); + icons.add(R.drawable.msg_viewreplies); items.add(LocaleController.getString("ViewInChat", R.string.ViewInChat)); } if (!selectedObject.isSponsored() && chatMode != MODE_SCHEDULED && ChatObject.isChannel(currentChat) && selectedObject.getDialogId() != mergeDialogId) { items.add(LocaleController.getString("CopyLink", R.string.CopyLink)); options.add(22); - icons.add(R.drawable.baseline_link_24); + icons.add(R.drawable.msg_link); } if (type == 2) { if (chatMode != MODE_SCHEDULED) { @@ -21851,7 +21852,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaWebPage && MessageObject.isNewGifDocument(selectedObject.messageOwner.media.webpage.document)) { items.add(LocaleController.getString("SaveToGIFs", R.string.SaveToGIFs)); options.add(11); - icons.add(R.drawable.deproko_baseline_gif_24); + icons.add(R.drawable.msg_gif); } } else if (type == 4) { if (!noforwardsOverride) { @@ -21859,35 +21860,35 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (!selectedObject.needDrawBluredPreview()) { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(4); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } } else if (selectedObject.isMusic()) { items.add(LocaleController.getString("SaveToMusic", R.string.SaveToMusic)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else if (selectedObject.getDocument() != null) { if (MessageObject.isNewGifDocument(selectedObject.getDocument())) { - items.add(LocaleController.getString("SaveToGIFs", R.string.SaveToGIFs)); - options.add(11); - icons.add(R.drawable.deproko_baseline_gif_24); - } + items.add(LocaleController.getString("SaveToGIFs", R.string.SaveToGIFs)); + options.add(11); + icons.add(R.drawable.msg_gif); + } items.add(LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else { if (!selectedObject.needDrawBluredPreview()) { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(4); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); } } } @@ -21898,21 +21899,21 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (!noforwardsForced) { items.add(LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } } else if (type == 10) { items.add(LocaleController.getString("ApplyThemeFile", R.string.ApplyThemeFile)); options.add(5); - icons.add(R.drawable.baseline_palette_24); + icons.add(R.drawable.msg_theme); items.add(LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads)); options.add(10); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else if (type == 21 || type == 22 || type == 23) { options.add(5); if (type == 21) { @@ -21920,7 +21921,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float icons.add(R.drawable.baseline_security_24); } else if (type == 22) { items.add(LocaleController.getString("ImportStickersList", R.string.ImportStickersList)); - icons.add(R.drawable.deproko_baseline_stickers_filled_24); + icons.add(R.drawable.msg_sticker); } else { items.add(LocaleController.getString("ImportSettings", R.string.ImportSettings)); icons.add(R.drawable.baseline_security_24); @@ -21928,46 +21929,46 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (!noforwardsOverride) { items.add(LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } } else if (type == 6 && !noforwardsOverride) { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(7); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); items.add(LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else if (type == 7) { if (selectedObject.isMask()) { items.add(LocaleController.getString("AddToMasks", R.string.AddToMasks)); options.add(9); - icons.add(R.drawable.deproko_baseline_stickers_24); + icons.add(R.drawable.msg_sticker); } else { if (!selectedObject.isAnimatedSticker()) { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(nkbtn_stickerdl); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); } items.add(LocaleController.getString("AddToStickers", R.string.AddToStickers)); options.add(9); - icons.add(R.drawable.deproko_baseline_stickers_24); + icons.add(R.drawable.msg_sticker); TLRPC.Document document = selectedObject.getDocument(); if (!getMediaDataController().isStickerInFavorites(document)) { if (getMediaDataController().canAddStickerToFavorites()/* && MessageObject.isStickerHasSet(document)*/) { items.add(LocaleController.getString("AddToFavorites", R.string.AddToFavorites)); options.add(20); - icons.add(R.drawable.baseline_star_24); + icons.add(R.drawable.msg_fave); } } else { items.add(LocaleController.getString("DeleteFromFavorites", R.string.DeleteFromFavorites)); options.add(21); - icons.add(R.drawable.baseline_star_24); + icons.add(R.drawable.msg_unfave); } } } else if (type == 8) { @@ -21979,35 +21980,35 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (user != null && user.id != getUserConfig().getClientUserId() && getContactsController().contactsDict.get(user.id) == null) { items.add(LocaleController.getString("AddContactTitle", R.string.AddContactTitle)); options.add(15); - icons.add(R.drawable.baseline_person_add_24); + icons.add(R.drawable.msg_addcontact); } if (!TextUtils.isEmpty(selectedObject.messageOwner.media.phone_number)) { if (!noforwardsOverride) { items.add(LocaleController.getString("Copy", R.string.Copy)); options.add(16); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); } items.add(LocaleController.getString("Call", R.string.Call)); options.add(17); - icons.add(R.drawable.baseline_call_24); + icons.add(R.drawable.msg_callback); } } else if (type == 9) { if (!selectedObject.isAnimatedSticker()) { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(nkbtn_stickerdl); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); } TLRPC.Document document = selectedObject.getDocument(); if (!getMediaDataController().isStickerInFavorites(document)) { //if (MessageObject.isStickerHasSet(document)) { items.add(LocaleController.getString("AddToFavorites", R.string.AddToFavorites)); options.add(20); - icons.add(R.drawable.baseline_star_24); + icons.add(R.drawable.msg_fave); //} } else { items.add(LocaleController.getString("DeleteFromFavorites", R.string.DeleteFromFavorites)); options.add(21); - icons.add(R.drawable.baseline_star_24); + icons.add(R.drawable.msg_unfave); } } boolean noforward = getMessagesController().isChatNoForwards(currentChat); @@ -22015,13 +22016,13 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (!selectedObject.isSponsored() && chatMode != MODE_SCHEDULED && !selectedObject.needDrawBluredPreview() && !selectedObject.isLiveLocation() && selectedObject.type != 16 && !noforwards) { items.add(LocaleController.getString("Forward", R.string.Forward)); options.add(2); - icons.add(R.drawable.baseline_forward_24); + icons.add(R.drawable.msg_forward); } if (chatMode != MODE_SCHEDULED && !selectedObject.needDrawBluredPreview() && !selectedObject.isLiveLocation() && selectedObject.type != 16) { if (!noforward) { items.add(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); options.add(nkbtn_forward_noquote); - icons.add(R.drawable.baseline_fast_forward_24); + icons.add(R.drawable.msg_forward_noquote); } } if (chatMode != MODE_SCHEDULED) { @@ -22029,7 +22030,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (!noforwardForced) { items.add(LocaleController.getString("AddToSavedMessages", R.string.AddToSavedMessages)); options.add(nkbtn_savemessage); - icons.add(R.drawable.baseline_bookmark_24); + icons.add(R.drawable.menu_saved); } } boolean allowRepeat = currentUser != null @@ -22057,13 +22058,13 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (NekoConfig.showDeleteDownloadedFile.Bool() && TelegramUtil.messageObjectIsFile(type, selectedObject)) { items.add(LocaleController.getString("DeleteDownloadedFile", R.string.DeleteDownloadedFile)); options.add(nkbtn_deldlcache); - icons.add(R.drawable.baseline_delete_sweep_24); + icons.add(R.drawable.msg_clear); } if (allowViewHistory && NekoConfig.showViewHistory.Bool()) { items.add(LocaleController.getString("ViewUserHistory", R.string.ViewHistory)); options.add(nkbtn_view_history); - icons.add(R.drawable.baseline_schedule_24); + icons.add(R.drawable.menu_recent); } MessageObject messageObject = getMessageForTranslate(); boolean docsWithMessages = false; @@ -22091,7 +22092,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (messageObject != null || docsWithMessages) { items.add(LocaleController.getString("ShareMessages", R.string.ShareMessages)); options.add(nkbtn_sharemessage); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.share); } } if (messageObject != null && StrUtil.isNotBlank(messageObject.messageOwner.message) && StrUtil.isNotBlank(NekoConfig.openPGPApp.String())) { @@ -22141,11 +22142,11 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (allowUnpin) { items.add(LocaleController.getString("UnpinMessage", R.string.UnpinMessage)); options.add(14); - icons.add(R.drawable.deproko_baseline_pin_undo_24); + icons.add(R.drawable.msg_unpin); } else if (allowPin) { items.add(LocaleController.getString("PinMessage", R.string.PinMessage)); options.add(13); - icons.add(R.drawable.deproko_baseline_pin_24); + icons.add(R.drawable.msg_pin); } // if (selectedObject != null && selectedObject.contentType == 0 && (messageText != null && messageText.length() > 0 && !selectedObject.isAnimatedEmoji() && !selectedObject.isDice()) && MessagesController.getGlobalMainSettings().getBoolean("translate_button", false)) { // items.add(LocaleController.getString("TranslateMessage", R.string.TranslateMessage)); @@ -22155,41 +22156,41 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (allowEdit) { items.add(LocaleController.getString("Edit", R.string.Edit)); options.add(12); - icons.add(R.drawable.baseline_edit_24); + icons.add(R.drawable.msg_edit); } if (chatMode == MODE_SCHEDULED && selectedObject.canEditMessageScheduleTime(currentChat)) { items.add(LocaleController.getString("MessageScheduleEditTime", R.string.MessageScheduleEditTime)); options.add(102); - icons.add(R.drawable.baseline_date_range_24); + icons.add(R.drawable.msg_schedule); } if (chatMode != MODE_SCHEDULED && selectedObject.contentType == 0 && selectedObject.getId() > 0 && !selectedObject.isOut() && (currentChat != null || currentUser != null && currentUser.bot)) { if (UserObject.isReplyUser(currentUser)) { items.add(LocaleController.getString("BlockContact", R.string.BlockContact)); options.add(23); - icons.add(R.drawable.baseline_report_24); + icons.add(R.drawable.msg_block2); } else if (NekoConfig.showReport.Bool()) { items.add(LocaleController.getString("ReportChat", R.string.ReportChat)); options.add(23); - icons.add(R.drawable.baseline_report_24); + icons.add(R.drawable.msg_report); } } if (message.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat) && (threadMessageObjects == null || !threadMessageObjects.contains(message))) { items.add(LocaleController.getString("Delete", R.string.Delete)); options.add(1); - icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24); + icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.msg_delete); } } else { if (allowChatActions) { items.add(LocaleController.getString("Reply", R.string.Reply)); options.add(8); - icons.add(R.drawable.baseline_reply_24); + icons.add(R.drawable.msg_reply); } if ((selectedObject.type == 0 || selectedObject.isAnimatedEmoji() || getMessageCaption(selectedObject, selectedObjectGroup) != null) && !noforwardsOverride) { items.add(LocaleController.getString("Copy", R.string.Copy)); options.add(3); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); } if (!isThreadChat() && chatMode != MODE_SCHEDULED && currentChat != null && (currentChat.has_link || message.hasReplies()) && currentChat.megagroup && message.canViewThread()) { if (message.hasReplies()) { @@ -22198,47 +22199,47 @@ private void createMenu(View v, boolean single, boolean listView, float x, float items.add(LocaleController.getString("ViewThread", R.string.ViewThread)); } options.add(27); - icons.add(R.drawable.baseline_forum_24); + icons.add(R.drawable.msg_viewreplies); } else if (isThreadChat() && chatMode != MODE_SCHEDULED && currentChat != null) { options.add(nkbtn_view_in_chat); - icons.add(R.drawable.baseline_forum_24); + icons.add(R.drawable.msg_viewreplies); items.add(LocaleController.getString("ViewInChat", R.string.ViewInChat)); } if (type == 4 && !noforwardsOverride) { if (selectedObject.isVideo()) { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(4); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else if (selectedObject.isMusic()) { items.add(LocaleController.getString("SaveToMusic", R.string.SaveToMusic)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else if (!selectedObject.isVideo() && selectedObject.getDocument() != null) { items.add(LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads)); options.add(OPTION_SAVE_TO_DOWNLOADS_OR_MUSIC); - icons.add(R.drawable.baseline_file_download_24); + icons.add(R.drawable.msg_download); items.add(LocaleController.getString("ShareFile", R.string.ShareFile)); options.add(6); - icons.add(R.drawable.baseline_share_24); + icons.add(R.drawable.msg_shareout); } else { items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); options.add(4); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); } } else if (type == 5) { items.add(LocaleController.getString("ApplyLocalizationFile", R.string.ApplyLocalizationFile)); options.add(5); - icons.add(R.drawable.baseline_language_24); + icons.add(R.drawable.msg_language); } else if (type == 10) { items.add(LocaleController.getString("ApplyThemeFile", R.string.ApplyThemeFile)); options.add(5); - icons.add(R.drawable.baseline_palette_24); + icons.add(R.drawable.msg_theme); } else if (type == 21) { items.add(LocaleController.getString("ImportProxyList", R.string.ImportProxyList)); options.add(5); @@ -22246,7 +22247,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float } else if (type == 7) { items.add(LocaleController.getString("AddToStickers", R.string.AddToStickers)); options.add(9); - icons.add(R.drawable.deproko_baseline_stickers_24); + icons.add(R.drawable.msg_sticker); } else if (type == 8) { long uid = selectedObject.messageOwner.media.user_id; TLRPC.User user = null; @@ -22256,17 +22257,17 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (user != null && user.id != getUserConfig().getClientUserId() && getContactsController().contactsDict.get(user.id) == null) { items.add(LocaleController.getString("AddContactTitle", R.string.AddContactTitle)); options.add(15); - icons.add(R.drawable.baseline_person_add_24); + icons.add(R.drawable.msg_addcontact); } if (!TextUtils.isEmpty(selectedObject.messageOwner.media.phone_number)) { if (!noforwardsOverride) { items.add(LocaleController.getString("Copy", R.string.Copy)); options.add(16); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); } items.add(LocaleController.getString("Call", R.string.Call)); options.add(17); - icons.add(R.drawable.baseline_call_24); + icons.add(R.drawable.msg_callback); } } MessageObject messageObject = getMessageForTranslate(); @@ -22318,7 +22319,7 @@ private void createMenu(View v, boolean single, boolean listView, float x, float } items.add(LocaleController.getString("Delete", R.string.Delete)); options.add(1); - icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24); + icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.msg_delete); } if (chatInfo != null && chatInfo.participants != null && chatInfo.participants.participants != null) { selectedParticipant = null; @@ -22350,13 +22351,13 @@ private void createMenu(View v, boolean single, boolean listView, float x, float if (canEditAdmin && NekoConfig.showAdminActions.Bool()) { items.add(editingAdmin ? LocaleController.getString("EditAdminRights", R.string.EditAdminRights) : LocaleController.getString("SetAsAdmin", R.string.SetAsAdmin)); - icons.add(R.drawable.baseline_stars_24); + icons.add(R.drawable.profile_admin); options.add(nkbtn_editAdmin); selectedParticipant = participant; } if (canRestrict && NekoConfig.showChangePermissions.Bool()) { items.add(LocaleController.getString("ChangePermissions", R.string.ChangePermissions)); - icons.add(R.drawable.baseline_block_24); + icons.add(R.drawable.msg_permissions); options.add(nkbtn_editPermission); selectedParticipant = participant; } @@ -23528,7 +23529,7 @@ private void processSelectedOption(int option) { File finalLocFile = locFile; AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("ImportStickersList", R.string.ImportStickersList), - R.drawable.deproko_baseline_stickers_filled_24, LocaleController.getString("Import", R.string.Import), + R.drawable.msg_sticker, LocaleController.getString("Import", R.string.Import), false, () -> { presentFragment(new StickersActivity(finalLocFile)); }); @@ -25175,7 +25176,7 @@ private void didPressMessageUrl(CharacterStyle url, boolean longPress, MessageOb builder.addItems( // TODO: builder.setItems(noforwards ? new CharSequence[] {LocaleController.getString("Open", R.string.Open)} : new CharSequence[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy)}, (dialog, which) -> { new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("ShareQRCode", R.string.ShareQRCode)}, - new int[]{R.drawable.baseline_open_in_browser_24, R.drawable.baseline_content_copy_24, R.drawable.wallet_qr}, (which, text, __) -> { + new int[]{R.drawable.msg_openin, R.drawable.msg_copy, R.drawable.wallet_qr}, (which, text, __) -> { if (which == 0) { if (str.startsWith("video?")) { didPressMessageUrl(url, false, finalMessageObject, finalCell); @@ -25244,7 +25245,7 @@ private void didPressMessageUrl(CharacterStyle url, boolean longPress, MessageOb // TODO: builder.setItems(noforwards ? new CharSequence[] {LocaleController.getString("Open", R.string.Open)} : new CharSequence[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy)}, (dialog, which) -> { builder.addItems( new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("ShareQRCode", R.string.ShareQRCode)}, - new int[]{R.drawable.baseline_open_in_browser_24, R.drawable.baseline_content_copy_24, R.drawable.wallet_qr}, (which, text, __) -> { + new int[]{R.drawable.msg_openin, R.drawable.msg_copy, R.drawable.wallet_qr}, (which, text, __) -> { if (which == 0) { processExternalUrl(1, urlFinal, false); } else if (which == 1) { @@ -26233,7 +26234,7 @@ public void didPressImage(ChatMessageCell cell, float x, float y) { File finalLocFile = locFile; AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("ImportStickersList", R.string.ImportStickersList), - R.drawable.deproko_baseline_stickers_filled_24, LocaleController.getString("Import", R.string.Import), false, () -> { + R.drawable.msg_sticker, LocaleController.getString("Import", R.string.Import), false, () -> { presentFragment(new StickersActivity(finalLocFile)); }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java index f03b21ec88..21d003c23b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java @@ -998,9 +998,9 @@ private void setAvatar() { } if (setAvatarCell != null) { if (hasPhoto || imageUpdater.isUploadingImage()) { - setAvatarCell.setTextAndIcon(LocaleController.getString("ChatSetNewPhoto", R.string.ChatSetNewPhoto), R.drawable.baseline_image_24, true); + setAvatarCell.setTextAndIcon(LocaleController.getString("ChatSetNewPhoto", R.string.ChatSetNewPhoto), R.drawable.menu_camera2, true); } else { - setAvatarCell.setTextAndIcon(LocaleController.getString("ChatSetPhotoOrVideo", R.string.ChatSetPhotoOrVideo), R.drawable.baseline_image_24, true); + setAvatarCell.setTextAndIcon(LocaleController.getString("ChatSetPhotoOrVideo", R.string.ChatSetPhotoOrVideo), R.drawable.menu_camera2, true); } if (cameraDrawable == null) { cameraDrawable = new RLottieDrawable(R.raw.camera_outline, "" + R.raw.camera_outline, AndroidUtilities.dp(50), AndroidUtilities.dp(50), false, null); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java index 63e4591dbc..f3a2162a58 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java @@ -859,14 +859,14 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { if (isChannel) { if (info.linked_chat_id != 0) { actionCell.setColors(Theme.key_windowBackgroundWhiteRedText5, Theme.key_windowBackgroundWhiteRedText5); - actionCell.setText(LocaleController.getString("DiscussionUnlinkGroup", R.string.DiscussionUnlinkGroup), null, R.drawable.baseline_remove_circle_24, false); + actionCell.setText(LocaleController.getString("DiscussionUnlinkGroup", R.string.DiscussionUnlinkGroup), null, R.drawable.actions_remove_user, false); } else { actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); - actionCell.setText(LocaleController.getString("DiscussionCreateGroup", R.string.DiscussionCreateGroup), null, R.drawable.baseline_group_24, true); + actionCell.setText(LocaleController.getString("DiscussionCreateGroup", R.string.DiscussionCreateGroup), null, R.drawable.menu_groups, true); } } else { actionCell.setColors(Theme.key_windowBackgroundWhiteRedText5, Theme.key_windowBackgroundWhiteRedText5); - actionCell.setText(LocaleController.getString("DiscussionUnlinkChannel", R.string.DiscussionUnlinkChannel), null, R.drawable.baseline_remove_circle_24, false); + actionCell.setText(LocaleController.getString("DiscussionUnlinkChannel", R.string.DiscussionUnlinkChannel), null, R.drawable.actions_remove_user, false); } break; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java index 742ac1b3fa..b8e83c3c82 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java @@ -1804,7 +1804,7 @@ private boolean createMenuForParticipant(final TLObject participant, boolean res return true; } items.add(editingAdmin ? LocaleController.getString("EditAdminRights", R.string.EditAdminRights) : LocaleController.getString("SetAsAdmin", R.string.SetAsAdmin)); - icons.add(R.drawable.baseline_stars_24); + icons.add(R.drawable.actions_addadmin); actions.add(0); } boolean hasRemove = false; @@ -1815,14 +1815,14 @@ private boolean createMenuForParticipant(final TLObject participant, boolean res if (!isChannel) { if (ChatObject.isChannel(currentChat) && !currentChat.gigagroup) { items.add(LocaleController.getString("ChangePermissions", R.string.ChangePermissions)); - icons.add(R.drawable.baseline_block_24); + icons.add(R.drawable.actions_permissions); actions.add(1); } items.add(LocaleController.getString("KickFromGroup", R.string.KickFromGroup)); } else { items.add(LocaleController.getString("ChannelRemoveUser", R.string.ChannelRemoveUser)); } - icons.add(R.drawable.baseline_remove_circle_24); + icons.add(R.drawable.actions_remove_user); actions.add(2); hasRemove = true; } @@ -1867,8 +1867,8 @@ private boolean createMenuForParticipant(final TLObject participant, boolean res LocaleController.getString("ChannelEditPermissions", R.string.ChannelEditPermissions), LocaleController.getString("ChannelDeleteFromList", R.string.ChannelDeleteFromList)}; icons = new int[]{ - R.drawable.baseline_block_24, - R.drawable.baseline_delete_24}; + R.drawable.actions_permissions, + R.drawable.chats_delete}; } else if (type == TYPE_BANNED && ChatObject.canBlockUsers(currentChat)) { if (resultOnly) { return true; @@ -1877,8 +1877,8 @@ private boolean createMenuForParticipant(final TLObject participant, boolean res ChatObject.canAddUsers(currentChat) && peerId > 0 ? (isChannel ? LocaleController.getString("ChannelAddToChannel", R.string.ChannelAddToChannel) : LocaleController.getString("ChannelAddToGroup", R.string.ChannelAddToGroup)) : null, LocaleController.getString("ChannelDeleteFromList", R.string.ChannelDeleteFromList)}; icons = new int[]{ - R.drawable.baseline_person_add_24, - R.drawable.baseline_delete_24}; + R.drawable.actions_addmember2, + R.drawable.chats_delete}; } else if (type == TYPE_ADMIN && ChatObject.canAddAdmins(currentChat) && canEdit) { if (resultOnly) { return true; @@ -1888,13 +1888,13 @@ private boolean createMenuForParticipant(final TLObject participant, boolean res LocaleController.getString("EditAdminRights", R.string.EditAdminRights), LocaleController.getString("ChannelRemoveUserAdmin", R.string.ChannelRemoveUserAdmin)}; icons = new int[]{ - R.drawable.baseline_stars_24, - R.drawable.baseline_remove_circle_24}; + R.drawable.actions_addadmin, + R.drawable.actions_remove_user}; } else { items = new CharSequence[]{ LocaleController.getString("ChannelRemoveUserAdmin", R.string.ChannelRemoveUserAdmin)}; icons = new int[]{ - R.drawable.baseline_remove_circle_24}; + R.drawable.actions_remove_user}; } } else { items = null; @@ -3320,24 +3320,24 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { if (position == addNewRow) { if (type == TYPE_KICKED) { actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); - actionCell.setText(LocaleController.getString("ChannelAddException", R.string.ChannelAddException), null, R.drawable.baseline_person_add_24, participantsStartRow != -1); + actionCell.setText(LocaleController.getString("ChannelAddException", R.string.ChannelAddException), null, R.drawable.actions_addmember2, participantsStartRow != -1); } else if (type == TYPE_BANNED) { - actionCell.setText(LocaleController.getString("ChannelBlockUser", R.string.ChannelBlockUser), null, R.drawable.baseline_remove_circle_24, false); + actionCell.setText(LocaleController.getString("ChannelBlockUser", R.string.ChannelBlockUser), null, R.drawable.actions_removed, false); } else if (type == TYPE_ADMIN) { actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); boolean showDivider = !(loadingUsers && !firstLoaded); - actionCell.setText(LocaleController.getString("ChannelAddAdmin", R.string.ChannelAddAdmin), null, R.drawable.baseline_stars_24, showDivider); + actionCell.setText(LocaleController.getString("ChannelAddAdmin", R.string.ChannelAddAdmin), null, R.drawable.add_admin, showDivider); } else if (type == TYPE_USERS) { actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); boolean showDivider = addNew2Row != -1 || (!(loadingUsers && !firstLoaded) && membersHeaderRow == -1 && !participants.isEmpty()); if (isChannel) { - actionCell.setText(LocaleController.getString("AddSubscriber", R.string.AddSubscriber), null, R.drawable.baseline_person_add_24, showDivider); + actionCell.setText(LocaleController.getString("AddSubscriber", R.string.AddSubscriber), null, R.drawable.actions_addmember2, showDivider); } else { - actionCell.setText(LocaleController.getString("AddMember", R.string.AddMember), null, R.drawable.baseline_person_add_24, showDivider); + actionCell.setText(LocaleController.getString("AddMember", R.string.AddMember), null, R.drawable.actions_addmember2, showDivider); } } } else if (position == recentActionsRow) { - actionCell.setText(LocaleController.getString("EventLog", R.string.EventLog), null, R.drawable.baseline_content_copy_24, false); + actionCell.setText(LocaleController.getString("EventLog", R.string.EventLog), null, R.drawable.group_log, false); } else if (position == addNew2Row) { actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); boolean showDivider = !(loadingUsers && !firstLoaded) && membersHeaderRow == -1 && !participants.isEmpty(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java index a08c6d679d..66551771e2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java @@ -803,11 +803,11 @@ public static void showCustomNotificationsDialog(BaseFragment parentFragment, lo }; int[] icons = new int[]{ - R.drawable.baseline_notifications_24, - R.drawable.baseline_notifications_paused_24, - R.drawable.baseline_notifications_paused_24, - R.drawable.baseline_settings_24, - R.drawable.baseline_notifications_off_24 + R.drawable.notifications_on, + R.drawable.notifications_mute1h, + R.drawable.notifications_mute2d, + R.drawable.notifications_settings, + R.drawable.notifications_off }; final LinearLayout linearLayout = new LinearLayout(parentFragment.getParentActivity()); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java index 959a924f03..7008128faf 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java @@ -1058,8 +1058,8 @@ public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { optionsButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_listSelector), 1, AndroidUtilities.dp(18))); } bottomView.addView(optionsButton, LayoutHelper.createFrame(48, 48, Gravity.LEFT | Gravity.TOP)); - optionsButton.addSubItem(1, R.drawable.baseline_forward_24, LocaleController.getString("Forward", R.string.Forward)); - optionsButton.addSubItem(2, R.drawable.baseline_share_24, LocaleController.getString("ShareFile", R.string.ShareFile)); + optionsButton.addSubItem(1, R.drawable.msg_forward, LocaleController.getString("Forward", R.string.Forward)); + optionsButton.addSubItem(2, R.drawable.msg_shareout, LocaleController.getString("ShareFile", R.string.ShareFile)); optionsButton.addSubItem(5, R.drawable.msg_download, LocaleController.getString("SaveToMusic", R.string.SaveToMusic)); optionsButton.addSubItem(4, R.drawable.msg_message, LocaleController.getString("ShowInChat", R.string.ShowInChat)); optionsButton.setShowedFromBottom(true); @@ -2541,4 +2541,4 @@ public TextView getNextTextView() { protected abstract TextView createTextView(); } -} \ No newline at end of file +} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java index e187bbc66f..7cd3500453 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java @@ -2520,7 +2520,7 @@ public void onClick(View v) { attachButton = new ImageView(context); attachButton.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_messagePanelIcons), PorterDuff.Mode.SRC_IN)); - attachButton.setImageResource(R.drawable.deproko_baseline_attach_26); + attachButton.setImageResource(R.drawable.input_attach); attachButton.setScaleType(ImageView.ScaleType.CENTER); if (Build.VERSION.SDK_INT >= 21) { attachButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_listSelector))); @@ -3178,7 +3178,7 @@ protected boolean drawChild(Canvas canvas, View child, long drawingTime) { audioSendButton = new ImageView(context); audioSendButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE); audioSendButton.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_messagePanelIcons), PorterDuff.Mode.SRC_IN)); - audioSendButton.setImageResource(!NekoConfig.useChatAttachMediaMenu.Bool() ? R.drawable.baseline_mic_24 : R.drawable.ic_ab_other); + audioSendButton.setImageResource(!NekoConfig.useChatAttachMediaMenu.Bool() ? R.drawable.input_mic : R.drawable.ic_ab_other); audioSendButton.setPadding(0, 0, AndroidUtilities.dp(4), 0); audioSendButton.setContentDescription(!NekoConfig.useChatAttachMediaMenu.Bool() ? LocaleController.getString("AccDescrVoiceMessage", R.string.AccDescrVoiceMessage) : @@ -3196,7 +3196,7 @@ protected boolean drawChild(Canvas canvas, View child, long drawingTime) { videoSendButton = new ImageView(context); videoSendButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE); videoSendButton.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_chat_messagePanelIcons), PorterDuff.Mode.SRC_IN)); - videoSendButton.setImageResource(R.drawable.baseline_camera_alt_24); + videoSendButton.setImageResource(R.drawable.input_video); videoSendButton.setPadding(0, 0, AndroidUtilities.dp(4), 0); videoSendButton.setContentDescription(LocaleController.getString("AccDescrVideoMessage", R.string.AccDescrVideoMessage)); videoSendButton.setFocusable(true); @@ -3602,7 +3602,7 @@ public boolean onTouch(View v, MotionEvent event) { if (!isInInput) { - cell.setTextAndIcon(LocaleController.getString("ChatAttachEnterMenuRecordAudio", R.string.ChatAttachEnterMenuRecordAudio), R.drawable.baseline_mic_24); + cell.setTextAndIcon(LocaleController.getString("ChatAttachEnterMenuRecordAudio", R.string.ChatAttachEnterMenuRecordAudio), R.drawable.input_mic); cell.setOnClickListener(v -> { if (menuPopupWindow != null && menuPopupWindow.isShowing()) { menuPopupWindow.dismiss(); @@ -3634,7 +3634,7 @@ public boolean onTouch(View v, MotionEvent event) { cell = new ActionBarMenuSubItem(getContext(), false, dlps == 0); - cell.setTextAndIcon(LocaleController.getString("ChatAttachEnterMenuRecordVideo", R.string.ChatAttachEnterMenuRecordVideo), R.drawable.baseline_camera_alt_24); + cell.setTextAndIcon(LocaleController.getString("ChatAttachEnterMenuRecordVideo", R.string.ChatAttachEnterMenuRecordVideo), R.drawable.input_video); cell.setOnClickListener(v -> { if (menuPopupWindow != null && menuPopupWindow.isShowing()) { menuPopupWindow.dismiss(); @@ -3761,7 +3761,7 @@ public boolean onTouch(View v, MotionEvent event) { cell = new ActionBarMenuSubItem(getContext(), false, dlps == 0); - cell.setTextAndIcon(LocaleController.getString("ReplaceText", R.string.ReplaceText), R.drawable.baseline_edit_24); + cell.setTextAndIcon(LocaleController.getString("ReplaceText", R.string.ReplaceText), R.drawable.msg_edit); cell.setOnClickListener(v -> { if (menuPopupWindow != null && menuPopupWindow.isShowing()) { menuPopupWindow.dismiss(); @@ -3778,7 +3778,7 @@ public boolean onTouch(View v, MotionEvent event) { cell.setTextAndIcon(dlps != 1 ? LocaleController.getString("ChatAttachEnterMenuEnableLinkPreview", R.string.ChatAttachEnterMenuEnableLinkPreview) : - LocaleController.getString("ChatAttachEnterMenuDisableLinkPreview", R.string.ChatAttachEnterMenuDisableLinkPreview), R.drawable.baseline_link_24); + LocaleController.getString("ChatAttachEnterMenuDisableLinkPreview", R.string.ChatAttachEnterMenuDisableLinkPreview), R.drawable.msg_link); ActionBarMenuSubItem finalCell = cell; cell.setOnClickListener(v -> { @@ -3791,7 +3791,7 @@ public boolean onTouch(View v, MotionEvent event) { finalCell.setTextAndIcon(delegate.getDisableLinkPreviewStatus() != 1 ? LocaleController.getString("ChatAttachEnterMenuEnableLinkPreview", R.string.ChatAttachEnterMenuEnableLinkPreview) : - LocaleController.getString("ChatAttachEnterMenuDisableLinkPreview", R.string.ChatAttachEnterMenuDisableLinkPreview), R.drawable.baseline_link_24); + LocaleController.getString("ChatAttachEnterMenuDisableLinkPreview", R.string.ChatAttachEnterMenuDisableLinkPreview), R.drawable.msg_link); }); @@ -3877,9 +3877,9 @@ public boolean onTouch(View v, MotionEvent event) { if (scheduleButtonValue) { ActionBarMenuSubItem scheduleButton = new ActionBarMenuSubItem(getContext(), true, !sendWithoutSoundButtonValue, resourcesProvider); if (self) { - scheduleButton.setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.baseline_date_range_24); + scheduleButton.setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.msg_schedule); } else { - scheduleButton.setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.baseline_date_range_24); + scheduleButton.setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.msg_schedule); } scheduleButton.setMinimumWidth(AndroidUtilities.dp(196)); scheduleButton.setOnClickListener(v -> { @@ -3892,7 +3892,7 @@ public boolean onTouch(View v, MotionEvent event) { } if (sendWithoutSoundButtonValue) { ActionBarMenuSubItem sendWithoutSoundButton = new ActionBarMenuSubItem(getContext(), !scheduleButtonValue, true, resourcesProvider); - sendWithoutSoundButton.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.baseline_notifications_off_24); + sendWithoutSoundButton.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); sendWithoutSoundButton.setMinimumWidth(AndroidUtilities.dp(196)); sendWithoutSoundButton.setOnClickListener(v -> { if (sendPopupWindow != null && sendPopupWindow.isShowing()) { @@ -4949,7 +4949,7 @@ private void checkAttachButton(boolean use, int duration) { if (use) { attachButton.setTag(1); - fromRes = R.drawable.deproko_baseline_attach_26; + fromRes = R.drawable.input_attach; targetRes = R.drawable.ic_ab_other; attachButton.setOnClickListener(this::onMenuClick); @@ -4961,7 +4961,7 @@ private void checkAttachButton(boolean use, int duration) { attachButton.setTag(2); fromRes = R.drawable.ic_ab_other; - targetRes = R.drawable.deproko_baseline_attach_26; + targetRes = R.drawable.input_attach; attachButton.setOnClickListener(v -> { if (adjustPanLayoutHelper != null && adjustPanLayoutHelper.animationInProgress()) { @@ -7529,15 +7529,15 @@ private void updateBotButton(boolean animated) { botButton.setVisibility(VISIBLE); } if (isPopupShowing() && currentPopupContentType == 1) { - botButtonDrawable.setIcon(R.drawable.baseline_keyboard_24, true); + botButtonDrawable.setIcon(R.drawable.input_keyboard, true); botButton.setContentDescription(LocaleController.getString("AccDescrShowKeyboard", R.string.AccDescrShowKeyboard)); } else { - botButtonDrawable.setIcon(R.drawable.deproko_baseline_bots_24, true); + botButtonDrawable.setIcon(R.drawable.input_bot2, true); botButton.setContentDescription(LocaleController.getString("AccDescrBotKeyboard", R.string.AccDescrBotKeyboard)); } } else { if (!canShowBotsMenu) { - botButtonDrawable.setIcon(R.drawable.deproko_baseline_bots_command_26, true); + botButtonDrawable.setIcon(R.drawable.input_bot1, true); botButton.setContentDescription(LocaleController.getString("AccDescrBotCommands", R.string.AccDescrBotCommands)); botButton.setVisibility(VISIBLE); } else { @@ -7568,10 +7568,10 @@ private boolean checkBotButton() { if (hasBotCommands || botReplyMarkup != null) { if (botReplyMarkup != null) { if (isPopupShowing() && currentPopupContentType == 1) { - botButtonDrawable.setIcon(R.drawable.baseline_keyboard_24, true); + botButtonDrawable.setIcon(R.drawable.input_keyboard, true); botButton.setContentDescription(LocaleController.getString("AccDescrShowKeyboard", R.string.AccDescrShowKeyboard)); } else { - botButtonDrawable.setIcon(R.drawable.deproko_baseline_bots_24, true); + botButtonDrawable.setIcon(R.drawable.input_bot2, true); botButton.setContentDescription(LocaleController.getString("AccDescrBotKeyboard", R.string.AccDescrBotKeyboard)); } if (botButton.getVisibility() != VISIBLE) { @@ -7579,7 +7579,7 @@ private boolean checkBotButton() { } } else { if (!canShowBotsMenu) { - botButtonDrawable.setIcon(R.drawable.deproko_baseline_bots_command_26, true); + botButtonDrawable.setIcon(R.drawable.input_bot1, true); botButton.setContentDescription(LocaleController.getString("AccDescrBotCommands", R.string.AccDescrBotCommands)); return true; } @@ -8450,13 +8450,13 @@ private void setEmojiButtonImage(boolean byOpen, boolean animated) { emojiButtonAnimation = null; } if (nextIcon == 0) { - emojiButton[animated ? 1 : 0].setImageResource(R.drawable.baseline_keyboard_24); + emojiButton[animated ? 1 : 0].setImageResource(R.drawable.input_keyboard); } else if (nextIcon == 1) { - emojiButton[animated ? 1 : 0].setImageResource(R.drawable.baseline_emoticon_24); + emojiButton[animated ? 1 : 0].setImageResource(R.drawable.input_smile); } else if (nextIcon == 2) { - emojiButton[animated ? 1 : 0].setImageResource(R.drawable.deproko_baseline_stickers_24); + emojiButton[animated ? 1 : 0].setImageResource(R.drawable.input_sticker); } else if (nextIcon == 3) { - emojiButton[animated ? 1 : 0].setImageResource(R.drawable.deproko_baseline_gif_24); + emojiButton[animated ? 1 : 0].setImageResource(R.drawable.input_gif); } emojiButton[animated ? 1 : 0].setTag(nextIcon == 2 ? 1 : null); currentEmojiIcon = nextIcon; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java index ea3d0f5cc1..d86087d3ab 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java @@ -1896,12 +1896,12 @@ public boolean onTouch(View v, MotionEvent event) { itemCells[a].setTextAndIcon(LocaleController.getString("Translate", R.string.Translate), R.drawable.ic_translate); } else if (num == 1) { if (UserObject.isUserSelf(user)) { - itemCells[a].setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.baseline_date_range_24); + itemCells[a].setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.msg_schedule); } else { - itemCells[a].setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.baseline_date_range_24); + itemCells[a].setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.msg_schedule); } } else if (num == 2) { - itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.baseline_notifications_off_24); + itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); } itemCells[a].setMinimumWidth(AndroidUtilities.dp(196)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java index 035c72eebe..8dbf4642b8 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java @@ -535,7 +535,7 @@ public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { parentAlert.selectedMenuItem.addSubItem(group, LocaleController.getString("SendWithoutGrouping", R.string.SendWithoutGrouping)); parentAlert.selectedMenuItem.addSubItem(compress, LocaleController.getString("SendWithoutCompression", R.string.SendWithoutCompression)); - parentAlert.selectedMenuItem.addSubItem(open_in, R.drawable.baseline_open_in_browser_24, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); + parentAlert.selectedMenuItem.addSubItem(open_in, R.drawable.msg_openin, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); parentAlert.selectedMenuItem.addSubItem(preview, LocaleController.getString("AttachMediaPreviewButton", R.string.AttachMediaPreviewButton)); gridView = new RecyclerListView(context, resourcesProvider) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ColorPicker.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ColorPicker.java index 44ba17dc48..a95422d76b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ColorPicker.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ColorPicker.java @@ -582,9 +582,9 @@ public void onAnimationEnd(Animator animation) { menuItem.setLongClickEnabled(false); menuItem.setIcon(R.drawable.ic_ab_other); menuItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); - menuItem.addSubItem(item_edit, R.drawable.baseline_edit_24, LocaleController.getString("OpenInEditor", R.string.OpenInEditor)); - menuItem.addSubItem(item_share, R.drawable.baseline_forward_24, LocaleController.getString("ShareTheme", R.string.ShareTheme)); - menuItem.addSubItem(item_delete, R.drawable.baseline_delete_24, LocaleController.getString("DeleteTheme", R.string.DeleteTheme)); + menuItem.addSubItem(item_edit, R.drawable.msg_edit, LocaleController.getString("OpenInEditor", R.string.OpenInEditor)); + menuItem.addSubItem(item_share, R.drawable.msg_share, LocaleController.getString("ShareTheme", R.string.ShareTheme)); + menuItem.addSubItem(item_delete, R.drawable.msg_delete, LocaleController.getString("DeleteTheme", R.string.DeleteTheme)); menuItem.setMenuYOffset(-AndroidUtilities.dp(80)); menuItem.setSubMenuOpenSide(2); menuItem.setDelegate(id -> { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEmoji.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEmoji.java index ac3909ba8f..847244ea1c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEmoji.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEmoji.java @@ -170,7 +170,7 @@ protected void onLineCountChanged(int oldLineCount, int newLineCount) { emojiIconDrawable.setIcon(R.drawable.smiles_tab_smiles, false); addView(emojiButton, LayoutHelper.createFrame(48, 48, Gravity.CENTER_VERTICAL | (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT), 0, 0, 0, 7)); } else { - emojiIconDrawable.setIcon(R.drawable.baseline_emoticon_24, false); + emojiIconDrawable.setIcon(R.drawable.input_smile, false); addView(emojiButton, LayoutHelper.createFrame(48, 48, Gravity.BOTTOM | Gravity.LEFT, 0, 0, 0, 0)); } if (Build.VERSION.SDK_INT >= 21) { @@ -415,7 +415,7 @@ private void showPopup(int show) { if (sizeNotifierLayout != null) { emojiPadding = currentHeight; sizeNotifierLayout.requestLayout(); - emojiIconDrawable.setIcon(R.drawable.baseline_keyboard_24, true); + emojiIconDrawable.setIcon(R.drawable.input_keyboard, true); onWindowSizeChanged(); } @@ -444,7 +444,7 @@ public void onAnimationEnd(Animator animation) { if (currentStyle == STYLE_FRAGMENT) { emojiIconDrawable.setIcon(R.drawable.smiles_tab_smiles, true); } else { - emojiIconDrawable.setIcon(R.drawable.baseline_emoticon_24, true); + emojiIconDrawable.setIcon(R.drawable.input_smile, true); } } if (emojiView != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java index 6b2d7c382a..2739c63c20 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java @@ -1085,31 +1085,31 @@ public EmojiView(boolean needStickers, boolean needGif, final Context context, b // TODO: replace with baseline icons - /* tabIcons = new Drawable[]{ - Theme.createEmojiIconSelectorDrawable(context, R.drawable.baseline_emoticon_outline_24, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.deproko_baseline_gif_24, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.msg_sticker, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)) - };*/ + tabIcons = new Drawable[]{ + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_tab_smiles, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_tab_gif, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_tab_stickers, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)) + }; - tabIcons = new Drawable[]{ + /* tabIcons = new Drawable[]{ Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.baseline_emoticon_outline_24, R.drawable.baseline_emoticon_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.deproko_baseline_gif_24, R.drawable.deproko_baseline_gif_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.deproko_baseline_stickers_24, R.drawable.deproko_baseline_stickers_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)) - }; - - /* emojiIcons = new Drawable[]{ - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_recent, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_smiles, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_cat, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_food, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_activities, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_travel, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_objects, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_other, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_flags, Theme.getColor(Theme.key_chat_messagePanelIcons), Theme.getColor(Theme.key_chat_emojiPanelIconSelected)), };*/ emojiIcons = new Drawable[]{ + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_recent, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_smiles, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_cat, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_food, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_activities, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_travel, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_objects, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_other, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.smiles_panel_flags, getThemedColor(Theme.key_chat_emojiPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + }; + + /* emojiIcons = new Drawable[]{ Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.baseline_access_time_24, R.drawable.baseline_access_time_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)), Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.baseline_emoticon_outline_24, R.drawable.baseline_emoticon_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)), Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.deproko_baseline_animals_outline_24, R.drawable.deproko_baseline_animals_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)), @@ -1119,12 +1119,12 @@ public EmojiView(boolean needStickers, boolean needGif, final Context context, b Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.deproko_baseline_lamp_24, R.drawable.deproko_baseline_lamp_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)), Theme.createEmojiIconSelectorDrawable(context, R.drawable.baseline_emoji_symbols_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)), Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.deproko_baseline_flag_outline_24, R.drawable.deproko_baseline_flag_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)) - }; + };*/ stickerIcons = new Drawable[]{ - Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.baseline_access_time_24, R.drawable.baseline_access_time_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.baseline_star_border_24, R.drawable.baseline_star_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.stickers_trending3, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.emoji_tabs_recent, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.emoji_tabs_faves, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.emoji_tabs_new3, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), new LayerDrawable(new Drawable[]{ searchIconDrawable = Theme.createEmojiIconSelectorDrawable(context, R.drawable.emoji_tabs_new1, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), searchIconDotDrawable = Theme.createEmojiIconSelectorDrawable(context, R.drawable.emoji_tabs_new2, getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)) @@ -1132,8 +1132,8 @@ public EmojiView(boolean needStickers, boolean needGif, final Context context, b }; gifIcons = new Drawable[]{ - Theme.createEmojiIconSelectorDrawableWithPressedResources(context, R.drawable.baseline_access_time_24, R.drawable.baseline_access_time_filled_24, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelStickerPackSelectorLine)), - Theme.createEmojiIconSelectorDrawable(context, R.drawable.stickers_gifs_trending, getThemedColor(Theme.key_chat_messagePanelIcons), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.stickers_recent, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), + Theme.createEmojiIconSelectorDrawable(context, R.drawable.stickers_gifs_trending, getThemedColor(Theme.key_chat_emojiBottomPanelIcon), getThemedColor(Theme.key_chat_emojiPanelIconSelected)), }; emojiTitles = new String[]{ @@ -6105,4 +6105,4 @@ public void checkVisibility() { public abstract boolean isShown(); } -} \ No newline at end of file +} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java index a4466c09e5..dd7dcb4a95 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java @@ -393,19 +393,19 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { cell.setTextColor(Theme.getColor(Theme.key_dialogTextBlack)); int icon; if ((filter.flags & MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) == (MessagesController.DIALOG_FILTER_FLAG_CONTACTS | MessagesController.DIALOG_FILTER_FLAG_NON_CONTACTS)) { - icon = R.drawable.baseline_person_24; + icon = R.drawable.menu_private; } else if ((filter.flags & MessagesController.DIALOG_FILTER_FLAG_EXCLUDE_READ) != 0 && (filter.flags & MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) == MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) { icon = R.drawable.menu_unread; } else if ((filter.flags & MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) == MessagesController.DIALOG_FILTER_FLAG_CHANNELS) { - icon = R.drawable.baseline_notifications_24; + icon = R.drawable.menu_broadcast; } else if ((filter.flags & MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) == MessagesController.DIALOG_FILTER_FLAG_GROUPS) { - icon = R.drawable.baseline_group_24; + icon = R.drawable.menu_groups; } else if ((filter.flags & MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) == MessagesController.DIALOG_FILTER_FLAG_CONTACTS) { - icon = R.drawable.baseline_contact_phone_24; + icon = R.drawable.menu_contacts; } else if ((filter.flags & MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS) == MessagesController.DIALOG_FILTER_FLAG_BOTS) { - icon = R.drawable.deproko_baseline_bots_24; + icon = R.drawable.menu_bots; } else { - icon = R.drawable.baseline_folder_24; + icon = R.drawable.menu_folders; } cell.setTextAndIcon(filter.name, icon); } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCreateSpan.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCreateSpan.java index c5474355b1..0bf1bbc121 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCreateSpan.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupCreateSpan.java @@ -67,7 +67,7 @@ public GroupCreateSpan(Context context, Object object, ContactsController.Contac super(context); currentContact = contact; - deleteDrawable = getResources().getDrawable(R.drawable.baseline_delete_24); + deleteDrawable = getResources().getDrawable(R.drawable.delete); textPaint.setTextSize(AndroidUtilities.dp(14)); String firstName; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ImageUpdater.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ImageUpdater.java index 3bd6aeb1c3..aa50d8b39c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ImageUpdater.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ImageUpdater.java @@ -181,14 +181,14 @@ public void openMenu(boolean hasAvatar, Runnable onDeleteAvatar, DialogInterface } - builder.addItem(LocaleController.getString("UploadImage", R.string.UploadImage), R.drawable.baseline_image_24, __ -> { + builder.addItem(LocaleController.getString("UploadImage", R.string.UploadImage), R.drawable.profile_photos, __ -> { openAttachMenu(onDismiss); return Unit.INSTANCE; }); if (searchAvailable) { - builder.addItem(LocaleController.getString("ChooseFromSearch", R.string.ChooseFromSearch), R.drawable.baseline_search_24, __ -> { + builder.addItem(LocaleController.getString("ChooseFromSearch", R.string.ChooseFromSearch), R.drawable.menu_search, __ -> { openSearch(); return Unit.INSTANCE; }); @@ -197,7 +197,7 @@ public void openMenu(boolean hasAvatar, Runnable onDeleteAvatar, DialogInterface if (hasAvatar) { - builder.addItem(LocaleController.getString("DeletePhoto", R.string.DeletePhoto), R.drawable.baseline_delete_24, true, __ -> { + builder.addItem(LocaleController.getString("DeletePhoto", R.string.DeletePhoto), R.drawable.chats_delete, true, __ -> { onDeleteAvatar.run(); return Unit.INSTANCE; }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java index 1b82f50d25..cd1aba8dc3 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java @@ -100,7 +100,7 @@ public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottom copyView = new TextView(context); copyView.setGravity(Gravity.CENTER_HORIZONTAL); SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(); - spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.baseline_content_copy_24), Theme.getColor(Theme.key_chats_actionIcon)), 0, 1, 0); + spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.msg_copy_filled)), 0, 1, 0); spannableStringBuilder.setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(8)), 1, 2, 0); spannableStringBuilder.append(LocaleController.getString("LinkActionCopy", R.string.LinkActionCopy)); spannableStringBuilder.append(".").setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(5)), spannableStringBuilder.length() - 1, spannableStringBuilder.length(), 0); @@ -114,7 +114,7 @@ public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottom shareView = new TextView(context); shareView.setGravity(Gravity.CENTER_HORIZONTAL); spannableStringBuilder = new SpannableStringBuilder(); - spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.baseline_forward_24), Theme.getColor(Theme.key_chats_actionIcon)), 0, 1, 0); + spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.msg_share_filled)), 0, 1, 0); spannableStringBuilder.setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(8)), 1, 2, 0); spannableStringBuilder.append(LocaleController.getString("LinkActionShare", R.string.LinkActionShare)); spannableStringBuilder.append(".").setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(5)), spannableStringBuilder.length() - 1, spannableStringBuilder.length(), 0); @@ -130,7 +130,7 @@ public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottom removeView = new TextView(context); removeView.setGravity(Gravity.CENTER_HORIZONTAL); spannableStringBuilder = new SpannableStringBuilder(); - spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.baseline_delete_24)), 0, 1, 0); + spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.msg_delete_filled)), 0, 1, 0); spannableStringBuilder.setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(8)), 1, 2, 0); spannableStringBuilder.append(LocaleController.getString("DeleteLink", R.string.DeleteLink)); spannableStringBuilder.append(".").setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(5)), spannableStringBuilder.length() - 1, spannableStringBuilder.length(), 0); @@ -206,7 +206,7 @@ public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottom ActionBarMenuSubItem subItem; if (!this.permanent && canEdit) { subItem = new ActionBarMenuSubItem(context, true, false); - subItem.setTextAndIcon(LocaleController.getString("Edit", R.string.Edit), R.drawable.baseline_edit_24); + subItem.setTextAndIcon(LocaleController.getString("Edit", R.string.Edit), R.drawable.msg_edit); layout.addView(subItem, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48)); subItem.setOnClickListener(view12 -> { if (actionBarPopupWindow != null) { @@ -225,7 +225,7 @@ public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottom if (!hideRevokeOption) { subItem = new ActionBarMenuSubItem(context, false, true); - subItem.setTextAndIcon(LocaleController.getString("RevokeLink", R.string.RevokeLink), R.drawable.baseline_delete_24); + subItem.setTextAndIcon(LocaleController.getString("RevokeLink", R.string.RevokeLink), R.drawable.msg_delete); subItem.setColors(Theme.getColor(Theme.key_windowBackgroundWhiteRedText), Theme.getColor(Theme.key_windowBackgroundWhiteRedText)); subItem.setOnClickListener(view1 -> { if (actionBarPopupWindow != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PhonebookShareAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PhonebookShareAlert.java index 8883944f97..a3ad0593c5 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PhonebookShareAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PhonebookShareAlert.java @@ -1056,19 +1056,19 @@ public void onBindViewHolder(View itemView, int position, int type) { int icon; if (position >= phoneStartRow && position < phoneEndRow) { item = phones.get(position - phoneStartRow); - icon = R.drawable.baseline_call_24; + icon = R.drawable.menu_calls; } else { item = other.get(position - vcardStartRow); if (item.type == 1) { - icon = R.drawable.baseline_alternate_email_24; + icon = R.drawable.menu_mail; } else if (item.type == 2) { - icon = R.drawable.baseline_location_on_24; + icon = R.drawable.menu_location; } else if (item.type == 3) { - icon = R.drawable.baseline_link_24; + icon = R.drawable.msg_link; } else if (item.type == 4) { icon = R.drawable.profile_info; } else if (item.type == 5) { - icon = R.drawable.baseline_date_range_24; + icon = R.drawable.menu_date; } else if (item.type == 6) { if ("ORG".equalsIgnoreCase(item.getRawType(true))) { icon = R.drawable.menu_work; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java index 72a8d09f79..4d88af1aa3 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java @@ -674,12 +674,12 @@ private void showPopup(int show, boolean animated) { if (sizeNotifierLayout != null) { emojiPadding = currentHeight; sizeNotifierLayout.requestLayout(); - emojiIconDrawable.setIcon(R.drawable.baseline_keyboard_24, true); + emojiIconDrawable.setIcon(R.drawable.input_keyboard, true); onWindowSizeChanged(); } } else { if (emojiButton != null) { - emojiIconDrawable.setIcon(R.drawable.baseline_emoticon_24, true); + emojiIconDrawable.setIcon(R.drawable.input_smile, true); } if (sizeNotifierLayout != null) { if (animated && SharedConfig.smoothKeyboard && show == 0 && emojiView != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchViewPager.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchViewPager.java index 66c01d06cb..81004b6c41 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchViewPager.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchViewPager.java @@ -313,7 +313,7 @@ private void showActionMode(boolean show) { selectedMessagesCountTextView.setOnTouchListener((v, event) -> true); gotoItem = actionMode.addItemWithWidth(gotoItemId, R.drawable.msg_message, AndroidUtilities.dp(54), LocaleController.getString("AccDescrGoToMessage", R.string.AccDescrGoToMessage)); - forwardItem = actionMode.addItemWithWidth(forwardItemId, R.drawable.baseline_forward_24, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward)); + forwardItem = actionMode.addItemWithWidth(forwardItemId, R.drawable.forward, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward)); deleteItem = actionMode.addItemWithWidth(deleteItemId, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete)); } if (parent.getActionBar().getBackButton().getDrawable() instanceof MenuDrawable) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java index 7a0ac70723..db227ed479 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java @@ -1468,7 +1468,7 @@ public boolean onTouch(View v, MotionEvent event) { sendPopupLayout2.setupRadialSelectors(getThemedColor(Theme.key_dialogButtonSelector)); ActionBarMenuSubItem sendWithoutSound = new ActionBarMenuSubItem(getContext(), true, true, resourcesProvider); - sendWithoutSound.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.baseline_notifications_off_24); + sendWithoutSound.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); sendWithoutSound.setMinimumWidth(AndroidUtilities.dp(196)); sendPopupLayout2.addView(sendWithoutSound, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48)); sendWithoutSound.setOnClickListener(v -> { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java index 660a8ff10a..01ae0a1424 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java @@ -1508,7 +1508,7 @@ public void onClick(View view) { gotoItem.setOnClickListener(v -> onActionBarItemClick(v, gotochat)); forwardNoQuoteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false); - forwardNoQuoteItem.setIcon(R.drawable.baseline_fast_forward_24); + forwardNoQuoteItem.setIcon(R.drawable.msg_forward_noquote); forwardNoQuoteItem.setContentDescription(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)); forwardNoQuoteItem.setDuplicateParentStateEnabled(false); actionModeLayout.addView(forwardNoQuoteItem, new LinearLayout.LayoutParams(AndroidUtilities.dp(54), ViewGroup.LayoutParams.MATCH_PARENT)); @@ -1516,7 +1516,7 @@ public void onClick(View view) { forwardNoQuoteItem.setOnClickListener(v -> onActionBarItemClick(v, forward_noquote)); forwardItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false); - forwardItem.setIcon(R.drawable.baseline_forward_24); + forwardItem.setIcon(R.drawable.msg_forward); forwardItem.setContentDescription(LocaleController.getString("Forward", R.string.Forward)); forwardItem.setDuplicateParentStateEnabled(false); actionModeLayout.addView(forwardItem, new LinearLayout.LayoutParams(AndroidUtilities.dp(54), ViewGroup.LayoutParams.MATCH_PARENT)); @@ -1526,7 +1526,7 @@ public void onClick(View view) { updateForwardItem(); } deleteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false); - deleteItem.setIcon(R.drawable.baseline_delete_24); + deleteItem.setIcon(R.drawable.msg_delete); deleteItem.setContentDescription(LocaleController.getString("Delete", R.string.Delete)); deleteItem.setDuplicateParentStateEnabled(false); actionModeLayout.addView(deleteItem, new LinearLayout.LayoutParams(AndroidUtilities.dp(54), ViewGroup.LayoutParams.MATCH_PARENT)); @@ -4866,7 +4866,7 @@ public void onLinkPress(String urlFinal, boolean longPress) { builder.addTitle(urlFinal); builder.addItems( new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("ShareQRCode", R.string.ShareQRCode)}, - new int[]{R.drawable.baseline_open_in_browser_24, R.drawable.baseline_content_copy_24, R.drawable.wallet_qr}, (which, text, __) -> { + new int[]{R.drawable.msg_openin, R.drawable.msg_copy, R.drawable.wallet_qr}, (which, text, __) -> { if (which == 0 || which == 2) { if (which == 0) { openUrl(urlFinal); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/StickersAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/StickersAlert.java index fadfdcf2e3..2e4fa18c77 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/StickersAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/StickersAlert.java @@ -755,10 +755,10 @@ public void requestLayout() { optionsButton.setIcon(R.drawable.ic_ab_other); optionsButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_player_actionBarSelector), 1)); containerView.addView(optionsButton, LayoutHelper.createFrame(40, 40, Gravity.TOP | Gravity.RIGHT, 0, 5, 5, 0)); - optionsButton.addSubItem(1, R.drawable.baseline_forward_24, LocaleController.getString("StickersShare", R.string.StickersShare)); - optionsButton.addSubItem(2, R.drawable.baseline_link_24, LocaleController.getString("CopyLink", R.string.CopyLink)); + optionsButton.addSubItem(1, R.drawable.msg_share, LocaleController.getString("StickersShare", R.string.StickersShare)); + optionsButton.addSubItem(2, R.drawable.msg_link, LocaleController.getString("CopyLink", R.string.CopyLink)); optionsButton.addSubItem(3, R.drawable.wallet_qr, LocaleController.getString("ShareQRCode", R.string.ShareQRCode)); - optionsButton.addSubItem(menu_archive, R.drawable.baseline_archive_24, LocaleController.getString("Archive", R.string.Archive)); + optionsButton.addSubItem(menu_archive, R.drawable.msg_archive, LocaleController.getString("Archive", R.string.Archive)); optionsButton.setOnClickListener(v -> optionsButton.toggleSubMenu()); optionsButton.setDelegate(this::onSubItemClick); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/WallpaperUpdater.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/WallpaperUpdater.java index d29684faae..b9628bfa96 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/WallpaperUpdater.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/WallpaperUpdater.java @@ -72,7 +72,7 @@ public void showAlert(final boolean fromTheme) { icons = null; } else { items = new String[]{LocaleController.getString("ChooseTakePhoto", R.string.ChooseTakePhoto), LocaleController.getString("SelectFromGallery", R.string.SelectFromGallery)}; - icons = new int[]{R.drawable.baseline_camera_alt_24, R.drawable.baseline_image_24}; + icons = new int[]{R.drawable.menu_camera, R.drawable.profile_photos}; } builder.addItems(items, icons, (i, t, c) -> { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java index 2412a36807..ca1ef9c6cd 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java @@ -175,17 +175,17 @@ public void run() { if (delegate != null) { if (delegate.needSend() && !delegate.isInScheduleMode()) { items.add(LocaleController.getString("SendStickerPreview", R.string.SendStickerPreview)); - icons.add(R.drawable.deproko_baseline_send_24); + icons.add(R.drawable.outline_send); actions.add(0); } if (delegate.needSend() && !delegate.isInScheduleMode()) { items.add(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound)); - icons.add(R.drawable.baseline_notifications_off_24); + icons.add(R.drawable.input_notify_off); actions.add(100); } if (delegate.canSchedule()) { items.add(LocaleController.getString("Schedule", R.string.Schedule)); - icons.add(R.drawable.baseline_timer_24); + icons.add(R.drawable.msg_timer); actions.add(3); } if (currentStickerSet != null && delegate.needOpen()) { @@ -195,11 +195,11 @@ public void run() { } if (delegate.needRemove()) { items.add(LocaleController.getString("ImportStickersRemoveMenu", R.string.ImportStickersRemoveMenu)); - icons.add(R.drawable.baseline_delete_24); + icons.add(R.drawable.msg_delete); actions.add(5); } items.add(LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); - icons.add(R.drawable.baseline_image_24); + icons.add(R.drawable.msg_gallery); actions.add(nkbtn_stickerdl); } if (!MessageObject.isMaskDocument(currentDocument) && (inFavs || MediaDataController.getInstance(currentAccount).canAddStickerToFavorites() && MessageObject.isStickerHasSet(currentDocument))) { @@ -209,7 +209,7 @@ public void run() { } if (isRecentSticker) { items.add(LocaleController.getString("DeleteFromRecent", R.string.DeleteFromRecent)); - icons.add(R.drawable.baseline_delete_24); + icons.add(R.drawable.msg_delete); actions.add(4); } if (items.isEmpty()) { @@ -289,17 +289,17 @@ protected void onContainerTranslationYChanged(float translationY) { if (delegate.needSend() && !delegate.isInScheduleMode()) { items.add(LocaleController.getString("SendGifPreview", R.string.SendGifPreview)); - icons.add(R.drawable.deproko_baseline_send_24); + icons.add(R.drawable.outline_send); actions.add(0); } if (delegate.needSend() && !delegate.isInScheduleMode()) { items.add(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound)); - icons.add(R.drawable.baseline_notifications_off_24); + icons.add(R.drawable.input_notify_off); actions.add(100); } if (delegate.canSchedule()) { items.add(LocaleController.getString("Schedule", R.string.Schedule)); - icons.add(R.drawable.baseline_timer_24); + icons.add(R.drawable.msg_timer); actions.add(3); } @@ -307,11 +307,11 @@ protected void onContainerTranslationYChanged(float translationY) { if (currentDocument != null) { if (canDelete = MediaDataController.getInstance(currentAccount).hasRecentGif(currentDocument)) { items.add(LocaleController.formatString("Delete", R.string.Delete)); - icons.add(R.drawable.baseline_delete_24); + icons.add(R.drawable.msg_delete); actions.add(1); } else { items.add(LocaleController.formatString("SaveToGIFs", R.string.SaveToGIFs)); - icons.add(R.drawable.deproko_baseline_gif_24); + icons.add(R.drawable.outline_add_gif); actions.add(2); } } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java index 801c8b6151..70b1e0610b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java @@ -2483,15 +2483,15 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { cell.setTextAndIcon(LocaleController.getString("FilterReorder", R.string.FilterReorder), R.drawable.tabs_reorder); } else if (a == 1) { if (N == 3) { - cell.setTextAndIcon(LocaleController.getString("FilterEditAll", R.string.FilterEditAll), R.drawable.baseline_edit_24); + cell.setTextAndIcon(LocaleController.getString("FilterEditAll", R.string.FilterEditAll), R.drawable.msg_edit); } else { - cell.setTextAndIcon(LocaleController.getString("FilterEdit", R.string.FilterEdit), R.drawable.baseline_edit_24); + cell.setTextAndIcon(LocaleController.getString("FilterEdit", R.string.FilterEdit), R.drawable.msg_edit); } } else if (a == 2) { if (N == 3) continue; - cell.setTextAndIcon(LocaleController.getString("FilterDeleteItem", R.string.FilterDeleteItem), R.drawable.baseline_delete_24); + cell.setTextAndIcon(LocaleController.getString("FilterDeleteItem", R.string.FilterDeleteItem), R.drawable.msg_delete); } else { - cell.setTextAndIcon(LocaleController.getString("MarkAllAsRead", R.string.MarkAllAsRead), R.drawable.baseline_done_all_24); + cell.setTextAndIcon(LocaleController.getString("MarkAllAsRead", R.string.MarkAllAsRead), R.drawable.msg_markread); } scrimPopupWindowItems[a] = cell; linearLayout.addView(cell); @@ -3866,18 +3866,18 @@ private void createActionMode(String tag) { actionMode.addView(selectedDialogsCountTextView, LayoutHelper.createLinear(0, LayoutHelper.MATCH_PARENT, 1.0f, 72, 0, 0, 0)); selectedDialogsCountTextView.setOnTouchListener((v, event) -> true); - pinItem = actionMode.addItemWithWidth(pin, R.drawable.deproko_baseline_pin_24, AndroidUtilities.dp(54)); - muteItem = actionMode.addItemWithWidth(mute, R.drawable.baseline_volume_off_24_white, AndroidUtilities.dp(54)); - archive2Item = actionMode.addItemWithWidth(archive2, R.drawable.baseline_archive_24, AndroidUtilities.dp(54)); - deleteItem = actionMode.addItemWithWidth(delete, R.drawable.baseline_delete_24, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete)); + pinItem = actionMode.addItemWithWidth(pin, R.drawable.msg_pin, AndroidUtilities.dp(54)); + muteItem = actionMode.addItemWithWidth(mute, R.drawable.msg_mute, AndroidUtilities.dp(54)); + archive2Item = actionMode.addItemWithWidth(archive2, R.drawable.msg_archive, AndroidUtilities.dp(54)); + deleteItem = actionMode.addItemWithWidth(delete, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete)); ActionBarMenuItem otherItem = actionMode.addItemWithWidth(0, R.drawable.ic_ab_other, AndroidUtilities.dp(54), LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); - archiveItem = otherItem.addSubItem(archive, R.drawable.baseline_archive_24, LocaleController.getString("Archive", R.string.Archive)); - pin2Item = otherItem.addSubItem(pin2, R.drawable.deproko_baseline_pin_24, LocaleController.getString("DialogPin", R.string.DialogPin)); - addToFolderItem = otherItem.addSubItem(add_to_folder, R.drawable.baseline_folder_24, LocaleController.getString("FilterAddTo", R.string.FilterAddTo)); - removeFromFolderItem = otherItem.addSubItem(remove_from_folder, R.drawable.baseline_folder_open_24, LocaleController.getString("FilterRemoveFrom", R.string.FilterRemoveFrom)); - readItem = otherItem.addSubItem(read, R.drawable.baseline_done_all_24, LocaleController.getString("MarkAsRead", R.string.MarkAsRead)); - clearItem = otherItem.addSubItem(clear, R.drawable.baseline_delete_sweep_24, LocaleController.getString("ClearHistory", R.string.ClearHistory)); - blockItem = otherItem.addSubItem(block, R.drawable.baseline_block_24, LocaleController.getString("BlockUser", R.string.BlockUser)); + archiveItem = otherItem.addSubItem(archive, R.drawable.msg_archive, LocaleController.getString("Archive", R.string.Archive)); + pin2Item = otherItem.addSubItem(pin2, R.drawable.msg_pin, LocaleController.getString("DialogPin", R.string.DialogPin)); + addToFolderItem = otherItem.addSubItem(add_to_folder, R.drawable.msg_addfolder, LocaleController.getString("FilterAddTo", R.string.FilterAddTo)); + removeFromFolderItem = otherItem.addSubItem(remove_from_folder, R.drawable.msg_removefolder, LocaleController.getString("FilterRemoveFrom", R.string.FilterRemoveFrom)); + readItem = otherItem.addSubItem(read, R.drawable.msg_markread, LocaleController.getString("MarkAsRead", R.string.MarkAsRead)); + clearItem = otherItem.addSubItem(clear, R.drawable.msg_clear, LocaleController.getString("ClearHistory", R.string.ClearHistory)); + blockItem = otherItem.addSubItem(block, R.drawable.msg_block, LocaleController.getString("BlockUser", R.string.BlockUser)); actionModeViews.add(pinItem); actionModeViews.add(archive2Item); @@ -5224,8 +5224,8 @@ private boolean onItemLongClick(View view, int position, float x, float y, int d final boolean hasUnread = getMessagesStorage().getArchiveUnreadCount() != 0; int[] icons = new int[]{ - hasUnread ? R.drawable.baseline_done_all_24 : 0, - SharedConfig.archiveHidden ? R.drawable.deproko_baseline_pin_24 : R.drawable.deproko_baseline_pin_undo_24, + hasUnread ? R.drawable.menu_read : 0, + SharedConfig.archiveHidden ? R.drawable.chats_pin : R.drawable.chats_unpin, }; String[] items = new String[]{ hasUnread ? LocaleController.getString("MarkAllAsRead", R.string.MarkAllAsRead) : null, @@ -6154,8 +6154,8 @@ private void updateCounters(boolean hide) { } if (canUnarchiveCount != 0) { final String contentDescription = LocaleController.getString("Unarchive", R.string.Unarchive); - archiveItem.setTextAndIcon(contentDescription, R.drawable.baseline_unarchive_24); - archive2Item.setIcon(R.drawable.baseline_unarchive_24); + archiveItem.setTextAndIcon(contentDescription, R.drawable.msg_unarchive); + archive2Item.setIcon(R.drawable.msg_unarchive); archive2Item.setContentDescription(contentDescription); if (filterTabsView != null && filterTabsView.getVisibility() == View.VISIBLE) { archive2Item.setVisibility(View.VISIBLE); @@ -6166,8 +6166,8 @@ private void updateCounters(boolean hide) { } } else if (canArchiveCount != 0) { final String contentDescription = LocaleController.getString("Archive", R.string.Archive); - archiveItem.setTextAndIcon(contentDescription, R.drawable.baseline_archive_24); - archive2Item.setIcon(R.drawable.baseline_archive_24); + archiveItem.setTextAndIcon(contentDescription, R.drawable.msg_archive); + archive2Item.setIcon(R.drawable.msg_archive); archive2Item.setContentDescription(contentDescription); if (filterTabsView != null && filterTabsView.getVisibility() == View.VISIBLE) { archive2Item.setVisibility(View.VISIBLE); @@ -6208,23 +6208,23 @@ private void updateCounters(boolean hide) { addToFolderItem.setVisibility(View.GONE); } if (canUnmuteCount != 0) { - muteItem.setIcon(R.drawable.baseline_bullhorn_24); + muteItem.setIcon(R.drawable.msg_unmute); muteItem.setContentDescription(LocaleController.getString("ChatsUnmute", R.string.ChatsUnmute)); } else { - muteItem.setIcon(R.drawable.baseline_volume_off_24_white); + muteItem.setIcon(R.drawable.msg_mute); muteItem.setContentDescription(LocaleController.getString("ChatsMute", R.string.ChatsMute)); } if (canReadCount != 0) { - readItem.setTextAndIcon(LocaleController.getString("MarkAsRead", R.string.MarkAsRead), R.drawable.baseline_done_all_24); + readItem.setTextAndIcon(LocaleController.getString("MarkAsRead", R.string.MarkAsRead), R.drawable.msg_markread); } else { - readItem.setTextAndIcon(LocaleController.getString("MarkAsUnread", R.string.MarkAsUnread), R.drawable.baseline_unsubscribe_24); + readItem.setTextAndIcon(LocaleController.getString("MarkAsUnread", R.string.MarkAsUnread), R.drawable.msg_markunread); } if (canPinCount != 0) { - pinItem.setIcon(R.drawable.deproko_baseline_pin_24); + pinItem.setIcon(R.drawable.msg_pin); pinItem.setContentDescription(LocaleController.getString("PinToTop", R.string.PinToTop)); pin2Item.setText(LocaleController.getString("DialogPin", R.string.DialogPin)); } else { - pinItem.setIcon(R.drawable.deproko_baseline_pin_undo_24); + pinItem.setIcon(R.drawable.msg_unpin); pinItem.setContentDescription(LocaleController.getString("UnpinFromTop", R.string.UnpinFromTop)); pin2Item.setText(LocaleController.getString("DialogUnpin", R.string.DialogUnpin)); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/FilterCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/FilterCreateActivity.java index 225ff9a649..a2697eb841 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/FilterCreateActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/FilterCreateActivity.java @@ -996,10 +996,10 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { textCell.setTextAndIcon(LocaleController.formatPluralString("FilterShowMoreChats", newNeverShow.size() - 5), R.drawable.arrow_more, false); } else if (position == includeAddRow) { textCell.setColors(Theme.key_switchTrackChecked, Theme.key_windowBackgroundWhiteBlueText4); - textCell.setTextAndIcon(LocaleController.getString("FilterAddChats", R.string.FilterAddChats), R.drawable.baseline_person_add_24, position + 1 != includeSectionRow); + textCell.setTextAndIcon(LocaleController.getString("FilterAddChats", R.string.FilterAddChats), R.drawable.actions_addchat, position + 1 != includeSectionRow); } else if (position == excludeAddRow) { textCell.setColors(Theme.key_switchTrackChecked, Theme.key_windowBackgroundWhiteBlueText4); - textCell.setTextAndIcon(LocaleController.getString("FilterRemoveChats", R.string.FilterRemoveChats), R.drawable.baseline_person_add_24, position + 1 != excludeSectionRow); + textCell.setTextAndIcon(LocaleController.getString("FilterRemoveChats", R.string.FilterRemoveChats), R.drawable.actions_addchat, position + 1 != excludeSectionRow); } break; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/FilterUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/FilterUsersActivity.java index 4dd789549f..d437e55da5 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/FilterUsersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/FilterUsersActivity.java @@ -427,7 +427,7 @@ public void onItemClick(int id) { ActionBarMenu menu = actionBar.createMenu(); ActionBarMenuItem headerItem = menu.addItem(0, R.drawable.ic_ab_other); headerItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); - headerItem.addSubItem(2, R.drawable.baseline_stars_24, LocaleController.getString("CheckAllAdministrated", R.string.CheckAllAdministrated)); + headerItem.addSubItem(2, R.drawable.group_admin, LocaleController.getString("CheckAllAdministrated", R.string.CheckAllAdministrated)); } fragmentView = new ViewGroup(context) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/FilteredSearchView.java b/TMessagesProj/src/main/java/org/telegram/ui/FilteredSearchView.java index d2ea8ca7f4..7c13b7d18a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/FilteredSearchView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/FilteredSearchView.java @@ -1072,7 +1072,7 @@ public void onLinkPress(String urlFinal, boolean longPress) { builder.addTitle(urlFinal); builder.addItems( new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("ShareQRCode", R.string.ShareQRCode)}, - new int[]{R.drawable.baseline_open_in_browser_24, R.drawable.baseline_content_copy_24, R.drawable.wallet_qr}, (which, text, __) -> { + new int[]{R.drawable.msg_openin, R.drawable.msg_copy, R.drawable.wallet_qr}, (which, text, __) -> { if (which == 0 || which == 2) { if (which == 0) { openUrl(urlFinal); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/FiltersSetupActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/FiltersSetupActivity.java index 5758892940..8083d95bee 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/FiltersSetupActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/FiltersSetupActivity.java @@ -551,8 +551,8 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType LocaleController.getString("FilterDeleteItem", R.string.FilterDeleteItem), }; final int[] icons = new int[]{ - R.drawable.baseline_edit_24, - R.drawable.baseline_delete_24 + R.drawable.msg_edit, + R.drawable.msg_delete }; builder1.setItems(items, icons, (dialog, which) -> { if (which == 0) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java index 82a6820700..f5b7f9f128 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java @@ -7314,7 +7314,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { options.add(8); } else { items.add(LocaleController.getString("VoipGroupOpenProfile", R.string.VoipGroupOpenProfile)); - icons.add(R.drawable.baseline_person_24); + icons.add(R.drawable.msg_openprofile); options.add(6); } if (!isAdmin && ChatObject.canBlockUsers(currentChat)) { @@ -7339,7 +7339,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { options.add(8); } else { items.add(LocaleController.getString("VoipGroupOpenChat", R.string.VoipGroupOpenChat)); - icons.add(R.drawable.baseline_person_24); + icons.add(R.drawable.msg_msgbubble3); options.add(6); } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/InviteContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/InviteContactsActivity.java index e4cd49c633..47c789f12c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/InviteContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/InviteContactsActivity.java @@ -745,7 +745,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType switch (viewType) { case 1: view = new InviteTextCell(context); - ((InviteTextCell) view).setTextAndIcon(LocaleController.getString("ShareTelegram", R.string.ShareTelegram), R.drawable.baseline_share_24); + ((InviteTextCell) view).setTextAndIcon(LocaleController.getString("ShareTelegram", R.string.ShareTelegram), R.drawable.share); break; default: view = new InviteUserCell(context, true); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java index ad9415781c..69d5f970ab 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java @@ -190,7 +190,7 @@ public void onTextChanged(EditText editText) { BottomBuilder builder = new BottomBuilder(getParentActivity()); - builder.addItem(LocaleController.getString("BotShare",R.string.BotShare),R.drawable.baseline_send_24,false,(__) -> { + builder.addItem(LocaleController.getString("BotShare",R.string.BotShare),R.drawable.msg_share,false,(__) -> { ShareUtil.shareText(getParentActivity(),"https://t.me/setlanguage/" + localeInfo.shortName.replace('_','-')); @@ -200,11 +200,11 @@ public void onTextChanged(EditText editText) { if (!localeInfo.isBuiltIn()) { - builder.addItem(LocaleController.getString("DeleteLocalizationTitle", R.string.DeleteLocalizationTitle), R.drawable.baseline_delete_24, true, (__) -> { + builder.addItem(LocaleController.getString("DeleteLocalizationTitle", R.string.DeleteLocalizationTitle), R.drawable.msg_delete, true, (__) -> { AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("DeleteLocalizationTitle", R.string.DeleteLocalizationTitle), - R.drawable.baseline_delete_24, + R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete), true, () -> { if (LocaleController.getInstance().deleteLanguage(localeInfo, currentAccount)) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LogoutActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LogoutActivity.java index 8ea0d6253e..9372093a3f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LogoutActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LogoutActivity.java @@ -193,15 +193,15 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { case 1: { TextDetailSettingsCell view = (TextDetailSettingsCell) holder.itemView; if (position == addAccountRow) { - view.setTextAndValueAndIcon(LocaleController.getString("AddAnotherAccount", R.string.AddAnotherAccount), LocaleController.getString("AddAnotherAccountInfo", R.string.AddAnotherAccountInfo), R.drawable.baseline_person_add_24, true); + view.setTextAndValueAndIcon(LocaleController.getString("AddAnotherAccount", R.string.AddAnotherAccount), LocaleController.getString("AddAnotherAccountInfo", R.string.AddAnotherAccountInfo), R.drawable.actions_addmember2, true); } else if (position == passcodeRow) { - view.setTextAndValueAndIcon(LocaleController.getString("SetPasscode", R.string.SetPasscode), LocaleController.getString("SetPasscodeInfo", R.string.SetPasscodeInfo), R.drawable.baseline_vpn_key_24, true); + view.setTextAndValueAndIcon(LocaleController.getString("SetPasscode", R.string.SetPasscode), LocaleController.getString("SetPasscodeInfo", R.string.SetPasscodeInfo), R.drawable.menu_passcode, true); } else if (position == cacheRow) { - view.setTextAndValueAndIcon(LocaleController.getString("ClearCache", R.string.ClearCache), LocaleController.getString("ClearCacheInfo", R.string.ClearCacheInfo), R.drawable.baseline_delete_sweep_24, true); + view.setTextAndValueAndIcon(LocaleController.getString("ClearCache", R.string.ClearCache), LocaleController.getString("ClearCacheInfo", R.string.ClearCacheInfo), R.drawable.menu_clearcache, true); } else if (position == phoneRow) { - view.setTextAndValueAndIcon(LocaleController.getString("ChangePhoneNumber", R.string.ChangePhoneNumber), LocaleController.getString("ChangePhoneNumberInfo", R.string.ChangePhoneNumberInfo), R.drawable.baseline_exit_to_app_24, true); + view.setTextAndValueAndIcon(LocaleController.getString("ChangePhoneNumber", R.string.ChangePhoneNumber), LocaleController.getString("ChangePhoneNumberInfo", R.string.ChangePhoneNumberInfo), R.drawable.menu_newphone, true); } else if (position == supportRow) { - view.setTextAndValueAndIcon(LocaleController.getString("ContactSupport", R.string.ContactSupport), LocaleController.getString("ContactSupportInfo", R.string.ContactSupportInfo), R.drawable.baseline_help_24, false); + view.setTextAndValueAndIcon(LocaleController.getString("ContactSupport", R.string.ContactSupport), LocaleController.getString("ContactSupportInfo", R.string.ContactSupportInfo), R.drawable.menu_support, false); } break; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java index 94bc907f54..714dedac5e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java @@ -1108,27 +1108,27 @@ public LinkCell(@NonNull Context context) { boolean redLastItem = false; if (invite.revoked) { items.add(LocaleController.getString("Delete", R.string.Delete)); - icons.add(R.drawable.baseline_delete_24); + icons.add(R.drawable.msg_delete); actions.add(4); redLastItem = true; } else { items.add(LocaleController.getString("CopyLink", R.string.CopyLink)); - icons.add(R.drawable.baseline_content_copy_24); + icons.add(R.drawable.msg_copy); actions.add(0); items.add(LocaleController.getString("ShareLink", R.string.ShareLink)); - icons.add(R.drawable.baseline_forward_24); + icons.add(R.drawable.msg_share); actions.add(1); if (!invite.permanent && canEdit) { items.add(LocaleController.getString("EditLink", R.string.EditLink)); - icons.add(R.drawable.baseline_edit_24); + icons.add(R.drawable.msg_edit); actions.add(2); } if (canEdit) { items.add(LocaleController.getString("RevokeLink", R.string.RevokeLink)); - icons.add(R.drawable.baseline_delete_24); + icons.add(R.drawable.msg_delete); actions.add(3); redLastItem = true; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/NotificationsCustomSettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/NotificationsCustomSettingsActivity.java index 16cb222afa..de1eaf95da 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/NotificationsCustomSettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/NotificationsCustomSettingsActivity.java @@ -1324,7 +1324,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { case 7: { TextCell textCell = (TextCell) holder.itemView; if (position == exceptionsAddRow) { - textCell.setTextAndIcon(LocaleController.getString("NotificationsAddAnException", R.string.NotificationsAddAnException), R.drawable.baseline_person_add_24, exceptionsStartRow != -1); + textCell.setTextAndIcon(LocaleController.getString("NotificationsAddAnException", R.string.NotificationsAddAnException), R.drawable.actions_addmember2, exceptionsStartRow != -1); textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); } else if (position == deleteAllRow) { textCell.setText(LocaleController.getString("NotificationsDeleteAllException", R.string.NotificationsDeleteAllException), false); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PeopleNearbyActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PeopleNearbyActivity.java index 89fa0d95d2..04bba9e58d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PeopleNearbyActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PeopleNearbyActivity.java @@ -1008,7 +1008,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { ManageChatTextCell actionCell = (ManageChatTextCell) holder.itemView; actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); if (position == chatsCreateRow) { - actionCell.setText(LocaleController.getString("NearbyCreateGroup", R.string.NearbyCreateGroup), null, R.drawable.baseline_group_add_24, chatsStartRow != -1); + actionCell.setText(LocaleController.getString("NearbyCreateGroup", R.string.NearbyCreateGroup), null, R.drawable.groups_create, chatsStartRow != -1); } else if (position == showMeRow) { if (showingMe = (getUserConfig().sharingMyLocationUntil > getConnectionsManager().getCurrentTime())) { actionCell.setText(LocaleController.getString("StopShowingMe", R.string.StopShowingMe), null, R.drawable.actions_nearby_off, usersStartRow != -1); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java index 7e698e0eea..19cc68c347 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java @@ -200,7 +200,7 @@ public void onItemClick(int id) { } ActionBarMenuItem menuItem = menu.addItem(0, R.drawable.ic_ab_other); menuItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); - menuItem.addSubItem(1, R.drawable.baseline_open_in_browser_24, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); + menuItem.addSubItem(1, R.drawable.msg_openin, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); sizeNotifierFrameLayout = new SizeNotifierFrameLayout(context) { @@ -489,12 +489,12 @@ public boolean onTouch(View v, MotionEvent event) { itemCells[a].setTextAndIcon(LocaleController.getString("Translate", R.string.Translate), R.drawable.ic_translate); } else if (num == 1) { if (UserObject.isUserSelf(user)) { - itemCells[a].setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.baseline_date_range_24); + itemCells[a].setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.msg_schedule); } else { - itemCells[a].setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.baseline_date_range_24); + itemCells[a].setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.msg_schedule); } } else if (num == 2) { - itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.baseline_notifications_off_24); + itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); } itemCells[a].setMinimumWidth(AndroidUtilities.dp(196)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java index 0f1b281453..c5423d21ea 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java @@ -537,7 +537,7 @@ public void onHideSubMenu() { } }); showAsListItem = menuItem.addSubItem(change_sort, R.drawable.msg_list, LocaleController.getString("ShowAsList", R.string.ShowAsList)); - menuItem.addSubItem(open_in, R.drawable.baseline_open_in_browser_24, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); + menuItem.addSubItem(open_in, R.drawable.msg_openin, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); } if (selectedAlbum == null) { @@ -1097,12 +1097,12 @@ public boolean onTouch(View v, MotionEvent event) { itemCells[a].setTextAndIcon(LocaleController.getString("Translate", R.string.Translate), R.drawable.ic_translate); } else if (num == 1) { if (UserObject.isUserSelf(user)) { - itemCells[a].setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.baseline_date_range_24); + itemCells[a].setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.msg_schedule); } else { - itemCells[a].setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.baseline_date_range_24); + itemCells[a].setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.msg_schedule); } } else if (num == 2) { - itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.baseline_notifications_off_24); + itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); } itemCells[a].setMinimumWidth(AndroidUtilities.dp(196)); @@ -1997,9 +1997,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { case 3: { TextCell cell = (TextCell) holder.itemView; if (position < recentSearches.size()) { - cell.setTextAndIcon(recentSearches.get(position), R.drawable.baseline_schedule_24, false); + cell.setTextAndIcon(recentSearches.get(position), R.drawable.menu_recent, false); } else { - cell.setTextAndIcon(LocaleController.getString("ClearRecentHistory", R.string.ClearRecentHistory), R.drawable.baseline_delete_sweep_24, false); + cell.setTextAndIcon(LocaleController.getString("ClearRecentHistory", R.string.ClearRecentHistory), R.drawable.menu_clear_recent, false); } break; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java index ee7383fe0e..1599918f9b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java @@ -4485,7 +4485,7 @@ public boolean canOpenMenu() { }); ActionBarMenu menu = actionBar.createMenu(); - masksItem = menu.addItem(gallery_menu_masks, R.drawable.deproko_baseline_masks_24); + masksItem = menu.addItem(gallery_menu_masks, R.drawable.msg_mask); masksItem.setContentDescription(LocaleController.getString("Masks", R.string.Masks)); masksItem.setIconColor(0xfffafafa); @@ -4493,11 +4493,11 @@ public boolean canOpenMenu() { pipItem.setContentDescription(LocaleController.getString("AccDescrPipMode", R.string.AccDescrPipMode)); pipItem.setIconColor(0xfffafafa); - sendNoQuoteItem = menu.addItem(gallery_menu_send_noquote, R.drawable.baseline_fast_forward_24); + sendNoQuoteItem = menu.addItem(gallery_menu_send_noquote, R.drawable.msg_forward_noquote); sendNoQuoteItem.setContentDescription(LocaleController.getString("NoQuoteForward", R.string.Forward)); sendNoQuoteItem.setIconColor(0xfffafafa); - sendItem = menu.addItem(gallery_menu_send, R.drawable.baseline_forward_24); + sendItem = menu.addItem(gallery_menu_send, R.drawable.msg_forward); sendItem.setContentDescription(LocaleController.getString("Forward", R.string.Forward)); sendItem.setIconColor(0xfffafafa); @@ -4562,21 +4562,21 @@ public boolean canOpenMenu() { speedItems[3] = menuItemSpeed.addSubItem(gallery_menu_speed_fast, R.drawable.msg_speed_1_5, LocaleController.getString("SpeedFast", R.string.SpeedFast)).setColors(0xfffafafa, 0xfffafafa); speedItems[4] = menuItemSpeed.addSubItem(gallery_menu_speed_veryfast, R.drawable.msg_speed_2, LocaleController.getString("SpeedVeryFast", R.string.SpeedVeryFast)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_openin, R.drawable.baseline_open_in_browser_24, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_openin, R.drawable.msg_openin, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)).setColors(0xfffafafa, 0xfffafafa); menuItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions)); allMediaItem = menuItem.addSubItem(gallery_menu_showall, R.drawable.msg_media, LocaleController.getString("ShowAllMedia", R.string.ShowAllMedia)); allMediaItem.setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_savegif, R.drawable.deproko_baseline_gif_24, LocaleController.getString("SaveToGIFs", R.string.SaveToGIFs)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_savegif, R.drawable.msg_gif, LocaleController.getString("SaveToGIFs", R.string.SaveToGIFs)).setColors(0xfffafafa, 0xfffafafa); menuItem.addSubItem(gallery_menu_showinchat, R.drawable.msg_message, LocaleController.getString("ShowInChat", R.string.ShowInChat)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_masks2, R.drawable.deproko_baseline_stickers_filled_24, LocaleController.getString("ShowStickers", R.string.ShowStickers)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_share, R.drawable.baseline_share_24, LocaleController.getString("ShareFile", R.string.ShareFile)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_save, R.drawable.baseline_image_24, LocaleController.getString("SaveToGallery", R.string.SaveToGallery)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_masks2, R.drawable.msg_sticker, LocaleController.getString("ShowStickers", R.string.ShowStickers)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_share, R.drawable.msg_shareout, LocaleController.getString("ShareFile", R.string.ShareFile)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_save, R.drawable.msg_gallery, LocaleController.getString("SaveToGallery", R.string.SaveToGallery)).setColors(0xfffafafa, 0xfffafafa); menuItem.addSubItem(gallery_menu_scan, R.drawable.wallet_qr, LocaleController.getString("ScanQRCode", R.string.ScanQRCode)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_set_as_main, R.drawable.baseline_camera_alt_24, LocaleController.getString("SetAsMain", R.string.SetAsMain)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_delete, R.drawable.baseline_delete_24, LocaleController.getString("Delete", R.string.Delete)).setColors(0xfffafafa, 0xfffafafa); - menuItem.addSubItem(gallery_menu_cancel_loading, R.drawable.baseline_cancel_24, LocaleController.getString("StopDownload", R.string.StopDownload)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_set_as_main, R.drawable.menu_camera, LocaleController.getString("SetAsMain", R.string.SetAsMain)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_delete, R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete)).setColors(0xfffafafa, 0xfffafafa); + menuItem.addSubItem(gallery_menu_cancel_loading, R.drawable.msg_cancel, LocaleController.getString("StopDownload", R.string.StopDownload)).setColors(0xfffafafa, 0xfffafafa); menuItem.redrawPopup(0xf9222222); menuItemSpeed.redrawPopup(0xf9222222); setMenuItemIcon(); @@ -4784,7 +4784,7 @@ public void invalidate() { paintButton.setContentDescription(LocaleController.getString("AccDescrPhotoEditor", R.string.AccDescrPhotoEditor)); shareButton = new ImageView(containerView.getContext()); - shareButton.setImageResource(R.drawable.baseline_share_24); + shareButton.setImageResource(R.drawable.share); shareButton.setColorFilter(new PorterDuffColorFilter(0xfffafafa, PorterDuff.Mode.SRC_IN)); shareButton.setScaleType(ImageView.ScaleType.CENTER); shareButton.setBackgroundDrawable(Theme.createSelectorDrawable(Theme.ACTION_BAR_WHITE_SELECTOR_COLOR)); @@ -5254,12 +5254,12 @@ public void setAlpha(float alpha) { ActionBarMenuSubItem cell = new ActionBarMenuSubItem(parentActivity, a == 0, a == 3, resourcesProvider); if (a == 0) { if (UserObject.isUserSelf(user)) { - cell.setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.baseline_date_range_24); + cell.setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.msg_schedule); } else { - cell.setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.baseline_date_range_24); + cell.setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.msg_schedule); } } else if (a == 1) { - cell.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.baseline_notifications_off_24); + cell.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); } else if (a == 2) { cell.setTextAndIcon(LocaleController.getString("ReplacePhoto", R.string.ReplacePhoto), R.drawable.msg_replace); } else if (a == 3) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PrivacyUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PrivacyUsersActivity.java index 8cd5e32465..ef6f3df553 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PrivacyUsersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PrivacyUsersActivity.java @@ -500,9 +500,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { ManageChatTextCell actionCell = (ManageChatTextCell) holder.itemView; actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); if (currentType == TYPE_BLOCKED) { - actionCell.setText(LocaleController.getString("BlockUser", R.string.BlockUser), null, R.drawable.baseline_person_add_24, false); + actionCell.setText(LocaleController.getString("BlockUser", R.string.BlockUser), null, R.drawable.actions_addmember2, false); } else { - actionCell.setText(LocaleController.getString("PrivacyAddAnException", R.string.PrivacyAddAnException), null, R.drawable.baseline_person_add_24, false); + actionCell.setText(LocaleController.getString("PrivacyAddAnException", R.string.PrivacyAddAnException), null, R.drawable.actions_addmember2, false); } break; case 3: diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 5559eab9f3..63a082c5fb 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -3612,15 +3612,15 @@ protected TextView createTextView() { writeButton.setBackground(combinedDrawable); if (userId != 0) { if (imageUpdater != null) { - writeButton.setImageResource(R.drawable.baseline_edit_24); + writeButton.setImageResource(R.drawable.msg_edit); writeButton.setContentDescription(LocaleController.getString("AccDescrChangeProfilePicture", R.string.AccDescrChangeProfilePicture)); writeButton.setPadding(AndroidUtilities.dp(2), 0, 0, AndroidUtilities.dp(2)); } else { - writeButton.setImageResource(R.drawable.baseline_chat_bubble_24); + writeButton.setImageResource(R.drawable.profile_newmsg); writeButton.setContentDescription(LocaleController.getString("AccDescrOpenChat", R.string.AccDescrOpenChat)); } } else { - writeButton.setImageResource(R.drawable.baseline_chat_bubble_24); + writeButton.setImageResource(R.drawable.profile_discuss); writeButton.setContentDescription(LocaleController.getString("ViewDiscussion", R.string.ViewDiscussion)); } writeButton.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_profile_actionIcon), PorterDuff.Mode.SRC_IN)); @@ -4068,7 +4068,7 @@ public boolean onMemberClick(TLRPC.ChatParticipant participant, boolean isLong, return true; } items.add(editingAdmin ? LocaleController.getString("EditAdminRights", R.string.EditAdminRights) : LocaleController.getString("SetAsAdmin", R.string.SetAsAdmin)); - icons.add(R.drawable.baseline_stars_24); + icons.add(R.drawable.actions_addadmin); actions.add(0); } if (canRestrict) { @@ -4076,7 +4076,7 @@ public boolean onMemberClick(TLRPC.ChatParticipant participant, boolean isLong, return true; } items.add(LocaleController.getString("ChangePermissions", R.string.ChangePermissions)); - icons.add(R.drawable.baseline_block_24); + icons.add(R.drawable.actions_permissions); actions.add(1); } if (allowKick) { @@ -4084,7 +4084,7 @@ public boolean onMemberClick(TLRPC.ChatParticipant participant, boolean isLong, return true; } items.add(LocaleController.getString("KickFromGroup", R.string.KickFromGroup)); - icons.add(R.drawable.baseline_remove_circle_24); + icons.add(R.drawable.actions_remove_user); actions.add(2); hasRemove = true; } @@ -6682,25 +6682,25 @@ private void updateProfileData() { idTextView.setOnClickListener(v -> { BottomBuilder builder = new BottomBuilder(getParentActivity()); builder.addTitle(finalId + ""); - builder.addItem(LocaleController.getString("Copy", R.string.Copy), R.drawable.baseline_content_copy_24, __ -> { + builder.addItem(LocaleController.getString("Copy", R.string.Copy), R.drawable.msg_copy, __ -> { AlertUtil.copyAndAlert(finalId + ""); return Unit.INSTANCE; }); if (finalId == userId) { - builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink), R.drawable.baseline_link_24, __ -> { + builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink), R.drawable.profile_link, __ -> { AlertUtil.copyLinkAndAlert("tg://user?id=" + finalId); return Unit.INSTANCE; }); - builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink) + " (Android)", R.drawable.baseline_link_24, __ -> { + builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink) + " (Android)", R.drawable.profile_link, __ -> { AlertUtil.copyLinkAndAlert("tg://openmessage?user_id=" + finalId); return Unit.INSTANCE; }); - builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink) + " (IOS)", R.drawable.baseline_link_24, __ -> { + builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink) + " (IOS)", R.drawable.profile_link, __ -> { AlertUtil.copyLinkAndAlert("https://t.me/@id" + finalId); return Unit.INSTANCE; }); } else { - builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink) + " (Android)", R.drawable.baseline_link_24, __ -> { + builder.addItem(LocaleController.getString("CopyLink", R.string.CopyLink) + " (Android)", R.drawable.profile_link, __ -> { AlertUtil.copyLinkAndAlert("tg://openmessage?chat_id=" + finalId); return Unit.INSTANCE; }); @@ -6747,41 +6747,41 @@ private void createActionBarMenu(boolean animated) { if (isBot || getContactsController().contactsDict.get(userId) == null) { if (MessagesController.isSupportUser(user)) { if (userBlocked) { - otherItem.addSubItem(block_contact, R.drawable.baseline_block_24, LocaleController.getString("Unblock", R.string.Unblock)); + otherItem.addSubItem(block_contact, R.drawable.msg_block, LocaleController.getString("Unblock", R.string.Unblock)); } } else { if (isBot) { if (!user.bot_nochats) { - otherItem.addSubItem(invite_to_group, R.drawable.baseline_group_add_24, LocaleController.getString("BotInvite", R.string.BotInvite)); + otherItem.addSubItem(invite_to_group, R.drawable.msg_addbot, LocaleController.getString("BotInvite", R.string.BotInvite)); } - otherItem.addSubItem(share, R.drawable.baseline_forward_24, LocaleController.getString("BotShare", R.string.BotShare)); + otherItem.addSubItem(share, R.drawable.msg_share, LocaleController.getString("BotShare", R.string.BotShare)); } else { - otherItem.addSubItem(add_contact, R.drawable.baseline_person_add_24, LocaleController.getString("AddContact", R.string.AddContact)); + otherItem.addSubItem(add_contact, R.drawable.msg_addcontact, LocaleController.getString("AddContact", R.string.AddContact)); } if (!TextUtils.isEmpty(user.phone)) { - otherItem.addSubItem(share_contact, R.drawable.baseline_forward_24, LocaleController.getString("ShareContact", R.string.ShareContact)); + otherItem.addSubItem(share_contact, R.drawable.msg_share, LocaleController.getString("ShareContact", R.string.ShareContact)); } if (isBot) { - otherItem.addSubItem(block_contact, !userBlocked ? R.drawable.baseline_block_24 : R.drawable.baseline_replay_24, !userBlocked ? LocaleController.getString("BotStop", R.string.BotStop) : LocaleController.getString("BotRestart", R.string.BotRestart)); + otherItem.addSubItem(block_contact, !userBlocked ? R.drawable.msg_block : R.drawable.msg_retry, !userBlocked ? LocaleController.getString("BotStop", R.string.BotStop) : LocaleController.getString("BotRestart", R.string.BotRestart)); } else { - otherItem.addSubItem(block_contact, !userBlocked ? R.drawable.baseline_block_24 : R.drawable.baseline_block_24, !userBlocked ? LocaleController.getString("BlockContact", R.string.BlockContact) : LocaleController.getString("Unblock", R.string.Unblock)); + otherItem.addSubItem(block_contact, !userBlocked ? R.drawable.msg_block : R.drawable.msg_block, !userBlocked ? LocaleController.getString("BlockContact", R.string.BlockContact) : LocaleController.getString("Unblock", R.string.Unblock)); } } } else { if (!TextUtils.isEmpty(user.phone)) { - otherItem.addSubItem(share_contact, R.drawable.baseline_forward_24, LocaleController.getString("ShareContact", R.string.ShareContact)); + otherItem.addSubItem(share_contact, R.drawable.msg_share, LocaleController.getString("ShareContact", R.string.ShareContact)); } - otherItem.addSubItem(block_contact, !userBlocked ? R.drawable.baseline_block_24 : R.drawable.baseline_block_24, !userBlocked ? LocaleController.getString("BlockContact", R.string.BlockContact) : LocaleController.getString("Unblock", R.string.Unblock)); - otherItem.addSubItem(edit_contact, R.drawable.baseline_edit_24, LocaleController.getString("EditContact", R.string.EditContact)); - otherItem.addSubItem(delete_contact, R.drawable.baseline_delete_24, LocaleController.getString("DeleteContact", R.string.DeleteContact)); + otherItem.addSubItem(block_contact, !userBlocked ? R.drawable.msg_block : R.drawable.msg_block, !userBlocked ? LocaleController.getString("BlockContact", R.string.BlockContact) : LocaleController.getString("Unblock", R.string.Unblock)); + otherItem.addSubItem(edit_contact, R.drawable.msg_edit, LocaleController.getString("EditContact", R.string.EditContact)); + otherItem.addSubItem(delete_contact, R.drawable.msg_delete, LocaleController.getString("DeleteContact", R.string.DeleteContact)); } if (!UserObject.isDeleted(user) && !isBot && currentEncryptedChat == null && !userBlocked && userId != 333000 && userId != 777000 && userId != 42777) { - otherItem.addSubItem(start_secret_chat, R.drawable.baseline_lock_24, LocaleController.getString("StartEncryptedChat", R.string.StartEncryptedChat)); + otherItem.addSubItem(start_secret_chat, R.drawable.msg_start_secret, LocaleController.getString("StartEncryptedChat", R.string.StartEncryptedChat)); } if (StrUtil.isNotBlank(user.username)) { otherItem.addSubItem(qr_code, R.drawable.wallet_qr, LocaleController.getString("ShareQRCode", R.string.ShareQRCode)); } - otherItem.addSubItem(add_shortcut, R.drawable.baseline_home_24, LocaleController.getString("AddShortcut", R.string.AddShortcut)); + otherItem.addSubItem(add_shortcut, R.drawable.msg_home, LocaleController.getString("AddShortcut", R.string.AddShortcut)); } } else if (chatId != 0) { TLRPC.Chat chat = getMessagesController().getChat(chatId); @@ -6790,10 +6790,11 @@ private void createActionBarMenu(boolean animated) { String text; if (!chat.megagroup) { text = LocaleController.getString("LinkedGroupChat", R.string.LinkedGroupChat); + otherItem.addSubItem(view_discussion, R.drawable.msg_discussion, text); } else { text = LocaleController.getString("LinkedChannelChat", R.string.LinkedChannelChat); + otherItem.addSubItem(view_discussion, R.drawable.msg_channel, text); } - otherItem.addSubItem(view_discussion, R.drawable.baseline_layers_24, text); } if (ChatObject.isChannel(chat)) { if (ChatObject.hasAdminRights(chat) || chat.megagroup) { @@ -6801,7 +6802,7 @@ private void createActionBarMenu(boolean animated) { } if (chatInfo != null) { if (ChatObject.canManageCalls(chat) && chatInfo.call == null) { - otherItem.addSubItem(call_item, R.drawable.baseline_keyboard_voice_24, chat.megagroup && !chat.gigagroup ? LocaleController.getString("StartVoipChat", R.string.StartVoipChat) : LocaleController.getString("StartVoipChannel", R.string.StartVoipChannel)); + otherItem.addSubItem(call_item, R.drawable.msg_voicechat, chat.megagroup && !chat.gigagroup ? LocaleController.getString("StartVoipChat", R.string.StartVoipChat) : LocaleController.getString("StartVoipChannel", R.string.StartVoipChannel)); hasVoiceChatItem = true; } if (chatInfo.can_view_stats) { @@ -6812,28 +6813,28 @@ private void createActionBarMenu(boolean animated) { } if (chat.megagroup) { canSearchMembers = true; - otherItem.addSubItem(search_members, R.drawable.baseline_search_24, LocaleController.getString("SearchMembers", R.string.SearchMembers)); + otherItem.addSubItem(search_members, R.drawable.msg_search, LocaleController.getString("SearchMembers", R.string.SearchMembers)); if (!chat.creator && !chat.left && !chat.kicked) { - otherItem.addSubItem(leave_group, R.drawable.baseline_exit_to_app_24, LocaleController.getString("LeaveMegaMenu", R.string.LeaveMegaMenu)); + otherItem.addSubItem(leave_group, R.drawable.msg_leave, LocaleController.getString("LeaveMegaMenu", R.string.LeaveMegaMenu)); } } else { if (!TextUtils.isEmpty(chat.username)) { - otherItem.addSubItem(share, R.drawable.baseline_forward_24, LocaleController.getString("BotShare", R.string.BotShare)); + otherItem.addSubItem(share, R.drawable.msg_share, LocaleController.getString("BotShare", R.string.BotShare)); } if (NekoConfig.channelAlias.Bool()){ - otherItem.addSubItem(aliasChannelName, R.drawable.ic_ab_fave, LocaleController.getString("setChannelAliasName", R.string.setChannelAliasName)); + otherItem.addSubItem(aliasChannelName, R.drawable.profile_admin, LocaleController.getString("setChannelAliasName", R.string.setChannelAliasName)); } if (!currentChat.creator && !currentChat.left && !currentChat.kicked) { - otherItem.addSubItem(leave_group, R.drawable.baseline_exit_to_app_24, LocaleController.getString("LeaveChannelMenu", R.string.LeaveChannelMenu)); + otherItem.addSubItem(leave_group, R.drawable.msg_leave, LocaleController.getString("LeaveChannelMenu", R.string.LeaveChannelMenu)); } } if (ChatObject.hasAdminRights(currentChat)) { - otherItem.addSubItem(event_log, R.drawable.baseline_content_paste_24, LocaleController.getString("EventLog", R.string.EventLog)); + otherItem.addSubItem(event_log, R.drawable.group_log, LocaleController.getString("EventLog", R.string.EventLog)); } } else { if (chatInfo != null) { if (ChatObject.canManageCalls(chat) && chatInfo.call == null) { - otherItem.addSubItem(call_item, R.drawable.baseline_keyboard_voice_24, LocaleController.getString("StartVoipChat", R.string.StartVoipChat)); + otherItem.addSubItem(call_item, R.drawable.msg_voicechat, LocaleController.getString("StartVoipChat", R.string.StartVoipChat)); hasVoiceChatItem = true; } ChatObject.Call call = getMessagesController().getGroupCall(chatId, false); @@ -6844,23 +6845,23 @@ private void createActionBarMenu(boolean animated) { } if (!ChatObject.isKickedFromChat(chat) && !ChatObject.isLeftFromChat(chat)) { canSearchMembers = true; - otherItem.addSubItem(search_members, R.drawable.baseline_search_24, LocaleController.getString("SearchMembers", R.string.SearchMembers)); + otherItem.addSubItem(search_members, R.drawable.msg_search, LocaleController.getString("SearchMembers", R.string.SearchMembers)); } - otherItem.addSubItem(leave_group, R.drawable.baseline_exit_to_app_24, LocaleController.getString("DeleteAndExit", R.string.DeleteAndExit)); + otherItem.addSubItem(leave_group, R.drawable.msg_leave, LocaleController.getString("DeleteAndExit", R.string.DeleteAndExit)); } if (StrUtil.isNotBlank(chat.username) || ChatObject.canUserDoAdminAction(chat, ChatObject.ACTION_INVITE)) { otherItem.addSubItem(qr_code, R.drawable.wallet_qr, LocaleController.getString("ShareQRCode", R.string.ShareQRCode)); } - otherItem.addSubItem(add_shortcut, R.drawable.baseline_home_24, LocaleController.getString("AddShortcut", R.string.AddShortcut)); + otherItem.addSubItem(add_shortcut, R.drawable.msg_home, LocaleController.getString("AddShortcut", R.string.AddShortcut)); } // NekoX-TODO: Check Chnage if (imageUpdater != null) { otherItem.addSubItem(set_as_main, R.drawable.menu_private, LocaleController.getString("SetAsMain", R.string.SetAsMain)); - otherItem.addSubItem(gallery_menu_save, R.drawable.baseline_image_24, LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); + otherItem.addSubItem(gallery_menu_save, R.drawable.msg_gallery, LocaleController.getString("SaveToGallery", R.string.SaveToGallery)); //otherItem.addSubItem(edit_avatar, R.drawable.photo_paint, LocaleController.getString("EditPhoto", R.string.EditPhoto)); - otherItem.addSubItem(delete_avatar, R.drawable.baseline_delete_24, LocaleController.getString("Delete", R.string.Delete)); + otherItem.addSubItem(delete_avatar, R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete)); } if (getMessagesController().isChatNoForwardsWithOverride(currentChat)) { otherItem.hideSubItem(gallery_menu_save); @@ -7722,15 +7723,15 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { } else if (position == subscribersRow) { if (chatInfo != null) { if (ChatObject.isChannel(currentChat) && !currentChat.megagroup) { - textCell.setTextAndValueAndIcon(LocaleController.getString("ChannelSubscribers", R.string.ChannelSubscribers), String.format("%d", chatInfo.participants_count), R.drawable.baseline_group_24, position != membersSectionRow - 1); + textCell.setTextAndValueAndIcon(LocaleController.getString("ChannelSubscribers", R.string.ChannelSubscribers), String.format("%d", chatInfo.participants_count), R.drawable.actions_viewmembers, position != membersSectionRow - 1); } else { - textCell.setTextAndValueAndIcon(LocaleController.getString("ChannelMembers", R.string.ChannelMembers), String.format("%d", chatInfo.participants_count), R.drawable.baseline_group_24, position != membersSectionRow - 1); + textCell.setTextAndValueAndIcon(LocaleController.getString("ChannelMembers", R.string.ChannelMembers), String.format("%d", chatInfo.participants_count), R.drawable.actions_viewmembers, position != membersSectionRow - 1); } } else { if (ChatObject.isChannel(currentChat) && !currentChat.megagroup) { - textCell.setTextAndIcon(LocaleController.getString("ChannelSubscribers", R.string.ChannelSubscribers), R.drawable.baseline_group_24, position != membersSectionRow - 1); + textCell.setTextAndIcon(LocaleController.getString("ChannelSubscribers", R.string.ChannelSubscribers), R.drawable.actions_viewmembers, position != membersSectionRow - 1); } else { - textCell.setTextAndIcon(LocaleController.getString("ChannelMembers", R.string.ChannelMembers), R.drawable.baseline_group_24, position != membersSectionRow - 1); + textCell.setTextAndIcon(LocaleController.getString("ChannelMembers", R.string.ChannelMembers), R.drawable.actions_viewmembers, position != membersSectionRow - 1); } } } else if (position == subscribersRequestsRow) { @@ -7739,9 +7740,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { } } else if (position == administratorsRow) { if (chatInfo != null) { - textCell.setTextAndValueAndIcon(LocaleController.getString("ChannelAdministrators", R.string.ChannelAdministrators), String.format("%d", chatInfo.admins_count), R.drawable.baseline_stars_24, position != membersSectionRow - 1); + textCell.setTextAndValueAndIcon(LocaleController.getString("ChannelAdministrators", R.string.ChannelAdministrators), String.format("%d", chatInfo.admins_count), R.drawable.actions_addadmin, position != membersSectionRow - 1); } else { - textCell.setTextAndIcon(LocaleController.getString("ChannelAdministrators", R.string.ChannelAdministrators), R.drawable.baseline_stars_24, position != membersSectionRow - 1); + textCell.setTextAndIcon(LocaleController.getString("ChannelAdministrators", R.string.ChannelAdministrators), R.drawable.actions_addadmin, position != membersSectionRow - 1); } } else if (position == blockedUsersRow) { if (chatInfo != null) { @@ -7751,48 +7752,53 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { } } else if (position == addMemberRow) { textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); - textCell.setTextAndIcon(LocaleController.getString("AddMember", R.string.AddMember), R.drawable.baseline_person_add_24, membersSectionRow == -1); + textCell.setTextAndIcon(LocaleController.getString("AddMember", R.string.AddMember), R.drawable.actions_addmember2, membersSectionRow == -1); } else if (position == sendMessageRow) { textCell.setText(LocaleController.getString("SendMessageLocation", R.string.SendMessageLocation), true); } else if (position == reportRow) { textCell.setText(LocaleController.getString("ReportUserLocation", R.string.ReportUserLocation), false); textCell.setColors(null, Theme.key_windowBackgroundWhiteRedText5); } else if (position == languageRow) { - textCell.setTextAndIcon(LocaleController.getString("Language", R.string.Language), R.drawable.baseline_language_24, false); + textCell.setTextAndIcon(LocaleController.getString("Language", R.string.Language), R.drawable.menu_language, false); } else if (position == notificationRow) { - textCell.setTextAndIcon(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds), R.drawable.baseline_notifications_24, true); + textCell.setTextAndIcon(LocaleController.getString("NotificationsAndSounds", R.string.NotificationsAndSounds), R.drawable.menu_notifications, true); } else if (position == privacyRow) { - textCell.setTextAndIcon(LocaleController.getString("PrivacySettings", R.string.PrivacySettings), R.drawable.baseline_lock_24, true); + textCell.setTextAndIcon(LocaleController.getString("PrivacySettings", R.string.PrivacySettings), R.drawable.menu_secret, true); } else if (position == dataRow) { - textCell.setTextAndIcon(LocaleController.getString("DataSettings", R.string.DataSettings), R.drawable.baseline_data_usage_24, true); + textCell.setTextAndIcon(LocaleController.getString("DataSettings", R.string.DataSettings), R.drawable.menu_data, true); } else if (position == chatRow) { - textCell.setTextAndIcon(LocaleController.getString("ChatSettings", R.string.ChatSettings), R.drawable.baseline_palette_24, true); + textCell.setTextAndIcon(LocaleController.getString("ChatSettings", R.string.ChatSettings), R.drawable.menu_chats, true); } else if (position == stickersRow) { - textCell.setTextAndIcon(LocaleController.getString("StickersAndMasks", R.string.StickersAndMasks), R.drawable.deproko_baseline_stickers_24, true); + textCell.setTextAndIcon(LocaleController.getString("StickersAndMasks", R.string.StickersAndMasks), R.drawable.smiles_tab_stickers, true); } else if (position == nekoRow) { - textCell.setTextAndIcon(LocaleController.getString("NekoSettings", R.string.NekoSettings), R.drawable.baseline_extension_24, true); + textCell.setTextAndIcon(LocaleController.getString("NekoSettings", R.string.NekoSettings), R.drawable.menu_settings, true); } else if (position == filtersRow) { - textCell.setTextAndIcon(LocaleController.getString("Filters", R.string.Filters), R.drawable.baseline_folder_24, true); + textCell.setTextAndIcon(LocaleController.getString("Filters", R.string.Filters), R.drawable.menu_folders, true); } else if (position == questionRow) { - textCell.setTextAndIcon(LocaleController.getString("NekoXUpdatesChannel", R.string.NekoXUpdatesChannel), R.drawable.baseline_bullhorn_24, true); + textCell.setTextAndIcon(LocaleController.getString("NekoXUpdatesChannel", R.string.NekoXUpdatesChannel), R.drawable.menu_channel_ny, true); } else if (position == faqRow) { - textCell.setTextAndIcon(LocaleController.getString("NekoXFaq", R.string.NekoXFaq), R.drawable.baseline_help_24, true); + textCell.setTextAndIcon(LocaleController.getString("NekoXFaq", R.string.NekoXFaq), R.drawable.menu_help, true); } else if (position == policyRow) { - textCell.setTextAndIcon(LocaleController.getString("PrivacyPolicy", R.string.PrivacyPolicy), R.drawable.baseline_security_24, true); + textCell.setTextAndIcon(LocaleController.getString("PrivacyPolicy", R.string.PrivacyPolicy), R.drawable.menu_policy, true); } else if (position == sendLogsRow) { textCell.setTextAndIcon(LocaleController.getString("DebugSendLogs", R.string.DebugSendLogs), R.drawable.baseline_bug_report_24, true); } else if (position == sendLastLogsRow) { textCell.setText(LocaleController.getString("DebugSendLastLogs", R.string.DebugSendLastLogs), true); } else if (position == clearLogsRow) { - textCell.setTextAndIcon(LocaleController.getString("DebugClearLogs", R.string.DebugClearLogs), R.drawable.baseline_delete_sweep_24, switchBackendRow != -1); + textCell.setTextAndIcon(LocaleController.getString("DebugClearLogs", R.string.DebugClearLogs), R.drawable.menu_clearcache, switchBackendRow != -1); } else if (position == switchBackendRow) { textCell.setText("Switch Backend", false); } else if (position == setAvatarRow) { +<<<<<<< HEAD textCell.setTextAndIcon(LocaleController.getString("SetProfilePhoto", R.string.SetProfilePhoto), R.drawable.baseline_image_24, false); textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); textCell.getImageView().setPadding(0, 0, 0, AndroidUtilities.dp(8)); textCell.setImageLeft(12); setAvatarCell = textCell; +======= + textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); + textCell.setTextAndIcon(LocaleController.getString("SetProfilePhoto", R.string.SetProfilePhoto), R.drawable.msg_addphoto, false); +>>>>>>> 23f09916a (feat: change to outline icons) } break; case VIEW_TYPE_NOTIFICATIONS_CHECK: diff --git a/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java index 38336148f1..affb4f033f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java @@ -321,7 +321,7 @@ public void startDocumentSelectActivity() { ActionBarMenuItem otherItem = menu.addItem(menu_other, R.drawable.ic_ab_other); - otherItem.addSubItem(menu_export, R.drawable.baseline_file_download_24, LocaleController.getString("ExportStickers", R.string.ExportStickers)); + otherItem.addSubItem(menu_export, R.drawable.msg_download, LocaleController.getString("ExportStickers", R.string.ExportStickers)); otherItem.addSubItem(menu_import, R.drawable.baseline_playlist_add_24, LocaleController.getString("ImportStickersX", R.string.ImportStickersX)); final ActionBarMenu actionMode = actionBar.createActionMode(); @@ -333,9 +333,9 @@ public void startDocumentSelectActivity() { selectedCountTextView.setOnTouchListener((v, event) -> true); shareMenuItem = actionMode.addItemWithWidth(MENU_SHARE, R.drawable.msg_share, AndroidUtilities.dp(54)); - exportMenuItem = actionMode.addItemWithWidth(MENU_EXPORT, R.drawable.baseline_file_download_24, AndroidUtilities.dp(54)); - archiveMenuItem = actionMode.addItemWithWidth(MENU_ARCHIVE, R.drawable.baseline_archive_24, AndroidUtilities.dp(54)); - deleteMenuItem = actionMode.addItemWithWidth(MENU_DELETE, R.drawable.baseline_delete_24, AndroidUtilities.dp(54)); + exportMenuItem = actionMode.addItemWithWidth(MENU_EXPORT, R.drawable.msg_download, AndroidUtilities.dp(54)); + archiveMenuItem = actionMode.addItemWithWidth(MENU_ARCHIVE, R.drawable.msg_archive, AndroidUtilities.dp(54)); + deleteMenuItem = actionMode.addItemWithWidth(MENU_DELETE, R.drawable.msg_delete, AndroidUtilities.dp(54)); listAdapter = new ListAdapter(context, MediaDataController.getInstance(currentAccount).getStickerSets(currentType)); @@ -1156,7 +1156,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType LocaleController.getString("StickersHide", R.string.StickersHide), LocaleController.getString("StickersReorder", R.string.StickersReorder) }; - icons = new int[]{R.drawable.baseline_archive_24, R.drawable.msg_reorder}; + icons = new int[]{R.drawable.msg_archive, R.drawable.msg_reorder}; } else { if (NekoConfig.enableStickerPin.Bool() && currentType == MediaDataController.TYPE_IMAGE) { options = new int[]{MENU_ARCHIVE, 3, 4, 2, MENU_DELETE, MENU_TOGGLE_PIN}; @@ -1171,12 +1171,12 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType LocaleController.getString("PinSticker", R.string.PinSticker) }; icons = new int[]{ - R.drawable.baseline_archive_24, - R.drawable.baseline_link_24, + R.drawable.msg_archive, + R.drawable.msg_link, R.drawable.msg_reorder, - R.drawable.baseline_forward_24, - R.drawable.baseline_delete_24, - R.drawable.deproko_baseline_pin_24 + R.drawable.msg_share, + R.drawable.msg_delete, + R.drawable.msg_pin }; } else { options = new int[]{MENU_ARCHIVE, 3, 4, 2, MENU_DELETE}; @@ -1188,11 +1188,11 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType LocaleController.getString("StickersRemove", R.string.StickersRemove) }; icons = new int[]{ - R.drawable.baseline_archive_24, - R.drawable.baseline_link_24, + R.drawable.msg_archive, + R.drawable.msg_link, R.drawable.msg_reorder, - R.drawable.baseline_forward_24, - R.drawable.baseline_delete_24 + R.drawable.msg_share, + R.drawable.msg_delete }; } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/WebviewActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/WebviewActivity.java index 5c856086c8..9a3de24c87 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/WebviewActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/WebviewActivity.java @@ -175,10 +175,10 @@ public void onItemClick(int id) { } }); ActionBarMenu menu = actionBar.createMenu(); - progressItem = menu.addItemWithWidth(share, R.drawable.baseline_share_24, AndroidUtilities.dp(54)); + progressItem = menu.addItemWithWidth(share, R.drawable.share, AndroidUtilities.dp(54)); if (type == TYPE_GAME) { ActionBarMenuItem menuItem = menu.addItem(0, R.drawable.ic_ab_other); - menuItem.addSubItem(open_in, R.drawable.baseline_open_in_browser_24, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); + menuItem.addSubItem(open_in, R.drawable.msg_openin, LocaleController.getString("OpenInExternalApp", R.string.OpenInExternalApp)); actionBar.setTitle(currentGame); actionBar.setSubtitle("@" + currentBot); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoSettingsActivity.java index 41018508bc..27c2bc8706 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoSettingsActivity.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoSettingsActivity.java @@ -463,13 +463,13 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { case 2: { TextCell textCell = (TextCell) holder.itemView; if (position == chatRow) { - textCell.setTextAndIcon(LocaleController.getString("Chat", R.string.Chat), R.drawable.baseline_chat_bubble_24, true); + textCell.setTextAndIcon(LocaleController.getString("Chat", R.string.Chat), R.drawable.menu_chats, true); } else if (position == generalRow) { - textCell.setTextAndIcon(LocaleController.getString("General", R.string.General), R.drawable.baseline_palette_24, true); + textCell.setTextAndIcon(LocaleController.getString("General", R.string.General), R.drawable.msg_theme, true); } else if (position == experimentRow) { - textCell.setTextAndIcon(LocaleController.getString("Experiment", R.string.Experiment), R.drawable.baseline_star_24, true); + textCell.setTextAndIcon(LocaleController.getString("Experiment", R.string.Experiment), R.drawable.msg_fave, true); } else if (position == accountRow) { - textCell.setTextAndIcon(LocaleController.getString("Account", R.string.Account), R.drawable.baseline_person_24, true); + textCell.setTextAndIcon(LocaleController.getString("Account", R.string.Account), R.drawable.menu_contacts, true); } break; }