lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

✨ folders on forward 

(cherry picked from commit 70516f429379f079f29a4d37550421c8f7f22e72)
This commit is contained in:
Riko Sakurauchi 2020-03-31 02:22:52 +08:00 committed by 世界
parent 0b31c484b4
commit e2c5ecf6b4
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
View File

@ -614,16 +614,14 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
childTop = commentView.getBottom();
}
} else if (child == filterTabsView) {
childTop = actionBar.getMeasuredHeight();
childTop = onlySelect ? 0 : actionBar.getMeasuredHeight();
} else if (child == searchListView || child == searchEmptyView) {
childTop = (onlySelect ? 0 : actionBar.getMeasuredHeight()) + topPadding;
} else if (child instanceof ViewPage) {
if (!onlySelect) {
if (filterTabsView != null && filterTabsView.getVisibility() == VISIBLE) {
childTop = AndroidUtilities.dp(44);
} else {
childTop = actionBar.getMeasuredHeight();
}
if (filterTabsView != null && filterTabsView.getVisibility() == VISIBLE) {
childTop = AndroidUtilities.dp(44);
} else if (!onlySelect) {
childTop = actionBar.getMeasuredHeight();
}
childTop += topPadding;
} else if (child instanceof FragmentContextView) {
@ -1660,7 +1658,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
scrollToTop();
});
if (initialDialogsType == 0 && folderId == 0 && !onlySelect) {
if (initialDialogsType == 3 || initialDialogsType == 0 && folderId == 0 && !onlySelect) {
scrimPaint = new Paint() {
@Override
public void setAlpha(int a) {
@ -2122,7 +2120,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
ContentView contentView = new ContentView(context);
fragmentView = contentView;
int pagesCount = folderId == 0 && initialDialogsType == 0 && !onlySelect ? 2 : 1;
int pagesCount = initialDialogsType == 3 || (folderId == 0 && initialDialogsType == 0 && !onlySelect) ? 2 : 1;
viewPages = new ViewPage[pagesCount];
for (int a = 0; a < pagesCount; a++) {
final ViewPage viewPage = new ViewPage(context) {
@ -2435,7 +2433,8 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
}
}
}
if (filterTabsView != null && filterTabsView.getVisibility() == View.VISIBLE && recyclerView == viewPages[0].listView && !searching && !actionBar.isActionModeShowed() && !disableActionBarScrolling) {
boolean f1flag = initialDialogsType == 0 && folderId == 0 && !onlySelect;
if (f1flag && filterTabsView != null && filterTabsView.getVisibility() == View.VISIBLE && recyclerView == viewPages[0].listView && !searching && !actionBar.isActionModeShowed() && !disableActionBarScrolling) {
if (dy > 0 && hasHiddenArchive() && viewPages[0].dialogsType == 0) {
View child = recyclerView.getChildAt(0);
if (child != null) {