From d09b5442cf231a42310f402f40109a20a21af40a Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 5 May 2015 11:16:57 +0200 Subject: [PATCH] Put FW/HW info inside its own TextView to cleanup the device list --- CHANGELOG.md | 5 +++ .../freeyourgadget/gadgetbridge/GBDevice.java | 9 ++-- .../gadgetbridge/adapter/GBDeviceAdapter.java | 6 +-- app/src/main/res/layout/device_item.xml | 42 +++++++++++++++---- app/src/main/res/values-de/strings.xml | 4 +- app/src/main/res/values-es/strings.xml | 4 +- app/src/main/res/values/strings.xml | 4 +- 7 files changed, 52 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323e4b195..5144e0136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ###Changelog +####Version (next) +* Add discovery and pairing Activity +* Listen vor Pebble Message intents and forward notification (used by Conversations) +* Make Strings translatable and add German, Spanish and Korean translation + ####Version 0.3.4 * Pebble: Huge speedup for app/firmware installation. * Pebble: Use a separate notification with progress bar for installation procedure diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java index a0f245368..114b89016 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java @@ -117,7 +117,7 @@ public class GBDevice implements Parcelable { mState = state; } - String getStateString() { + public String getStateString() { switch (mState) { case NOT_CONNECTED: return GBApplication.getContext().getString(R.string.not_connected); @@ -131,14 +131,15 @@ public class GBDevice implements Parcelable { return GBApplication.getContext().getString(R.string.unknown_state); } + public String getInfoString() { if (mFirmwareVersion != null) { if (mHardwareVersion != null) { - return GBApplication.getContext().getString(R.string.connectionstate_hw_fw, getStateString(), mHardwareVersion, mFirmwareVersion); + return GBApplication.getContext().getString(R.string.connectionstate_hw_fw, mHardwareVersion, mFirmwareVersion); } - return GBApplication.getContext().getString(R.string.connectionstate_fw, getStateString(), mFirmwareVersion); + return GBApplication.getContext().getString(R.string.connectionstate_fw, mFirmwareVersion); } else { - return getStateString(); + return ""; } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java index f2edd40ca..35e1a5221 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java @@ -16,13 +16,11 @@ import nodomain.freeyourgadget.gadgetbridge.R; public class GBDeviceAdapter extends ArrayAdapter { private final Context context; - private final List deviceList; public GBDeviceAdapter(Context context, List deviceList) { super(context, 0, deviceList); this.context = context; - this.deviceList = deviceList; } @Override @@ -37,10 +35,12 @@ public class GBDeviceAdapter extends ArrayAdapter { } TextView deviceStatusLabel = (TextView) view.findViewById(R.id.device_status); TextView deviceNameLabel = (TextView) view.findViewById(R.id.device_name); + TextView deviceInfoLabel = (TextView) view.findViewById(R.id.device_info); ImageView deviceImageView = (ImageView) view.findViewById(R.id.device_image); - deviceStatusLabel.setText(device.getInfoString()); + deviceStatusLabel.setText(device.getStateString()); deviceNameLabel.setText(device.getName()); + deviceInfoLabel.setText(device.getInfoString()); switch (device.getType()) { case PEBBLE: diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml index 464f80f44..00efdda39 100644 --- a/app/src/main/res/layout/device_item.xml +++ b/app/src/main/res/layout/device_item.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" - android:padding="8dp" > + android:padding="8dp"> - + android:paddingLeft="8dp"> - + android:layout_alignLeft="@+id/statuswrapper" + android:layout_toLeftOf="@+id/device_info" + android:singleLine="true" + android:textColor="@color/primarytext" + android:typeface="sans" /> + + + + + - + android:layout_alignBaseline="@+id/device_name" + android:layout_alignParentRight="true" + android:gravity="right" + android:textColor="@color/secondarytext" + android:textSize="12sp" /> + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9e8ffc10c..f64ac2177 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -44,8 +44,8 @@ verbinde verbunden unbekannter Zustand - %1$s (HW: %2$s FW: %3$s) - %1$s (FW: %2$s) + HW: %1$s FW: %2$s + FW: %1$s (unknown) Test Test Benachrichtigung diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b01796e7d..f68500a93 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -39,8 +39,8 @@ conectando conectado estado desconocido - %1$s (HW: %2$s FW: %3$s) - %1$s (FW: %2$s) + HW: %1$s FW: %2$s + FW: %1$s (desconocido) Probar Probar notificación diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c0bc703d..d070488bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,8 +46,8 @@ connecting connected unknown state - %1$s (HW: %2$s FW: %3$s) - %1$s (FW: %2$s) + HW: %1$s FW: %2$s + FW: %1$s (unknown) Test Test Notification