Skip to content

Commit

Permalink
Merge pull request #8623 from wordpress-mobile/issue/8458-swipe-conflict
Browse files Browse the repository at this point in the history
Pages: Tabs/STR gesture collision fix
  • Loading branch information
malinajirka authored Nov 20, 2018
2 parents 3fe9961 + c2d6a4d commit 7d9c6e9
Showing 1 changed file with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.MenuItem.OnActionExpandListener
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
Expand Down Expand Up @@ -148,6 +149,14 @@ class PagesFragment : Fragment(), GutenbergWarningDialogClickInterface {
.beginTransaction()
.replace(R.id.searchFrame, searchFragment)
.commit()

pagesPager.setOnTouchListener { _, event ->
swipeToRefreshHelper.setEnabled(false)
if (event.action == MotionEvent.ACTION_UP) {
swipeToRefreshHelper.setEnabled(true)
}
return@setOnTouchListener false
}
}

private fun initializeSearchView() {
Expand Down Expand Up @@ -238,7 +247,8 @@ class PagesFragment : Fragment(), GutenbergWarningDialogClickInterface {
val isGutenbergContent = PostUtils.contentContainsGutenbergBlocks(post?.content)
if (isGutenbergContent && !AppPrefs.isGutenbergWarningDialogDisabled()) {
PostUtils.showGutenbergCompatibilityWarningDialog(
getActivity(), fragmentManager, post, viewModel.site)
getActivity(), fragmentManager, post, viewModel.site
)
} else {
ActivityLauncher.editPageForResult(this, page)
}
Expand Down Expand Up @@ -379,11 +389,13 @@ class PagesFragment : Fragment(), GutenbergWarningDialogClickInterface {

private fun displayDeleteDialog(page: Page) {
val dialog = BasicFragmentDialog()
dialog.initialize(page.id.toString(),
dialog.initialize(
page.id.toString(),
getString(string.delete_page),
getString(string.page_delete_dialog_message, page.title),
getString(string.delete),
getString(string.cancel))
getString(string.cancel)
)
dialog.show(fragmentManager, page.id.toString())
}
}
Expand Down

0 comments on commit 7d9c6e9

Please sign in to comment.