From b3251a33f27fc8459c114d038900ba55e42c64f2 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 27 Mar 2015 12:33:51 +0100
Subject: [PATCH] show hint at the bottom of the Main Activity, update
 README.md, bump to 0.1.4

---
 CHANGELOG.md                                        |  1 +
 README.md                                           |  1 +
 app/build.gradle                                    |  4 ++--
 .../freeyourgadget/gadgetbridge/ControlCenter.java  | 13 ++++++++++++-
 app/src/main/res/layout/activity_controlcenter.xml  | 12 +++++++++++-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6efe9e57b..8aa778559 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * New AppManager shows installed Apps/Watchfaces (removal possible via context menu)
 * Allow back navigation in ActionBar (Debug and AppMananger Activities)
 * Make sure Intent broadcasts do not leave Gadgetbridge
+* Show hint in the Main Activiy (tap to connect etc)
 
 ####Version 0.1.3
 * Remove the connect button, list all suported devices and connect on tap instead
diff --git a/README.md b/README.md
index 207a6c901..239a851e8 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Features:
 * Support for generic notificaions (above filtered out)
 * Apollo playback info (artist, album, track)
 * Music control: play/pause, next track, previous track
+* List and remove installed apps/watchfaces
 
 How to use:
 
diff --git a/app/build.gradle b/app/build.gradle
index 1b3c4e316..59778346a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "nodomain.freeyourgadget.gadgetbridge"
         minSdkVersion 19
         targetSdkVersion 21
-        versionCode 4
-        versionName "0.1.3"
+        versionCode 5
+        versionName "0.1.4"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
index e398727f1..8f03cdd1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
@@ -16,6 +16,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.util.ArrayList;
@@ -33,6 +34,7 @@ public class ControlCenter extends Activity {
     public static final String ACTION_REFRESH_DEVICELIST
             = "nodomain.freeyourgadget.gadgetbride.controlcenter.action.set_version";
 
+    TextView hintTextView;
     ListView deviceListView;
     GBDeviceAdapter mGBDeviceAdapter;
     final List<GBDevice> deviceList = new ArrayList<>();
@@ -57,6 +59,12 @@ public class ControlCenter extends Activity {
                             device.setFirmwareVersion(firmwareVersion);
                             device.setState(state);
                             mGBDeviceAdapter.notifyDataSetChanged();
+                            if (state == GBDevice.State.CONNECTED) {
+                                hintTextView.setText("tap connected device for App Mananger");
+                            }
+                            else if (state == GBDevice.State.NOT_CONNECTED ) {
+                                hintTextView.setText("tap a device to connect");
+                            }
                             break;
                         }
                     }
@@ -69,7 +77,7 @@ public class ControlCenter extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_controlcenter);
-
+        hintTextView = (TextView)  findViewById(R.id.hintTextView);
         deviceListView = (ListView) findViewById(R.id.deviceListView);
         mGBDeviceAdapter = new GBDeviceAdapter(this, deviceList);
         deviceListView.setAdapter(this.mGBDeviceAdapter);
@@ -169,6 +177,9 @@ public class ControlCenter extends Activity {
                     deviceList.add(new GBDevice(device.getAddress(), device.getName()));
                 }
             }
+            if (!deviceList.isEmpty()) {
+                hintTextView.setText("tap a device to connect");
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/activity_controlcenter.xml b/app/src/main/res/layout/activity_controlcenter.xml
index 5a45e791f..4620c8da8 100644
--- a/app/src/main/res/layout/activity_controlcenter.xml
+++ b/app/src/main/res/layout/activity_controlcenter.xml
@@ -11,6 +11,16 @@
         android:layout_height="wrap_content"
         android:id="@+id/deviceListView"
         android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true"
+        android:layout_above="@+id/hintTextView" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:id="@+id/hintTextView"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:textStyle="italic" />
 
 </RelativeLayout>