Intermediate commit: Work on new FileDetailFragment layout, simplified

[pub/Android/ownCloud.git] / 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 3e3082c..e4b33f1 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -29,10 +29,10 @@ import android.view.LayoutInflater;
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.view.ViewGroup;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.view.ViewGroup;\r

+import android.widget.Button;\r

 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r

-import android.widget.VideoView;\r

 \r
 import com.actionbarsherlock.app.SherlockFragment;\r
 \r
 \r
 import com.actionbarsherlock.app.SherlockFragment;\r
 \r


@@ -53,7 +53,7 @@ public class FileDetailFragment extends SherlockFragment implements
     public static final String FILE = "FILE";\r
 \r
     private Intent mIntent;\r
     public static final String FILE = "FILE";\r
 \r
     private Intent mIntent;\r

-    private View mView;\r
+    //private View mView;\r

     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private OCFile mFile;\r
 \r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private OCFile mFile;\r
 \r


@@ -73,7 +73,7 @@ public class FileDetailFragment extends SherlockFragment implements
      * to contain {@link FileDetailFragment#FILE} with an OCFile and also\r
      * {@link FileDownloader#EXTRA_ACCOUNT} with the account.\r
      * \r
      * to contain {@link FileDetailFragment#FILE} with an OCFile and also\r
      * {@link FileDownloader#EXTRA_ACCOUNT} with the account.\r
      * \r

-     * @param nonEmptyFragment True, to enable file detail rendering\r
+     * @param intent Intent with an account and a file in it for rendering\r

      */\r
     public FileDetailFragment(Intent intent) {\r
         mLayout = R.layout.file_details_fragment;\r
      */\r
     public FileDetailFragment(Intent intent) {\r
         mLayout = R.layout.file_details_fragment;\r


@@ -122,28 +122,20 @@ public class FileDetailFragment extends SherlockFragment implements
             setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile\r
                     .getMimetype()));\r
             setFilesize(mFile.getFileLength());\r
             setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mFile\r
                     .getMimetype()));\r
             setFilesize(mFile.getFileLength());\r

-\r
-            // set file preview if available and possible\r
-            VideoView videoView = (VideoView) mView\r
-                    .findViewById(R.id.videoView1);\r
-            videoView.setVisibility(View.INVISIBLE);\r
-            if (mFile.getStoragePath() == null) {\r
-                ImageView imageView = (ImageView) getView().findViewById(\r
-                        R.id.imageView2);\r
-                imageView.setImageResource(R.drawable.download);\r
-                imageView.setOnClickListener(this);\r
-            } else {\r
+            \r
+            // Update preview\r
+            if (mFile.getStoragePath() != null) {\r

                 if (mFile.getMimetype().startsWith("image/")) {\r
                 if (mFile.getMimetype().startsWith("image/")) {\r

-                    ImageView imageView = (ImageView) mView\r
-                            .findViewById(R.id.imageView2);\r
+                    ImageView preview = (ImageView) getView().findViewById(\r
+                            R.id.fdPreview);\r

                     Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());\r
                     Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());\r

-                    imageView.setImageBitmap(bmp);\r
-                } else if (mFile.getMimetype().startsWith("video/")) {\r
-                    videoView.setVisibility(View.VISIBLE);\r
-                    videoView.setVideoPath(mFile.getStoragePath());\r
-                    videoView.start();\r
+                    preview.setImageBitmap(bmp);\r

                 }\r
             }\r
                 }\r
             }\r

+            \r
+            // Make download button effective\r
+            Button downloadButton = (Button) getView().findViewById(R.id.fdDownloadBtn);\r
+            downloadButton.setOnClickListener(this);\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -151,38 +143,40 @@ public class FileDetailFragment extends SherlockFragment implements
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
             Bundle savedInstanceState) {\r
         View view = null;\r
     public View onCreateView(LayoutInflater inflater, ViewGroup container,\r
             Bundle savedInstanceState) {\r
         View view = null;\r

-\r

         view = inflater.inflate(mLayout, container, false);\r
         view = inflater.inflate(mLayout, container, false);\r

-        mIntent = getActivity().getIntent();\r
-        mView = view;\r
-\r
-        // make sure we are not using the empty layout\r
-        if (mEmptyLayout == false) {\r
-            updateFileDetails();\r
-        }\r
-\r

         return view;\r
     }\r
 \r
     @Override\r
         return view;\r
     }\r
 \r
     @Override\r

-    public View getView() {\r
-        return mView == null ? super.getView() : mView;\r
-    };\r
+    public void onStart() {\r
+        super.onStart();\r
+        \r
+        // Fill in required information about file displaying\r
+        if(mIntent == null){\r
+            mIntent = getActivity().getIntent();\r
+        }\r
+        \r
+        // Fill in the details if the layout is not empty\r
+        if(!mEmptyLayout){\r
+            updateFileDetails();\r
+        }\r
+        \r
+    }\r

 \r
     private void setFilename(String filename) {\r
 \r
     private void setFilename(String filename) {\r

-        TextView tv = (TextView) getView().findViewById(R.id.textView1);\r
+        TextView tv = (TextView) getView().findViewById(R.id.fdFilename);\r

         if (tv != null)\r
             tv.setText(filename);\r
     }\r
 \r
     private void setFiletype(String mimetype) {\r
         if (tv != null)\r
             tv.setText(filename);\r
     }\r
 \r
     private void setFiletype(String mimetype) {\r

-        TextView tv = (TextView) getView().findViewById(R.id.textView2);\r
+        TextView tv = (TextView) getView().findViewById(R.id.fdType);\r

         if (tv != null)\r
             tv.setText(mimetype);\r
     }\r
 \r
     private void setFilesize(long filesize) {\r
         if (tv != null)\r
             tv.setText(mimetype);\r
     }\r
 \r
     private void setFilesize(long filesize) {\r

-        TextView tv = (TextView) getView().findViewById(R.id.textView3);\r
+        TextView tv = (TextView) getView().findViewById(R.id.fdSize);\r

         if (tv != null)\r
             tv.setText(DisplayUtils.bitsToHumanReadable(filesize));\r
     }\r
         if (tv != null)\r
             tv.setText(DisplayUtils.bitsToHumanReadable(filesize));\r
     }\r


@@ -209,8 +203,7 @@ public class FileDetailFragment extends SherlockFragment implements
         Intent i = new Intent(getActivity(), FileDownloader.class);\r
         i.putExtra(FileDownloader.EXTRA_ACCOUNT,\r
                 mIntent.getParcelableExtra(FileDownloader.EXTRA_ACCOUNT));\r
         Intent i = new Intent(getActivity(), FileDownloader.class);\r
         i.putExtra(FileDownloader.EXTRA_ACCOUNT,\r
                 mIntent.getParcelableExtra(FileDownloader.EXTRA_ACCOUNT));\r

-        i.putExtra(FileDownloader.EXTRA_FILE_PATH,\r
-                mIntent.getStringExtra(FileDownloader.EXTRA_FILE_PATH));\r
+        i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getPath());\r

         getActivity().startService(i);\r
     }\r
 \r
         getActivity().startService(i);\r
     }\r
 \r