bug fix

Airforce-1 · Jul 28, 2018 · c42e733 · c42e733
1 parent 62ee714
commit c42e733
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java b/matisse/src/main/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
@@ -246,7 +246,7 @@ private void updateApplyButton() {
             mOriginalLayout.setVisibility(View.VISIBLE);
             updateOriginalState();
         } else {
-            mOriginalLayout.setVisibility(View.INVISIBLE);
+            mOriginalLayout.setVisibility(View.GONE);
         }
     }
 
@@ -295,6 +295,12 @@ protected void updateSize(Item item) {
         } else {
             mSize.setVisibility(View.GONE);
         }
+
+        if (item.isVideo()) {
+            mOriginalLayout.setVisibility(View.GONE);
+        } else if (mSpec.originalable) {
+            mOriginalLayout.setVisibility(View.VISIBLE);
+        }
     }
 
     protected void sendBackResult(boolean apply) {

diff --git a/matisse/src/main/res/layout/activity_media_preview.xml b/matisse/src/main/res/layout/activity_media_preview.xml
@@ -56,7 +56,7 @@
             <LinearLayout
                 android:padding="16dp"
                 android:id="@+id/originalLayout"
-                android:visibility="visible"
+                android:visibility="gone"
                 android:orientation="horizontal"
                 android:layout_gravity="center"
                 android:layout_width="wrap_content"

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -39,6 +39,8 @@ ext.supportLibVersion = '27.1.1'
 
 dependencies {
     implementation project(':matisse')
+
+//    implementation 'com.zhihu.android:matisse:0.5.1-beta1'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "com.android.support:appcompat-v7:${supportLibVersion}"

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -22,7 +22,9 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
-        <activity android:name="com.zhihu.matisse.sample.SampleActivity">
+        <activity
+            android:name="com.zhihu.matisse.sample.SampleActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

diff --git a/sample/src/main/java/com/zhihu/matisse/sample/SampleActivity.java b/sample/src/main/java/com/zhihu/matisse/sample/SampleActivity.java
@@ -34,7 +34,6 @@
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.engine.impl.GlideEngine;
 import com.zhihu.matisse.engine.impl.PicassoEngine;
 import com.zhihu.matisse.filter.Filter;
 import com.zhihu.matisse.internal.entity.CaptureStrategy;
@@ -91,10 +90,8 @@ public void onNext(Boolean aBoolean) {
                                                     getResources().getDimensionPixelSize(R.dimen.grid_expected_size))
                                             .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
                                             .thumbnailScale(0.85f)
-                                            // for glide-V3
-//                                            .imageEngine(new GlideEngine())
-                                            // for glide-V4
-                                            .imageEngine(new Glide4Engine())
+//                                            .imageEngine(new GlideEngine())  // for glide-V3
+                                            .imageEngine(new Glide4Engine())    // for glide-V4
                                             .setOnSelectedListener(new OnSelectedListener() {
                                                 @Override
                                                 public void onSelected(