From 6d2e86277cdf02d3c731d963656e2c4a0f8fea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 5 May 2015 11:28:01 +0200
Subject: Rename user session fragment, add icon resource.

The FabButton doesn't scale the icon as big as I want it to be, and it
doesn't let me set the size to "wrap_content" because the library sets
the sizes to match_parent.
I'm going to try to modify my fork of FabButton to see if I can obtain
what I want in its demo: just an icon and the progress indicator, the
icon as big as possible.
---
 .../userstatus/UserStatusFragment.java             |   4 +-
 .../main/res/drawable-hdpi/ic_account_circle.png   | Bin 0 -> 1028 bytes
 .../main/res/drawable-mdpi/ic_account_circle.png   | Bin 0 -> 669 bytes
 .../main/res/drawable-xhdpi/ic_account_circle.png  | Bin 0 -> 1447 bytes
 .../main/res/drawable-xxhdpi/ic_account_circle.png | Bin 0 -> 2339 bytes
 .../res/drawable-xxxhdpi/ic_account_circle.png     | Bin 0 -> 3663 bytes
 .../res/layout-xlarge/fragment_user_session.xml    |  55 ---------------------
 .../res/layout-xlarge/user_session_fragment.xml    |  55 +++++++++++++++++++++
 app/src/main/res/layout/fragment_user_session.xml  |  52 -------------------
 app/src/main/res/layout/user_session_fragment.xml  |  51 +++++++++++++++++++
 10 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_account_circle.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
 delete mode 100644 app/src/main/res/layout-xlarge/fragment_user_session.xml
 create mode 100644 app/src/main/res/layout-xlarge/user_session_fragment.xml
 delete mode 100644 app/src/main/res/layout/fragment_user_session.xml
 create mode 100644 app/src/main/res/layout/user_session_fragment.xml

(limited to 'app')

diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
index f0f4a8fa..ed822116 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
@@ -50,9 +50,11 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        View view = inflater.inflate(R.layout.fragment_user_session, container, false);
+        View view = inflater.inflate(R.layout.user_session_fragment, container, false);
         ButterKnife.inject(this, view);
 
+        icon.setIcon(R.drawable.ic_account_circle, R.drawable.ic_account_circle);
+
         Bundle arguments = getArguments();
         allows_registration = arguments.getBoolean(Provider.ALLOW_REGISTRATION);
         handleNewStatus(status);
diff --git a/app/src/main/res/drawable-hdpi/ic_account_circle.png b/app/src/main/res/drawable-hdpi/ic_account_circle.png
new file mode 100644
index 00000000..60e50a03
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_circle.png b/app/src/main/res/drawable-mdpi/ic_account_circle.png
new file mode 100644
index 00000000..9cc9f0b5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_circle.png b/app/src/main/res/drawable-xhdpi/ic_account_circle.png
new file mode 100644
index 00000000..8af55604
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_circle.png b/app/src/main/res/drawable-xxhdpi/ic_account_circle.png
new file mode 100644
index 00000000..6e81a76b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
new file mode 100644
index 00000000..9511ae3a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png differ
diff --git a/app/src/main/res/layout-xlarge/fragment_user_session.xml b/app/src/main/res/layout-xlarge/fragment_user_session.xml
deleted file mode 100644
index 30969219..00000000
--- a/app/src/main/res/layout-xlarge/fragment_user_session.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<LinearLayout 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:layout_marginTop="30dp"
-    android:layout_marginLeft="60dp"
-    android:layout_marginStart="60dp"
-    android:orientation="vertical"
-    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
-
-    <TextView
-        android:id="@+id/user.status.username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
-        android:layout_marginRight="60dp"
-        android:layout_marginEnd="60dp"
-        android:layout_gravity="center"
-        android:textSize="46sp"
-        android:text="@string/default_username"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <Button
-            android:id="@+id/user.status.button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="24sp"
-            />
-
-        <view
-            android:id="@+id/user.status.icon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_marginLeft="26dp"
-            android:layout_marginStart="26dp"
-            android:background="@android:color/transparent"
-            android:color="@android:color/holo_blue_dark"
-            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.3"
-            />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-xlarge/user_session_fragment.xml b/app/src/main/res/layout-xlarge/user_session_fragment.xml
new file mode 100644
index 00000000..30969219
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/user_session_fragment.xml
@@ -0,0 +1,55 @@
+<LinearLayout 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:layout_marginTop="30dp"
+    android:layout_marginLeft="60dp"
+    android:layout_marginStart="60dp"
+    android:orientation="vertical"
+    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
+
+    <TextView
+        android:id="@+id/user.status.username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginRight="60dp"
+        android:layout_marginEnd="60dp"
+        android:layout_gravity="center"
+        android:textSize="46sp"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <LinearLayout
+        android:id="@+id/user.status.buttonAndIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <Button
+            android:id="@+id/user.status.button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            />
+
+        <view
+            android:id="@+id/user.status.icon"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_marginLeft="26dp"
+            android:layout_marginStart="26dp"
+            android:background="@android:color/transparent"
+            android:color="@android:color/holo_blue_dark"
+            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.3"
+            />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml
deleted file mode 100644
index 5194e495..00000000
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<LinearLayout 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:layout_marginTop="10dp"
-    android:layout_marginLeft="20dp"
-    android:layout_marginStart="20dp"
-    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
-
-    <TextView
-        android:id="@+id/user.status.username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginEnd="20dp"
-        android:textSize="20sp"
-        android:text="@string/default_username"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <LinearLayout
-        android:id="@+id/user.status.buttonAndIcon"
-        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"
-            />
-
-        <view
-            android:id="@+id/user.status.icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginLeft="9dp"
-            android:layout_marginStart="9dp"
-            android:background="@android:color/transparent"
-            android:color="@android:color/holo_blue_dark"
-            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"
-            />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
new file mode 100644
index 00000000..18eda6d9
--- /dev/null
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -0,0 +1,51 @@
+<LinearLayout 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:layout_marginTop="10dp"
+    android:layout_marginLeft="20dp"
+    android:layout_marginStart="20dp"
+    tools:context="se.leap.bitmaskclient.userstatus.UserStatusFragment">
+
+    <TextView
+        android:id="@+id/user.status.username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
+        android:textSize="20sp"
+        android:text="@string/default_username"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+    <LinearLayout
+        android:id="@+id/user.status.buttonAndIcon"
+        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"
+            />
+
+        <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"
+            />
+
+    </LinearLayout>
+</LinearLayout>
-- 
cgit v1.2.3