From 3ef942b5d399f0da2a9308bd2066160744735060 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sat, 9 Apr 2016 09:12:40 +0800
Subject: [PATCH 1/9] Do not crash on null BT adapter, allows UI work on
 emulator.

---
 .../gadgetbridge/activities/DiscoveryActivity.java           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
index 81a5a2f62..fc8e727ec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
@@ -290,6 +290,11 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
             return false;
         }
         BluetoothAdapter adapter = bluetoothService.getAdapter();
+        if (adapter == null) {
+            LOG.warn("No bluetooth available");
+            this.adapter = null;
+            return false;
+        }
         if (!adapter.isEnabled()) {
             LOG.warn("Bluetooth not enabled");
             Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);

From 5a3004cbceb3365a420d64f33a770c34e88430c3 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sat, 9 Apr 2016 11:41:31 +0800
Subject: [PATCH 2/9] AppCompat and FAB, more Material Design

---
 app/build.gradle                              |   1 +
 .../activities/AbstractSettingsActivity.java  | 104 +++++++++++++++++-
 .../gadgetbridge/activities/AlarmDetails.java |   4 +-
 .../activities/AndroidPairingActivity.java    |   4 +-
 .../activities/AppBlacklistActivity.java      |   4 +-
 .../activities/AppManagerActivity.java        |   4 +-
 .../activities/ControlCenter.java             |   3 +-
 .../activities/DebugActivity.java             |   4 +-
 .../activities/DiscoveryActivity.java         |   3 +-
 .../activities/ExternalPebbleJSActivity.java  |   4 +-
 .../activities/FwAppInstallerActivity.java    |   4 +-
 app/src/main/res/drawable/ic_add_black.png    | Bin 0 -> 201 bytes
 .../res/layout/activity_controlcenter.xml     |  19 +++-
 app/src/main/res/values-v21/styles.xml        |   5 +-
 app/src/main/res/values/colors.xml            |   6 +-
 app/src/main/res/values/styles.xml            |   5 +-
 16 files changed, 146 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_add_black.png

diff --git a/app/build.gradle b/app/build.gradle
index d0646fe55..b87fb8a0b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:design:23.3.0'
     compile 'com.github.tony19:logback-android-classic:1.1.1-4'
     compile 'org.slf4j:slf4j-api:1.7.7'
     compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
