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

First step towards nicer empty/error views

Browse source
This commit is contained in:
Mario Danic 2017-01-23 12:18:25 +01:00 committed by AndyScherzinger
parent caccef129b
commit f95ffb4886
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 76 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
res/layout/preview_image_fragment.xml
View file

@ -27,41 +27,35 @@
android:gravity="center_horizontal"
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#000000"
android:animateLayoutChanges="true">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.fragment.PreviewImageFragment">
<ProgressBar
android:id="@+id/progressWheel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
android:indeterminateOnly="true"
android:layout_centerInParent="true"
/>
<third_parties.michaelOrtiz.TouchImageViewCustom
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/zero"
android:layout_centerInParent="true"
android:layout_margin="@dimen/zero"
android:contentDescription="@string/preview_image_description"
android:src="@drawable/image_fail"
/>
android:src="@drawable/image_fail"/>
<RelativeLayout
android:id="@+id/multi_view"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/empty_list"/>
</ScrollView>
</RelativeLayout>
<TextView
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/preview_image_fragment_display_text_margin"
android:text="@string/placeholder_sentence"
android:textColor="@color/owncloud_blue_bright"
/>
</RelativeLayout>

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

@ -31,6 +31,8 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
@ -41,7 +43,9 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.owncloud.android.R;
@ -78,8 +82,14 @@ public class PreviewImageFragment extends FileFragment {
private static final String ARG_IGNORE_FIRST = "IGNORE_FIRST";
private TouchImageViewCustom mImageView;
private TextView mMessageView;
private ProgressBar mProgressWheel;
private RelativeLayout mMultiView;
protected LinearLayout mMultiListContainer;
protected TextView mMultiListMessage;
protected TextView mMultiListHeadline;
protected ImageView mMultiListIcon;
protected ProgressBar mMultiListProgress;
public Bitmap mBitmap = null;
@ -169,14 +179,22 @@ public class PreviewImageFragment extends FileFragment {
}
});
mMessageView = (TextView)view.findViewById(R.id.message);
mMessageView.setVisibility(View.GONE);
mProgressWheel = (ProgressBar)view.findViewById(R.id.progressWheel);
mProgressWheel.setVisibility(View.VISIBLE);
mMultiView = (RelativeLayout) view.findViewById(R.id.multi_view);
setupMultiView(view);
setMultiListLoadingMessage();
return view;
}
protected void setupMultiView(View view) {
mMultiListContainer = (LinearLayout) view.findViewById(R.id.empty_list_view);
mMultiListMessage = (TextView) view.findViewById(R.id.empty_list_view_text);
mMultiListHeadline = (TextView) view.findViewById(R.id.empty_list_view_headline);
mMultiListIcon = (ImageView) view.findViewById(R.id.empty_list_icon);
mMultiListProgress = (ProgressBar) view.findViewById(R.id.empty_list_progress);
}
/**
* {@inheritDoc}
*/
@ -214,7 +232,7 @@ public class PreviewImageFragment extends FileFragment {
public void onStart() {
super.onStart();
if (getFile() != null) {
mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
mLoadBitmapTask = new LoadBitmapTask(mImageView);
//mLoadBitmapTask.execute(new String[]{getFile().getStoragePath()});
// mLoadBitmapTask.execute(getFile().getStoragePath());
mLoadBitmapTask.execute(getFile());
@ -381,29 +399,12 @@ public class PreviewImageFragment extends FileFragment {
/**
* Weak reference to the target {@link ImageView} where the bitmap will be loaded into.
*
* <p>
* Using a weak reference will avoid memory leaks if the target ImageView is retired from
* memory before the load finishes.
*/
private final WeakReference<ImageViewCustom> mImageViewRef;
/**
* Weak reference to the target {@link TextView} where error messages will be written.
*
* Using a weak reference will avoid memory leaks if the target ImageView is retired from
* memory before the load finishes.
*/
private final WeakReference<TextView> mMessageViewRef;
/**
* Weak reference to the target {@link ProgressBar} shown while the load is in progress.
*
* Using a weak reference will avoid memory leaks if the target ImageView is retired from
* memory before the load finishes.
*/
private final WeakReference<ProgressBar> mProgressWheelRef;
/**
* Error message to show when a load fails
@ -416,11 +417,8 @@ public class PreviewImageFragment extends FileFragment {
*
* @param imageView Target {@link ImageView} where the bitmap will be loaded into.
*/
public LoadBitmapTask(ImageViewCustom imageView, TextView messageView,
ProgressBar progressWheel) {
public LoadBitmapTask(ImageViewCustom imageView) {
mImageViewRef = new WeakReference<ImageViewCustom>(imageView);
mMessageViewRef = new WeakReference<TextView>(messageView);
mProgressWheelRef = new WeakReference<ProgressBar>(progressWheel);
}
@Override
@ -502,14 +500,12 @@ public class PreviewImageFragment extends FileFragment {
@Override
protected void onPostExecute(LoadImage result) {
hideProgressWheel();
if (result.bitmap != null) {
showLoadedImage(result);
}
else {
} else {
showErrorMessage();
}
if (result.bitmap != null && mBitmap != result.bitmap) {
if (result.bitmap != null && mBitmap != result.bitmap) {
// unused bitmap, release it! (just in case)
result.bitmap.recycle();
}
@ -546,36 +542,40 @@ public class PreviewImageFragment extends FileFragment {
}
imageView.setVisibility(View.VISIBLE);
mBitmap = bitmap; // needs to be kept for recycling when not useful
mBitmap = bitmap; // needs to be kept for recycling when not useful
}
final TextView messageView = mMessageViewRef.get();
if (messageView != null) {
messageView.setVisibility(View.GONE);
} // else , silently finish, the fragment was destroyed
mMultiView.setVisibility(View.GONE);
mImageView.setVisibility(View.VISIBLE);
}
private void showErrorMessage() {
final ImageView imageView = mImageViewRef.get();
if (imageView != null) {
// shows the default error icon
imageView.setVisibility(View.VISIBLE);
} // else , silently finish, the fragment was destroyed
final TextView messageView = mMessageViewRef.get();
if (messageView != null) {
messageView.setText(mErrorMessageId);
messageView.setVisibility(View.VISIBLE);
} // else , silently finish, the fragment was destroyed
}
private void hideProgressWheel() {
final ProgressBar progressWheel = mProgressWheelRef.get();
if (progressWheel != null) {
progressWheel.setVisibility(View.GONE);
if (getActivity() != null && (getActivity() instanceof PreviewImageActivity)) {
((PreviewImageActivity) getActivity()).toggleFullScreen();
}
setMessageForMultiList(mErrorMessageId, R.drawable.file_image);
}
}
private void setMultiListLoadingMessage() {
if (mMultiView != null) {
mMultiListHeadline.setText(R.string.file_list_loading);
mMultiListMessage.setText("");
mMultiListIcon.setVisibility(View.GONE);
mMultiListProgress.setVisibility(View.VISIBLE);
}
}
public void setMessageForMultiList(@StringRes int headline, @DrawableRes int icon) {
if (mMultiListContainer != null && mMultiListMessage != null) {
mMultiListHeadline.setText(headline);
mMultiListIcon.setImageResource(icon);
mMultiListIcon.setVisibility(View.VISIBLE);
mMultiListProgress.setVisibility(View.GONE);
}
}
/**