From f3d95740afd7b96127490f01eb1030068b995c63 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 10 Dec 2014 11:08:06 +0000
Subject: [PATCH] Labels in address book FAM (using FAB library 1.3.0)

---
 app/build.gradle                                   | 4 ++--
 app/src/main/res/layout/fragment_list_contacts.xml | 9 ++++++---
 app/src/main/res/values/colors.xml                 | 2 ++
 app/src/main/res/values/strings.xml                | 1 +
 app/src/main/res/values/styles.xml                 | 5 +++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4f019ad..15e12f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'com.android.support:support-v4:21.0.2'
     compile 'com.android.support:appcompat-v7:21.0.2'
-    compile 'net.i2p.android.ext:floatingactionbutton:1.1.0'
+    compile 'net.i2p.android.ext:floatingactionbutton:1.3.0'
     compile ('com.mcxiaoke.viewpagerindicator:library:2.4.1') {
         exclude group: 'com.android.support', module: 'support-v4'
     }
@@ -49,7 +49,7 @@ dependencyVerification {
             'net.i2p.android:client:9176b5e32f74929856eeedf1dbe7e9f0a64fbb8a58a62b13f929c362353773d3',
             'com.android.support:support-v4:126a4c291f41f75f3fff4968e9d397bc8454cdff4d8f994cbe0524e3bad76e72',
             'com.android.support:appcompat-v7:b760fd3d0b0b0547a1bcef9031b40939f31049ba955f04c8fdc5aa09a25d19e9',
-            'net.i2p.android.ext:floatingactionbutton:84cf5b67a66337bef59b46f57468c730387ca766b5a5f06ca852ba46cabbc0fb',
+            'net.i2p.android.ext:floatingactionbutton:b4185725209ad59222a3b7baf376dbeac6ffdbac033c8243f7f17cd9da85ca9a',
             'com.mcxiaoke.viewpagerindicator:library:470bbd2bec1ede64ad21efd6f02676807d22f1b526c4ac6a5b41a428c6e47e67',
             'com.google.zxing:core:f00b32f7a1b0edc914a8f74301e8dc34f189afc4698e9c8cc54e5d46772734a5',
             'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
diff --git a/app/src/main/res/layout/fragment_list_contacts.xml b/app/src/main/res/layout/fragment_list_contacts.xml
index 1398f68..7a117d5 100644
--- a/app/src/main/res/layout/fragment_list_contacts.xml
+++ b/app/src/main/res/layout/fragment_list_contacts.xml
@@ -21,7 +21,8 @@
         android:layout_marginEnd="@dimen/listitem_horizontal_margin"
         android:layout_marginRight="@dimen/listitem_horizontal_margin"
         app:fab_addButtonColorNormal="@color/accent"
-        app:fab_addButtonColorPressed="@color/accent_dark">
+        app:fab_addButtonColorPressed="@color/accent_dark"
+        app:fab_labelStyle="@style/menu_labels_style">
 
         <net.i2p.android.ext.floatingactionbutton.FloatingActionButton
             android:id="@+id/action_scan_qr_code"
@@ -29,7 +30,8 @@
             android:layout_height="wrap_content"
             app:fab_colorNormal="@color/accent"
             app:fab_colorPressed="@color/accent_dark"
-            app:fab_icon="@drawable/ic_scan_qr_code_white_24dp"/>
+            app:fab_icon="@drawable/ic_scan_qr_code_white_24dp"
+            app:fab_title="@string/action_scan_qr_code"/>
 
         <net.i2p.android.ext.floatingactionbutton.FloatingActionButton
             android:id="@+id/action_new_contact"
@@ -37,6 +39,7 @@
             android:layout_height="wrap_content"
             app:fab_colorNormal="@color/accent"
             app:fab_colorPressed="@color/accent_dark"
-            app:fab_icon="@drawable/ic_person_add_white_24dp"/>
+            app:fab_icon="@drawable/ic_person_add_white_24dp"
+            app:fab_title="@string/action_new_contact"/>
     </net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dc779f7..fabce6f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,4 +15,6 @@
     <color name="green">#4caf50</color>
     <color name="red">#f44336</color>
 
+    <color name="black_semi_transparent">#B2000000</color>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa8b2a4..81a1259 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,6 +124,7 @@
     <string name="address_book_empty">Address book is empty</string>
     <string name="share">Share</string>
     <string name="action_new_contact">New contact</string>
+    <string name="action_scan_qr_code">Scan QR code</string>
     <string name="edit_contact">Edit contact</string>
     <string name="select_a_picture">Select a picture</string>
     <string name="no_image_cropping_app_found">No image cropping app found</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 701c215..fe9c102 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,4 +56,9 @@
         <item name="android:layout_height">match_parent</item>
     </style>
 
+    <style name="menu_labels_style">
+        <item name="android:background">@drawable/fab_label_background</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
 </resources>