Skip to content
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

Fix viewpager position snapping back to 0 #160

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Fix viewpager position snapping back to 0 #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
895c659
Fix viewpager position snapping back to 0
naveensingh Mar 7, 2024
c6cf82c
Merge branch 'master' into fix_position_glitch
naveensingh Mar 7, 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
35 changes: 17 additions & 18 deletions app/src/main/kotlin/org/fossify/gallery/activities/ViewPagerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ import android.content.pm.ActivityInfo
import android.content.pm.ShortcutInfo
import android.content.pm.ShortcutManager
import android.content.res.Configuration
import android.database.Cursor
import android.graphics.Bitmap
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Icon
import android.os.Bundle
import android.os.Handler
import android.provider.MediaStore.Images
import android.view.MenuItem
import android.view.View
import android.view.WindowManager
Expand Down Expand Up @@ -59,7 +57,10 @@ import kotlin.math.min

@Suppress("UNCHECKED_CAST")
class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, ViewPagerFragment.FragmentListener {
private val REQUEST_VIEW_VIDEO = 1
companion object {
private const val REQUEST_VIEW_VIDEO = 1
private const val SAVED_PATH = "current_path"
}

private var mPath = ""
private var mDirectory = ""
Expand Down Expand Up @@ -98,7 +99,9 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View

handlePermission(getPermissionToRequest()) {
if (it) {
initViewPager()
initViewPager(
savedPath = savedInstanceState?.getString(SAVED_PATH).orEmpty()
)
} else {
toast(org.fossify.commons.R.string.no_storage_permissions)
finish()
Expand Down Expand Up @@ -284,22 +287,18 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
(binding.mediumViewerAppbar.layoutParams as RelativeLayout.LayoutParams).topMargin = statusBarHeight
}

private fun initViewPager() {
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putString(SAVED_PATH, getCurrentPath())
}

private fun initViewPager(savedPath: String) {
val uri = intent.data
if (uri != null) {
var cursor: Cursor? = null
try {
val proj = arrayOf(Images.Media.DATA)
cursor = contentResolver.query(uri, proj, null, null, null)
if (cursor?.moveToFirst() == true) {
mPath = cursor.getStringValue(Images.Media.DATA)
}
} finally {
cursor?.close()
}
mPath = savedPath.ifEmpty { getDataColumn(uri).orEmpty() }
} else {
try {
mPath = intent.getStringExtra(PATH) ?: ""
mPath = savedPath.ifEmpty { intent.getStringExtra(PATH).orEmpty() }

// make sure "Open Recycle Bin" works well with "Show all folders content"
mShowAll = config.showAll && (mPath.isNotEmpty() && !mPath.startsWith(recycleBinPath))
Expand All @@ -310,7 +309,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
}
}

if (intent.extras?.containsKey(REAL_FILE_PATH) == true) {
if (savedPath.isEmpty() && intent.extras?.containsKey(REAL_FILE_PATH) == true) {
mPath = intent.extras!!.getString(REAL_FILE_PATH)!!
}

Expand Down Expand Up @@ -1028,7 +1027,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
model: Any,
target: Target<Bitmap>,
dataSource: DataSource,
isFirstResource: Boolean
isFirstResource: Boolean,
): Boolean {
printHelper.printBitmap(path.getFilenameFromPath(), bitmap)
return false
Expand Down