diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java index 33ba77b20d..fa21e8e457 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java @@ -662,7 +662,7 @@ protected void onDraw(Canvas canvas) { case ACTION_TYPE_CHANGE_PHONE_NUMBER: { BottomBuilder builder = new BottomBuilder(getParentActivity()); builder.addTitle(LocaleController.getString("PhoneNumberAlert", R.string.PhoneNumberAlert)); - builder.addItem(LocaleController.getString("Change", R.string.Change),R.drawable.baseline_check_circle_24, i -> { + builder.addItem(LocaleController.getString("Change", R.string.Change),R.drawable.msg_check, i -> { presentFragment(new LoginActivity().changePhoneNumber(), true); return Unit.INSTANCE; }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index af30730c94..74c6b82fd6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -3627,12 +3627,15 @@ public void toggleMute() { if (currentChat != null && (currentChat.has_link || (chatInfo != null && chatInfo.linked_chat_id != 0))) { String text; + int draw; if (!currentChat.megagroup) { text = LocaleController.getString("LinkedGroupChat", R.string.LinkedGroupChat); + draw = R.drawable.msg_discussion; } else { text = LocaleController.getString("LinkedChannelChat", R.string.LinkedChannelChat); + draw = R.drawable.msg_channel; } - headerItem.lazilyAddSubItem(nkheaderbtn_linked_chat, R.drawable.baseline_layers_24, text); + headerItem.lazilyAddSubItem(nkheaderbtn_linked_chat, draw, text); } if (currentUser != null) { @@ -3683,7 +3686,7 @@ public void toggleMute() { } if (currentChat != null && !ChatObject.isChannel(currentChat) && currentChat.creator) { - headerItem.lazilyAddSubItem(nkheaderbtn_upgrade, R.drawable.baseline_arrow_upward_24, LocaleController.getString("UpgradeGroup", R.string.UpgradeGroup)); + headerItem.lazilyAddSubItem(nkheaderbtn_upgrade, R.drawable.ic_upward, LocaleController.getString("UpgradeGroup", R.string.UpgradeGroup)); } } if (currentUser != null && currentUser.self) { @@ -7472,7 +7475,7 @@ private void createBottomMessagesActionButtons() { replyButton.setTextColor(getThemedColor(Theme.key_actionBarActionModeDefaultIcon)); replyButton.setCompoundDrawablePadding(AndroidUtilities.dp(7)); replyButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - Drawable image = getContext().getResources().getDrawable(R.drawable.baseline_reply_24).mutate(); + Drawable image = getContext().getResources().getDrawable(R.drawable.input_reply).mutate(); image.setColorFilter(new PorterDuffColorFilter(getThemedColor(Theme.key_actionBarActionModeDefaultIcon), PorterDuff.Mode.SRC_IN)); replyButton.setCompoundDrawablesWithIntrinsicBounds(image, null, null, null); replyButton.setOnClickListener(v -> { @@ -7504,7 +7507,7 @@ private void createBottomMessagesActionButtons() { forwardButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_actionBarActionModeDefaultSelector), 3)); forwardButton.setTextColor(getThemedColor(Theme.key_actionBarActionModeDefaultIcon)); forwardButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); - image = getContext().getResources().getDrawable(R.drawable.baseline_forward_24).mutate(); + image = getContext().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 -> { @@ -7832,47 +7835,56 @@ private void createActionMode() { int maxActionBarItems = (int) (Math.ceil(displayMetrics.widthPixels / (double) AndroidUtilities.dp(54))) - 2; shrinkActionBarItems = maxActionBarItems < 6; - 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().isChatNoForwards(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)); + if (NaConfig.INSTANCE.getShowNoQuoteForward().Bool()) { + 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.msg_shareout, 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 (NaConfig.INSTANCE.getShowRepeatAsCopy().Bool() || (NaConfig.INSTANCE.getAutoReplaceRepeat().Bool() && noforward)) { + actionModeOtherItem.addSubItem(nkbtn_repeatascopy, R.drawable.msg_repeat, LocaleController.getString("RepeatAsCopy", R.string.RepeatAsCopy)); + } if (NekoConfig.showMessageHide.Bool()) { - actionModeOtherItem.addSubItem(nkbtn_hide, R.drawable.baseline_remove_circle_24, LocaleController.getString("Hide", R.string.Hide)); + actionModeOtherItem.addSubItem(nkbtn_hide, R.drawable.msg_disable, LocaleController.getString("Hide", R.string.Hide)); + } + if (NekoConfig.showMessageDetails.Bool()) { + actionModeOtherItem.addSubItem(nkbtn_detail,R.drawable.msg_info,LocaleController.getString("MessageDetails", R.string.MessageDetails)); } actionMode.getItem(nkactionbarbtn_reply).setVisibility(ChatObject.canSendMessages(currentChat) && selectedMessagesIds[0].size() + selectedMessagesIds[1].size() == 1 ? View.VISIBLE : View.GONE); actionMode.getItem(edit).setVisibility(canEditMessagesCount == 1 && selectedMessagesIds[0].size() + selectedMessagesIds[1].size() == 1 ? View.VISIBLE : View.GONE); actionMode.getItem(copy).setVisibility(!getMessagesController().isChatNoForwardsWithOverride(currentChat) && selectedMessagesCanCopyIds[0].size() + selectedMessagesCanCopyIds[1].size() != 0 ? View.VISIBLE : View.GONE); actionMode.getItem(delete).setVisibility(cantDeleteMessagesCount == 0 ? View.VISIBLE : View.GONE); + actionMode.getItem(combine_message).setVisibility(selectedMessagesCanCopyIds[0].size() + selectedMessagesCanCopyIds[1].size() != 0 ? View.VISIBLE : View.GONE); actionModeOtherItem.setSubItemVisibility(star, selectedMessagesCanStarIds[0].size() + selectedMessagesCanStarIds[1].size() != 0); @@ -7995,7 +8007,7 @@ protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, i searchCalendarButton = new ImageView(getContext()); 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)); @@ -8016,7 +8028,7 @@ public void run(int param) { // NekoX: go to the first message searchGoToBeginningButton = new ImageView(getContext()); searchGoToBeginningButton.setScaleType(ImageView.ScaleType.CENTER); - searchGoToBeginningButton.setImageResource(R.drawable.baseline_arrow_upward_24); + searchGoToBeginningButton.setImageResource(R.drawable.ic_upward); searchGoToBeginningButton.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chat_searchPanelIcons), PorterDuff.Mode.SRC_IN)); searchGoToBeginningButton.setBackgroundDrawable(Theme.createSelectorDrawable(Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), 1)); searchContainer.addView(searchGoToBeginningButton, LayoutHelper.createFrame(48, 48, Gravity.RIGHT | Gravity.TOP, 0, 0, 48 * 2, 0)); @@ -8777,7 +8789,7 @@ protected void onDraw(Canvas canvas) { } pinnedListButton = new ImageView(getContext()); - pinnedListButton.setImageResource(R.drawable.baseline_menu_24); + pinnedListButton.setImageResource(R.drawable.msg_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)); @@ -8827,7 +8839,7 @@ protected void onDraw(Canvas canvas) { } 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); @@ -8836,7 +8848,7 @@ protected void onDraw(Canvas canvas) { 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(); @@ -8869,12 +8881,12 @@ protected void onDraw(Canvas canvas) { } 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(); @@ -24350,13 +24362,13 @@ public void setAutoDeleteHistory(int time, int action) { options.add(5); if (type == 21) { items.add(LocaleController.getString("ImportProxyList", R.string.ImportProxyList)); - icons.add(R.drawable.baseline_security_24); + icons.add(R.drawable.menu_secret); } else if (type == 22) { items.add(LocaleController.getString("ImportStickersList", R.string.ImportStickersList)); icons.add(R.drawable.msg_sticker); } else if (type == 23) { items.add(LocaleController.getString("ImportSettings", R.string.ImportSettings)); - icons.add(R.drawable.baseline_security_24); + icons.add(R.drawable.menu_secret); } else { items.add(LocaleController.getString("ApplyEmojiSet", R.string.ApplyEmojiSet)); icons.add(R.drawable.smiles_tab_smiles); @@ -26466,7 +26478,7 @@ private void processSelectedOption(int option) { File finalLocFile1 = locFile; AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("ImportProxyList", R.string.ImportProxyList), - R.drawable.baseline_security_24, LocaleController.getString("Import", R.string.Import), + R.drawable.menu_secret, LocaleController.getString("Import", R.string.Import), false, () -> { String status = ProxyListActivity.processProxyListFile(getParentActivity(), finalLocFile1); if (!StrUtil.isBlank(status)) { @@ -30914,7 +30926,7 @@ public void didPressImage(ChatMessageCell cell, float x, float y) { File finalLocFile = locFile; AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("ImportProxyList", R.string.ImportProxyList), - R.drawable.baseline_security_24, LocaleController.getString("Import", R.string.Import), + R.drawable.menu_secret, LocaleController.getString("Import", R.string.Import), false, () -> { String status = ProxyListActivity.processProxyListFile(getParentActivity(), finalLocFile); if (!StrUtil.isBlank(status)) { @@ -30927,7 +30939,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/Components/AlertsCreator.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java index 2a274c443d..e9c2f09d3b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java @@ -227,7 +227,7 @@ public static Dialog createWebViewPermissionsRequestDialog(Context ctx, Theme.Re public static BottomBuilder createApkRestrictedDialog(Context ctx, Theme.ResourcesProvider resourcesProvider) { BottomBuilder builder = new BottomBuilder(ctx); builder.addTitle(LocaleController.getString("ApkRestricted", R.string.ApkRestricted)); - builder.addItem(LocaleController.getString("PermissionOpenSettings", R.string.PermissionOpenSettings), R.drawable.baseline_settings_24, (i) -> { + builder.addItem(LocaleController.getString("PermissionOpenSettings", R.string.PermissionOpenSettings), R.drawable.menu_settings, (i) -> { try { ctx.startActivity(new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:" + ctx.getPackageName()))); } catch (Exception e) { 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 2eb2387618..dd999cff65 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java @@ -2045,7 +2045,7 @@ public void onClick(View v) { attachButton = new ImageView(context); attachButton.setScaleType(ImageView.ScaleType.CENTER); 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); if (Build.VERSION.SDK_INT >= 21) { attachButton.setBackgroundDrawable(Theme.createSelectorDrawable(getThemedColor(Theme.key_listSelector))); } @@ -3699,9 +3699,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_calendar); } 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_calendar); } scheduleButton.setMinimumWidth(AndroidUtilities.dp(196)); scheduleButton.setOnClickListener(v -> { @@ -8583,7 +8583,7 @@ private void updateBotButton(boolean animated) { } else { if (!canShowBotsMenu && !NaConfig.INSTANCE.getHideBotButtonInInputField().Bool()) { createBotButton(); - 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 if (botButton != null) { 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 1e272beb58..ea27002557 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java @@ -2492,9 +2492,9 @@ 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_calendar); } 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_calendar); } } else if (num == 2) { itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertLocationLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertLocationLayout.java index 89d1c61ea9..3a6a552202 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertLocationLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertLocationLayout.java @@ -1685,7 +1685,7 @@ void onShow(ChatAttachAlert.AttachAlertLayout previousLayout) { if (activity.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { BottomBuilder builder = new BottomBuilder(activity); builder.addTitle(LocaleController.getString("PermissionNoLocation", R.string.PermissionNoLocation), true); - builder.addItem(LocaleController.getString("Ok", R.string.OK),R.drawable.baseline_check_circle_24, __ -> { + builder.addItem(LocaleController.getString("Ok", R.string.OK),R.drawable.msg_check, __ -> { activity.requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 2); return Unit.INSTANCE; }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java index f15ccbe6a6..a5c543713c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContentPreviewViewer.java @@ -238,7 +238,7 @@ public void run() { } 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()) { @@ -519,7 +519,7 @@ public void dismiss() { } 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); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java index 0d1693da20..281e5feb69 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java @@ -653,7 +653,7 @@ public void onOpenInPressed() { } else { - writeButton.setImageResource(R.drawable.baseline_check_circle_24); + writeButton.setImageResource(R.drawable.msg_check); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java index 92351dc057..059d147dcf 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoAlbumPickerActivity.java @@ -492,9 +492,9 @@ 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_calendar); } 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_calendar); } } else if (num == 2) { itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java index cca084f54b..62a80861d2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java @@ -1132,9 +1132,9 @@ 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_calendar); } 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_calendar); } } else if (num == 2) { itemCells[a].setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java index d26fc8f503..16d48ceff2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java @@ -5812,9 +5812,9 @@ 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_timer_24); + cell.setTextAndIcon(LocaleController.getString("SetReminder", R.string.SetReminder), R.drawable.msg_timer); } else { - cell.setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.baseline_timer_24); + cell.setTextAndIcon(LocaleController.getString("ScheduleMessage", R.string.ScheduleMessage), R.drawable.msg_timer); } } else if (a == 1) { cell.setTextAndIcon(LocaleController.getString("SendWithoutSound", R.string.SendWithoutSound), R.drawable.input_notify_off); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java index e27af8dbca..847191fac3 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java @@ -719,7 +719,7 @@ public void startDocumentSelectActivity() { } else if (id == menu_delete_all) { AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("DeleteAllServer", R.string.DeleteAllServer), - R.drawable.baseline_delete_24, LocaleController.getString("Delete", R.string.Delete), + R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete), true, () -> { SharedConfig.deleteAllProxy(); updateRows(true); @@ -727,7 +727,7 @@ public void startDocumentSelectActivity() { } else if (id == menu_delete_unavailable) { AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("DeleteUnavailableServer", R.string.DeleteUnavailableServer), - R.drawable.baseline_delete_24, LocaleController.getString("Delete", R.string.Delete), + R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete), true, () -> { deleteUnavailableProxy(); }); @@ -921,11 +921,11 @@ protected void dispatchDraw(Canvas canvas) { }, new int[]{ R.drawable.group_edit, - R.drawable.baseline_share_24, + R.drawable.msg_share, R.drawable.wallet_qr, - R.drawable.baseline_link_24, - R.drawable.baseline_delete_24, - R.drawable.baseline_cancel_24 + R.drawable.msg_link, + R.drawable.msg_delete, + R.drawable.msg_cancel }, (i, text, cell) -> { @@ -958,7 +958,7 @@ protected void dispatchDraw(Canvas canvas) { } else if (i == 4) { AlertUtil.showConfirm(getParentActivity(), LocaleController.getString("DeleteProxy", R.string.DeleteProxy), - R.drawable.baseline_delete_24, LocaleController.getString("Delete", R.string.Delete), + R.drawable.msg_delete, LocaleController.getString("Delete", R.string.Delete), true, () -> { SharedConfig.deleteProxy(info); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java b/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java index b807708622..2df3dfd45f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/TopicsFragment.java @@ -688,9 +688,9 @@ public void onSearchFilterCleared(FiltersView.MediaFilterData filterData) { } other = menu.addItem(0, R.drawable.ic_ab_other, themeDelegate); other.addSubItem(toggle_id, R.drawable.baseline_forum_24, LocaleController.getString("TopicViewAsMessages", R.string.TopicViewAsMessages)); - addMemberSubMenu = other.addSubItem(add_member_id, R.drawable.baseline_person_add_24, LocaleController.getString("AddMember", R.string.AddMember)); - createTopicSubmenu = other.addSubItem(create_topic_id, R.drawable.baseline_group_add_24, LocaleController.getString("CreateTopic", R.string.CreateTopic)); - deleteChatSubmenu = other.addSubItem(delete_chat_id, R.drawable.baseline_exit_to_app_24, LocaleController.getString("LeaveMegaMenu", R.string.LeaveMegaMenu), themeDelegate); + addMemberSubMenu = other.addSubItem(add_member_id, R.drawable.menu_invite, LocaleController.getString("AddMember", R.string.AddMember)); + createTopicSubmenu = other.addSubItem(create_topic_id, R.drawable.groups_create, LocaleController.getString("CreateTopic", R.string.CreateTopic)); + deleteChatSubmenu = other.addSubItem(delete_chat_id, R.drawable.menu_newphone, LocaleController.getString("LeaveMegaMenu", R.string.LeaveMegaMenu), themeDelegate); avatarContainer = new ChatAvatarContainer(context, this, false); avatarContainer.getAvatarImageView().setRoundRadius(AndroidUtilities.dp(16)); @@ -1897,7 +1897,7 @@ public void toggleMute() { if (ChatObject.canDeleteTopic(currentAccount, getCurrentChat(), topic)) { ActionBarMenuSubItem deleteItem = new ActionBarMenuSubItem(getParentActivity(), false, true); - deleteItem.setTextAndIcon(LocaleController.getPluralString("DeleteTopics", 1), R.drawable.baseline_delete_24); + deleteItem.setTextAndIcon(LocaleController.getPluralString("DeleteTopics", 1), R.drawable.msg_delete); deleteItem.setIconColor(getThemedColor(Theme.key_dialogRedIcon)); deleteItem.setTextColor(getThemedColor(Theme.key_dialogTextRed)); deleteItem.setMinimumWidth(160); diff --git a/TMessagesProj/src/main/res/drawable-hdpi/msg_check.png b/TMessagesProj/src/main/res/drawable-hdpi/msg_check.png new file mode 100644 index 0000000000..64b204e262 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/msg_check.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/msg_schedule.png b/TMessagesProj/src/main/res/drawable-hdpi/msg_schedule.png new file mode 100644 index 0000000000..d4da876f7b Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/msg_schedule.png differ diff --git a/TMessagesProj/src/main/res/drawable-hdpi/msg_timer.png b/TMessagesProj/src/main/res/drawable-hdpi/msg_timer.png new file mode 100644 index 0000000000..8913c6595d Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/msg_timer.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_check.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_check.png new file mode 100644 index 0000000000..3fd562cf79 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_check.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_schedule.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_schedule.png new file mode 100644 index 0000000000..eb3518506c Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_schedule.png differ diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_timer.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_timer.png new file mode 100644 index 0000000000..1d0716682c Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_timer.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/msg_check.png b/TMessagesProj/src/main/res/drawable-xhdpi/msg_check.png new file mode 100644 index 0000000000..1df03d2ed8 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xhdpi/msg_check.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/msg_schedule.png b/TMessagesProj/src/main/res/drawable-xhdpi/msg_schedule.png new file mode 100644 index 0000000000..6109f1b6ac Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xhdpi/msg_schedule.png differ diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/msg_timer.png b/TMessagesProj/src/main/res/drawable-xhdpi/msg_timer.png new file mode 100644 index 0000000000..456e7f6441 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xhdpi/msg_timer.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/msg_check.png b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_check.png new file mode 100644 index 0000000000..5a266d8bc3 Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_check.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/msg_schedule.png b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_schedule.png new file mode 100644 index 0000000000..b6f32af1db Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_schedule.png differ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/msg_timer.png b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_timer.png new file mode 100644 index 0000000000..14b0682aad Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-xxhdpi/msg_timer.png differ