X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6cb184ab6377431383d7a6b30da30c3c4b02d8d7..a6afe6efd24d35d02dc9720432a2daa47b58ffdd:/src/com/owncloud/android/ui/preview/PreviewImageFragment.java diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index aa2a6b36..25eaf38a 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -1,5 +1,5 @@ /* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2012-2014 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -18,7 +18,6 @@ package com.owncloud.android.ui.preview; import java.lang.ref.WeakReference; - import android.accounts.Account; import android.annotation.SuppressLint; import android.app.Activity; @@ -32,7 +31,7 @@ import android.support.v4.app.FragmentStatePagerAdapter; import android.view.Display; import android.view.LayoutInflater; import android.view.View; -import android.view.View.OnTouchListener; +import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ProgressBar; @@ -41,12 +40,12 @@ import android.widget.TextView; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import com.ortiz.touch.TouchImageView; import com.owncloud.android.R; -import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.FileMenuFilter; -import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.dialog.ConfirmationDialogFragment; +import com.owncloud.android.ui.dialog.RemoveFileDialogFragment; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.utils.Log_OC; @@ -60,14 +59,13 @@ import com.owncloud.android.utils.Log_OC; * * @author David A. Velasco */ -public class PreviewImageFragment extends FileFragment implements -ConfirmationDialogFragment.ConfirmationDialogFragmentListener { +public class PreviewImageFragment extends FileFragment { public static final String EXTRA_FILE = "FILE"; public static final String EXTRA_ACCOUNT = "ACCOUNT"; private View mView; private Account mAccount; - private ImageView mImageView; + private TouchImageView mImageView; private TextView mMessageView; private ProgressBar mProgressWheel; @@ -126,53 +124,33 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); mView = inflater.inflate(R.layout.preview_image_fragment, container, false); - mImageView = (ImageView)mView.findViewById(R.id.image); + mImageView = (TouchImageView) mView.findViewById(R.id.image); mImageView.setVisibility(View.GONE); - mView.setOnTouchListener((OnTouchListener)getActivity()); + mImageView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ((PreviewImageActivity) getActivity()).toggleFullScreen(); + } + + }); mMessageView = (TextView)mView.findViewById(R.id.message); mMessageView.setVisibility(View.GONE); mProgressWheel = (ProgressBar)mView.findViewById(R.id.progressWheel); mProgressWheel.setVisibility(View.VISIBLE); return mView; } - /** * {@inheritDoc} */ @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (!(activity instanceof OnTouchListener)) { - throw new ClassCastException(activity.toString() + - " must implement " + OnTouchListener.class.getSimpleName()); - } - } - - - /** - * {@inheritDoc} - */ - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); if (savedInstanceState != null) { if (!mIgnoreFirstSavedState) { OCFile file = (OCFile)savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_FILE); + setFile(file); mAccount = savedInstanceState.getParcelable(PreviewImageFragment.EXTRA_ACCOUNT); - - // Update the file - if (mAccount!= null) { - OCFile updatedFile = ((FileActivity) getSherlockActivity()). - getStorageManager().getFileByPath(file.getRemotePath()); - if (updatedFile != null) { - setFile(updatedFile); - } else { - setFile(file); - } - } else { - setFile(file); - } } else { mIgnoreFirstSavedState = false; } @@ -226,13 +204,18 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { public void onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - FileMenuFilter mf = new FileMenuFilter( - getFile(), - mContainerActivity.getStorageManager().getAccount(), - mContainerActivity, - getSherlockActivity() - ); - mf.filter(menu); + if (mContainerActivity.getStorageManager() != null) { + // Update the file + setFile(mContainerActivity.getStorageManager().getFileById(getFile().getFileId())); + + FileMenuFilter mf = new FileMenuFilter( + getFile(), + mContainerActivity.getStorageManager().getAccount(), + mContainerActivity, + getSherlockActivity() + ); + mf.filter(menu); + } // additional restriction for this fragment // TODO allow renaming in PreviewImageFragment @@ -241,6 +224,15 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { item.setVisible(false); item.setEnabled(false); } + + // additional restriction for this fragment + // TODO allow refresh file in PreviewImageFragment + item = menu.findItem(R.id.action_sync_file); + if (item != null) { + item.setVisible(false); + item.setEnabled(false); + } + } @@ -264,7 +256,8 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { return true; } case R.id.action_remove_file: { - removeFile(); + RemoveFileDialogFragment dialog = RemoveFileDialogFragment.newInstance(getFile()); + dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION); return true; } case R.id.action_see_details: { @@ -302,13 +295,12 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { super.onPause(); } - @Override public void onDestroy() { - super.onDestroy(); if (mBitmap != null) { mBitmap.recycle(); } + super.onDestroy(); } @@ -321,56 +313,6 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { } - /** - * Starts a the removal of the previewed file. - * - * Shows a confirmation dialog. The action continues in {@link #onConfirmation(String)} , {@link #onNeutral(String)} or {@link #onCancel(String)}, - * depending upon the user selection in the dialog. - */ - private void removeFile() { - ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance( - R.string.confirmation_remove_alert, - new String[]{getFile().getFileName()}, - R.string.confirmation_remove_remote_and_local, - R.string.confirmation_remove_local, - R.string.common_cancel); - confDialog.setOnConfirmationListener(this); - confDialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION); - } - - - /** - * Performs the removal of the previewed file, both locally and in the server. - */ - @Override - public void onConfirmation(String callerTag) { - FileDataStorageManager storageManager = mContainerActivity.getStorageManager(); - if (storageManager.getFileById(getFile().getFileId()) != null) { // check that the file is still there; - mContainerActivity.getFileOperationsHelper().removeFile(getFile(), false); - } - } - - - /** - * Removes the file from local storage - */ - @Override - public void onNeutral(String callerTag) { - OCFile file = getFile(); - mContainerActivity.getFileOperationsHelper().removeFile(file, true); - //mContainerActivity.getStorageManager().removeFile(file, false, true); // TODO perform in background task / new thread - //finish(); - } - - /** - * User cancelled the removal action. - */ - @Override - public void onCancel(String callerTag) { - // nothing to do here - } - - private class BitmapLoader extends AsyncTask { /** @@ -562,5 +504,8 @@ ConfirmationDialogFragment.ConfirmationDialogFragmentListener { container.finish(); } + public TouchImageView getImageView() { + return mImageView; + } }