diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt index d2154dd4..965796e7 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt @@ -40,10 +40,7 @@ import jp.juggler.subwaytooter.span.MyClickableSpanClickCallback import jp.juggler.subwaytooter.table.AcctColor import jp.juggler.subwaytooter.table.SavedAccount import jp.juggler.subwaytooter.util.* -import jp.juggler.subwaytooter.view.ColumnStripLinearLayout -import jp.juggler.subwaytooter.view.GravitySnapHelper -import jp.juggler.subwaytooter.view.ListDivider -import jp.juggler.subwaytooter.view.MyEditText +import jp.juggler.subwaytooter.view.* import org.apache.commons.io.IOUtils import java.io.File import java.io.FileInputStream @@ -147,7 +144,7 @@ class ActMain : AppCompatActivity() lateinit var post_helper : PostHelper class PhoneEnv { - internal lateinit var pager : ViewPager + internal lateinit var pager : MyViewPager internal lateinit var pager_adapter : ColumnPagerAdapter } diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt index bd43baa1..8139d369 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/EmojiPicker.kt @@ -27,6 +27,7 @@ import jp.juggler.subwaytooter.R import jp.juggler.subwaytooter.api.entity.CustomEmoji import jp.juggler.subwaytooter.put import jp.juggler.subwaytooter.util.* +import jp.juggler.subwaytooter.view.MyViewPager import jp.juggler.subwaytooter.view.NetworkEmojiView @SuppressLint("InflateParams") @@ -60,7 +61,7 @@ class EmojiPicker( private val page_list = ArrayList() - private val pager : ViewPager + private val pager : MyViewPager private val dialog : Dialog diff --git a/app/src/main/java/jp/juggler/subwaytooter/view/MyViewPager.kt b/app/src/main/java/jp/juggler/subwaytooter/view/MyViewPager.kt new file mode 100644 index 00000000..8391fe48 --- /dev/null +++ b/app/src/main/java/jp/juggler/subwaytooter/view/MyViewPager.kt @@ -0,0 +1,27 @@ +package jp.juggler.subwaytooter.view + +import android.annotation.SuppressLint +import android.content.Context +import android.support.v4.view.ViewPager +import android.util.AttributeSet +import android.view.MotionEvent + +class MyViewPager : ViewPager { + constructor(context : Context) : super(context) + constructor(context : Context, attrs : AttributeSet?) : super(context, attrs) + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(ev : MotionEvent) : Boolean = try { + super.onTouchEvent(ev) + } catch(ex : IllegalArgumentException) { + ex.printStackTrace() + false + } + + override fun onInterceptTouchEvent(ev : MotionEvent) : Boolean = try { + super.onInterceptTouchEvent(ev) + } catch(ex : IllegalArgumentException) { + ex.printStackTrace() + false + } +} diff --git a/app/src/main/res/layout/act_main.xml b/app/src/main/res/layout/act_main.xml index bc405995..1829f599 100644 --- a/app/src/main/res/layout/act_main.xml +++ b/app/src/main/res/layout/act_main.xml @@ -42,7 +42,7 @@ - - - - + />