From de63a99c74bb05c271b0c7a5903b6bfab9ec0a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 29 May 2015 10:33:51 +0200
Subject: Updated libraries, simplified user status fragment

Updated butterknife, dagger, renderers, fabbuton and gson, as well as
gradle plugin.
---
 app/src/main/res/layout/user_session_fragment.xml | 48 ++++++++++-------------
 1 file changed, 20 insertions(+), 28 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
index 18eda6d9..30068381 100644
--- a/app/src/main/res/layout/user_session_fragment.xml
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -12,40 +12,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginRight="15dp"
         android:layout_marginEnd="20dp"
         android:textSize="20sp"
         android:text="@string/default_username"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
+    <Button
+        android:id="@+id/user.status.button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/user.status.button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            />
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        />
 
-        <view
-            android:id="@+id/user.status.icon"
-            android:layout_width="32dp"
-            android:layout_marginLeft="9dp"
-            android:layout_marginStart="9dp"
-            android:src="@drawable/ic_account_circle"
-            android:color="@android:color/transparent"
-            class="mbanje.kurt.fabbutton.FabButton"
-            android:layout_gravity="center"
-            android:visibility="visible"
-            android:indeterminate="true"
-            android:max="100"
-            fbb_autoStart="true"
-            fbb_progressColor="#ff170aff"
-            fbb_progressWidthRatio="0.1"
-            />
+    <view
+        android:id="@+id/user.status.icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginStart="9dp"
+        android:shadowRadius="0"
+        android:src="@drawable/ic_account_circle"
+        android:color="@android:color/transparent"
+        class="se.leap.bitmaskclient.userstatus.FabButton"
+        android:indeterminate="true"
+        fbb_progressColor="@android:color/holo_blue_dark"
+        fbb_progressWidthRatio="0.1"
+        />
 
-    </LinearLayout>
 </LinearLayout>
-- 
cgit v1.2.3