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

fix merge 9.1.6

Browse Source
This commit is contained in:
luvletter2333 2022-12-02 17:17:53 +08:00
parent b95fa5971d
commit 9ed10404e5
No known key found for this signature in database
GPG Key ID: A26A8880836E1978
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TMessagesProj/build.gradle
View File

@ -3,15 +3,15 @@ import cn.hutool.core.util.RuntimeUtil
apply plugin: "com.android.application"
apply plugin: "kotlin-android"
def verName = "9.0.2-preview01"
def verName = "9.1.6-preview01"
def verCode = 670
if (System.getenv("DEBUG_BUILD") == "true") {
verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1").trim()
}
def officialVer = "9.0.2"
def officialCode = 2808
def officialVer = "9.1.6"
def officialCode = 2929
def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")

4
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java
View File

@ -182,7 +182,7 @@ public class BottomSheet extends Dialog {
public boolean useBackgroundTopPadding = true;
protected int customViewGravity = Gravity.LEFT | Gravity.TOP;
protected class ContainerView extends LinearLayout implements NestedScrollingParent {
protected class ContainerView extends FrameLayout implements NestedScrollingParent {
private VelocityTracker velocityTracker = null;
private int startedTrackingX;
@ -1401,7 +1401,7 @@ public class BottomSheet extends Dialog {
delegate = bottomSheetDelegate;
}
public LinearLayout getContainer() {
public FrameLayout getContainer() {
return container;
}

1
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/INavigationLayout.java
View File

@ -258,6 +258,7 @@ public interface INavigationLayout {
/**
* @deprecated You should override {@link INavigationLayoutDelegate#needPresentFragment(INavigationLayout, NavigationParams)} for more fields
*/
@Deprecated
default boolean needPresentFragment(BaseFragment fragment, boolean removeLast, boolean forceWithoutAnimation, INavigationLayout layout) {
return true;
}

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

@ -142,7 +142,7 @@ public class Bulletin {
containerLayout = null;
}
private Bulletin(BaseFragment fragment, @NonNull ViewGroup containerLayout, @NonNull Layout layout, int duration) {
private Bulletin(BaseFragment fragment, @NonNull FrameLayout containerLayout, @NonNull Layout layout, int duration) {
this.layout = layout;
this.parentLayout = new ParentLayout(layout) {
@Override

6
TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java
View File

@ -40,7 +40,7 @@ public final class BulletinFactory {
return new BulletinFactory(fragment);
}
public static BulletinFactory of(ViewGroup containerLayout, Theme.ResourcesProvider resourcesProvider) {
public static BulletinFactory of(FrameLayout containerLayout, Theme.ResourcesProvider resourcesProvider) {
return new BulletinFactory(containerLayout, resourcesProvider);
}
@ -133,7 +133,7 @@ public final class BulletinFactory {
this.resourcesProvider = fragment == null ? null : fragment.getResourceProvider();
}
private BulletinFactory(ViewGroup containerLayout, Theme.ResourcesProvider resourcesProvider) {
private BulletinFactory(FrameLayout containerLayout, Theme.ResourcesProvider resourcesProvider) {
this.containerLayout = containerLayout;
this.fragment = null;
this.resourcesProvider = resourcesProvider;
@ -686,7 +686,7 @@ public final class BulletinFactory {
}
@CheckResult
public static Bulletin createCopyLinkBulletin(ViewGroup containerView) {
public static Bulletin createCopyLinkBulletin(FrameLayout containerView) {
return of(containerView, null).createCopyLinkBulletin();
}

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

@ -514,7 +514,7 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou
this.forceDarkTheme = forceDarkTheme;
NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.albumsDidLoad);
NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.cameraInitied);
LinearLayout container = alert.getContainer();
FrameLayout container = alert.getContainer();
cameraDrawable = context.getResources().getDrawable(R.drawable.instant_camera).mutate();

4
TMessagesProj/src/main/java/org/telegram/ui/Delegates/MemberRequestsDelegate.java
View File

@ -89,7 +89,7 @@ public class MemberRequestsDelegate implements MemberRequestCell.OnClickListener
private final ArrayList<TLRPC.TL_chatInviteImporter> allImporters = new ArrayList<>();
private final Adapter adapter = new Adapter();
private final BaseFragment fragment;
private final ViewGroup layoutContainer;
private final FrameLayout layoutContainer;
private final MemberRequestsController controller;
private final long chatId;
private final int currentAccount;
@ -114,7 +114,7 @@ public class MemberRequestsDelegate implements MemberRequestCell.OnClickListener
private boolean isFirstLoading = true;
private boolean isShowLastItemDivider = true;
public MemberRequestsDelegate(BaseFragment fragment, ViewGroup layoutContainer, long chatId, boolean showSearchMenu) {
public MemberRequestsDelegate(BaseFragment fragment, FrameLayout layoutContainer, long chatId, boolean showSearchMenu) {
this.fragment = fragment;
this.layoutContainer = layoutContainer;
this.chatId = chatId;

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

@ -5942,7 +5942,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (!mainFragmentsStack.isEmpty()) {
int type = (int) args[0];
LinearLayout container = null;
FrameLayout container = null;
BaseFragment fragment = null;
if (GroupCallActivity.groupCallUiVisible && GroupCallActivity.groupCallInstance != null) {
container = GroupCallActivity.groupCallInstance.getContainer();
@ -6915,7 +6915,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
drawerLayoutContainer.setAllowOpenDrawer(false, true);
int account = -1;
for (int a = 0; a < UserConfig.MAX_ACCOUNT_COUNT; a++) {
for (int a : SharedConfig.activeAccounts) {
if (UserConfig.getInstance(a).isClientActivated()) {
account = a;
break;