overspend1/Overgram
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 9.4.8

Browse Source
This commit is contained in:
xaxtix
2023-02-27 14:35:15 +04:00
committed by immat0x1
parent 808b5318e3
commit b87cb68b74
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
View File

@@ -1480,7 +1480,7 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
return false;
}
fragment.setParentLayout(this);
if (position == -1) {
if (position == -1 || position == INavigationLayout.FORCE_NOT_ATTACH_VIEW) {
if (!fragmentsStack.isEmpty()) {
BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1);
previousFragment.onPause();
@@ -1499,11 +1499,13 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
}
}
fragmentsStack.add(fragment);
attachView(fragment);
fragment.onResume();
fragment.onTransitionAnimationEnd(false, true);
fragment.onTransitionAnimationEnd(true, true);
fragment.onBecomeFullyVisible();
if (position != INavigationLayout.FORCE_NOT_ATTACH_VIEW) {
attachView(fragment);
fragment.onResume();
fragment.onTransitionAnimationEnd(false, true);
fragment.onTransitionAnimationEnd(true, true);
fragment.onBecomeFullyVisible();
}
onFragmentStackChanged("addFragmentToStack " + position);
} else {
fragmentsStack.add(position, fragment);

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

@@ -20,6 +20,8 @@ import java.util.List;
public interface INavigationLayout {
int REBUILD_FLAG_REBUILD_LAST = 1, REBUILD_FLAG_REBUILD_ONLY_LAST = 2;
int FORCE_NOT_ATTACH_VIEW = -2;
boolean presentFragment(NavigationParams params);
boolean checkTransitionAnimation();
boolean addFragmentToStack(BaseFragment fragment, int position);

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

@@ -3020,7 +3020,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (AndroidUtilities.isTablet()) {
if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
if (layersActionBarLayout.getFragmentStack().isEmpty()) {
layersActionBarLayout.addFragmentToStack(getClientNotActivatedFragment());
layersActionBarLayout.addFragmentToStack(getClientNotActivatedFragment(), INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(false, false);
}
} else {
@@ -3030,14 +3030,14 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (searchQuery != null) {
dialogsActivity.setInitialSearchString(searchQuery);
}
actionBarLayout.addFragmentToStack(dialogsActivity);
actionBarLayout.addFragmentToStack(dialogsActivity, INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(true, false);
}
}
} else {
if (actionBarLayout.getFragmentStack().isEmpty()) {
if (!UserConfig.getInstance(currentAccount).isClientActivated()) {
actionBarLayout.addFragmentToStack(getClientNotActivatedFragment());
actionBarLayout.addFragmentToStack(getClientNotActivatedFragment(), INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(false, false);
} else {
DialogsActivity dialogsActivity = new DialogsActivity(null);
@@ -3045,14 +3045,12 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati
if (searchQuery != null) {
dialogsActivity.setInitialSearchString(searchQuery);
}
actionBarLayout.addFragmentToStack(dialogsActivity);
actionBarLayout.addFragmentToStack(dialogsActivity, INavigationLayout.FORCE_NOT_ATTACH_VIEW);
drawerLayoutContainer.setAllowOpenDrawer(true, false);
}
}
}
if (SharedConfig.useLNavigation) {
actionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);
}
actionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);
if (AndroidUtilities.isTablet()) {
layersActionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);
rightActionBarLayout.rebuildFragments(INavigationLayout.REBUILD_FLAG_REBUILD_LAST);

4
gradle.properties
View File

@@ -15,8 +15,8 @@ RELEASE_KEY_PASSWORD=***REMOVED***
RELEASE_KEY_ALIAS=exteraGram
RELEASE_STORE_PASSWORD=***REMOVED***
org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=4096m -XX:+UseParallelGC -Dfile.encoding=UTF-8
APP_VERSION_NAME=9.4.7
APP_VERSION_CODE=3160
APP_VERSION_NAME=9.4.8
APP_VERSION_CODE=3161
APP_PACKAGE=com.exteragram.messenger
org.gradle.daemon=true
org.gradle.parallel=true