X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/97b36b23359f29ee77e91c48ee79f11edb91c5c9..7f7af85f124517c674b52f09f100e90a58eb148b:/src/com/owncloud/android/ui/preview/FileDownloadFragment.java diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index 849afaf2..99a4d444 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -1,6 +1,8 @@ -/* ownCloud Android client application - * - * Copyright (C) 2012-2013 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 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, @@ -23,7 +25,6 @@ import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.ui.fragment.FileFragment; -import com.owncloud.android.utils.Log_OC; import android.accounts.Account; import android.os.Bundle; @@ -33,16 +34,16 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ImageButton; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.utils.Log_OC; /** * This Fragment is used to monitor the progress of a file downloading. - * - * @author David A. Velasco */ public class FileDownloadFragment extends FileFragment implements OnClickListener { @@ -126,6 +127,13 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene ((ImageButton)mView.findViewById(R.id.cancelBtn)).setOnClickListener(this); + ((LinearLayout)mView.findViewById(R.id.fileDownloadLL)).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ((PreviewImageActivity) getActivity()).toggleFullScreen(); + } + }); + if (mError) { setButtonsForRemote(); } else { @@ -164,8 +172,8 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene @Override public void onStop() { - super.onStop(); leaveTransferProgress(); + super.onStop(); } @Override @@ -203,10 +211,11 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene * @param transferring When true, the view must be updated assuming that the holded file is * downloading, no matter what the downloaderBinder says. */ + /* public void updateView(boolean transferring) { // configure UI for depending upon local state of the file - FileDownloaderBinder downloaderBinder = (mContainerActivity == null) ? null : mContainerActivity.getFileDownloaderBinder(); - if (transferring || (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, getFile()))) { + // TODO remove + if (transferring || getFile().isDownloading()) { setButtonsForTransferring(); } else if (getFile().isDown()) { @@ -219,7 +228,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene getView().invalidate(); } - + */ /** * Enables or disables buttons for a file being downloaded @@ -299,9 +308,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene /** - * Helper class responsible for updating the progress bar shown for file uploading or downloading - * - * @author David A. Velasco + * Helper class responsible for updating the progress bar shown for file uploading or downloading */ private class ProgressListener implements OnDatatransferProgressListener { int mLastPercent = 0;