From 0c259673d8a38844a9a9775051e887fb396f63bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 8 Jul 2013 14:26:07 +0200
Subject: [PATCH] non-compact stuff is now hidden by default via xml

Also, forgot to add the backwards compatibility for END_OF
---
 res/layout/applistitem.xml                      |  2 ++
 src/org/fdroid/fdroid/views/AppListAdapter.java | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 5cb2d308c..0165ad12f 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -28,11 +28,13 @@
       <ImageView android:id="@+id/icon_status_has_updates"
           android:layout_width="18dp"
           android:layout_height="18dp"
+          android:visibility="gone"
           android:gravity="end" />
 
       <ImageView android:id="@+id/icon_status_installed"
           android:layout_width="18dp"
           android:layout_height="18dp"
+          android:visibility="gone"
           android:gravity="end" />
 
   </LinearLayout>
diff --git a/src/org/fdroid/fdroid/views/AppListAdapter.java b/src/org/fdroid/fdroid/views/AppListAdapter.java
index 09167b892..8d7d25971 100644
--- a/src/org/fdroid/fdroid/views/AppListAdapter.java
+++ b/src/org/fdroid/fdroid/views/AppListAdapter.java
@@ -62,9 +62,6 @@ abstract public class AppListAdapter extends BaseAdapter {
             init = true;
         }
 
-        ImageView iconUpdates   = (ImageView) convertView.findViewById(R.id.icon_status_has_updates);
-        ImageView iconInstalled = (ImageView) convertView.findViewById(R.id.icon_status_installed);
-
         TextView name = (TextView) convertView.findViewById(R.id.name);
         TextView summary = (TextView) convertView.findViewById(R.id.summary);
         TextView status = (TextView) convertView.findViewById(R.id.status);
@@ -87,17 +84,19 @@ abstract public class AppListAdapter extends BaseAdapter {
             icon.setImageResource(android.R.drawable.sym_def_app_icon);
         }
 
-        iconUpdates.setVisibility(View.GONE);
-        iconInstalled.setVisibility(View.GONE);
-
         if (init) {
-            iconInstalled.setImageResource(R.drawable.ic_cab_done_holo_dark);
-            iconUpdates.setImageResource(R.drawable.ic_menu_refresh);
             SharedPreferences prefs = PreferenceManager
                     .getDefaultSharedPreferences(mContext);
             pref_compactlayout = prefs.getBoolean("compactlayout", false);
 
             if (pref_compactlayout == true) {
+
+                ImageView iconInstalled = (ImageView) convertView.findViewById(R.id.icon_status_installed);
+                ImageView iconUpdates   = (ImageView) convertView.findViewById(R.id.icon_status_has_updates);
+
+                iconInstalled.setImageResource(R.drawable.ic_cab_done_holo_dark);
+                iconUpdates.setImageResource(R.drawable.ic_menu_refresh);
+
                 status.setVisibility(View.GONE);
                 license.setVisibility(View.GONE);
 
@@ -106,6 +105,7 @@ abstract public class AppListAdapter extends BaseAdapter {
                         RelativeLayout.LayoutParams.WRAP_CONTENT,
                         RelativeLayout.LayoutParams.WRAP_CONTENT);
                 summaryLayout.addRule(RelativeLayout.BELOW, R.id.name);
+                summaryLayout.addRule(RelativeLayout.RIGHT_OF, R.id.icon);
                 summaryLayout.addRule(RelativeLayout.END_OF, R.id.icon);
                 summary.setLayoutParams(summaryLayout);