From 63c573b28b3b68007a3f658645571aa97d2e28c1 Mon Sep 17 00:00:00 2001
From: Henrik Tunedal <tunedal@gmail.com>
Date: Wed, 30 Mar 2011 01:39:36 +0200
Subject: [PATCH] Add landscape layout for AppDetails

---
 res/layout-land/appdetails.xml        | 77 +++++++++++++++++++++++++++
 res/layout/apklistitem.xml            | 22 ++++----
 src/org/fdroid/fdroid/AppDetails.java |  1 +
 3 files changed, 91 insertions(+), 9 deletions(-)
 create mode 100644 res/layout-land/appdetails.xml

diff --git a/res/layout-land/appdetails.xml b/res/layout-land/appdetails.xml
new file mode 100644
index 000000000..5c57ae87b
--- /dev/null
+++ b/res/layout-land/appdetails.xml
@@ -0,0 +1,77 @@
+<?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="horizontal">
+
+  <LinearLayout android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_weight="0.5"
+                android:layout_margin="5dp"
+                android:orientation="vertical">
+
+    <RelativeLayout android:id="@+id/header"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:orientation="horizontal">
+
+      <TextView android:id="@+id/title"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:singleLine="false"
+                android:layout_marginBottom="4dp"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true" />
+
+      <ImageView android:id="@+id/icon"
+                 android:scaleType="fitCenter"
+                 android:layout_marginRight="5dp"
+                 android:layout_height="42dp"
+                 android:layout_width="42dp"
+                 android:layout_below="@id/title" />
+
+      <TextView android:id="@+id/license"
+                android:textSize="12sp"
+                android:layout_below="@id/title"
+                android:layout_toRightOf="@id/icon"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+      <TextView android:id="@+id/status"
+                android:textSize="12sp"
+                android:layout_below="@id/license"
+                android:layout_toRightOf="@id/icon"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent" />
+
+    </RelativeLayout>
+
+    <TextView android:id="@+id/signature"
+              android:textSize="12sp"
+              android:visibility="gone"
+              android:layout_marginBottom="4dp"
+              android:layout_height="wrap_content"
+              android:layout_width="fill_parent" />
+
+    <ScrollView
+        android:id="@+id/desc_scrollview"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+      <TextView android:id="@+id/description"
+                android:singleLine="false"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+
+    </ScrollView>
+
+  </LinearLayout>
+
+  <ListView android:id="@android:id/list"
+            android:layout_width="0dp"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.5" />
+
+</LinearLayout>
diff --git a/res/layout/apklistitem.xml b/res/layout/apklistitem.xml
index b95e8587f..29348f092 100644
--- a/res/layout/apklistitem.xml
+++ b/res/layout/apklistitem.xml
@@ -16,19 +16,13 @@
 
   <TextView android:id="@+id/version"
 	    android:textStyle="bold"
-	    android:singleLine="true"
-	    android:ellipsize="marquee"
+	    android:maxLines="2"
+	    android:ellipsize="end"
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
+	    android:layout_toLeftOf="@id/buildtype"
 	    android:textSize="18sp" />
 
-  <TextView android:id="@+id/status"
-	    android:textSize="12sp"
-	    android:layout_below="@id/version"
-	    android:layout_alignParentRight="false"
-	    android:layout_height="wrap_content"
-	    android:layout_width="wrap_content" />
-
   <TextView android:id="@+id/size"
 	    android:textSize="12sp"
 	    android:layout_below="@id/version"
@@ -36,4 +30,14 @@
 	    android:layout_height="wrap_content"
 	    android:layout_width="wrap_content" />
 
+  <TextView android:id="@+id/status"
+	    android:textSize="12sp"
+	    android:maxLines="2"
+	    android:ellipsize="end"
+	    android:layout_below="@id/version"
+	    android:layout_toLeftOf="@id/size"
+	    android:layout_alignParentLeft="true"
+	    android:layout_height="wrap_content"
+	    android:layout_width="wrap_content" />
+
 </RelativeLayout>
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 824703fac..cb0c44f0c 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -327,6 +327,7 @@ public class AppDetails extends ListActivity {
         if (pref_expert && mInstalledSignature != null) {
             tv = (TextView) findViewById(R.id.signature);
             tv.setText("Signed: " + mInstalledSigID);
+            tv.setVisibility(View.VISIBLE);
         }
     }