lynx/NekoX
1
0
Fork 0
mirror of https://github.com/NekoX-Dev/NekoX.git synced 2024-11-25 16:49:32 +01:00
Code Issues Projects Releases Wiki Activity

fix merge bugs

Browse Source
This commit is contained in:
luvletter2333 2023-04-04 11:22:32 -04:00
parent 722a0322e1
commit edd2ecef68
No known key found for this signature in database
GPG Key ID: 9EB7723F3A0ACF92
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1537,7 +1537,7 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
} else {
count = forum ? 14 : 13;
}
blockCell.setTextAndValueAndIcon(LocaleController.getString("ChannelPermissions", R.string.ChannelPermissions), String.format("%d/%d", count, forum ? 14 : 13), animated, R.drawable.msg_permissions, true);
blockCell.setTextAndValue(LocaleController.getString("ChannelPermissions", R.string.ChannelPermissions), String.format("%d/%d", count, forum ? 14 : 13), animated, true);
}
if (memberRequestsCell != null) {
memberRequestsCell.setTextAndValue(LocaleController.getString("MemberRequests", R.string.MemberRequests), String.format("%d", info.requests_pending), logCell != null && logCell.getVisibility() == View.VISIBLE);

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

@ -6201,7 +6201,7 @@ public class ChatActivityEnterView extends BlurredFrameLayout implements Notific
runningAnimation = new AnimatorSet();
ArrayList<Animator> animators = new ArrayList<>();
if (NekoConfig.useChatAttachMediaMenu.Bool() && botButton.getVisibility() == VISIBLE) {
if (NekoConfig.useChatAttachMediaMenu.Bool() && botButton != null && botButton.getVisibility() == VISIBLE) {
animators.add(ObjectAnimator.ofFloat(botButton, View.SCALE_X, 0.1f));
animators.add(ObjectAnimator.ofFloat(botButton, View.SCALE_Y, 0.1f));
animators.add(ObjectAnimator.ofFloat(botButton, View.ALPHA, 0.0f));

4
TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
View File

@ -1561,7 +1561,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter
actionModeViews.add(gotoItem);
gotoItem.setOnClickListener(v -> onActionBarItemClick(v, gotochat));
forwardNoQuoteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false);
forwardNoQuoteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_actionBarActionModeDefaultIcon), false);
forwardNoQuoteItem.setIcon(R.drawable.baseline_fast_forward_24);
forwardNoQuoteItem.setContentDescription(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward));
forwardNoQuoteItem.setDuplicateParentStateEnabled(false);
@ -6603,7 +6603,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter
arrayList.add(new ThemeDescription(gotoItem, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_actionBarActionModeDefaultSelector));
}
if (forwardNoQuoteItem != null) {
arrayList.add(new ThemeDescription(forwardNoQuoteItem.getIconView(), ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteGrayText2));
arrayList.add(new ThemeDescription(forwardNoQuoteItem.getIconView(), ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_actionBarActionModeDefaultIcon));
arrayList.add(new ThemeDescription(forwardNoQuoteItem, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_actionBarActionModeDefaultSelector));
}
if (forwardItem != null) {