aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-10-12 12:36:05 -0400
committerGitHub <noreply@github.com>2017-10-12 12:36:05 -0400
commit32ff6c3269abb81289160aa6f9f55c14369c99a3 (patch)
tree5d4e7c8c14dec400c2f0853d73e06392e188ac51 /app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
parent20f3bcd2b75e35d182d6d39a7c3a4e365311fa78 (diff)
downloadfrost-32ff6c3269abb81289160aa6f9f55c14369c99a3.tar.gz
frost-32ff6c3269abb81289160aa6f9f55c14369c99a3.tar.bz2
frost-32ff6c3269abb81289160aa6f9f55c14369c99a3.zip
misc (#400)
* Remove job scheduler null check * Add try catch for viewpager on touch event. Resolves #356 * Update kotlin and translation url * Use short url * Check job scheduler null check against travis lint * Add badges and update crashlytics
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt11
1 files changed, 8 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
index 91673b15..8122d362 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
@@ -18,10 +18,15 @@ class FrostViewPager @JvmOverloads constructor(context: Context, attrs: Attribut
override fun onInterceptTouchEvent(ev: MotionEvent?) =
try {
Prefs.viewpagerSwipe && enableSwipe && super.onInterceptTouchEvent(ev)
- } catch(e: IllegalArgumentException) {
- true
+ } catch (e: IllegalArgumentException) {
+ false
}
@SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(ev: MotionEvent?): Boolean = Prefs.viewpagerSwipe && enableSwipe && super.onTouchEvent(ev)
+ override fun onTouchEvent(ev: MotionEvent?): Boolean =
+ try {
+ Prefs.viewpagerSwipe && enableSwipe && super.onTouchEvent(ev)
+ } catch (e: IllegalArgumentException) {
+ false
+ }
} \ No newline at end of file