mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 16:02:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix UI bugs

Browse source
This commit is contained in:
Mario Danic 2017-01-30 15:22:42 +01:00 committed by AndyScherzinger
parent 1f15ddf707
commit de1328e380
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -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"

9
res/layout/preview_image_fragment.xml
View file

@ -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

7
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
View file

@ -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)) {

7
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -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);
}
}