Skip to content

fixes #1555 #3923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VishnuSanal wants to merge 5 commits into from
Closed

fixes #1555 #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
232b318
fixes #1555
VishnuSanal Jun 27, 2023
7c65a62
Merge branch 'release/4.0' into issue/1555
VishnuSanal Jun 9, 2024
0e7911b
[WIP] fixes #1555
VishnuSanal Jun 9, 2024
225cf90
Merge branch 'refs/heads/release/4.0' into issue/1555
VishnuSanal Aug 2, 2024
f9abff8
Merge branch 'release/4.0' into issue/1555
VishnuSanal Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/src/main/java/com/amaze/filemanager/ui/fragments/TabFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,22 +234,23 @@ public void updatePaths(int pos) {

@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);

if (sharedPrefs != null) {
sharedPrefs.edit().putInt(PREFERENCE_CURRENT_TAB, MainActivity.currentTab).apply();
}

if (fragments.size() != 0) {
if (fragmentManager == null) {
return;
}
if (fragmentManager != null
&& !fragments.isEmpty()
&& fragments.get(0).isAdded()
&& fragments.get(1).isAdded()) {

fragmentManager.executePendingTransactions();
fragmentManager.putFragment(outState, KEY_FRAGMENT_0, fragments.get(0));
fragmentManager.putFragment(outState, KEY_FRAGMENT_1, fragments.get(1));

outState.putInt(KEY_POSITION, viewPager.getCurrentItem());
}
super.onSaveInstanceState(outState);
}

public void setPagingEnabled(boolean isPaging) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/amaze/filemanager/ui/views/FastScroller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ public FastScroller(@NonNull Context context, AttributeSet attributeSet, int i)
}

private float computeHandlePosition() {
if (recyclerView == null) return -1;
View firstVisibleView = recyclerView.getChildAt(0);
if (firstVisibleView == null) return -1;
handle.setVisibility(VISIBLE);
float recyclerViewOversize; // how much is recyclerView bigger than fastScroller
int recyclerViewAbsoluteScroll;
if (firstVisibleView == null || recyclerView == null) return -1;
recyclerViewOversize =
firstVisibleView.getHeight() / columns * recyclerView.getAdapter().getItemCount()
- getHeightMinusPadding();
Expand Down