From: Lennart Rosam <lennart@familie-rosam.de>
Date: Sat, 7 Apr 2012 00:52:50 +0000 (+0200)
Subject: FileDetail fragement is now showing a text hint if there is no file
X-Git-Tag: oc-android-1.4.3~474
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/320e446748f2e302e2542098a06e16242ae6f580

FileDetail fragement is now showing a text hint if there is no file
selected.
---

diff --git a/res/layout/file_details.xml b/res/layout/file_details.xml
index b84b6bba..e02ed7cd 100644
--- a/res/layout/file_details.xml
+++ b/res/layout/file_details.xml
@@ -1,46 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical" android:background="#F7F7F7">
-	<LinearLayout android:layout_width="fill_parent"
-		android:id="@+id/linearLayout1" android:layout_height="wrap_content">
-		<LinearLayout android:layout_width="wrap_content"
-			android:id="@+id/linearLayout2" android:layout_height="fill_parent">
-			<ImageView android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:src="@drawable/icon"
-				android:id="@+id/imageView1"></ImageView>
-		</LinearLayout>
-		<LinearLayout android:layout_width="wrap_content"
-			android:id="@+id/linearLayout3" android:layout_height="fill_parent"
-			android:orientation="vertical">
-			<TextView android:id="@+id/textView1" android:layout_height="wrap_content"
-				android:layout_width="wrap_content" android:text="TextView"></TextView>
-			<TextView android:id="@+id/textView2" android:layout_height="wrap_content"
-				android:layout_width="wrap_content" android:text="TextView"></TextView>
-			<TextView android:id="@+id/textView3" android:layout_height="wrap_content"
-				android:layout_width="wrap_content" android:text="TextView"></TextView>
-			<TextView android:id="@+id/textView4" android:layout_height="wrap_content"
-				android:layout_width="wrap_content" android:text="TextView"></TextView>
-			<TextView android:id="@+id/textView5" android:layout_height="wrap_content"
-				android:layout_width="wrap_content" android:text="TextView"></TextView>
-		</LinearLayout>
-	</LinearLayout>
-	<LinearLayout android:layout_width="fill_parent"
-		android:id="@+id/linearLayout4" android:layout_height="fill_parent">
-
-		<ImageView
-		    android:id="@+id/imageView2"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/action_item_btn" />
-
-		<VideoView
-		    android:id="@+id/videoView1"
-		    android:layout_width="wrap_content"
-		    android:layout_height="match_parent" />
-
-		<ListView android:layout_width="fill_parent" android:id="@android:id/list"
-			android:layout_height="fill_parent" android:divider="@drawable/uploader_list_separator"
-			android:dividerHeight="1dip"></ListView>
-	</LinearLayout>
-</LinearLayout>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#F7F7F7"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent" >
+
+            <ImageView
+                android:id="@+id/imageView1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon" >
+            </ImageView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linearLayout3"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/textView1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="TextView" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="TextView" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="TextView" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="TextView" >
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="TextView" >
+            </TextView>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout4"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/action_item_btn" />
+
+        <VideoView
+            android:id="@+id/videoView1"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent" />
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:divider="@drawable/uploader_list_separator"
+            android:dividerHeight="1dip" >
+        </ListView>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/file_details_empty.xml b/res/layout/file_details_empty.xml
new file mode 100644
index 00000000..1cd82fca
--- /dev/null
+++ b/res/layout/file_details_empty.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#F7F7F7"
+    android:orientation="vertical" >
+
+    <TextView 
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical|center_horizontal"
+        android:text="@string/filedetails_select_file"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47daf45f..fc3fb856 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,6 +43,7 @@
     <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="uploader_btn_create_dir_text">Create dir for upload</string>
+    <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="common_ok">OK</string>
     <string name="common_cancel">Cancel</string>
     <string name="uploader_info_dirname">Directory name</string>
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
index 4786bef9..1f7368eb 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
@@ -101,11 +101,14 @@ public class FileDetail extends Fragment implements OnClickListener {
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container,
       Bundle savedInstanceState) {
-    View v = inflater.inflate(R.layout.file_details, container, false);
+    View v = null;
     
-    if (getActivity().getIntent() != null) {
-      mIntent = getActivity().getIntent();
-      setStuff(v);
+    if (getActivity().getIntent() != null && getActivity().getIntent().getStringExtra("FILE_ID") != null) {
+    	v = inflater.inflate(R.layout.file_details, container, false);
+    	mIntent = getActivity().getIntent();
+    	setStuff(v);
+    } else {
+    	v = inflater.inflate(R.layout.file_details_empty, container, false);
     }
     return v;
   }