From d17f98f3e4e71ac9754e2ad54b06e12b92278d1f Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 3 Jun 2016 01:31:34 +0800
Subject: [PATCH] Upgrade GLGallery to 0.1.2

---
 app/build.gradle                              |  4 ++--
 .../hippo/ehviewer/ui/GalleryActivity.java    | 23 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b4fbdf6a7..a0c58b132 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     compile 'com.github.seven332:conaco:0.1.5-eh'
     compile 'com.github.seven332:drawerlayout:0.1.0'
     compile 'com.github.seven332:easyrecyclerview:0.1.0'
-    compile 'com.github.seven332:glgallery:0.1.1'
+    compile 'com.github.seven332:glgallery:0.1.2'
     compile 'com.github.seven332:glview:0.1.0'
     compile 'com.github.seven332:glview-image:0.1.0'
     compile 'com.github.seven332:hotspot:0.1.0'
@@ -76,7 +76,7 @@ dependencies {
     compile 'com.github.seven332:ripple:0.1.1'
     compile 'com.github.seven332:streampipe:0.1.0'
     compile 'com.github.seven332:tuxiang:0.1.2'
-    compile 'com.github.seven332:unifile:0.1.3'
+    compile 'com.github.seven332:unifile:0.1.4'
     compile 'com.github.seven332:yorozuya:0.1.2'
     compile 'com.github.seven332:yorozuya-thread:0.1.1'
     compile 'com.github.seven332:yorozuya-collect:0.1.4'
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index e1bdc6c5f..c20092525 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -61,7 +61,6 @@ import com.hippo.glgallery.GalleryPageView;
 import com.hippo.glgallery.GalleryProvider;
 import com.hippo.glgallery.GalleryView;
 import com.hippo.glgallery.SimpleAdapter;
-import com.hippo.glgallery.SimpleProviderListener;
 import com.hippo.glview.view.GLRootView;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.SystemUiHelper;
@@ -106,7 +105,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
     @Nullable
     private GalleryProvider2 mGalleryProvider;
     @Nullable
-    private ProviderListener mProviderListener;
+    private GalleryAdapter mGalleryAdapter;
 
     @Nullable
     private SystemUiHelper mSystemUiHelper;
@@ -269,9 +268,10 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
         setContentView(R.layout.activity_gallery);
         mGLRootView = (GLRootView) ViewUtils.$$(this, R.id.gl_root_view);
+        mGalleryAdapter = new GalleryAdapter(mGLRootView, mGalleryProvider);
         Resources resources = getResources();
         int primaryColor = ResourcesUtils.getAttrColor(this, R.attr.colorPrimary);
-        mGalleryView = new GalleryView.Builder(this, new SimpleAdapter(mGalleryProvider))
+        mGalleryView = new GalleryView.Builder(this, mGalleryAdapter)
                 .setListener(this)
                 .setLayoutMode(Settings.getReadingDirection())
                 .setScaleMode(Settings.getPageScaling())
@@ -294,10 +294,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                 .setEmptyString(resources.getString(R.string.error_empty))
                 .build();
 
-        mProviderListener = new ProviderListener(mGLRootView, mGalleryView, mGalleryProvider);
-
         mGLRootView.setContentPane(mGalleryView);
-        mGalleryProvider.setListener(mProviderListener);
+        mGalleryProvider.setListener(mGalleryAdapter);
         mGalleryProvider.setGLRoot(mGLRootView);
 
         // System UI helper
@@ -370,9 +368,9 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         super.onDestroy();
         mGLRootView = null;
         mGalleryView = null;
-        if (mProviderListener != null) {
-            mProviderListener.clearUploader();
-            mProviderListener = null;
+        if (mGalleryAdapter != null) {
+            mGalleryAdapter.clearUploader();
+            mGalleryAdapter = null;
         }
         if (mGalleryProvider != null) {
             mGalleryProvider.setListener(null);
@@ -977,11 +975,10 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
     }
 
-    private class ProviderListener extends SimpleProviderListener {
+    private class GalleryAdapter extends SimpleAdapter {
 
-        public ProviderListener(@NonNull GLRootView glRootView,
-                @NonNull GalleryView galleryView, @NonNull GalleryProvider provider) {
-            super(glRootView, galleryView, provider);
+        public GalleryAdapter(@NonNull GLRootView glRootView, @NonNull GalleryProvider provider) {
+            super(glRootView, provider);
         }
 
         @Override