Skip to content
This repository was archived by the owner on May 23, 2025. It is now read-only.

#3562: Only allow the view pager if it makes sense #3572

Closed
Lakoja wants to merge 1 commit into from
Closed

#3562: Only allow the view pager if it makes sense #3572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
private var attachments: ArrayList<AttachmentViewData>? = null
private val toolbarVisibilityListeners = mutableListOf<ToolbarVisibilityListener>()
private var imageUrl: String? = null
private var hasMultiple: Boolean = false

fun addToolbarVisibilityListener(listener: ToolbarVisibilityListener): Function0<Boolean> {
this.toolbarVisibilityListeners.add(listener)
Expand Down Expand Up @@ -113,13 +114,16 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
SingleImagePagerAdapter(this, imageUrl!!)
}

hasMultiple = attachments != null && attachments!!.size > 1

binding.viewPager.adapter = adapter
binding.viewPager.setCurrentItem(initialPosition, false)
binding.viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
binding.toolbar.title = getPageTitle(position)
}
})
binding.viewPager.isUserInputEnabled = hasMultiple
Copy link
Copy Markdown
Collaborator Author

@Lakoja Lakoja Apr 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least for a single image this is a 100% improvement: have no (useless) view paging there


// Setup the toolbar.
setSupportActionBar(binding.toolbar)
Expand Down Expand Up @@ -195,6 +199,16 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
.start()
}

override fun onZoom(zoomFactor: Float) {
// If the view pager is (input) enabled it will grab most interaction at the device edges; this disturbs zooming or dragging

if (zoomFactor > 1.01) {
binding.viewPager.isUserInputEnabled = false
} else {
binding.viewPager.isUserInputEnabled = hasMultiple
}
}

private fun getPageTitle(position: Int): CharSequence {
if (attachments == null) {
return ""
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class ViewImageFragment : ViewMediaFragment() {
fun onBringUp()
fun onDismiss()
fun onPhotoTap()
fun onZoom(zoomFactor: Float)
}

private var _binding: FragmentViewImageBinding? = null
Expand Down Expand Up @@ -125,6 +126,10 @@ class ViewImageFragment : ViewMediaFragment() {
}
result
}

setOnScaleChangeListener { scaleFactor, _, _ ->
photoActionsListener.onZoom(scale) // TODO at least for the first call here during pinch zoom only scaleFactor is different; "scale" is still 1
}
}

var lastY = 0f
Expand Down