index 4d3c48a13..d52abe1d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
@@ -1,12 +1,21 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
 import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,6 +29,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractSettingsActivity extends PreferenceActivity {
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractSettingsActivity.class);
+    private AppCompatDelegate delegate;
 
     /**
      * A preference value change listener that updates the preference's summary
@@ -56,15 +66,15 @@ public abstract class AbstractSettingsActivity extends PreferenceActivity {
     }
 
     private static class ExtraSetSummaryOnChangeListener extends SimpleSetSummaryOnChangeListener {
-        private final Preference.OnPreferenceChangeListener delegate;
+        private final Preference.OnPreferenceChangeListener prefChangeListener;
 
-        public ExtraSetSummaryOnChangeListener(Preference.OnPreferenceChangeListener delegate) {
-            this.delegate = delegate;
+        public ExtraSetSummaryOnChangeListener(Preference.OnPreferenceChangeListener prefChangeListener) {
+            this.prefChangeListener = prefChangeListener;
         }
 
         @Override
         public boolean onPreferenceChange(Preference preference, Object value) {
-            boolean result = delegate.onPreferenceChange(preference, value);
+            boolean result = prefChangeListener.onPreferenceChange(preference, value);
             if (result) {
                 return super.onPreferenceChange(preference, value);
             }
@@ -74,11 +84,19 @@ public abstract class AbstractSettingsActivity extends PreferenceActivity {
 
     private static final SimpleSetSummaryOnChangeListener sBindPreferenceSummaryToValueListener = new SimpleSetSummaryOnChangeListener();
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        getDelegate().installViewFactory();
+        getDelegate().onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
+        getDelegate().onPostCreate(savedInstanceState);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         for (String prefKey : getPreferenceKeysWithSummary()) {
             final Preference pref = findPreference(prefKey);
@@ -90,6 +108,67 @@ public abstract class AbstractSettingsActivity extends PreferenceActivity {
         }
     }
 
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        getDelegate().onPostResume();
+    }
+
+    @Override
+    protected void onTitleChanged(CharSequence title, int color) {
+        super.onTitleChanged(title, color);
+        getDelegate().setTitle(title);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        getDelegate().onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        getDelegate().onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getDelegate().onDestroy();
+    }
+
+    @Override
+    public MenuInflater getMenuInflater() {
+        return getDelegate().getMenuInflater();
+    }
+
+    @Override
+    public void setContentView(@LayoutRes int layoutResID) {
+        getDelegate().setContentView(layoutResID);
+    }
+
+    @Override
+    public void setContentView(View view) {
+        getDelegate().setContentView(view);
+    }
+
+    @Override
+    public void setContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().setContentView(view, params);
+    }
+
+    @Override
+    public void addContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().addContentView(view, params);
+    }
+
+    public void invalidateOptionsMenu() {
+        getDelegate().invalidateOptionsMenu();
+    }
+
+
     /**
      * Subclasses should reimplement this to return the keys of those
      * preferences which should print its values as a summary below the
@@ -141,4 +220,19 @@ public abstract class AbstractSettingsActivity extends PreferenceActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    public ActionBar getSupportActionBar() {
+        return getDelegate().getSupportActionBar();
+    }
+
+    public void setSupportActionBar(@Nullable Toolbar toolbar) {
+        getDelegate().setSupportActionBar(toolbar);
+    }
+
+    private AppCompatDelegate getDelegate() {
+        if (delegate == null) {
+            delegate = AppCompatDelegate.create(this, null);
+        }
+        return delegate;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
index a137ad0cb..9bfe12959 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
@@ -1,8 +1,8 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.support.v7.app.AppCompatActivity;
 import android.text.format.DateFormat;
 import android.view.MenuItem;
 import android.widget.CheckBox;
@@ -12,7 +12,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
 
-public class AlarmDetails extends Activity {
+public class AlarmDetails extends AppCompatActivity {
 
     private GBAlarm alarm;
     private TimePicker timePicker;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java
index 284f67915..f85d3ca09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java
@@ -1,11 +1,11 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 
-public class AndroidPairingActivity extends Activity {
+public class AndroidPairingActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
index 630e9c047..c2767f56f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
@@ -1,6 +1,5 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -12,6 +11,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -34,7 +34,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 
 
-public class AppBlacklistActivity extends Activity {
+public class AppBlacklistActivity extends AppCompatActivity {
     private static final Logger LOG = LoggerFactory.getLogger(AppBlacklistActivity.class);
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
index 6b566f3e2..59732098f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
@@ -1,6 +1,5 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -11,6 +10,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
@@ -37,7 +37,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.PebbleUtils;
 
 
-public class AppManagerActivity extends Activity {
+public class AppManagerActivity extends AppCompatActivity {
     public static final String ACTION_REFRESH_APPLIST
             = "nodomain.freeyourgadget.gadgetbridge.appmanager.action.refresh_applist";
     private static final Logger LOG = LoggerFactory.getLogger(AppManagerActivity.class);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
index 187c5c955..82e82fa50 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
@@ -19,6 +19,7 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.AppCompatActivity;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -45,7 +46,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
-public class ControlCenter extends Activity {
+public class ControlCenter extends AppCompatActivity {
 
     private static final Logger LOG = LoggerFactory.getLogger(ControlCenter.class);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
index dc7eb2f5f..1fa097247 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
@@ -1,6 +1,5 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -14,6 +13,7 @@ import android.os.Bundle;
 import android.support.v4.app.NavUtils;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.RemoteInput;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -37,7 +37,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 
-public class DebugActivity extends Activity {
+public class DebugActivity extends AppCompatActivity {
     private static final Logger LOG = LoggerFactory.getLogger(DebugActivity.class);
 
     private static final String EXTRA_REPLY = "reply";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
index fc8e727ec..82f2c7e5a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
@@ -12,6 +12,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcelable;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -32,7 +33,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
-public class DiscoveryActivity extends Activity implements AdapterView.OnItemClickListener {
+public class DiscoveryActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
     private static final Logger LOG = LoggerFactory.getLogger(DiscoveryActivity.class);
     private static final long SCAN_DURATION = 60000; // 60s
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index 2f86bfaf2..4ddc013cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -1,10 +1,10 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.MenuItem;
 import android.webkit.ConsoleMessage;
@@ -32,7 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.PebbleUtils;
 
-public class ExternalPebbleJSActivity extends Activity {
+public class ExternalPebbleJSActivity extends AppCompatActivity {
 
     private static final Logger LOG = LoggerFactory.getLogger(ExternalPebbleJSActivity.class);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
index 7f8d507f1..d74250aa5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
@@ -1,6 +1,5 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -9,6 +8,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -35,7 +35,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 
-public class FwAppInstallerActivity extends Activity implements InstallActivity {
+public class FwAppInstallerActivity extends AppCompatActivity implements InstallActivity {
 
     private static final Logger LOG = LoggerFactory.getLogger(FwAppInstallerActivity.class);
     private static final String ITEM_DETAILS = "details";
diff --git a/app/src/main/res/drawable/ic_add_black.png b/app/src/main/res/drawable/ic_add_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..a633259ea45269cb387ef27f1301009e05578617
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s
z6m;}-aSX}0_x6e-F9QPyv*DlFZTf5+ieJ(etatU8q%v3gb^{FTYb;7|aB!&OfB~R<
b=31t&4=&kA&-A(iG>pO1)z4*}Q$iB}b3r%*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_controlcenter.xml b/app/src/main/res/layout/activity_controlcenter.xml
index 39a5d2c82..832b2e5c1 100644
--- a/app/src/main/res/layout/activity_controlcenter.xml
+++ b/app/src/main/res/layout/activity_controlcenter.xml
@@ -1,6 +1,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -25,6 +28,7 @@
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <TextView
+        tools:text="Hint here"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -33,4 +37,15 @@
         android:layout_centerHorizontal="true"
         android:textStyle="italic" />
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_add_black"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_gravity="bottom|end"
+        app:elevation="6dp"
+        app:pressedTranslationZ="12dp"/>
+
 </RelativeLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index dfd096b58..80bee978d 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,10 +1,13 @@
 <resources>
 
-    <style name="GadgetbridgeTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+    <style name="GadgetbridgeTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:colorPrimary">@color/primary_light</item>
         <item name="android:colorPrimaryDark">@color/primarydark_light</item>
         <item name="android:colorAccent">@color/accent</item>
         <item name="android:textColor">@color/primary_text_default_material_light</item>
+        <item name="colorPrimary">@color/primary_light</item>
+        <item name="colorPrimaryDark">@color/primarydark_light</item>
+        <item name="colorAccent">@color/accent</item>
 
         <!-- unfortunately it doesn't work this way :( -->
         <!--
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8d5f07fd3..82744a0c9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary_light" type="color">#ffff5000</color>
+    <color name="primary_light" type="color">#ff5000</color>
     <color name="primarydark_light" type="color">#f0f03000</color>
 
-    <color name="primary_dark" type="color">#fff03000</color>
+    <color name="primary_dark" type="color">#f03000</color>
     <color name="primarydark_dark" type="color">#f0f03000</color>
 
-    <color name="accent" type="color">#ff0091ea</color>
+    <color name="accent" type="color">#0091ea</color>
     <color name="primarytext" type="color">#ff000000</color>
     <color name="secondarytext" type="color">#ff808080</color>
     <color name="divider" type="color">#1f000000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3f1c38025..31de73544 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,12 @@
 <resources>
 
-    <style name="GadgetbridgeTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+    <style name="GadgetbridgeTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/GadgetbridgeActionBar</item>
         <item name="android:actionBarWidgetTheme">@style/GadgetbridgeActionBarWidget</item>
         <item name="android:textColor">@color/primarytext</item>
+        <item name="colorPrimary">@color/primary_light</item>
+        <item name="colorPrimaryDark">@color/primarydark_light</item>
+        <item name="colorAccent">@color/accent</item>
     </style>
 
     <style name="GadgetbridgeActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">

From 80a21f2ec2c0cb90773e7f78356545e556ffe8a8 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sat, 9 Apr 2016 12:04:39 +0800
Subject: [PATCH 3/9] Move Discovery functionality to FAB

---
 .../activities/ControlCenter.java             | 27 ++++++++++++++-----
 app/src/main/res/menu/menu_main.xml           |  2 --
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
index 82e82fa50..490b8a23d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
@@ -15,6 +15,7 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
@@ -54,6 +55,7 @@ public class ControlCenter extends AppCompatActivity {
             = "nodomain.freeyourgadget.gadgetbridge.controlcenter.action.set_version";
 
     private TextView hintTextView;
+    private FloatingActionButton fab;
     private SwipeRefreshLayout swipeLayout;
     private GBDeviceAdapter mGBDeviceAdapter;
     private GBDevice selectedDevice = null;
@@ -124,8 +126,18 @@ public class ControlCenter extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_controlcenter);
+
         hintTextView = (TextView) findViewById(R.id.hintTextView);
         ListView deviceListView = (ListView) findViewById(R.id.deviceListView);
+        fab = (FloatingActionButton) findViewById(R.id.fab);
+
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                launchDiscoveryActivity();
+            }
+        });
+
         mGBDeviceAdapter = new GBDeviceAdapter(this, deviceList);
         deviceListView.setAdapter(this.mGBDeviceAdapter);
         deviceListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -333,18 +345,19 @@ public class ControlCenter extends AppCompatActivity {
                 Intent quitIntent = new Intent(GBApplication.ACTION_QUIT);
                 LocalBroadcastManager.getInstance(this).sendBroadcast(quitIntent);
                 return true;
-            case R.id.action_discover:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    startActivity(new Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS));
-                } else {
-                    startActivity(new Intent(this, DiscoveryActivity.class));
-                }
-                return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    private void launchDiscoveryActivity() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            startActivity(new Intent(android.provider.Settings.ACTION_BLUETOOTH_SETTINGS));
+        } else {
+            startActivity(new Intent(this, DiscoveryActivity.class));
+        }
+    }
+
     @Override
     protected void onDestroy() {
         LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver);
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 945de4570..c8648cd42 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,8 +2,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter">
-    <item android:id="@+id/action_discover" android:title="@string/action_discover"
-        android:orderInCategory="100" app:showAsAction="never" />
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
         android:orderInCategory="100" app:showAsAction="never" />
     <item android:id="@+id/action_debug" android:title="@string/action_debug"

From 83e6e6b85facdc481a57ba3ae14defbef1b27245 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sat, 9 Apr 2016 13:41:58 +0800
Subject: [PATCH 4/9] Add background image for empty ControlCenter

---
 .../gadgetbridge/activities/ControlCenter.java  |  10 ++++++++++
 app/src/main/res/drawable/gadgetbridge_img.png  | Bin 0 -> 19039 bytes
 .../main/res/layout/activity_controlcenter.xml  |   7 +++++++
 3 files changed, 17 insertions(+)
 create mode 100644 app/src/main/res/drawable/gadgetbridge_img.png

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
index 490b8a23d..cb188ba46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
@@ -26,6 +26,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -56,6 +57,8 @@ public class ControlCenter extends AppCompatActivity {
 
     private TextView hintTextView;
     private FloatingActionButton fab;
+    private ImageView background;
+
     private SwipeRefreshLayout swipeLayout;
     private GBDeviceAdapter mGBDeviceAdapter;
     private GBDevice selectedDevice = null;
@@ -130,6 +133,7 @@ public class ControlCenter extends AppCompatActivity {
         hintTextView = (TextView) findViewById(R.id.hintTextView);
         ListView deviceListView = (ListView) findViewById(R.id.deviceListView);
         fab = (FloatingActionButton) findViewById(R.id.fab);
+        background = (ImageView) findViewById(R.id.no_items_bg);
 
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -381,6 +385,12 @@ public class ControlCenter extends AppCompatActivity {
             }
         }
 
+        if (deviceList.isEmpty()) {
+            background.setVisibility(View.VISIBLE);
+        } else {
+            background.setVisibility(View.INVISIBLE);
+        }
+
         if (connected) {
             hintTextView.setText(R.string.tap_connected_device_for_app_mananger);
         } else if (!deviceList.isEmpty()) {
diff --git a/app/src/main/res/drawable/gadgetbridge_img.png b/app/src/main/res/drawable/gadgetbridge_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdb748e00aaf650ce6a75b77449d9fae67450e7c
GIT binary patch
literal 19039
zcmV*}KqkM5P)<h;3K|Lk000e1NJLTq008L#00C791^@s63P{LV00001b5ch_0Itp)
z=>Pyg07*naRCodHodwt(#ns2-ZUhNV2p)n%fI>)+LLmf~7AWo?R!VS5DNeECP+W^c
zgOx%AO$ZhsMMH2BEFtdS@4UVHvU_&++Iwa8-m}lM&&-^$bN(}Dd}o_Cv!|j6EL^y-
z9T~RZo!`89^Vt>6+%iig0?kv&bqbh989V;;(@#5~i0i^`FWkMbuZX#Li2a$^zvBH2
zzcIX{x^?R|40CEIj9Kd(0aMZvR)CCR4kXDvdBtpBX!0ni^sfKmy=Rd{7I_Hw+(Of^
z@U?}2DQOAH6XonguXzed{fW0@36czw_y#4t8fCo-Q+i!{>JR}_(k2u-%GqM_<jDst
zSg_!Hl3A(=N#%<A6-s(q_wL>A&K1!7YYzca(jv>0p0f{8??h48D<lb&Z4TjEiGmjr
zPr?#chQNno&L}jlg-<U6rldub9lhta^XJchkf>d9ME@3rdYJchlyZFAwr$6E=+NQY
zOq|Xrde;^$S}ca&X3)0g9e}-CwlqoWy;iMS?cSwJmyfcAGr!tFz?8JWvi$MK9}h!O
zu0xqxB}AQx|82bgWTo~c%moSIVr0^6NdwT2;qz&DZW{~mE8!QE`yhJNM}8%ltyU2*
zB`u(2>G>`|kwk%F56ZX@;=SU(=%R~$84FM#Vak*#o6uXIO?unAqGptT7v`z|a`_vr
zb`UTn&9f{~(8E!f8(qOsn0H&YY<Xzcu3bmF{F_3fXWboTy^S<FJJOj>zFW{^zv=KZ
zQjH*BN}5MOq9_|O1bqo5ZL5Q$pwBSu+zYd82M~Vw<(Jjw&71cy`LC(-$1QW*jZ4vc
zJJL3i2M83r!sr3d6=i{8XLl6zp#%lJ0R`Q$oC+$!vPkqH`D{!+Lmk2|1^r3*ljDZ=
z)F1+;q*)4;ir<`}<~^7z=wK+uHOvQ(!kn-D%HbxT=_u;nr2V>1AO6<*`RAWc)O2&#
z1_CzR%~FocLytfKZqPwcm{(Ak0hkp(vNvtov>tQj%o*iqIHt12vr4B<ohE92&7E!p
ztS3z<zv<Jb%L$^39p01LwQDDH(26Ul@RCtN8Dh(!i15>S?%cWOg$ZV_4FpU{6UuSc
ztXbF4TXogmtfubEfrPI$y^?N*+3%6x-*ukwdoaEK+L~_ebR%F&>L@?vcRNGg&Ea(m
z+a2<SiVx3u^rqj389_;<JdX_1%$|M(Oi5K4QqjAxntQDxi*pjk@lJNot3skTokGUv
z=*;1Nw~VrCFLS390aH>{aP*=VL0U$U#d$1;6@GHit43n+>UJ`prWokKzHWa-GiQns
zFeMEY9_Mm5#d$=C)L>;;`4oo*9?<k^yWvaD3CH$M=}G0Ib9-t80aMaUK~k|>WBrF?
zs3<+vQNETpN-AIDL>^=q6d{-+)d-l9W{Qs?q8yy>txJ=yP0nEc_l2hW;$|W1X%uy~
z;%8YDwS%IWGo=Wal2UMTHkL|#x}yw7qXgGD=-!ZI$P4ciG(&8~tf*<`PA39M-$bTU
znj*NSf;VTe=w{5w;dv_mJd%@dNAvz3w216W5(OT|!~bgG#Gr|iz8|J(yU0Fu>eSUZ
z1hEc&YY=A%%td(T<0rlI*Nh}SVYT}W=Hyw^BCI`SLZI%I6a|$}(E2&>y@X-zSO?ul
z(r20}6t0)1iCYvCnRme4lipUoRTaf-c%TK=MiT{Xu(PQ49SS>?_vUhZlGm7_Sz-v(
z^>8=K(Z7$`-uP<_El&w3q<pRxc~H1U<r5Fw?c`Po6muMQSrI;fHxfp|WqFoFVGre#
zxlyDu8b#kSOIY(NAp&)+q)A8r=q-+*;?F7}&SgysrHg$K4z1zq9LzQ-=IOkj!^BOz
ztCxV8jZoMZNb?Dlb%he7XGvs1pl+3v%9V8V?^b%zVOcQq(JOYwn1*I9GOoibm!Qd&
zqlNUEdC5q+gHYCS^sFaguluP}UZ52bsCf}_QXhp1B{%i`7eVyNB02iEhHoc}asiGk
z_al>hYZ`tYWi&7ldYdp&+X*8R(RX-X#4cxnrx9m5_6{iEx|p)4)H_!?gn5mxgLd!O
zvEw(`?I|Gwb=msSyCfa`J1%VsnyCxRJL<%)D3*iVaDT6OJV9@J7w>Rxe)!QDFheAr
zPV6HeiuosAS6&iw6Q&Pu&|vJrg4@g4(lfup5U9JJl%d(C^bRjm*&?z-dy>kvV`1=B
zKeQ+ijn2=QIU8JLlx?MZTeog~ap%sR#}&%G<bksOfgbh(;x6loPag7}?eSoFz02Qd
zg(DEDsD(#QR}3my8|w3$m}@G|r%}1qq+)%c=-xZ&xnxKiJHP8-d^F1W$5LFXO@1<6
z_$!zlgT19AFS%|1Sn%}vAc%`^A8B>9a6~U~szX7WG34|5=wG&qgFJHced2?%$SUt&
zQJBq2p`elxX-?&E!wGx<FQbyr6EeRXMczEY&&UNJP&Ykk=32~msML{@MPN0W3M`e)
z`;$ewT#-e#SH?rv3t$aFk?BXm?1VzSqT`mz4X%r^clrSNZ0ShzI~J2Ru*D<?G6j(8
zq9>&SHK!sukN#1SQ*rdqRi+Hx4~Cwkpt4fCWjPg8c%payfi0_T!BO^L^|R#c*|X(3
z)Vio=TKH1A>jFF~bJEejOX)?^a`Z1!=2U$7wC=nJ@mI%0>DiF&-Cs%Nv!S5#P}HNz
z;RT%wd~8Z@zq_WJJAVXfUP*Ht{W~{*sQd~kpVpxOi)yY=m}za=w2>aPq6gy1cRu<4
z0e-%A@N_1;*3HyP%imOY%_}K;cUMzETqkl;b@VS>(0sYF1lu5|glT~tSr2A=MGk6I
z{2|{-EW+)hGlr+NX;kEdmpw%wP}54vFjp#uYp9jRqkoOX%jMYD;)s3JO>g!XJ!tHv
zhQ^2$urTZ$NjA^xtWeZ5HO<`lAyBhQN~P#bZzGjiKa<!xI7t)J;-*KEMrRMrFADl2
z3L?YJsz2a+p=N^e*Z|&F)O2&_MxbVulwLIP=pVN&{G1ya|3b*mqxd&Xtl>dHf8d~k
ze6;PwmpkAqJ?R*YAiQVY)79b4{XYb1Qc30LAL1RU3z<qRxBmT8)6?RnlFP02Jv6`c
zQpYeKlr0x;9<Y8)GXrfaO*40H1Zqx6sjzLR46-MxWt#>Z-ro9`tEkw<*b$lb)!{@L
zJZ*SJXkOvpb>Kk<Gq*xOS7ha#J}2{@q@#alvTyiB`Xp-B3<d2<1$X`3?Ps<<yli-w
zACCs>nF{YEZC<Jn$-`MwN}A)=zpL}W!^<Ej=w&b#J6S|8dIEo0`_4zE;cX7@+nP6M
zi)os<vm;P5N=ikp$)kVtJiny~57EU)Wq+F9>P}7f%pLnJ2j$ewGakKXr)HFt)!f6V
z0R0?@r}^k#C$^DpcF6P#vL4}}`$n3o8DjCPASIQ?m%|&2V|LPM)r&jlhr-nYBJ)S<
zUD<PclSABN={XX&7v$(42e~iNyb|XVdYf}KJuPk;o{OoRD`<X^YcTWcFE!mm_b(2f
z5|tEr#cyY1-Vn1FW-sRBJ+ZgLl)1Tlb|-(6o6P$S{<6*U8mF9|rJRLUlaH553i!<_
z5E;sC%hxN-D7<;N--rGt74!`;sif~<pCP3pNB=Ooiaq?`e>iWVa)-nEW=G~Nkkhp&
z^a2&q)w}v8g76c&zlHLMjNU?uxhL}emN)TECj45GX7|k73$x*SRp@isb{kIGw}H(=
zm~-)~na9gR&nV={0Do~dlqm>lRX^aJL|E6-{;h0H#O89@()7g-dD>HX$6~Imc$&`0
zVl55}e5UALIw{AekYW2UbClZ-G_X%Y?;z!j-(cR@5yx<x0_}1U+GXT%4SCHeFs_%u
zy;D*aN;YI3_6mh4pJEmJ%p(4IRA{-&=q(CNhDfP-P|(Z3;6%+Z!@A?>DN?gaP46ZL
z{a06V^g)gdkWcPOimh0yuthsjP-)2IuBCq!orot9y;4#Xsw1uITVS(Fsqmq&WXSa?
z?;E^tQbFE;_Li@=0&?_k6Bbvbafu8I;rS&Lv_EDlZjgX~nX*g=^Y*-r5B$q?WrIdS
z9v0%rZH6*6>#T9f6`i<$1Gm#K=j96PtG`!DN)K`~E$pEc0!!wqAMrjx0gmEO!0YTe
zPOMPg&TOcFZ8MG38Y;jn&gQODsym8Q+GTOl*sRQY!pACcX<#CakMfuMlO{lW5K|he
z@hI45*yXfX@E@Bl+>P9WdeV<~8^UabSJsQai9eF^-P_kaWsxo0<BgJ{pt}J2qYh@r
za8J(8EDo&&*c(tN>u1cKj<8K4k?!XtFp4}zV;@ZgkzTi9ajHoP=NTCVy@0$=)4}24
zWQJ{*YP!#EhPpCbmqQr&Jkns^fb!kT2<P>DA_QT;t2tAo{?whbpozjJJ>Qc4uB1OI
zDS)qZFO)R1-SQrQ>(eOH=|R?a^&s*^2;tYKaMlN089s@*k`!90z(zS_aq2zZQ4Etu
zlb0y&xD35i*)*g>MH5-1fzT`Na#7lE%8_SD1yG66;EX_)EfhKCM6UZFo{EfL#5@Zm
zkmqLPIfQ82xT2ERPbli9uKMH(?+dMD6}l+`0q#)19q35oa8_t<cF>(9(&<V;tVd<v
z0CRoP6mu2KtV1kkV#!4L1%vF*jYe@tF@GElk4@UMgum8|B*tK_9nO|~=0IDY^xqHD
zeYa<B5d03_Wy{3*Aln4|_d&K-odKFaq#hhY^vg*<w)jZCpJWvEhbClE(Wq5dQUH}p
z!fw=31LotjuDfV@p>EQa8{XF=y#}QvzVx_jKrf}@en<K;jA~F^8i_IRp7)9}{GCml
zzi8QL1kR%8K2OtqcO%bn$a7T|K1a80+jggNt^vpb9CP9a;bB?L2W9m#xNeO(Tl@Lw
zuBwtU#9NV`=v{#6sKA-XM1QSveItp2c9cTIT!D9E^6tyq2fH3>Dz@@-Qurjb@Iyk6
z!rq{`%!TCC)LfkcjnrDuq!*2B;uH35D$+)nsalmpj`qkTtLaN=Su^fOX~6bHF8zf}
zLh$0ra-5K>W=4{N-UgBdsvF@W_RVqexs@+w)s&RNls`_tfH^>m2Y`bBaHyu2(=C+?
zeq>>)FZnkpF7}?K%9Au_lb&oZH7G87xTBdHeMW_T4cdm`d<Z*_w=YU6;ZyZwTQEYV
z5y-TS$X6+$q$8kLm%0Ap;XL7C0q+Lz^LCi-qrGZMO65ET;I7u70Nl+e=;4}P4Y#z!
zbLY<87(PXDrMKM(d-qcDLYh-aud_}M`uSjRrl$MuMwX5!#pfu+q7GiaWr(|eHMT)A
zL*EzRsePC)a2^KETZL&p+N+|Z6l5=kxnlt&GRy_E3AAjo)iTXTu!JWHd=+>Xg$<N<
zT`FhWQt^xI)0vA7p{Kp0T*LiR@v76I;XMy5&d_vZlAcp8>wZc5Rmu%-N5k8-IzO=9
zg*x}Rru*csxRL^t40DHJ_74L=K`sQaZ8(=IEnaFK<Y>cc<~mAoR~0#%A_REMC5^|~
zf;x*~v7Ax%`T>L0S*Upzo?Y|$zp#osq?!W2S4--h{0nGJ#m5KmrVo#(Ak}p?sUj7_
zIzTyB{-~7K(bE23F=_f12N}B|&qfUU8hc!L>`@G#q$9o1jcgkXL0P@rHlX55!z<^l
zH_<Y}znmKCjal`TR7P;y(wIK0d1TbG5uJl<t9kiUR7nA8rOYrl^3?+c_!$McHm0}3
z+@_Wu!>#41#2X`Hpt!OX6dCSk%Y%5brE@+wU4`ANuRAE$LnzmOxcFyuv=uxLbNN++
z#=_R~<QtiXg6Ac45T{gwpM3JHn385%TRDZ&FU%MKE##Gg93H0Ex*Z&3__d}eF0yV0
z20LPREx1IWAlyh=emUM2yP6~tutE-5Tw|E~38RKCI!k!Hi^{*hrdQJq<_Ey*?O`6^
z^E3GD6{h)Qub7eo&hdbAr4}B5t_2`DAyU_mC@qUpat3ub?7ITS(pdocnBnh06!qgQ
zVJhN9FM1EX=sr3#%5@4nuI$?ooqE^}d?)fo_N9Fu^0v_6mcvcuTbastflix(l=+Ic
z!wk)DIo)6}Ulz@z!Qx$!y#5UB=Y%|Eh50oq+!hJ`6(OUbTe%ceGKcpQd{a>2i~1(l
ztUM?7@PpEB8g~0+uZWUTkT)T;o`=dX_h4T6=FpxH0$?(S701hI-B*SzbI`dV?*=QC
zN<J`n4n>WulIw8ga+7yk-dhsVe+6Z@J;Bch@(9fYort%?-LfkwmFPeUb4v{h?rSK>
z7+8*QbxV?YC(3#P0Bnh(##VO0wGEZ)0Tx4+t29U~gq=y=J$1hDIgf24udl6PF>Abo
z@A_0y`5J<X^fw0}GR!?y)6MNhfZ^}UR4iFwa_yHc0sUccF4=(!Hy6KBWlt1kbe11{
zobUU-E<DDR6zRNGQrE`wucgsM8>@cuxlnAyk_vYug*>B)$=6kM=Bwiwm23*0Pw+-o
z$N^#_dbaB@E7F5euD8I0tL{voLAlWPf}!qB&^#i~@|u?9=KJR*xk9!V(~*v(C3D=#
z)afZ4d7O;9<lAG-lNf0#okfLhn2W|H=m>ES1-V~S)34X~EW*j}59OYqo*Dxx%I=I%
z9?|qty0h(xQfaqN!-+9uSOg3sTUgY~AE=j+L->MQ=KS_<ShojrxqGW8Z)AN1cjH4k
z(o2u#9m!ec$2)fH_)Vi{k(RP3DZ;d))t4h;vhdOPAiz(|S5{BknbbxBJh6c7y37Y(
zft|>KaoppmXma*>K{;5J=?j%x_C&kt^vTn^JyFeL;0C{*$naU<78CwI0lS6^@I;C6
z-;4UYC-ecBi65_r)6jO}E`%oKbRCVS+}jje0Mv0@?y@W#0m4~YK_zpT9Bc~eDu%*n
z6!_a<d6*+sZz|Zn4thyQRNSi)6!aGw-#?cmlgcF0&5_L%>a5(5A^Z8CV!wefTNkUK
zl0I?e!(zG8<sPOZpYtAt-8D^cu=6Xa<UJ{j^db2-VJ32Q1(j+9E!BWuvo>2(5nxqU
z&Y^A_P6wQ2QBD?iifXmPX@%`5zwC)VAEpI%hS>*^=k0;pcN1A+Q!((8!}l^WS+&gk
z|CjU+Wz}AK*u0*S_M`|YN`I3>L1%ON<cPdDvOswwz#Q-l9T@C;(Hk73=}mEyW?Oof
z#63~wp?5ST{YuA0p3QWg(AI&Lmx7|uau4w9n9@kfNBg39-{Q_^nz07qhEqnz5ht&w
z;I21Ys$_g5!p2T+z|;jS%YT?HuK5*?0Ln3j-t<vo$}z&mhcY-6ha4a&$;0SK8iSrX
zG0Jrwjqf3tGWSZ&13udn$gFIAJ&3ITl6s81zqsO4|K;naElFR7$&$xvu5kFZ=DiAB
zH)RBJ7;&<GSRy@NNgi2LU}^p%GG9a`_yNP*bzr3AOVcW!x^z;|YlHbaT6ikdDjbIR
zMAHj(%bqCZn)IFMxeVLRDKyP$h6k&TDAUiFk?EM`iTXMpnlyCRQ-9yp{`t5WR&UJ+
z<ZSZVB1`yj`27wXzf1~Kvf(cCl?!1eqM!&WA95dI3Yr9e)9F+ox#8j?of3+*v!)f}
zPTCWtOl42>f@0FFW*qc$P#y~U3=3gvBj3@*DyYcFNauOt_eTe|1g}>U<d$!3pM<B_
zS42Vhk|-&AcXIbnY$F|-{EBX5keQj~L4ZmyRHsbAXKTH6aHpFJeK2MC8<!_}$}o4f
z%g<LDvdGBstStOZL#|y>tnJx_kRGli4>~ZMw;y<2;z|&{)&lDXFrCxSCM&53PHTI0
z27pE$U}!SeaypNWH3l+ENe}?*CmjiG?x5vOlIaV9FLy;Czq`|LXhHMN@N-w{X>U!>
zxW7h0H%FNsOYm<J8O-LR{HI7GKti!OEqrZ<qQ>rEl1!VdqzHZx>Bza#$OBVn+n#6y
zlCn9Nd%j5GGs78B=-uV_9bsA_cBU^^X4w-xv5>TU2rHck@;H@%y82H0_U$)DL1T0K
zQu8j20Qt#B{!?_?@OU_iD*6<8nxv#GT69J5*jY^&c$bz|&XU?w0R+H%F7G!wD=vm!
zS<~`y)9`LZx$f%<OFk#0vGGMF`OsrYhfGsAzPCe%4jsOB_?3l3kNO@x>K;;VIs<T*
zpLTT$)0?EEBsPS^mIx;(b}~PPS60XDsT=~|>8vQ9Wi>6An>dMkqLk^YG`_dzO2aq*
z88c=qi(JQRzK};2Hg_q-`C6TJE;l&-hx}bP=r2icdRjPs(Ml?}Es#m<c0XwM(WQ?J
zXJYp9BS0mbsB@tL=6%sw5Lfm@Nvmhz4ou2b_C)0){Z#FV3jh2z^J!#qoxi<_x;i|N
zvC<}a-wK|0>3re!M9N|LfL^qcvRHI6iRrzjY5YrcaFDo}l|z8So}_c5d^%`aHn;4F
zl1`)*55kj{97vH({Zu{3BrDW%R8>FUp(ICXVx`^ai{L#&<=YOP8~2}!Qc|>BRt|Sl
z2{)tVzPOTOd!2usyJNqr0FQzWkR<JilFsMMqf)mgN=0wSZ$hro^+HAiEEMf3ruM6}
zJEJd`I`Z8E{@V(@U?nA@ob12Mk?7Zqvz<%!j<7~5Jp!@$C*>4dK}^b)c~Ih>C})II
zw<juc(wRJjp+Dynug6giIdkj9Lj!mT4ThWt4nJL3?AlHU1uH3q`FrB^4X4(SP>U94
zkdf}Tbue?64}qAHqFlP*ow?_+C;GfIqQ^vJlE0(x;9zkE!(6Gu-aMi=ymAIR^3cfc
zDTIQQlt|M3y0%>2q8E)#fFn7YqpS!}Hp}P?*z5dI(_HRa+!JM(`zV;i&ZcwR?`RZa
zwhM=9(%|U<oj?5VBsy1+lG6RkS1v2)#F&eoL?#O~-Q1NyfYFVVNjsI>G=@=MDO$`)
z+%0QxPgLf3v8_R9@38oFM+^iH2pmWmh7ReGPZxGk`sA&oC}&3s^K>l_2@j<geL>UB
zT{#3Om)P`!a(S0G>%xe%(!962I3;eH_e4+7G9k}=R#IKVUmdh6Zupx=#xLp28RhiK
zTS;kgWivR^I+5@K3i(u>u(>OX03(^$u}sQkbS^GfSUH_=J#{##FboS*_noN7!Jg<-
z$Q0WX1*6NVacDtfo6Qa1<F!9!v0`3Iih|0WFs}X2d-)FTeVwqmD~kYy>*`5IW#fW{
zmDQ*Kv5}F)A-xMZ`uE>#@qP58o*o46YiZt)^E-x<-ghSO8B<bZ$*(6x@RN8&Q5zo;
zoJZ?4q>*5jsvtnQbSC4Nl2SHVds6m9ZzZnl)2P($i8AcJRu=;GbRj3Db`w+kdFcMk
z!P5#kdr}sQ7NIa*_p#i<T=Y{%qDHD90`wjODW8T-?@+eiW-FUakK_DKG_xl<E0k6$
ztkly7VbrxJ`UHzbucko=%F%V+eO^u_%_yj}*5PLslkmTW31+Vj0+dhe<QKihf0DS#
z?1^6C@+aOsD0eFNM8RR8L#CPRiSF&7dr1QS$Y?dg<dm#Rir}4jU0)B}Y{&nqU(S?`
zY`er(EGg{glDK1-dj-S7uG*hCa(C{ZG~IVM7&K=E^bs*NugG&0a(TBWs`(7LW95S1
z<g7}{ut+ZRT_lu<e1<j$n(M4#IGEWhfB>tre<YiZDytdvhL0&)gOl=<o9y;;`BAQa
zO6hl^m(u9;&@v&9w|k<R*O0q=$R1dedr}IsJ#Xv_e1yL<+s$S{%4U`q0m?=`3_e%q
zLis$*J5|#OFZ0%0G+o?;mp#$jTz)>&GT(`wpm{`|`SKyRrl-Ii+e$;0?_H~V4YJVc
zN-G^{p+tDziz+276-)jp^D_Cp!fNGk-VrPU{7|X<ea?qo^c478GRz}oBOfte8Kwnx
z*%QUSV&D!;;@F;O07ex}>UvA+`Tz$DZ^g#(K_D(&mi^D(fm=)pw4#4R6Q&u;3=4RW
zN{C(f5{0c>rOo^_SkC1}Rx`opPL2W|5a1P<vM0)1^gSwqt5N<dBcro}uxT-=8wXK0
zZgucG5e$~f)D?%fpCpd|ZA=+OzRW>}`7C^Oa}`=Mma~7$WIUpvA{vn{tE7k&!hmpo
zR5EE)<OAM5@OKRU3+W*mm6qEHN3o#wRX9$q*}<SaGCz!55e3CPlNI+fT=G)*N&gc~
z?VczYB<+cM@tvrv9J0|Uqa7XoFQaqQoJvaNca8H$pw(|V5-J-B2IaSNiRo*lojG&n
ze0rJhi6^IRM$_AlLY6VKta*P|nV6Xe9wIN5Q@%FZ$idEKt_CX8<80;#-z=?rqR5o`
zJ<)J^P_CVk>1bWosmG5>xY%%4?k=L2lHWx{{HXA|qNL7M!*GVBvXg%sD&%C+(>+GE
zEMyZt@-+y8lGMTvppV8biaVMkV((y|n=K(9{lMcQWRbb3e!iw5lB-W5{}houQOYvu
zf1(wgx@d-rbtBVn=yhHKhe-V-y_sOJ2pFVk%cTJZ%Jo#_iF^Wz9P=0%^^~p7SWil!
z9-;vt!gyByo+uXBV&akK913K4dcyv^14u*OH8pS0!cRm&#Um4b4XkTmKLGif(Q3`6
z$CXjRDDr9Oagpy+3Gd?r->u;Ja?E2L{LP?8+!;9{3M%2K%vTU6w)aNZ)b5E=p&vms
zt)R_({Z7<TUJ(-IBmbsx{oD1C;4DH!SR%9pgfB>C>2OLE>dCZHRo@$xo}oac4U3W0
zj*LGMU^EysC@$wcNBgjnEEimJf9`|u)lUlm&kJ~WV}$d#_M_nCJJA<3UEGW&4k3<f
z(Zv<q8yagRm(s|d<X~tli(l(F=-!jixAQ35*jfVhZxcp*GHr{tNJQ9y2v3G3qY})e
zm0FgK?nz;~4|b)rJHb;A_}AxHi)Izs#}m0>m`sHqMML!#w3$UGSYSkY`|XG#dz;H7
zL_LYh8C%Q~45-lmh36G@JotYN1(mBsk|+B*k_T?t6Xi3s3CI@t3=KKtJJA(_UdIDg
z^JZb{)TwK5gT&j&)J8>mm~!1CphbF8D#b&1>>hY#%twh3J0GgTc;OUbQQUQCZ8wG?
z`H9rV6ymCw5jl%xmbB&(cPwv%;?mlU>eQ*z2hbN3o2DxsjioH~oDbjqUH%!`m6VI~
z7$4<0gfQpmxWYdT?%HYm3=NqC_q7}{{f)+Ru%`R&mO9C3XC&t4VO}YtIgE6Aho@hS
zm6yPss2txDAu_Kc(m+6XDx6T7>;NG@cHM|xMLy@+7&*o4Q9>EybdUV?xj}Jd8>pC%
zi^0AtylqE12V!oY#2@~1@H>_=xycoVMrt)0sdtfA--#^2&qJ}#a>etRMj6)Bo~U3=
zqjM<6%?{lELKzJS(;JnPNPFV(K*W<HNeqo-V|ad;o_0HhzJe$%as`UJJ~HVuuuTzD
z{wpF%`#R=lykBCMD^G>qjIE+2m}mBY2N|CC#&00xe%NCRc@jSKd_(WOJ9CxDrgz9+
zuCbJrPw9yx4|#k}S;`7<sy;(QmUhS_>jmw@0wITdC%QT72CszaX|OZQU7TU=2guf4
z@%s^t@7l-~S)p#M6nN}LBo(LGqtI(gK}A3+>*pBqJ}7SFmLplRa=bA^jlP(oyyA|`
ze<W<4kIW(EH+#DV;jzoAas$BF8yiRQ7r$H&<uHt1dLM?@-z9}5{R2__n1V`pSu7%r
zR4J(N&D>f#j);N^o#$U^R8V0Y1(j8It)Q}R?fhz|p|TJ`_9VY2eiun3c!;zet^dCR
zcRiUbR4g-l_Us8%`o@N=8uFu9Z<Fttw6Ku{J<W?OqA|=(+7rE(`1|TOzPphr+n#9m
zlr}osP)^Tj?2*NJq*KB*e5yukwF&l!f)eQ`hE>ibe4Rlpx>-r=rxldmNPaXcS8>QM
z7v!&4<vhtGXLI+a*Iz%Ef(riZiCzZ3NqeHP6J!#{=SM~x^f*c1i5?C1sT&m_Q#;D&
zdW}1>{K(MVwO85@w4s+Eaz7mr+6zRM)y#T*Vk?PY@)!#9D1gW-!_?-?FJz&nVTg=d
zR+HDp)Jy95VmOWXa;i)IO!qAIyrvoqbLB&X{au;RsGOL_??jR566A?3@PWx#hPk)9
zWc8hfOlMIyR@QtX)8K4-@_~|W;fOd~)9TE<f|i#G|5lg=xH6giAoJcSeiTAmhH2}e
zG_nP>CL}rOv=XNDa-DePLj_qF_yzg|>>pzv%hW<X!+QhwTnUr!Bl$5^ajx`|)@zK0
zZp}9>U&6^$gON;ZdkJ}DPjsL!d=|oo?1?hkkqiBFw0Shhw`pS7-HJ#pDCAAUM6t7<
zHcZp%%pIH9qj-snHUTzNBvC+FeT}Waf_1|}lvK7Ld{a%z?ljU^B_SR8vp}p?B!u;b
zoOE|C3|`^-h`<}h6Bwb~Wl!`*%-9Hv@`)Yi)XB6U^0E*+E013oB8^kDdUH0+*TX{7
zlgb`t(T^x+DHT-qL`m<|1cshxX#R47pSNUWI*`h|wu8Zm^f)Iw=-!j~Xhr^57n@QF
z<Ir=~De7GdS1T+-xVnA-FQ%jb;#IH2@aYElbRL7GT+dBg0g5av7G0<LrXgC$$Sy5+
z=SJ9<JyAwrGQUoGa<2QdAc2^Y0!rO0DTulhGP1v!gnA|DjDV!a8Q{u`@_U0`XQa!|
zXBsj+2!F0U(V;2c6P2%*VpFG}94M>YN=l$5f(U_0qF)5|dNsjirj{LCTop(ME4!N^
z;iB;Jw=5Ywlf}<VFJzK+5!dYma(C`tUNW77DYiDZrkwW65iGZol89?EJ1a-R_24~S
z3kg;oG_4wLhJ=^F%c4nn)4)8R<mV$DS(-C+ckYQYZ2v#xNnL$JCfO6cAs60+%dMm&
z5>rwlrVf-`U=-mWQ&Q4ctcY|<8igU@01`YPOQJJ5CH6`dfA75LafVRmmeh=)oMUrs
zPv|(lxLI{S1DRrbq7MG@QqtIV0N}K9Bvx-EIolg~z-65Xp~4Onv>OF~TefWB@k3tO
z21>;v3oFPZ+encI8B)C`3jeW{XlQRlgv0?YFC~?Gg!CgD@Adw?sR5ueZK!FLbc=%W
z_RNu|t2}c=sh&4O_dAfOwdR1zdwp8>M3E`BCyG4sooM79qm0aXDXHuHY27O+Oa8G|
zkIJ+z!<at0LRG>|FM2%r?~+GeuJX(yTIGW<%-sr^ws+(#zseZwpnFeB+7m_2i%`_B
zv;fd^o-mWWKv$vGy^_jxF@XB61{L?w4q91BC}@8Q^HQA&{K*IBk%w@p=t<$TEek8o
z<BS}Uya3r!w=R-pPxNCBmR!IYZ`X(+cTWmfKSxR#2ehg$kZ7K&<c@8u!^a`?rfXG-
zA3nza9hLcM$|O?2RASl3y+-o^y_=@_=*}#x$eCvS{K9$T%QZ0#ZiczeJy9B+BPo~J
zybWjNl`Oe?QWBV?BFSWSaZRg7H!F*GBlj<1*-;i*4Zl+>O*l-c>~dQMW$^^*x%Ou-
zVUF{#Bd--5G_OePiOLNTr?{Ac{!iZ69<?j1Pqd^xQDnJ`q5BKMEA~i3D>Uj+ZYAYw
z|Co{zF?PT~60EleP^TgD6<TiaS(hQ`RhnKZH|fjOswb2G{n%p#3;jhJkTc0|yv~#G
zy)?}yH~h(-Xl!96;1T~+?ePlV@Z64}?Dc^Rfk`?2#M(yVccP4lTxFSixZA#c`|pE9
z1CzuTBV(Db*8Rg=;(YLUTLS?;N1;eVQPvf-UsK%lo@<isE2Mw1s|?`fReDgl40|3e
z^v{@j4%%t@^yy1Ag@<y+rN=o4xwdfSfh-H@G#Yvxm%pzx8M?#UDw;p!865tW7k5la
ziIcl0C8CU#e+*{;h;n24vSC`i+QCLZ+#fUcwE{Q|q;(ueA)SJ~NvDxm73_|J4j~`e
z`swS!8^34iLAMd*4E)LWlfWLBeCp*oUKe;*&CKkHUXq1@ap6jxC7d^2$g~FK;@T4(
zNjXLKv<VkeQpzt@ue5Lty(Ix-!zL2+er}_MDVLkxR91N#hb=0f4&ZkYjoKHyXN$5a
z|Ex~ptc!B~gCU?S&!0nDu@hjD0Oj!j3c3^K43*$B$}P^l9JH#Favf(x_HV1sWC0Ao
zuUzpWUm``yj53<TFjp3fWO1+YNf_?t>`5C|n@DUt8Ew><+W#z~q$3oqZk;IVHT0Ov
zfm5v26i}ecq4&Q~5Q7Of3{2%p&(YjnGZxxB?2J-dwB#z!B?u??|87jQP4MfT4OHUE
ziLlF1(9^Il&|#s;FDPVw+W0`*lEs<DvR%p17`Q?f*%M{n_QxFA>7jd$;MMg`8oE;+
z7c(OGujY<&X@j38=clB^iuI&a9_vXJoG9uk^n9;^&DD4%O$Rzr5QF5E=u}LVO8!m?
zbu5Z~2*ai^NwMH*EIsju_^%d(A@7#-%tzopKcH39gde%$<%V25AZu!rREF;KqOrYe
zWNg?Ib;(M-i4Aut<GhEvpXo%2Y)Yy@!A*}Qmyt>DcNG{FuYr!V0}|=VI>8y_wLvxo
z4Z>r}cbJg}#W<CpJ;e^KM*>yIfr6e+R;%R74xUqUfFUz<k4<gZ(v-V%opL~r42uO1
zWX{=>Hq1#$IM$OA-;^|=Rsr@@eg$v>^NzK!|0^L_!DP~sA0S`MyBZCFoVuBpPa>4x
zt%TJrawqN$J};m6<qRXM)$n$z&I4L(I7pb~bT}W~nLW|i&>fj%PxSdDp7D1nY0i%!
zf^8O;k~R*Xk}|D#y39LJrkxn3txEyi03MNp5BcIlT>0(#e)OEnk>078pXVD_!cj3~
zBoy1XCC!6SlHU}PRw={MOLQi^hcF|R6TW0&B{GlB<lC#1`IjRtWNDkvo~SEtje~>{
zEL>s3w1$Nvj$wVlkVLxZ#!u8paB=2eJ*hAg!V%0KM*xi8fqE2}9Y-s>DRYl)0Dmpq
zvOK>8eo|Rm;Ff!Jf53bja}3HYbIma*S>u)p?qVO=&pnW|8&8X2ZvpKwc-n+KTn%xt
zdF2(4I&}*HSJ#2z>k{V7FF5GlkKT~!4ET->-N8AsC#q!=H(}Z$d&CQOeo9K@`DFek
z5hATFm8~x+PKcyxjzk2&QRWvTGjC$Ja(K`KPoWIYA?@qJ=~JeQ)ABzhjYo+ZgK+YR
zc6b>~-h1i*VDt`+nlvc02s4>5-9lkHv4yn?oyNx@nm1NC&Pd}Td*TtEkR`S!8VQhb
zpihwzg^+2e^B(TX1a_28m;^*g?MVp&RQ{W&FfTdSU5yGdlod(o)yw)&kD8-=^7rc4
zp#^xGOr6?Y6g0zx>_0~y8kCq~M*>vIA#$OhvEz)$;@lH;u}Rp*k!s*iy7?<9kzz_p
z0;Z$^nkg`;1oPRK-39X#%`Rp68}?}5WRAM2_A8Z}JlZlvx(8E+gpmiH7V;iIZ~kfE
zf&1aW9x}aDQbr=q<BZ7a+!GDS6SlSuJH!qK`70?coJ&d9hlyf;|EKvecLfmO0K<>0
z_U=I8|LDkW8R#QWB>8|mSTuA5E1bkIbraHknRNe<5c?u}dikQK@oC$(?L+Vr89Nex
zU51sbHU{#*k~z*;(4J@l+c70Y-u#sm04I>}B$aqaz+X?%%;`A-nK|9Au2z~#(VC&}
zl?+MW<J|{$lNw>tSf2MjhJvq>)&?$U;NxcM*IC++>ruXj_KK#HR;(x1VJhh^W=}MM
zzu0gWY=WVGLX^y}4+CE!#ClT-beF*2%=93@Leh(HyAAKR30%vMr0zk%<O6}D8P4Us
z{Xx8r44e1nmEr0~xPR};gZd;x+*9G@aLoA$VIFYM{|G--y-zCO2|nbCmp=yXz(k(A
z8M;3oxbrbdr@an`e$CW0?QR|>P*}2!a9x;&eH<J2Ybu&KQ-T1ej(RW`{U_zxKNrhX
zya~MjA>3GAS$Um|dkSV3%wANeUYM)m9)N$W!a)l^(nIV|-HDxs3I`&sPSiVD&0R7~
zC!d#4?tWofrS0(5l|0{o$H)y5@Fw4hu3qRDJEZpnX$=a?!8CJcJq-x^i#?*G@*N_l
zRK6ym2wfOruJfUeZ0>X*KzX)gzIY+#;0kd(MvlkP(<Gib4)Z~8bqK4v{|M8>P6a-m
z3jB9Xuaq05dKAoJBS~aC6xnVmln+K8&k;vPH;oTzZA)50PkbVa2OT?hl%dh9Iy7^H
zT{X?z=|O;&e?GmE-1M*oT)$pM&gD<&2as3ad=*r9VGey8yvc!($b*7hj-piM+gS3I
z{m__#!sm<dduxQzJRQXCpo8W!+>I!yBmiTN=!Br{rfKF*9|9=Pi@Y1tdduBOFPBh)
zZ&1#2NPAU!zB@@fvSOPnAHpvn{)svq^{yrF{fq)Cx_C)`JHyNQnjiT5iB~QFC`i6g
zIx!_Bt?40ur!}Ue6ktqAiMbI&66eaDGgTvci-1%xdbx*CsLfG~^>JSevmX_~@HfQ0
znztWmEsJuVi+x5B=`=)vCpji~r6Ybv6!lpYXG@1)$w~B}$B>`=mnO36jclTra=v;(
zv6+%)Oi9tVoR~%Co<Zg?DwE~)1Gktkc^`$bPnc%*+CgB(j2X+Y9?=(x)?x^@2xd3R
zyc?!0p2+!9xfozPmFhFhPf)6{nTm^7X&%y*pIVE8NKY1d$ZI|X`F!t^Qs*lfN#4|Z
zxk~hSaXX%KSp+-BLC>4Sob)RKFB6Wy9b?Pox~bo(qyTj=1r?bX1I#=G=>?--hBGm{
zAy7&LsAC;amJy`s+=8JVK2DfpOIZ)eZ*$VTB1@ifx0D<ZS<n<&QPL^I?-EXf(F{p1
zGC54s_SkS&0?<m{gE2827$I80<Z)q|*$shGBS0OS!AYb+nB!e(QxD~)#7|JH8|h4X
zy29j3V+ywtiX+$0$ewayqkt00U&foHpu!Vrbkw||YjSOD*2k%&BsLojzs3>sFa(OU
z1dcF9G6b50K&MWfzT*sXU+Uqru7s$Aa#zsdydR;gck}Ke`@ycTn#MNc(kS<F#Ceg?
zqU_J^p~HmSS7sD6=e#i#$7zLExv(xW&n4h2WSr-W5F$E<yW-FJ$wfI1^##_*WEbU?
zOR-K0rD0Y>pezVbsb!vcHWm3SvFFN!aPJXrG<Ec6!paa*hL^3N^}<{cb0xy8hM8FJ
z2`4?C%zuw(4dz;Lm*SDefvZ;K7-aaF$gn+fh$HM7*t0SVK-VJB(LrD_5nvvN8`j~p
z#kert?1n(O5MW69JL=tC)WyZhl}9MuQS{;`uowDTh}L8)hxB`M^6Pz-(1$2#?4x)U
zrdh7mNtWj$T|GdxqK9=2g>~BIHUvt702TQelynst#bL@ybIBjl{gQWIde2Qut)Rjz
z3Mwn*`pLRr6a>zyq%iyij9(B04onnvOM2O)Pm+RQW*Pz|LqJwQWtv6ZTbVj3m$kV*
z#Va^J(s_qSgGpO1f4diVu?H2h=1sa?bpU92DQVW>t|SU5a%ZZ1LBER1<Qw+P`mj1B
z<9~Y$fr=tPy==$o?6xfa>`KPl@-Ce(0~y79kYVkEoJs#E-*`<4C!HER-y2Q?KK@C=
z;QWFp9IjQ^;j)v^Y~}>A_42gxUmAeqSL(7PUY6EJ<!4Sqpb-J;oP1^TMCNTKhcQ@~
zSr59*TV-h3mHH_MGURCC1cu5DhcW0e$3vTjf2E&A9U11;ljc-XNm%9tDC(nFrPXSD
z5PlHL+45z@C5=S07y?y5AoBsaUOlY>C+;lKl_j(fv`L!ga%Y{BstCu^0{x_D;yj<O
zyq|+^BtyUu$RL33#FP|TX_b`TRE`54K*EusEv<p<L)~AAo9L{>4S}>GP^q4@8I#<h
zfaDt5F3q;g!!VNTYyGrhY<wF6O+vuclQK^(ZBH6-$i({$GL*B9kp~6cocZYkn0d`}
zBazKv2-H3TvDIf*mm}xnlOQN$PTG(L3Ob(y(6VeCYXwly9Z}R<FmrD0Br#-kL!j0W
z$mm1l6E%^MGs^PmTF$3nC6yGpW<|clm#_O{cZR~y{_I~}nlon$U<lL+0-W3JfnKx;
zi;M2aC2v#1v?O~`N-Bvl>>Wuaf8dqF$dQNrsXw#gdrE|84nv?$5#W-w<sG8SLTp}7
z(Ml?*qo{J5+L5lDpkIWd9`5opnjuh62%rltCH*2_44R~*k_lTg|DZQLJt4#EIRvqH
zf}fEMfx19|k>$z`K|goUoTMfzsiex*%!L?N>Ktf6TA;vp+F=KcjJfLx0rWthdzVi>
z<%9FQo{}i3<b<N0NXB>RTwzcq%#Zo@6CTZ{xebAGA%I@QloY+l`(S^`loUo5GDkfa
z^KmUK40Y#%?I&6FT}1nt+YqRA1gQV3Y8m;0tnxjnFoA;3Ls9p}d|5LEqbsw@CI2L8
zsr}4t2-GS9at#r(MebihKj!j@+-Ld9T(X`t$Pfl*bCO~g%-D}?3G-WeQ`fP=Ai9}`
zKusaQqR~1Ifj&S#a$Z0d#4EXyO2V`fKcJ`sVI=lJI82|&LehQ#17;cmwTu8GN0*Ym
zQ;5uEQBq+*zIf+Uk_>%ghaF)2Mih0eLKwBMhCmt-aP_3re?OE|0Oe|x=U~Wn@~8ve
zkD#bs(+IrrYzX9w0G-sjIxLGu{wS$1$6*J#;q4yHD9S4vymI}D9mdz-n7bwrpl)|Y
zkUm-%l=N*)%jPcIa5tPOE57nO_OW4_*b!o9zM45n)6H!N)B*xircBwCIv&~0Ko34G
z^bg?`QBoM2LF=(Q<`f6`7jSg&Hx9ay41rW5z?Ng|S|OD7#X^Ouh>{9ZTsZs*N_rq~
z?D`dG_h<H#3gzFz8v@=UK)v2vGsj}8ze+01GVFZ}<8PXAT9@TGk!15z4UD-{ivV?6
ze$cdu7QlNY6^2pN(`jK|(aa;zKvsKWzhu|p%xwsy0Rax}Yy+R|6tCYhqRjg^U=X)r
z!`&c56jXjj{CmvU^`Ou$M7Rxuux1(pDMnzBgZHN#w49`hE2(glxgK<Xlv2-6TeJCl
zKT0f1*Y+3!sYHPK+njnlP&3a^_g|WpkGm>LDva@I+mk5i<(f$ZT#0R&8#LYAhCo^n
zU=g%0ye_5qoyFmv|0r5s&Z;S?a0k<;VT{q7qNw|zs0V1exeb9dAi&nk{+drZq!)On
zYkEHJswyc=&*dP#{6aByYZ}9aYnY#|l#dV=#t`rY0Xi7D<Up>xjXc!#2P1?69930P
z;WM*;dX$6bPP9n(B6KT<pOFj!FA?CB(IDz<cg5UvMvV_CTHem8E2(hG{PZ4LnmZj_
z_hs1o7YE%)hJcp{FakV8Ge+Hhn78QPEqZgfoz|x_3i%dhWQdD!3wXC=e|4l5-rR<O
zPYCeSvflg?={@RjM6Wm!yEQ%O3&ry4MNcZsqli-xW?#(67wZVzg7<C|xLdJ8T0BFb
z5(vzhGw07*L8;H5GNl{Vl>EI>QV{}SMqvyQd-y@{<#?|P)68xN_=Lc;Y15WOA@_Cg
zbOrRtc>qV4tR%0LR5)c=dm%!_hPEi_A2>F+PgZHn(-5c<0t|BpQ%Bo|v!@>aNPWI7
zOe@CjosuHh0tERZrt7n|Yx%5gxncyhIEFyE5MU~{0t)(nI(=x@QIBV6dZBLblvD&@
zwf75*qqQ&y-3_7d#PpJH&9AxZ0|DyedAyNc6v?NzY18JKQXt@MWk*r(MIrCgLITDB
zTCP89y15O3Y9K&eT#tNRbJ5GVfg$z}-(q--EEN}%Ksn>ciY`hymNzoQMS11Fs2ick
z@0K%vOWP30h5+@l1?wd8+2zJ6+$8Ge%GA@?NjeoSFQ>OXsc_GvTYj`EU(3imwebNQ
z8Cu+pDMzsEF$AiD0LNC3C1b6ivYmKtsT5QM^IA!TK@@d3hU;sYwdra9Dq-v~1S*XH
zJ?QeBE;`?l?>Or0O%8g|B=40}Btz&kX_;I@+miq*cG*+WXjnu;AP)p&n9F+$K|6+n
zXGVO7Va^THn`%#mk|OkMUfGtJ6Bby&!hJhtr!d{@hCn$HU<7w6>C5#f`njG94PsXV
z=|F|LQ=z0H6uqh3`hB(*5C!c8XqRfbxebAGAi&6NGtxcRk@i>AQTaZ)<d4^@yINZ5
zIZ?<Fn6ax8IrqCAhnWAZ<CxnJC=~+SxUd+vTE0pB)4L4|xEe+3Ur{$N<l-+iJ*f!7
za96-M5NqrUcfLKn1qHT4_yUwYB}V|oY>k3GtQ9nq(S_wwP)R>kN-7Kk#-}LjV6m%b
zSpd9B(adQGlmr2Wxz|&_w$O=D7hhtSdyb};(w(Z|ZXh^dH3zh3asM`;1tvZ1E`auU
z;5O3`Xet7n7nl2>FVpFupg*>2*KXYo9Xfoa{YvRhT~8{)1CD(9a|q@X4F-ExH_6;V
z)6H!N6oUX$s9mXNv4u%!b9r|!w}J}KsZ>&7T<-1#q~pb|o+bEf=z2vnry)=<0x0MJ
zMs4@;#`FZ*|1n}4QE;L~M2KZxL>g6#0!VkDs82W;*n{D)+(KxNAy5<o9Qj+HQQ6}t
zqyD-@(z}vQ;^v|fE+SGY=cHjd`69jt*H*j_n2Uz#DDO{g+qUh~v17+?!*sJ70=W=i
zy0jXjv5|yZLWiYZ4W)C~1#`akE0;UfJ*j}wsZ*zkC}`|TP-xv}&z}8{asg-Q)+Pds
z!1|z|GK_U8=*uYRUX@f(K{@qGDnc;yco5+37kl_YQFmb261!qC9LDU1K!AV@aj_5Q
z?Gexdllt`@I|qX>X9l!NnW-P{20(Esad$SG-^aaVK+Bj@0k%)(wg=^9PD9{-2(Znv
zDfQ%O8uqRl6X+9|I&H?(=^O1=33pBOqyiK-4gLg}hdDs&4Dc13<U8^=lIIApirXI+
z|DB+qU($naT`dI_=xRnuMHqU^p%}M{T|L{<QXZ;k<}?JFQ7^V*758bNaD7Sj6$-i~
zr`*O@6RMgS?gk*z8g^mwFT>tt16s!X1+$OruPVAZ>l6Wc(4D9+5AeFSS-#?<jRA5D
zwc7C1R8J~kGUOFybPapE;Ag|$YS%bV@<&1UM>*xdd`v;9CtvuYpaNITDX9oWZ}|*H
zY}iYIY)9c7EMe@aPXwp~a(URr3~}$k-pYZ(2hcb7p$83ktGVHBAQ%PF6|iO4yG%e6
zlU8yHhobvb;>=|@U$a*q0qR2+8fp2R=D-AQ#<XtTdiyS2y8MvfUlnrADyg7}qV7O}
zJgJdIQJ-d!X$MU=ckLp;9_UJZb1X+ld%L8hP7LFq!p@i_xrWn~N3pb;9PS2SpomXl
zzddjVCW^Z~E$V@R+sxWV00rHO;q7RoOj6LhQPAyuR8T3InpV;V0b8{A6J~4^8b!Tg
z#*7(}p|FIvr?wDaG<7rz`Yh$$T}y^i%D-<<p)r?B?&QLCFQ1xMQd&s4VEb^5K84n8
z)~s1KYPz{=0|CmnH3}-XDO}6zS|E~P?anCZCB92s({s`=_!O9|=ItM*iJi^r15xBV
zG~L|kMSwqU%QwaUq`U{Xq@dCMlm()l_*cs~m%necx=~W*C5y0dAgjGgg$scKo6Nb)
zHLH2-E6k7Cn}z_5@%AXE{1Y^GNM2H=yoa#|x`!MiZCXy1i(T`>-2h7Vy?&;EjtJa=
zNr86bleX&vx0&fgfO2fd5x=W2Ww9_xL9b`jv~8LcR7#_6deWfk(bC>ULGBm00}}<_
zhxy5Uf!oaVAV8V+fm^xeM9kPj+0KJ_9OawJ#<=d3H0hHz3i1c$DZQDed><=iBY2Ad
zTWQC!dV4Vpwo71g5`D!E@&Et|4M{{nRO=4Erw1LD;O{-TZic%-Nyt!#LOVKe2PUoX
zVk|b4<j>4Onr4;{0l7AZ9`q>`RPI`KDku%_)2uhFon{3U1naIR4XO<VEUSNe1@6E^
zfp?=&9}V1Q`iB5zH;}TEv)M}|a5sx`JehL5I>A3x<hoT-mgyI#=Nu<Js4B5<Dd64|
z@MJ|dXO$5^Ipx-bODQwgS56Jw#hm#+lxrKntzqm8#*xerX6zjM5@t|C7_yY)2xlxI
z#t{uiGbT$JWnU&CTgj4xA%vOiYqC|Zv6K;S(t<*y_x2CGzrCOL*XQ%OpKH0V`?~Mz
zxu5I%GOjDlc2;JgMz2G8r0Y|12PdJhZ8ef?7NFH9ruKd6T}JnX8WIP@lz%1XB0^FM
z+H&Z${IAwLs9S0MT(SP6K<J?)^q`a>U+}RqY@}r@3OMWoT<7l}+m){sJF@g{J369|
zJ67;n@UO(1+SJHi0e4ZkzQJl_p*STOoXeVIQ0~63)04tUr%ZUxX$O(g!M3?A-wp?f
z^_&;kwZjUdgF&vY1<h0I*PhBji;DEi&_z%%IbP1hH-cQP;Fm=X*8V?qy<@yT&DvB@
zk62vSp`ELD=(VMZ#QB{H>zU=|;jP!L5Ef!fI-J<xFp4JSjM&QxAvU52m3IlJY?X)s
zoh(oH9gAQbqJT1-*vkT@)NX$l`iS?CCu5Oo3ERco>$cXsk)WZw(?9b}eONqVIaD7;
z=$u~Dac~#2(v{g<ID=_7g%F+H3m*AZ)qno@c+hF4=>#v|ocn!2e>jz4gj@|Tf@U{X
zj|>negZ|N`nvSh-av8m90ypJV6(^?A{!DNx0E`90zeZn(ec=Gj=%Ntjc^#fc1b_hu
z%WwV8V{XOBnWmt1q=m?#N3G+Sfde5<Q2-eDRw_p2#lYpj$JI9zx|SFQH|Tk{K=S<W
zUrDC5PiA*`@kK<wCiz9KG}at?OUd364Kr>Q@2d*_x_P?PdpBx%IYP@+q1aM2A*r@H
zZBP$F+gg~dP_&Zu_mQoX7u(W74~ZjX4yOg*M#m1x*5eWlS#@F)dFcq82C%44G4QJp
z83MfEg(%gO!<3%q2?=rfz(wv$6(5aG?l_=&#PQ=6xRIX^=_fCYsaGSBzl3F79g^^k
zCzUex{(a67RV^HoJu(*$PQpjdDuYo4FmPEiP2rPDnvaP>GAqm^=w<%#{Jt(Ie)4Xl
z`hc4N;avs;{T;p%*tM9&@;nZMrT=|RAgkph8u&e#fu!eJdWhPfM0*e9gJaa9f6O>(
zN1Z8^)iZ2JESf5iJVhy67}tiB)EeHPXLSq5jNr143ZhhqS=O*w4tr;*&V<*I<j7`W
z*wTBvDK{hRw7`5%axsQgk-1x`dt0mBXKgp~op-&2l{N)MmLdb{hR>tg&SD)>^`$l?
z)K-O`)j1S|hGa_|k9{KJ?W%s0k2+V>Y?B1HI3`7i$YZPMddiLO=W4VB2;{42OW!qB
zYSl;`S_lx8*-8}Lr3MxgDWKo`4Imke-EsEm(%bP1ilM9P*zXx`PhHrHmyYXMh1Ev{
zKYWm?d7il-Vxq<9s>c*}Q>Nq&==;&2sAz=y_RMQ6vDcFleeC+E2C>MM8RTm6Hr)AD
zV<N;!v1Aand7Jf{*_U8V<KXtTC_rkU$(7e4VEr3sc&VBaSli0U6DcN^SGWw`qc-vE
zYp4)QW=+41R)=v_h2u>auLVxk+V<~zCsv$kKF;Bpe?&~^b$pq;JSuO?$kD%j+FDD^
z+e~rLTw~M9vTlJm!OvlAlfbl|ioD9#Sw{)4;5oubkcLu5(YHcp*C`N5*-t;sN_Ocd
zR46?*%7G6@#j&=Aff69Ru!HQ=e|Yef^JRwR(JuAPY~rH?MV{3=u>79>>F{vj=UMDM
z95<{*v#$Ics(Z4Tc#SfU@0B1EZc1&t0d(2+)EM<J;W>;^>?Z70nyMZFP!u|QjZ95D
zZwjxVOGyI+L?A_q#hx;Z+q40?JC{l%f(pjXzRiCif>(!0eifaI6>8;)PZ#3yD5T+p
zUkm0ag-^LjSiEjn^mzGUvXE(AvU>kmc=@_ShGLSTvZjRbt^S5E>Ha2Dfi;;)O7rwK
zk&t$fNWtJudO}-`j7eC<!Yma;w(5OIOoxa)@1=YnHo@_Us!`knPks?Eyo?Xfy&MFx
z9cUo!Oa6&dTS&W;IuMyV=>BcC{Pr__+>HTq4}V2t0UrR__;{3Q22`~d^E59W7D9|)
zi0>K`b99mGpC2_Fq|*me2;thBD#$f&<`6kElK`JkOX<G8N+!iCVR>_lmx=O45Oqw~
z!>=WSW?X;P58ds`4C5eZJy;QKyGy@{#RNfp4U{!GYD2AM`{%7}H<Dac=Eo<vyE|i>
zl(S8{m--o@)G3`ykW)r@LH~py{^@NojSC+)cX8s*Rp=9aX07HX73%Ix^3EBi@};8v
zzB*L!tq}~-?Y+-E7n4hASmp7tMK%ZxCUK%FKNA%^rAw`ZM`^3AO1n*4$DSIk5jF39
zH_dO&j)%3yK=;B#ylAd;li=WpzpBu-xf{t3Mlnj=g&A_+3q}lL?Cix~Cj9PF_*_r9
zj$?dVgYdknKBZfV)P`?rcpE+@T_@n74%{_skEI<qNV6Ifjgbuz89eyeh8KLvvoFPo
z`s_8AR)1Z&lEIF%du5c~omcxN<QUoO91aDO`!sv@o4$336i5VKnisNb@E}*!6_y=6
zBGYKujcupQOSl)YNke6r8}IeGpC3*nW1{Be<wWq`CEz%%gG!$qQs-l3mvi>R^Cqsa
zP3dm|9%R0oN@<B&?Q3P2=lV_ge4IUt={3SJ^G{(jVqcDdE#~U&=P+F!7Ero9Qui@p
zNf@k%1!$74AOBO39HN)~+%OC|u$DSe5dU7Wh$G-if8V2Ik`Wj|JO}MhMJ(BYO({Li
zMVRyIQF5(9QpGWhbP}psPNw`ft_47{`QYdRQ%WYu0dYoJb_P7p0ElP$UYU-a5T_9k
z7w%0B;g6+&5k|I`sW7f^AnyO8Aer{#a`wgEDwma=PlXBs2AYVp`;weYnnJ*ekmps-
zv)HH{<J>AsYc~DiD1Sj>J7>$=`u}F-`-%r;8H+92=NsTQx>xAp8G6-*qBG;aesRwB
W1a08e-{t{g6bIJU$)+CdoA@99D|9LV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_controlcenter.xml b/app/src/main/res/layout/activity_controlcenter.xml
index 832b2e5c1..dc3eb6a79 100644
--- a/app/src/main/res/layout/activity_controlcenter.xml
+++ b/app/src/main/res/layout/activity_controlcenter.xml
@@ -9,6 +9,13 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter">
 
+    <ImageView
+        android:id="@+id/no_items_bg"
+        android:layout_centerInParent="true"
+        android:src="@drawable/gadgetbridge_img"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/controlcenter_swipe_layout"
         android:paddingLeft="0px"

From 70ed14243fb7c9d2458279be90e66df722b26164 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sun, 10 Apr 2016 06:13:25 +0800
Subject: [PATCH 5/9] Remove all getActionBar occurences, temporary fix for
 overlap

---
 .../activities/AbstractSettingsActivity.java  |  2 -
 .../activities/AppBlacklistActivity.java      |  1 -
 .../activities/AppManagerActivity.java        |  1 -
 .../activities/ConfigureAlarms.java           |  9 ++--
 .../activities/DebugActivity.java             |  1 -
 .../activities/ExternalPebbleJSActivity.java  |  1 -
 .../activities/FwAppInstallerActivity.java    |  2 +-
 .../res/layout/activity_configure_alarms.xml  |  6 +--
 .../res/layout/activity_controlcenter.xml     | 49 ++++++++++---------
 app/src/main/res/values/strings.xml           |  4 +-
 10 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
index d52abe1d3..d9a3b1c36 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
@@ -96,8 +96,6 @@ public abstract class AbstractSettingsActivity extends PreferenceActivity {
         super.onPostCreate(savedInstanceState);
         getDelegate().onPostCreate(savedInstanceState);
 
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         for (String prefKey : getPreferenceKeysWithSummary()) {
             final Preference pref = findPreference(prefKey);
             if (pref != null) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
index c2767f56f..06021c084 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
@@ -53,7 +53,6 @@ public class AppBlacklistActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_appblacklist);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
 
         final PackageManager pm = getPackageManager();
         sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
index 59732098f..f5182ee36 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
@@ -134,7 +134,6 @@ public class AppManagerActivity extends AppCompatActivity {
         sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         setContentView(R.layout.activity_appmanager);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
 
         ListView appListView = (ListView) findViewById(R.id.appListView);
         mGBDeviceAppAdapter = new GBDeviceAppAdapter(this, appList);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
index a640faff2..d04338cc9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
@@ -1,11 +1,12 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
-import android.app.ListActivity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
+import android.widget.ListView;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -20,7 +21,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ALARMS;
 
 
-public class ConfigureAlarms extends ListActivity {
+public class ConfigureAlarms extends AppCompatActivity {
 
     private static final int REQ_CONFIGURE_ALARM = 1;
 
@@ -33,7 +34,6 @@ public class ConfigureAlarms extends ListActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_configure_alarms);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
 
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         preferencesAlarmListSet = sharedPrefs.getStringSet(PREF_MIBAND_ALARMS, new HashSet<String>());
@@ -45,7 +45,8 @@ public class ConfigureAlarms extends ListActivity {
 
         mGBAlarmListAdapter = new GBAlarmListAdapter(this, preferencesAlarmListSet);
 
-        setListAdapter(mGBAlarmListAdapter);
+        ListView listView = (ListView) findViewById(R.id.alarm_list);
+        listView.setAdapter(mGBAlarmListAdapter);
         updateAlarmsFromPrefs();
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
index 1fa097247..524522e20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
@@ -81,7 +81,6 @@ public class DebugActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_debug);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(GBApplication.ACTION_QUIT);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index 4ddc013cb..4c18bb90b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -61,7 +61,6 @@ public class ExternalPebbleJSActivity extends AppCompatActivity {
         }
 
         setContentView(R.layout.activity_external_pebble_js);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
 
         WebView myWebView = (WebView) findViewById(R.id.configureWebview);
         myWebView.clearCache(true);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
index d74250aa5..be79ea0a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
@@ -113,7 +113,7 @@ public class FwAppInstallerActivity extends AppCompatActivity implements Install
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_appinstaller);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+
         GBDevice dev = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
         if (dev != null) {
             device = dev;
diff --git a/app/src/main/res/layout/activity_configure_alarms.xml b/app/src/main/res/layout/activity_configure_alarms.xml
index 3dd725a24..5d5fe957f 100644
--- a/app/src/main/res/layout/activity_configure_alarms.xml
+++ b/app/src/main/res/layout/activity_configure_alarms.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
     android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
@@ -10,7 +10,7 @@
         android:descendantFocusability="blocksDescendants"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@android:id/list"
+        android:id="@+id/alarm_list"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true" />
-</RelativeLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_controlcenter.xml b/app/src/main/res/layout/activity_controlcenter.xml
index dc3eb6a79..159f955ed 100644
--- a/app/src/main/res/layout/activity_controlcenter.xml
+++ b/app/src/main/res/layout/activity_controlcenter.xml
@@ -1,58 +1,59 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter">
 
     <ImageView
         android:id="@+id/no_items_bg"
-        android:layout_centerInParent="true"
-        android:src="@drawable/gadgetbridge_img"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:src="@drawable/gadgetbridge_img" />
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/controlcenter_swipe_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="0px"
         android:paddingLeft="0px"
         android:paddingRight="0px"
-        android:paddingTop="0px"
-        android:paddingBottom="0px"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:paddingTop="0px">
 
     <ListView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:id="@+id/deviceListView"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_above="@+id/hintTextView" />
-    </android.support.v4.widget.SwipeRefreshLayout>
-
-    <TextView
-        tools:text="Hint here"
         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" />
+        android:layout_above="@+id/hintTextView"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true" />
+    </android.support.v4.widget.SwipeRefreshLayout>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_add_black"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_gravity="bottom|end"
+        android:src="@drawable/ic_add_black"
         app:elevation="6dp"
         app:pressedTranslationZ="12dp"/>
 
+    <TextView
+        android:id="@+id/hintTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/fab"
+        android:layout_centerHorizontal="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textStyle="italic"
+        android:text="@string/tap_connected_device_for_app_mananger" />
+
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 407d428f3..beac2a5df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,8 +83,8 @@
     <string name="this_is_a_test_notification_from_gadgetbridge">This is a Test Notification from Gadgetbridge</string>
     <string name="bluetooth_is_not_supported_">Bluetooth is not supported.</string>
     <string name="bluetooth_is_disabled_">Bluetooth is disabled.</string>
-    <string name="tap_connected_device_for_app_mananger">tap connected device for App Mananger</string>
-    <string name="tap_a_device_to_connect">tap a device to connect</string>
+    <string name="tap_connected_device_for_app_mananger">Tap connected device for App Manager</string>
+    <string name="tap_a_device_to_connect">Tap a device to connect</string>
     <string name="cannot_connect_bt_address_invalid_">Cannot connect. BT address invalid?</string>
     <string name="gadgetbridge_running">Gadgetbridge running</string>
     <string name="installing_binary_d_d">installing binary %1$d/%2$d</string>

From eba1ee6dc6650a9251eefc1dd33ca457eee55f85 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sun, 10 Apr 2016 19:14:42 +0800
Subject: [PATCH 6/9] Device disabled icons

---
 .../ic_device_default_disabled.png            | Bin 0 -> 2048 bytes
 .../ic_device_miband_disabled.png             | Bin 0 -> 971 bytes
 .../ic_device_default_disabled.png            | Bin 0 -> 1277 bytes
 .../ic_device_miband_disabled.png             | Bin 0 -> 584 bytes
 .../ic_device_default_disabled.png            | Bin 0 -> 2906 bytes
 .../ic_device_miband_disabled.png             | Bin 0 -> 1415 bytes
 .../ic_device_default_disabled.png            | Bin 0 -> 4851 bytes
 .../ic_device_miband_disabled.png             | Bin 0 -> 2316 bytes
 app/src/main/res/layout/device_item.xml       | 128 +++++++++---------
 9 files changed, 67 insertions(+), 61 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_device_default_disabled.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_device_default_disabled.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_device_default_disabled.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_device_default_disabled.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png

diff --git a/app/src/main/res/drawable-hdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_default_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..694e9cd943c8476be30b4287aa7877bb3ad064f4
GIT binary patch
literal 2048
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cabe9b459b62ea347e293f62499b12728a780a
GIT binary patch
literal 971
zcmV;+12p`JP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000A$Nkl<Zc-rlp
z+e#Zz6oyUGqitzRPt>L*jiM0`H{K~0U&7i}O=2SnYGP6k0VAR!LPRni5=C<%_yWeK
z&^J&}UqJ6v6cn88`egzhC`KoVGs9Z&lbgw2YkygL?LDwp3JTcR*x1<E*x1<aVkVNA
zWYLMtO3bEw!LiiT)I2UJDS2wOTAvpc6%}exh|OlRJ*%jwc+$|&@aPh#+`*Zfo2y+|
zSZJD^oo$|;o_5A!F}Ea1ZP4W8q-KP8l-OJpXG<cH_!W=G>qbUK%sGRTOeSOG?3f(O
zB%w3O6#LQq{CrG-l+{c!&CJZyMx)WAv9U3sXJHOgQ&V-<YLoh!Gd@24lN`u;2ZT9{
zj*k9DZ9*MY3+ZCFLXjI98v0`tK>hvwZoA$78io84r27Fv^~Y`yiA0<R0VH~QdVH0Y
zm7f3!JF&9d?v+I*5T*=z84icri~t7;1Ok47^UdLKyu**L8c<nT*(*xRzeWM%_xpo1
zr|*<KA83As${9%=puWC7k5K@1b#;YGOH1v=#l;^{hiIM*hygJm2E>3E5CdXB42S_S
zAO>U@K$0YhrKKgYyu6$fVQl!&9iWMc39-JuE)EY5#mUKuI6Xbhi7+;Nz!!Y#0#Gy>
z6`PxzLYC#c3O?am^MF#RRNmpF1>c$nw6nAGV1Tx_x3v%G;NalaiR|v~ip9l6v9+~z
zBLl8yAfCaqdwYAgjtk$00hCN8Zva|dUA@qCKzKG2K>Pdqyu@_B#2%_hpPikFm6a9V
z=KrUSjSYQl^XY@)+S*#)4vO%ln}Z_1YVgY{17bi7hygJm2E>3E5CdXB42S{c4UiEp
zab^t=t^pefP#_TKb~qe1%A)tU<*Mo$Fs{gAkb!{#mr*W~2ZO;*g7c-Ss_HFT5>x@g
zmvI|C5{a}J1yFBqZ#yoLV`ZStLQN|I%#17=92{&iO0PyZ9B!_zu707m4dF^dODGgV
zGupA<0SyliA5jgeSDIKX*=p6ifJAFoqFQuJ*(8&M&Lkst`k`al1ark28yhVh9Ub*P
zpRdK^@wB_$?oOA>)!o|K8dCI6Lkc;a&LGK8vHHATuZ!aTp{6h6PVG@t{omjmf!%;U
zzoL6aYeHP*<>jB#1zBxxSjI&gjsOV<NPxn2sa2sTESm*6<9dWl!WId~5Y7`?6XHUQ
t*)GVLLQ4O+fL@drFl=mWY;0`Wv2&0Okf*H{HVOa$002ovPDHLkV1iDuy59f*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_default_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..113ad06c694b09d5a4a8158bd33170f808963882
GIT binary patch
literal 1277
zcmV<Z1OoesP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000EUNkl<Zc-rk*
zNl0r~7=Co%^*svRl+yN<(sjEiw9sMavKHqV+oFQ=5J()bPYtfbsT*~nRiwHR6lp6|
zajH|JXbCZjLp53_#8lrR(dV4}{r^L++!t@mIoBKQA_qQlxi|No?>ql+&iT)S2Z0u7
zffi`7v9T{_W@dhnk&%&&zds^I5xZGgSw{rC{s%FI*KPP8LrzZ4N9pP5uiiWH?Ck8<
zk=S<#6XFyBoNytm2ptM}^Ik?ANAp`GU_-bCh%3R4&?hG+zji0&am3z7@_iZ*_r#y*
zULX6FJa+IUcC@20aXB0~II;dB|21}S=tuGr&atmdt=;DHJ0dR^5w8h({MZx3CU58H
z0?^ab1O5H|U@#bNBf^OT_sOlumzS5ngdh4<q~nH$2DrSu1h?A_BO@b#Bgvpf1ioiM
z5sy_1pnwv|HhFn@u(Pwn$h%xF=<e=@_4RdFSXcm^PN&uq#j42b_4-Hn@*;0X6%`fG
z)YJr<o11Wad<@IW%P==L$HWlo>+7MivQmv(J;Mp}Z8g3h%{%&KWo2-5bOdK-XRx=o
z2h-Ej(9zKWhlhuZ{QmwvjE#-4>+S7rz@>zc2=s)fYJ7i?w*&b|OE^6}1(V6dT&b_G
z4=ye)*nJY!*473S6BAHcTFNWnFLcj`BBTG-e~U1mA1BxFBrjoRW(HPQS7C8+@#^02
z@G!F$U6Z?U2DqD2xrl&ocvB`3Br;oDTQD^>1s011oK7cfY;1tpY=++6US<XQ&+hIn
z6D5fm7#M)~_;^5aJQ>L-l6`*Q5s;ssf92;A1_uXWetw<_7#|;JS%~gaYL&Z^!{LB}
zf&vH+4+mTv`V@hjx<!@^KdTjBx7(SB(a}*D8X96&A@WwMl|k-GG-r?iP7yW{7c%p@
z(AwJCHQy(fktQ>;00r~x>?{*T?q##t*xXQ4Q*$Li5^+OJJjdkn3a@~_c{5N;ON-Ya
z_5=m*<m4o?1c@vvDtbYH4-qG5p*J)aK%J4#^NNr_lU+hW!ZiVen3xzP5kdmYA`?w<
zaWNbm90&=ZY!n$8sVKmUC7#nxP}3lmqqeq|&BQ$9Pfkvtq@=_vc`t!&(>#rOqN}UR
zCwZEo8yg#M9DOAbLTMELoTx?st#Rb3(i1ByD_}Glxyj2#q@|@9{j!ws1TCSx321I^
z79uW#J2W)(3%@PqB+$&-+1bhRyb@YlTOlbaNmxKcM8ryPaPULXO?;GS>7=Tv3fkM-
z*)Og8<*2T%X3uB^s=@+K)oy4O)Ci!B3%>sXq-QDwJd28odPi+3B}T*wg@uJI6D=(*
zT?6gV$c0i;QiKGAg@t{8+fDs1B37V^goZ(E!Qg#-tI9-fZtlBCY=c(-Z6#@AuY|g~
zIuY_t4Bk(*sttX{TiBxMKQS>8qNAe~!Abrcp-o{+77t&Eh@i<wWzIiGzt^_3=uu+a
z<`oea7bi;If#m&D+?85tYU+DP@Hd|9Bw`8l_nDB85dW6fJq|c%y|n5}2!|!?2z^jc
z(A^wxC>$|S1>=vKj+higxDZx^4%6h_A2BIegida#u8(L!{7wfUvO~T-d~U*3=uhb5
n1|<IB|KgA@&;l*c?!WyD$BaV0uXDS?00000NkvXXu0mjfIHpk*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1d9e92abf1cb4639867084c5f34e3ff9f64d5d5
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006HNkl<Zc-rlm
z%WA?<5Qa7OroHUi($-Q%@q*wcFW}R-@`4+M7-LY}iFiQ;SGDy*5$#5Cp*vs02N4C+
zGh(_ZE{rA~sWb4Cg*h|xopUn6j82D!hISIBrzF*qH+Vdr3yZ~aWj33QS_)#=?e<Hb
z&v&*rL@t*zRw@;)R4Ubr#bP6$&$kYtLZQ$k@jlAsavXBldFRPuE|bYf>2#WkAa*vJ
z<w!1!($mnx5fUfww33%4isC2BvL>Zhih;XG7B^@EBoc`)o6YtB5bKlJ4#4a6UJHWI
zq7A@tT$cd6I-Sm2C??wiK-IZPCX?+W0O+|~E(@tlcL;z02!H?xa9jYjT21Qr`_gbY
z+)1z&d{6-xkH^wtv5=O_<z50G;On3O)oN9m&*yt5FAIEu&w~LB27`@>%w{ubGMW6I
z%yc?kN#1Gr4c^(b7JMSW$y_1OXf#soBL-hsM)98*0T2KI5C8%GHnxrgpzC(K-;_4C
z7-)49fF^AKp65FR;0ZQVNo!Hhvh2Aiignrmf*>?t_hCMvxI-O{M&qeeidymzI~I%a
z>&`TzQ)-b&#25~TdGc(ALZMC|5a<Pi!EdcaVs?qzBxb_z_nY<|F&W_gkt%Rcj`Ep2
z&05OgaJ*Qp)<>v1aE;ZNm92&yFfV`}J-}!whyev;ojjvc$>gaab3my!r9?yf&-Mcw
W=2OkedRqAa0000<MNUMnLSTZ~H3XCZ

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_default_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..208c6abe876db0ab135869ba948423f885ec2706
GIT binary patch
literal 2906
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
Ef;&u(EdT%j

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..e86b4071ed819b76c744fc92be22037d6de74385
GIT binary patch
literal 1415
zcmai!{Xf$Q0LQ<Zec3#19v3CcQzRBKv`*wHp_pNwXKo%soI|o1aq>{&Jmuj$l!wZ_
zQVv&n$d+t6=AjrVA{XXb<2*D%=U(^2{dV_yeIEXR&+GHfc0K1HBdID00Dz3+8C$|$
zlm9kcd@tXZUNQ#&@SLNqH8F8gP}zTezn3EWN*y2Xa%Ssx5ykl-BwL2yZs%Wv3wLra
zX!J<bCI^T&A45WnDM2XG1m>YOQyjLf0MjCi>5Gn&rQpZXz%w)a9r212KM+Bq#FMLP
zd<A5G6>U&hMH^BZE_-aQnrmM>5@zyGwU)Mu^5spMMDTk@MEl<6c6N4FxL&;YiRPM+
zuyLQ{Ie~;TSe)aSQ3blRv8m~LdR<*zUTkcvrLrvjHpoKjT3BrMtgWqmo(+ZDu0bCA
zHFaoeY9ccj2US(KsAMwcogm?qKq&lbLpN9y2$Gfi(~zibxvi<Wm2I7Ex^(p{jd;k}
z*?AwE!@0A=NMSClg1t3b-@u<fTWD@>=FiRs*_dFS)4Hbd6x6Ha<YdD6^Ld8gJ20Q`
zs^j<ODdxeZhEg~Bp2~2<vL@!Ew5;rIjQ{>M{?#{QW9x;l_$PUIKrUS~vu6d?D}h@?
zWx?u!K9<8}-pI&`t+dr=0F}<;@$P7d9=Yl1A*`!*bXl%9UJEwp(0rxV*O4hIxooVh
z@>@jlyGKR3?sGjY>TO1M6_|+B_V#uSqt(I;O9vgYg(Q_VCT5j0tC5?VI~4OBbP?fm
zpLa8)#lpjR;6Xk}I;2r@>t_&X4-XHoHZ?Ihc{o)87#ka-QV6OpI_`wCXMgj5i*S`>
za*w4pG&Gz-%)qQXJUlLYdU__=+q2Cm8;7A*iwPOVKz;~pStoU1U_b(f>eB8z4Zy7a
zOO0YPaVP3uyl@PsQtf<veG73oTpgFojZkXJj=*BE{lTo#I0#da;3Op_^>TOjsiL&F
z$E~ieZ^9XjfP)nc5ON83aPVwqW@aOTLE5LlPRMr7QUhvhYY7;XtN(J(vx#j+cLL<7
zfq^53!)XLln+*&NFQA!AOG_Eh*tj^YsHiB%j*gD#D?LMaJpPwKnv9S|TTwwj(P7{9
z2GITt-uSq79!Jx~#pT6*>hBS7y6Efr%Fb&SCE-d^S8Ut&Bh)NF1Hfc0K$xMMbW3k9
z1W?_ptxG{nPERuy<YDmPjuK4gO(&FD&^ln1%`ql|63yx9Vq>6saCuqT$cFV%x;~V%
z+fs3%HQH`~%XKuo=@e)-7o&OIY%URBo`S>x(ErnVyi-tjjTvNgbkxtc8}o#!f)D8e
zXNuvB^1ieOO3~ipfKDO*)%^TC6eqw#Tz!3gkEDIAWRXSkh3;;^VtE$t`p0q+Hg#)j
z3%!UA#Z?G{Vkre|z0qHdA>TG5Cj=XTd!qv-!7%kHEu$~Rk<r*th~e<`^zP%14&Tp!
zt@I5aAD=%*oRnC3VUy)GihxQQDed5i1F}<QLS>@~IhEzbfpj&+Kh%;Xtq)krgPY@(
zm6h!>mUOgHsUa5IjYelUR6KtZiL1SPHQ-t#ytS<j%+RXTg;&q+9Shx?`K7On+~%W>
z_~7N~X^GX>r@8t0`5hs85{bkB5-BV@o|RWnP~cTxU*D^I?Sn8UCkN`5w5!Xw6v+QD
zpW<Op`VzBcBXiyGy}4WtR~OtVvhxnfif18b#~+!8WjMLitHuSg<)2BI{DcIoVW;FO
zpF_kl3rSvKgeix>Fjyd;u=;XA%!)Y!XvATj+}}e>QCVN?0KMLc+h5XfXGp#Wu!;I)
zsx68iY@rZ?f6O!LycKkBNiXSZv7C?czew|++=Y;HH43d>R;lj+7I3sXXWMj|oc0&J
CCupqz

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_default_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4349b1ba8cb74d62250b4341f58264e0515b69d
GIT binary patch
literal 4851
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
KtXk=1`2PdL$QHQ(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..db5603a27cc7b117ec5792ced887e53da4d2d627
GIT binary patch
literal 2316
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
L1^S7>_2|C=UW6<|

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index 34c14667c..edcf7fa3f 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator"
@@ -11,83 +11,89 @@
         android:id="@+id/device_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:contentDescription="@string/candidate_item_device_image" />
+        android:contentDescription="@string/candidate_item_device_image"
+        tools:src="@drawable/ic_device_pebble" />
 
     <GridLayout
-        android:background="?android:attr/activatedBackgroundIndicator"
-        android:paddingBottom="2dp"
-        android:columnCount="5"
         android:layout_gravity="fill_horizontal"
+        android:background="?android:attr/activatedBackgroundIndicator"
+        android:columnCount="5"
+        android:paddingBottom="2dp"
         android:paddingTop="3dp">
 
-    <TextView
-        android:id="@+id/device_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:typeface="sans" />
+        <TextView
+            android:id="@+id/device_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:typeface="sans"
+            tools:text="My Pebble Watch" />
 
-    <ProgressBar
-        android:id="@+id/device_busy_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_rowSpan="2"
-        android:indeterminate="true" />
+        <ProgressBar
+            android:id="@+id/device_busy_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_rowSpan="2"
+            android:indeterminate="true"
+            android:visibility="gone"
+            tools:visibility="visible" />
 
-    <android.support.v4.widget.Space
-        android:layout_width="wrap_content"
-        android:layout_rowSpan="2" />
+        <android.support.v4.widget.Space
+            android:layout_width="wrap_content"
+            android:layout_rowSpan="2" />
 
-    <TextView
-        android:id="@+id/battery_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/secondarytext"
-        android:textStyle="bold"
-        android:paddingLeft="7sp"
-        android:paddingRight="7sp" />
+        <TextView
+            android:id="@+id/battery_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="7sp"
+            android:paddingRight="7sp"
+            android:textColor="@color/secondarytext"
+            android:textStyle="bold"
+            tools:text="BAT" />
 
-    <ImageView
-        android:src="@drawable/ic_information_outline_grey600_24dp"
-        android:id="@+id/device_info_image"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_rowSpan="2"
-        android:scaleType="centerInside"
-        android:contentDescription="@string/candidate_item_device_image"
-        android:clickable="true"
-        android:layout_gravity="center_vertical|right" />
+        <ImageView
+            android:id="@+id/device_info_image"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center_vertical|right"
+            android:layout_rowSpan="2"
+            android:clickable="true"
+            android:contentDescription="@string/candidate_item_device_image"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_information_outline_grey600_24dp" />
 
 
-    <TextView
-        android:id="@+id/device_status"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="start|bottom"
-        android:textStyle="bold"
-        android:layout_gravity="fill_horizontal" />
+        <TextView
+            android:id="@+id/device_status"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_horizontal"
+            android:gravity="start|bottom"
+            android:textStyle="bold"
+            tools:text="@string/connecting" />
 
-    <TextView
-        android:id="@+id/battery_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|bottom"
-        android:textColor="@color/secondarytext"
-        android:textStyle="bold"
-        android:layout_gravity="end"
-        android:paddingRight="7sp"
-        android:paddingLeft="7sp" />
+        <TextView
+            android:id="@+id/battery_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="start|bottom"
+            android:paddingLeft="7sp"
+            android:paddingRight="7sp"
+            android:textColor="@color/secondarytext"
+            android:textStyle="bold"
+            tools:text="100% CHG" />
     </GridLayout>
 
     <ListView
         android:id="@+id/device_item_infos"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill"
         android:layout_marginStart="@dimen/widget_margin"
         android:gravity="fill_horizontal"
-        android:layout_columnSpan="2"
-        android:visibility="gone"
-        android:layout_gravity="fill"
-        android:paddingLeft="36dp" />
+        android:paddingLeft="36dp"
+        android:visibility="gone" />
 </GridLayout>

From e5726075a4a104fe55416de2899372811b843b69 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sun, 10 Apr 2016 19:47:35 +0800
Subject: [PATCH 7/9] Rework device item layout

---
 app/src/main/res/layout/device_item.xml | 28 ++++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index edcf7fa3f..5813e1a62 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -17,7 +17,7 @@
     <GridLayout
         android:layout_gravity="fill_horizontal"
         android:background="?android:attr/activatedBackgroundIndicator"
-        android:columnCount="5"
+        android:columnCount="3"
         android:paddingBottom="2dp"
         android:paddingTop="3dp">
 
@@ -29,19 +29,6 @@
             android:typeface="sans"
             tools:text="My Pebble Watch" />
 
-        <ProgressBar
-            android:id="@+id/device_busy_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_rowSpan="2"
-            android:indeterminate="true"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <android.support.v4.widget.Space
-            android:layout_width="wrap_content"
-            android:layout_rowSpan="2" />
-
         <TextView
             android:id="@+id/battery_label"
             android:layout_width="wrap_content"
@@ -63,7 +50,6 @@
             android:scaleType="centerInside"
             android:src="@drawable/ic_information_outline_grey600_24dp" />
 
-
         <TextView
             android:id="@+id/device_status"
             android:layout_width="wrap_content"
@@ -84,8 +70,20 @@
             android:textColor="@color/secondarytext"
             android:textStyle="bold"
             tools:text="100% CHG" />
+
+        <ProgressBar
+            android:id="@+id/device_busy_indicator"
+            android:layout_width="140dp"
+            android:layout_height="4dp"
+            android:layout_rowSpan="1"
+            android:indeterminate="true"
+            android:visibility="visible"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            tools:visibility="visible" />
     </GridLayout>
 
+
+
     <ListView
         android:id="@+id/device_item_infos"
         android:layout_width="match_parent"

From 39cba84ab1e8e5202e5179a4e4780f8ed229acfd Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sun, 10 Apr 2016 20:13:48 +0800
Subject: [PATCH 8/9] Apply gray images on non-connected devices in the list.

---
 .../gadgetbridge/adapter/GBDeviceAdapter.java |  24 +++++++++++++-----
 .../ic_device_pebble_disabled.png             | Bin 0 -> 1008 bytes
 .../ic_device_pebble_disabled.png             | Bin 0 -> 650 bytes
 .../ic_device_pebble_disabled.png             | Bin 0 -> 1351 bytes
 .../ic_device_pebble_disabled.png             | Bin 0 -> 2273 bytes
 app/src/main/res/layout/device_item.xml       |   4 +--
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_device_pebble_disabled.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_device_pebble_disabled.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_device_pebble_disabled.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_device_pebble_disabled.png

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 a1ed4359a..92ca09b5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java
@@ -60,11 +60,11 @@ public class GBDeviceAdapter extends ArrayAdapter<GBDevice> {
         if (device.isBusy()) {
             deviceStatusLabel.setText(device.getBusyTask());
             busyIndicator.setVisibility(View.VISIBLE);
-            batteryLabel.setVisibility(View.GONE);
-            batteryStatusLabel.setVisibility(View.GONE);
+            batteryLabel.setVisibility(View.INVISIBLE);
+            batteryStatusLabel.setVisibility(View.INVISIBLE);
         } else {
             deviceStatusLabel.setText(device.getStateString());
-            busyIndicator.setVisibility(View.GONE);
+            busyIndicator.setVisibility(View.INVISIBLE);
             batteryLabel.setVisibility(View.VISIBLE);
             batteryStatusLabel.setVisibility(View.VISIBLE);
         }
@@ -113,13 +113,25 @@ public class GBDeviceAdapter extends ArrayAdapter<GBDevice> {
 
         switch (device.getType()) {
             case PEBBLE:
-                deviceImageView.setImageResource(R.drawable.ic_device_pebble);
+                if (device.isConnected()) {
+                    deviceImageView.setImageResource(R.drawable.ic_device_pebble);
+                } else {
+                    deviceImageView.setImageResource(R.drawable.ic_device_pebble_disabled);
+                }
                 break;
             case MIBAND:
-                deviceImageView.setImageResource(R.drawable.ic_device_miband);
+                if (device.isConnected()) {
+                    deviceImageView.setImageResource(R.drawable.ic_device_miband);
+                } else {
+                    deviceImageView.setImageResource(R.drawable.ic_device_miband_disabled);
+                }
                 break;
             default:
-                deviceImageView.setImageResource(R.drawable.ic_launcher);
+                if (device.isConnected()) {
+                    deviceImageView.setImageResource(R.drawable.ic_launcher);
+                } else {
+                    deviceImageView.setImageResource(R.drawable.ic_device_default_disabled);
+                }
         }
 
         return view;
diff --git a/app/src/main/res/drawable-hdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_pebble_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5772510cca6cd33dce8e8432355456347ade034
GIT binary patch
literal 1008
zcmV<M0}uR(P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000BGNkl<Zc-rlp
zOG{fp6vs`{r)_CVU)0)?M$w3mjXTBSm$0@~lh}wsO-$+|U_?|@R3wRSB;UdZK347p
zHwr4a(48CIsUXN5=O1o@kuHoA<=)9T@F&^axo3WvIWu?eImyT%BO@atBO@atOU4Xb
zMlO?1WK?}NJQN&LX=&->+}zx!+1c68v$C=>wJ7*zHk+Rn78X9KtgL)=4b=U?nVFd>
zo12@fo}8Sl86O|F1%p9HC={xP#>U1pBlx5GX6Js^PESw&nwpv_@9XO`-W!}qBogE|
zJLfl6xR}nQaNo~nXJ>;dq?C>%!^Ffy*~rMq*}%X6)3eZra5!9kBQ}Z0oS~tipZo@j
z-T|Qx{r&yF5t|T4MIl93D+IZoo}NFl0P5`QbXY8w*9hd-Al(fRqCZxHKp<d~1Q2U$
zYjYJ96@3CEti<YcyVEE#fG{6HFa3Uhy$o<5kH_QYaK2fs)_3^vg#qQ~=fC2^@~<p_
z+-|p*_vt$yJs)`gGSxkj7@&@h4yP=DT3T9sd3kx3oSdAGh(o-e1W1#Bwzjs|#l=Nj
z3kwUvotvMZPiS*{dt1MNc6N4{q9}1KEiDNHT3lRAXmfXWmjI;=po4=0wz07xB(xzd
zp!*O3N*6%K$H#1Sb(JkIFAHgHZH=9roX7|0@bHig4-X3mX|#d1qy~h~(b3VQbp2ZC
z0j;mEv!kP<q=akI2GHi_X41hJ*Q7O|%gal)zrP<9z7wDu0PtKD4u_+{cLGF!?hfem
z^fdmo9-D3iNCh-FI2Z>7?d|OmpctS?B$5D!0R0EjP0<vieGma6Km>>$R_VBd4$Slp
z2*;#2E?rq!5t6h=u5@Tmfat{`y?Q1<l>R~qRFq++S3oi*ai$Cq(tu?G<nee~tyZg<
zkD~X;aurGgMv5#N>FVmT%aTa$^?I8*oG-=2#cxrPAOr{(BO5&s2-L~~sJ*?t0ZHVT
z87Q+5DMf%8F^amoyQ^iX)$sfMH6<k_FGR}_5(-*;J|BwF&h-wcx3~9<$Dj(eh{cqu
zQq3qNK6gVr7M=6aq;N5vNrCVDhYqF^OoCNaRhgQankrl_SFO|OY;ZUn&33!JwXUwt
zr|O@E<g?jqUM@HH)z#S8Xy<<a5UI;ZsyvEE|2No2U^U>MUr{}yHNmfff`ZSnfGk=Y
zcI%*x8vznFkN}0{QmaBuSSkbZt>Y0!5|&8Z7{Y!+Yl2_!G1US2wvb|fE}$1Z2pBRl
eGBPqU?bsE8OS00_UlV))0000<MNUMnLSTZf$<vbn

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_pebble_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..675a26a7f67a2a73f579abc02303abac38ecec79
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006}Nkl<Zc-rlm
z$!_965Qf2-jm&b(L^DG)AP|d?xcCKl8cr<Y0+M5l1w!J05Q|uj34uf*U?lDcAs&DS
zfVbd?gi~b^jx%;*(%p$m`sGWvt3G$T+^(|OEVInAcVTuyGA;O%P$=}t<#K&-I-QPV
z3VnFJ-p`Rp<im?0DwT?()oKZiM&r6(ulK6e>g{W&R;%^FU$@z8USbT-e)2F`C>D!q
zp-><q^j$8O1&D<+x*B#|Lb%Blso<X^%kmA+^QT6)6o-2eCih4KWV6|OkH_;9A@(bw
z4<H;4f0ZQZmNbAM2qOTv@caGWF`4KEz^wBvm&@Hz0H6c{0T*PZAEpC9mQbhDsisb+
zqdTZ}yM34kS&kgQU@%a3yPc--c&r;hQIx|xyayEki^W3icDuTSW2pmpuBZUmZnx@s
zy;fJNl`i2}oI?%3X0uUCrIPM<0LS7S>Hsji%;)oe3dc|jFdPp5yXSEXGXS&MOcS#J
zlgUIA(*XFj#w&hxnFClZmxong5`g)a*aEOVWbfrD!Te#4`Q!AP_@QC)my-FPdYa2B
zT49S4fKf0Q{A;wZ#bK!%0Q#f>L{WSIfM57Pjg%JcJkNiWW%-&kfFwyheEQg*FkGQd
zr_-1De4beF=sT0ii2KSkXESQ4RLYS|CPldR6N$t_EEZGZ@%Z@I0-qz$9r(;fqtVls
zwwO+E|3MZwgQffpSLZS1^ZEX`-R^VDI=GF^=#^>B4(u0TjUHi+DfEE}WFI_dGs&L1
khTJR4v@WG(mc3<r1Q-6$aoP!S`v3p{07*qoM6N<$g6N|(lmGw#

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_pebble_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..705aad25e230438695bf0cdb5eae70775ca696c5
GIT binary patch
literal 1351
zcmV-N1-SZ&P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000FJNkl<Zc-rlq
z%TF6u6vnZWrtdT%>5Ec=F~tTXHb_ksb%ENXElo+PR^j2sHZOx%n1=uvu`mb_FM%!b
z5{Q3*1uJI(8(6SIzybstcB~Kx6j-rIJ-y#}OpW`L$+fZl9qAJWp_w`7ch8-3Ju_!g
zQfM?9jYgx<Xfzs)Mx)W<(sY{i2`*iTu2k@GaMy~8impS2g@tcG`T6-b;#omIAov9z
z!$4e};Nu`OGc(^xOG|sFprGJg;lO)|Aov2Mr>DQ2ot^zA{M10i9>BoB!0m~NiTgs|
zj*X3dH!?C(JUBS`czAgDC-JkSzrX)UJPSTR@JHxJkH_<a@be*jhVL<jFgrVIn3<XJ
zO-)UmOioVv#X%{_AovQOr>CcV<KyFoSU}Kuz1~~mAbdkZLrQONZ&C`r3m`r%6QXur
zQ0IJ+ieHM<JW1Bzhd_8aIy(AQv`*0HC*1Dt?r-|~`hHJ#03rsj+-~<H6dyQ2YasNp
z0I0!7dDhw4`A8f<(gQ#Y+S=M4i{Rfxr6d!AI{Hz9p&WC$T*U;S%I|bKe=!=3ABilu
zrIp_|WR$78;OIwf4C(|B08n3FUnWL=y3mKn1WZR-7QB7{NHOfBsj2A+c1{4jeuu;H
zo7rs66a(`UWC3P~kZI`k0s!5ttgH_j8ylYzKmb5ZO^sCyN~6hSO3TQ|xQ%ZDWC6Gy
z1kl{v{4)Ur09033+w$`AvU75BJ`<xq6#%raE93w`ni0T70J*ujUl2g-rXYJ<0$5*P
zSI*APE@)?GM_RD3?eP6=Y-}VifX&TK#qalD(C+T8GyvFk`2M!Gwg`X#2!H^BIyyR1
zR#sM|2-_xr{{Rqe5dZ-Y00C$^Jv~*HmX?%-g#{^EUS3xBK>+^%V1IvK@pwGasvv9|
z`yc=Uhz|f>uNSv~TuRsm0YnI3b#+xaK0dybunhu;5CFbByKI%Sy}eBU1dxCL4i68N
z`T2QO_)Gv%2C%occm99)OaKHx00a;t0BdV&>hD1v92^ipGy#NbZf=eM2q3`$;EsmS
zX@^q~7h(iJ00ck)1V8`;KmfcT!%LF9B*}~N1V8{0+?a)%rxq6%rHD6X@zz8FAOHg3
z0~!RtN0bPF00<!V0Pv7BAJk^60s<fa0*J3}DeM<?5kPHiZPfY&sV&RcG3ze?o{QjT
zi7fb3ddo5ZFqus6x3sjBuxVcaKwVv(MFjtz!C?3pgHtL1bWKESMs`j76F@^l!!z`Y
zGn>tKFgP(tQzW&m)PpR}11^{Adjbdmz;uk@qnji~zs&abY8GGz9UUDHdwP139)O6!
ztJc=mV)Rl)@I#um>SX~?A&4pHzT53i`sUpt1}{YhJP3QSgS6h!=Mco=BUO-p(bd(J
zw84k(A_hL2&2}dx2Cp{JIh{_UsD@sMY&dCeZ}$r+Ng_XdhVO_$N(^7_qh^A`;dmfa
zTvb)|)M~XpD=#m%2wBU@%50^jrS^Ci{HUm?cy6&+%I$Xhua%XRC8G5FTKw&<?CIuz
zRYsWmu=+y{j4t9>5sH&h2Kp(Bvdj?gf*-=K&#}-7mYT8}bVp+P-~tWn13(bLPemtj
zz`)`p-lYwyyXXsz;L9#GBVHc>0uBx!v<1n{L=b#InTagN$d_GeMp~Mlze@}UsI|FI
zD8aA4c~{JpvC!8TUQ1wIski9;TSg?ZXfzs)Mx)VaG#V{p`vV2O6^|(F;)4JH002ov
JPDHLkV1ndoTfG1P

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_pebble_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_pebble_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1eebfd5974537b27e16dd341de28826c8d03ab9
GIT binary patch
literal 2273
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
T{b5;OfLo3pu_8RcyI%eW$RF$t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index 5813e1a62..18431f2b8 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -73,17 +73,15 @@
 
         <ProgressBar
             android:id="@+id/device_busy_indicator"
+            style="@android:style/Widget.ProgressBar.Horizontal"
             android:layout_width="140dp"
             android:layout_height="4dp"
-            android:layout_rowSpan="1"
             android:indeterminate="true"
             android:visibility="visible"
-            style="@android:style/Widget.ProgressBar.Horizontal"
             tools:visibility="visible" />
     </GridLayout>
 
 
-
     <ListView
         android:id="@+id/device_item_infos"
         android:layout_width="match_parent"

From 290d695fec886ec72173e561756dfecbcce8e967 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Sun, 10 Apr 2016 21:36:32 +0200
Subject: [PATCH 9/9] Add margin for the shadow of the FAB

Also make the hint color grey, like in the discovery activity
---
 app/src/main/res/layout/activity_controlcenter.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_controlcenter.xml b/app/src/main/res/layout/activity_controlcenter.xml
index 159f955ed..7bdcc89fa 100644
--- a/app/src/main/res/layout/activity_controlcenter.xml
+++ b/app/src/main/res/layout/activity_controlcenter.xml
@@ -43,7 +43,9 @@
         android:layout_gravity="bottom|end"
         android:src="@drawable/ic_add_black"
         app:elevation="6dp"
-        app:pressedTranslationZ="12dp"/>
+        app:pressedTranslationZ="12dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="10dp" />
 
     <TextView
         android:id="@+id/hintTextView"
@@ -52,6 +54,7 @@
         android:layout_above="@id/fab"
         android:layout_centerHorizontal="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/secondarytext"
         android:textStyle="italic"
         android:text="@string/tap_connected_device_for_app_mananger" />