From a6bfcc5f93f29eb518c3bce1e6fc4becf4537c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E4=B8=9C=E9=B2=81?= <foolfalcon@hotmail.com>
Date: Fri, 28 Aug 2015 09:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                             | 2 +-
 .../java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java | 2 +-
 PhotoPicker/src/main/res/layout/item_pager.xml             | 7 ++++---
 photopickerdemo/src/main/res/layout/activity_main.xml      | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fd2068d..bec66fa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -79,7 +79,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java
index 2de448f..0dd98bf 100644
--- a/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java
+++ b/PhotoPicker/src/main/java/me/iwf/photopicker/adapter/PhotoPagerAdapter.java
@@ -9,6 +9,7 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +47,6 @@ public PhotoPagerAdapter(Context mContext, List<String> paths) {
     }
     Glide.with(mContext)
         .load(uri)
-        .override(800, 800)
         .placeholder(R.drawable.ic_photo_black_48dp)
         .error(R.drawable.ic_broken_image_black_48dp)
         .into(imageView);
diff --git a/PhotoPicker/src/main/res/layout/item_pager.xml b/PhotoPicker/src/main/res/layout/item_pager.xml
index e15cede..c77f5fc 100644
--- a/PhotoPicker/src/main/res/layout/item_pager.xml
+++ b/PhotoPicker/src/main/res/layout/item_pager.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:gravity="center"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:fillViewport="true"
     >
 
   <me.iwf.photopicker.widget.TouchImageView
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
+      android:layout_height="wrap_content"
       android:src="@drawable/ic_photo_black_48dp"
       android:id="@+id/iv_pager"
       />
 
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/photopickerdemo/src/main/res/layout/activity_main.xml b/photopickerdemo/src/main/res/layout/activity_main.xml
index 487dfe4..c9de654 100644
--- a/photopickerdemo/src/main/res/layout/activity_main.xml
+++ b/photopickerdemo/src/main/res/layout/activity_main.xml
@@ -46,7 +46,7 @@
 
   <android.support.v7.widget.RecyclerView
       android:id="@+id/recycler_view"
-      android:layout_below="@id/pick_photo_gif"
+      android:layout_below="@id/button_photo_gif"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       />