X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/435b31ba4f3597cc7a43270cd4a54fb0180956c1..6d6a5c3a20a75a3c3a11c275bcab3ffface6ad0e:/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java index 5dbb56eb..7d10ebac 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java @@ -17,22 +17,23 @@ */ package eu.alefzero.owncloud.ui.fragment; -import android.app.FragmentTransaction; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.net.Uri; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import android.widget.VideoView; import com.actionbarsherlock.app.SherlockFragment; @@ -52,34 +53,44 @@ public class FileDetailFragment extends SherlockFragment implements public static final String FILE = "FILE"; + private DownloadFinishReceiver mDownloadFinishReceiver; private Intent mIntent; + private int mLayout; private View mView; - private DownloadFinishReceiver mDownloadFinishReceiver; private OCFile mFile; - - private int mLayout; - private boolean mEmptyLayout; + private static final String TAG = "FileDetailFragment"; /** - * Default constructor. When inflated by android -> display empty layout + * Default constructor - contains real layout */ - public FileDetailFragment() { - mLayout = R.layout.file_details_empty; - mEmptyLayout = true; + public FileDetailFragment(){ + mLayout = R.layout.file_details_fragment; } - + /** - * Custom construtor. Use with a {@link FragmentTransaction}. The intent has - * to contain {@link FileDetailFragment#FILE} with an OCFile and also - * {@link FileDownloader#EXTRA_ACCOUNT} with the account. + * Creates a dummy layout. For use if the user never has + * tapped on a file before * - * @param nonEmptyFragment - * True, to enable file detail rendering + * @param useEmptyView If true, use empty layout */ - public FileDetailFragment(Intent intent) { + public FileDetailFragment(boolean useEmptyView){ + if(useEmptyView){ + mLayout = R.layout.file_details_empty; + } else { + mLayout = R.layout.file_details_fragment; + } + } + + /** + * Use this when creating the fragment and display + * a file at the same time + * + * @param showDetailsIntent The Intent with the required parameters + * @see FileDetailFragment#updateFileDetails(Intent) + */ + public FileDetailFragment(Intent showDetailsIntent) { + mIntent = showDetailsIntent; mLayout = R.layout.file_details_fragment; - mIntent = intent; - mEmptyLayout = false; } @Override @@ -101,9 +112,8 @@ public class FileDetailFragment extends SherlockFragment implements /** * Use this method to signal this Activity that it shall update its view. * - * @param intent - * The {@link Intent} that contains extra information about this - * file The intent needs to have these extras: + * @param intent The {@link Intent} that contains extra information about + * this file The intent needs to have these extras: *

* * {@link FileDetailFragment#FILE}: An {@link OCFile} @@ -117,6 +127,7 @@ public class FileDetailFragment extends SherlockFragment implements private void updateFileDetails() { mFile = mIntent.getParcelableExtra(FILE); + Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn); if (mFile != null) { // set file details @@ -124,85 +135,74 @@ public class FileDetailFragment extends SherlockFragment implements setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile .getMimetype())); setFilesize(mFile.getFileLength()); - - // set file preview if available and possible - VideoView videoView = (VideoView) mView - .findViewById(R.id.videoView1); - videoView.setVisibility(View.INVISIBLE); - if (mFile.getPath() == null) { - ImageView imageView = (ImageView) getView().findViewById( - R.id.imageView2); - imageView.setImageResource(R.drawable.download); - imageView.setOnClickListener(this); - } else { - if (mFile.getMimetype().startsWith("image/")) { - ImageView imageView = (ImageView) mView - .findViewById(R.id.imageView2); - Bitmap bmp = BitmapFactory.decodeFile(mFile.getPath()); - imageView.setImageBitmap(bmp); - } else if (mFile.getMimetype().startsWith("video/")) { - videoView.setVisibility(View.VISIBLE); - videoView.setVideoPath(mFile.getPath()); - videoView.start(); + // Update preview + if (mFile.getStoragePath() != null) { + try { + if (mFile.getMimetype().startsWith("image/")) { + ImageView preview = (ImageView) getView().findViewById( + R.id.fdPreview); + Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath()); + preview.setImageBitmap(bmp); + } + } catch (OutOfMemoryError e) { + Log.e(TAG, "Out of memory occured for file with size " + mFile.getFileLength()); } + downloadButton.setText("Open file"); + downloadButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mFile.getMimetype()); + startActivity(i); + } + }); + } else { + // Make download button effective + downloadButton.setOnClickListener(this); } } } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = null; - - view = inflater.inflate(mLayout, container, false); - mIntent = getActivity().getIntent(); - mView = view; - - // make sure we are not using the empty layout - if (mEmptyLayout == false) { - updateFileDetails(); - } - - return view; - } - - @Override - public View getView() { - return mView == null ? super.getView() : mView; - }; - + private void setFilename(String filename) { - TextView tv = (TextView) getView().findViewById(R.id.textView1); + TextView tv = (TextView) getView().findViewById(R.id.fdFilename); if (tv != null) tv.setText(filename); } private void setFiletype(String mimetype) { - TextView tv = (TextView) getView().findViewById(R.id.textView2); + TextView tv = (TextView) getView().findViewById(R.id.fdType); if (tv != null) tv.setText(mimetype); } private void setFilesize(long filesize) { - TextView tv = (TextView) getView().findViewById(R.id.textView3); + TextView tv = (TextView) getView().findViewById(R.id.fdSize); if (tv != null) tv.setText(DisplayUtils.bitsToHumanReadable(filesize)); } - /** - * Use this to check if the correct layout is loaded. When android - * instanciates this class using the default constructor, the layout will be - * empty. - * - * Once a user touches a file for the first time, you must instanciate a new - * Fragment with the new FileDetailFragment(true) to inflate the actual - * details - * - * @return If the layout is empty, this method will return true, otherwise - * false - */ - public boolean isEmptyLayout() { - return mEmptyLayout; + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = null; + view = inflater.inflate(mLayout, container, false); + mView = view; + if(mLayout == R.layout.file_details_fragment){ + // Phones will launch an activity with this intent + if(mIntent == null){ + mIntent = getActivity().getIntent(); + } + updateFileDetails(); + } + + return view; + } + + + + @Override + public View getView() { + return super.getView() == null ? mView : super.getView(); } @Override @@ -211,8 +211,7 @@ public class FileDetailFragment extends SherlockFragment implements Intent i = new Intent(getActivity(), FileDownloader.class); i.putExtra(FileDownloader.EXTRA_ACCOUNT, mIntent.getParcelableExtra(FileDownloader.EXTRA_ACCOUNT)); - i.putExtra(FileDownloader.EXTRA_FILE_PATH, - mIntent.getStringExtra(FileDownloader.EXTRA_FILE_PATH)); + i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getPath()); getActivity().startService(i); }