Work around for https://github.com/chrisbanes/PhotoView/issues/31
This commit is contained in:
parent
a37e3712bd
commit
0a7d2c68bd
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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<EmojiPickerPage>()
|
||||
|
||||
private val pager : ViewPager
|
||||
private val pager : MyViewPager
|
||||
|
||||
private val dialog : Dialog
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.v4.view.ViewPager
|
||||
<jp.juggler.subwaytooter.view.MyViewPager
|
||||
android:id="@+id/viewPager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
|
@ -64,12 +64,10 @@
|
|||
android:layout_gravity="top"
|
||||
/>
|
||||
|
||||
<android.support.v4.view.ViewPager
|
||||
<jp.juggler.subwaytooter.view.MyViewPager
|
||||
android:id="@+id/pager"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
>
|
||||
|
||||
</android.support.v4.view.ViewPager>
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
|
Loading…
Reference in New Issue