Mario Danic 8 жил өмнө
parent
commit
de1328e380

+ 1 - 1
AndroidManifest.xml

@@ -99,7 +99,7 @@
         </activity>
         <activity
             android:name=".ui.preview.PreviewImageActivity"
-            android:theme="@style/Theme.ownCloud.Overlay" />
+            android:theme="@style/Theme.ownCloud" />
         <activity
             android:name=".ui.preview.PreviewVideoActivity"
             android:label="@string/app_name"

+ 5 - 4
res/layout/preview_image_fragment.xml

@@ -27,10 +27,11 @@
     android:gravity="center_horizontal"
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:context=".ui.fragment.PreviewImageFragment">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true">
 
 
     <third_parties.michaelOrtiz.TouchImageViewCustom

+ 1 - 6
src/com/owncloud/android/ui/preview/PreviewImageActivity.java

@@ -26,7 +26,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.view.ViewPager;
@@ -122,11 +121,7 @@ public class PreviewImageActivity extends FileActivity implements
                         }
                     }
                 });
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            getWindow().setStatusBarColor(getResources().getColor(R.color.owncloud_blue_dark_transparent));
-        }
-            
+         
         if (savedInstanceState != null) {
             mRequestWaitingForBinder = savedInstanceState.getBoolean(KEY_WAITING_FOR_BINDER);
             if (!savedInstanceState.getBoolean(KEY_SYSTEM_VISIBLE, true)) {

+ 6 - 1
src/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -24,6 +24,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -89,7 +90,6 @@ public class PreviewImageFragment extends FileFragment {
     protected ImageView mMultiListIcon;
     protected ProgressBar mMultiListProgress;
 
-
     public Bitmap mBitmap = null;
 
     private static final String TAG = PreviewImageFragment.class.getSimpleName();
@@ -566,11 +566,15 @@ public class PreviewImageFragment extends FileFragment {
             }
 
             mMultiView.setVisibility(View.GONE);
+            if (getResources() != null) {
+                mImageView.setBackgroundColor(getResources().getColor(R.color.black));
+            }
             mImageView.setVisibility(View.VISIBLE);
 
         }
 
         private void showErrorMessage() {
+            mImageView.setBackgroundColor(Color.TRANSPARENT);
             setMessageForMultiList(mErrorMessageId, R.string.preview_sorry, R.drawable.file_image);
         }
     }
@@ -593,6 +597,7 @@ public class PreviewImageFragment extends FileFragment {
 
             mMultiListIcon.setVisibility(View.VISIBLE);
             mMultiListProgress.setVisibility(View.GONE);
+
         }
     }