nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make use of some new icons

This commit is contained in:
Andreas Shimokawa 2015-12-11 21:38:43 +01:00
parent c9d1b9dd4a
commit b1954eec3e
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
View File

@ -50,7 +50,7 @@ public class GBDeviceAppAdapter extends ArrayAdapter<GBDeviceApp> {
deviceImageView.setImageResource(R.drawable.ic_watchface);
break;
default:
deviceImageView.setImageResource(R.drawable.ic_device_pebble);
deviceImageView.setImageResource(R.drawable.ic_watchapp);
}
return view;

26
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
View File

@ -72,9 +72,11 @@ public class PBWInstallHandler implements InstallHandler {
}
GenericItem installItem = new GenericItem();
installItem.setIcon(R.drawable.ic_device_pebble);
installItem.setIcon(R.drawable.ic_watchapp); // FIXME: do not set twice
if (mPBWReader.isFirmware()) {
installItem.setIcon(R.drawable.ic_firmware);
String hwRevision = mPBWReader.getHWRevision();
if (hwRevision != null && hwRevision.equals(device.getHardwareVersion())) {
installItem.setName(mContext.getString(R.string.pbw_installhandler_pebble_firmware, ""));
@ -96,15 +98,19 @@ public class PBWInstallHandler implements InstallHandler {
installItem.setName(app.getName());
installItem.setDetails(mContext.getString(R.string.pbwinstallhandler_app_item, app.getCreator(), app.getVersion()));
int drawable;
switch (app.getType()) {
case WATCHFACE:
drawable = R.drawable.ic_watchface;
break;
case APP_ACTIVITYTRACKER:
drawable = R.drawable.ic_activitytracker;
break;
default:
drawable = R.drawable.ic_device_pebble;
if (mPBWReader.isLanguage()) {
drawable = R.drawable.ic_languagepack;
} else {
switch (app.getType()) {
case WATCHFACE:
drawable = R.drawable.ic_watchface;
break;
case APP_ACTIVITYTRACKER:
drawable = R.drawable.ic_activitytracker;
break;
default:
drawable = R.drawable.ic_watchapp;
}
}
installItem.setIcon(drawable);