Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove "Try to install" from swap UI

Browse Source 
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
This commit is contained in:
Hans-Christoph Steiner 2016-05-18 13:52:23 +02:00
parent 15005372a2
commit 1591851273
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
View File

@ -238,7 +238,6 @@ public class SwapAppsView extends ListView implements
TextView nameView; TextView nameView;
ImageView iconView; ImageView iconView;
Button btnInstall; Button btnInstall;
TextView btnAttemptInstall;
TextView statusInstalled; TextView statusInstalled;
TextView statusIncompatible; TextView statusIncompatible;
@ -343,22 +342,24 @@ public class SwapAppsView extends ListView implements
ImageLoader.getInstance().displayImage(app.iconUrl, iconView, displayImageOptions); 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()) { if (app.hasUpdates()) {
btnInstall.setText(R.string.menu_upgrade); btnInstall.setText(R.string.menu_upgrade);
btnInstall.setVisibility(View.VISIBLE); btnInstall.setVisibility(View.VISIBLE);
statusIncompatible.setVisibility(View.GONE);
statusInstalled.setVisibility(View.GONE);
} else if (app.isInstalled()) { } else if (app.isInstalled()) {
btnInstall.setVisibility(View.GONE);
statusIncompatible.setVisibility(View.GONE);
statusInstalled.setVisibility(View.VISIBLE); statusInstalled.setVisibility(View.VISIBLE);
} else if (!app.compatible) { } else if (!app.compatible) {
btnAttemptInstall.setVisibility(View.VISIBLE); btnInstall.setVisibility(View.GONE);
statusIncompatible.setVisibility(View.VISIBLE); statusIncompatible.setVisibility(View.VISIBLE);
statusInstalled.setVisibility(View.GONE);
} else { } else {
btnInstall.setText(R.string.menu_install); btnInstall.setText(R.string.menu_install);
btnInstall.setVisibility(View.VISIBLE); btnInstall.setVisibility(View.VISIBLE);
statusIncompatible.setVisibility(View.GONE);
statusInstalled.setVisibility(View.GONE);
} }
OnClickListener installListener = new OnClickListener() { OnClickListener installListener = new OnClickListener() {
@ -372,14 +373,11 @@ public class SwapAppsView extends ListView implements
}; };
btnInstall.setOnClickListener(installListener); btnInstall.setOnClickListener(installListener);
btnAttemptInstall.setOnClickListener(installListener);
} }
private void showProgress() { private void showProgress() {
progressView.setVisibility(View.VISIBLE); progressView.setVisibility(View.VISIBLE);
btnInstall.setVisibility(View.GONE); btnInstall.setVisibility(View.GONE);
btnAttemptInstall.setVisibility(View.GONE);
statusInstalled.setVisibility(View.GONE); statusInstalled.setVisibility(View.GONE);
statusIncompatible.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.nameView = (TextView) view.findViewById(R.id.name);
holder.iconView = (ImageView) view.findViewById(android.R.id.icon); holder.iconView = (ImageView) view.findViewById(android.R.id.icon);
holder.btnInstall = (Button) view.findViewById(R.id.btn_install); 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.statusInstalled = (TextView) view.findViewById(R.id.status_installed);
holder.statusIncompatible = (TextView) view.findViewById(R.id.status_incompatible); holder.statusIncompatible = (TextView) view.findViewById(R.id.status_incompatible);

7
app/src/main/res/layout/swap_app_list_item.xml
View File

@ -55,13 +55,6 @@
android:textColor="@color/swap_incompatible" android:textColor="@color/swap_incompatible"
android:text="@string/app_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> </LinearLayout>
<TextView <TextView

1
app/src/main/res/values/strings.xml
View File

@ -335,7 +335,6 @@
<string name="bluetooth_unavailable">Bluetooth unavailable</string> <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="swap_cant_send_no_bluetooth">Cannot send F-Droid, because Bluetooth is unavailable on this device.</string>
<string name="loading">Loading…</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_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">Swapping not enabled</string>
<string name="swap_not_enabled_description">Before swapping, your device must be made visible.</string> <string name="swap_not_enabled_description">Before swapping, your device must be made visible.</string>