diff options
| author | Andrew Dolgov <[email protected]> | 2017-05-31 23:44:52 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-05-31 23:44:52 +0300 |
| commit | 15cda36008f2461680c93144f4cf0c63c68edb6b (patch) | |
| tree | f1b2049eebdcbc42d990351280527ac82e4b9c7b /org.fox.ttrss/src/main/res | |
| parent | bb32ac7dc4319d338cdaaa5af8b3c53ef35c4897 (diff) | |
rework pinch-zoom image view to use ImageMatrixTouchHandler
kill video surface in fragment onpause
Diffstat (limited to 'org.fox.ttrss/src/main/res')
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout/article_images_image.xml | 2 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/article_images_pager.xml | 2 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/values/attrs.xml | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/article_images_image.xml b/org.fox.ttrss/src/main/res/layout/article_images_image.xml index 37f44c38..29a53bd0 100644 --- a/org.fox.ttrss/src/main/res/layout/article_images_image.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_image.xml @@ -18,7 +18,7 @@ android:layout_gravity="center" android:id="@+id/flavor_image_progress" /> - <it.sephiroth.android.library.imagezoom.ImageViewTouch + <ImageView android:id="@+id/flavor_image" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml index eaaca37a..469068eb 100755 --- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml @@ -6,7 +6,7 @@ android:background="@android:color/black" android:layout_height="fill_parent"> - <org.fox.ttrss.ArticleImagesPager + <com.bogdwellers.pinchtozoom.view.ImageViewPager android:id="@+id/article_images_pager" android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 3f4922d0..e0bfb02c 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -49,7 +49,4 @@ <attr format="reference|color" name="insetForeground"> </attr></declare-styleable> <attr name="drawer_header" format="reference" /> - <declare-styleable name="ForegroundImageView"> - <attr name="android:foreground"/> - </declare-styleable> </resources>
\ No newline at end of file |