From 159185127309dedf408fe999665e4f80bb17e926 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 18 May 2016 13:52:23 +0200
Subject: [PATCH] remove "Try to install" from swap UI

This should no longer be necessary since the local swap repo metadata now
includes the nativecode tag.

#30 https://gitlab.com/fdroid/fdroidclient/issues/30
---
 .../fdroid/views/swap/SwapAppsView.java       | 19 ++++++++-----------
 .../main/res/layout/swap_app_list_item.xml    |  7 -------
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
index e40d6c09f..305035e4d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
@@ -238,7 +238,6 @@ public class SwapAppsView extends ListView implements
             TextView nameView;
             ImageView iconView;
             Button btnInstall;
-            TextView btnAttemptInstall;
             TextView statusInstalled;
             TextView statusIncompatible;
 
@@ -343,22 +342,24 @@ public class SwapAppsView extends ListView implements
 
                 ImageLoader.getInstance().displayImage(app.iconUrl, iconView, displayImageOptions);
 
-                btnInstall.setVisibility(View.GONE);
-                btnAttemptInstall.setVisibility(View.GONE);
-                statusInstalled.setVisibility(View.GONE);
-                statusIncompatible.setVisibility(View.GONE);
-
                 if (app.hasUpdates()) {
                     btnInstall.setText(R.string.menu_upgrade);
                     btnInstall.setVisibility(View.VISIBLE);
+                    statusIncompatible.setVisibility(View.GONE);
+                    statusInstalled.setVisibility(View.GONE);
                 } else if (app.isInstalled()) {
+                    btnInstall.setVisibility(View.GONE);
+                    statusIncompatible.setVisibility(View.GONE);
                     statusInstalled.setVisibility(View.VISIBLE);
                 } else if (!app.compatible) {
-                    btnAttemptInstall.setVisibility(View.VISIBLE);
+                    btnInstall.setVisibility(View.GONE);
                     statusIncompatible.setVisibility(View.VISIBLE);
+                    statusInstalled.setVisibility(View.GONE);
                 } else {
                     btnInstall.setText(R.string.menu_install);
                     btnInstall.setVisibility(View.VISIBLE);
+                    statusIncompatible.setVisibility(View.GONE);
+                    statusInstalled.setVisibility(View.GONE);
                 }
 
                 OnClickListener installListener = new OnClickListener() {
@@ -372,14 +373,11 @@ public class SwapAppsView extends ListView implements
                 };
 
                 btnInstall.setOnClickListener(installListener);
-                btnAttemptInstall.setOnClickListener(installListener);
-
             }
 
             private void showProgress() {
                 progressView.setVisibility(View.VISIBLE);
                 btnInstall.setVisibility(View.GONE);
-                btnAttemptInstall.setVisibility(View.GONE);
                 statusInstalled.setVisibility(View.GONE);
                 statusIncompatible.setVisibility(View.GONE);
             }
@@ -410,7 +408,6 @@ public class SwapAppsView extends ListView implements
             holder.nameView = (TextView) view.findViewById(R.id.name);
             holder.iconView = (ImageView) view.findViewById(android.R.id.icon);
             holder.btnInstall = (Button) view.findViewById(R.id.btn_install);
-            holder.btnAttemptInstall = (TextView) view.findViewById(R.id.btn_attempt_install);
             holder.statusInstalled = (TextView) view.findViewById(R.id.status_installed);
             holder.statusIncompatible = (TextView) view.findViewById(R.id.status_incompatible);
 
diff --git a/app/src/main/res/layout/swap_app_list_item.xml b/app/src/main/res/layout/swap_app_list_item.xml
index 2219f2f96..f4d1b069d 100644
--- a/app/src/main/res/layout/swap_app_list_item.xml
+++ b/app/src/main/res/layout/swap_app_list_item.xml
@@ -55,13 +55,6 @@
             android:textColor="@color/swap_incompatible"
             android:text="@string/app_incompatible" />
 
-        <TextView
-            android:id="@+id/btn_attempt_install"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/swap_light_blue"
-            android:text="@string/swap_attempt_install" />
-
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed6276b96..3dade6788 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -335,7 +335,6 @@
     <string name="bluetooth_unavailable">Bluetooth unavailable</string>
     <string name="swap_cant_send_no_bluetooth">Cannot send F-Droid, because Bluetooth is unavailable on this device.</string>
     <string name="loading">Loading…</string>
-    <string name="swap_attempt_install">Try to install</string>
     <string name="swap_connection_misc_error">An error occurred while connecting to device, we can\'t seem to swap with it.</string>
     <string name="swap_not_enabled">Swapping not enabled</string>
     <string name="swap_not_enabled_description">Before swapping, your device must be made visible.</string>