1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00

Added a fix for crashes while zooming in PhotoView inside a DrawerLayout.

This commit is contained in:
Christophe Beyls 2016-01-01 21:43:57 +01:00
parent 06b2c82242
commit 719e387d91
2 changed files with 38 additions and 2 deletions

View file

@ -0,0 +1,36 @@
package be.digitalia.fosdem.widgets;
import android.content.Context;
import android.support.v4.widget.DrawerLayout;
import android.util.AttributeSet;
import android.view.MotionEvent;
/**
* DrawerLayout which includes a fix to prevent crashes with PhotoView.
* <p/>
* See https://github.com/chrisbanes/PhotoView#issues-with-viewgroups
* http://code.google.com/p/android/issues/detail?id=18990
*/
public class PhotoViewDrawerLayout extends DrawerLayout {
public PhotoViewDrawerLayout(Context context) {
super(context);
}
public PhotoViewDrawerLayout(Context context, AttributeSet attrs) {
super(context, attrs);
}
public PhotoViewDrawerLayout(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
try {
return super.onInterceptTouchEvent(ev);
} catch (Exception e) {
return false;
}
}
}

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout <be.digitalia.fosdem.widgets.PhotoViewDrawerLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -50,4 +50,4 @@
<include layout="@layout/include_navigation_drawer"/> <include layout="@layout/include_navigation_drawer"/>
</android.support.v4.widget.DrawerLayout> </be.digitalia.fosdem.widgets.PhotoViewDrawerLayout>