TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: merged 8.6.1

Browse Source
This commit is contained in:
NextAlone 2022-03-15 22:21:52 +08:00
parent b5e7c25925
commit 60ef3596d9
No known key found for this signature in database
GPG Key ID: DBA7B0AEF8C1CD2C
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/ui/Components/SearchViewPager.java
View File

@ -313,7 +313,7 @@ public class SearchViewPager extends ViewPagerFixed implements FilteredSearchVie
selectedMessagesCountTextView.setOnTouchListener((v, event) -> true); selectedMessagesCountTextView.setOnTouchListener((v, event) -> true);
gotoItem = actionMode.addItemWithWidth(gotoItemId, R.drawable.msg_message, AndroidUtilities.dp(54), LocaleController.getString("AccDescrGoToMessage", R.string.AccDescrGoToMessage)); gotoItem = actionMode.addItemWithWidth(gotoItemId, R.drawable.msg_message, AndroidUtilities.dp(54), LocaleController.getString("AccDescrGoToMessage", R.string.AccDescrGoToMessage));
forwardItem = actionMode.addItemWithWidth(forwardItemId, R.drawable.forward, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward)); forwardItem = actionMode.addItemWithWidth(forwardItemId, R.drawable.msg_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)); deleteItem = actionMode.addItemWithWidth(deleteItemId, R.drawable.msg_delete, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete));
} }
if (parent.getActionBar().getBackButton().getDrawable() instanceof MenuDrawable) { if (parent.getActionBar().getBackButton().getDrawable() instanceof MenuDrawable) {

7
TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
View File

@ -7789,16 +7789,11 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
} else if (position == switchBackendRow) { } else if (position == switchBackendRow) {
textCell.setText("Switch Backend", false); textCell.setText("Switch Backend", false);
} else if (position == setAvatarRow) { } else if (position == setAvatarRow) {
<<<<<<< HEAD textCell.setTextAndIcon(LocaleController.getString("SetProfilePhoto", R.string.SetProfilePhoto), R.drawable.msg_addphoto, false);
textCell.setTextAndIcon(LocaleController.getString("SetProfilePhoto", R.string.SetProfilePhoto), R.drawable.baseline_image_24, false);
textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton); textCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton);
textCell.getImageView().setPadding(0, 0, 0, AndroidUtilities.dp(8)); textCell.getImageView().setPadding(0, 0, 0, AndroidUtilities.dp(8));
textCell.setImageLeft(12); textCell.setImageLeft(12);
setAvatarCell = textCell; 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; break;
case VIEW_TYPE_NOTIFICATIONS_CHECK: case VIEW_TYPE_NOTIFICATIONS_CHECK: