summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-05-05 11:28:01 +0200
committerParménides GV <parmegv@sdf.org>2015-05-05 11:28:01 +0200
commit6d2e86277cdf02d3c731d963656e2c4a0f8fea5f (patch)
treebec56537f6e7a32d3859b9c1b5e5477009c8e1f7 /app/src/main
parentff679b7f20700cec2c08cb8026c585b47df3612f (diff)
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.
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java4
-rw-r--r--app/src/main/res/drawable-hdpi/ic_account_circle.pngbin0 -> 1028 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_account_circle.pngbin0 -> 669 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_account_circle.pngbin0 -> 1447 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_account_circle.pngbin0 -> 2339 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/ic_account_circle.pngbin0 -> 3663 bytes
-rw-r--r--app/src/main/res/layout-xlarge/user_session_fragment.xml (renamed from app/src/main/res/layout-xlarge/fragment_user_session.xml)0
-rw-r--r--app/src/main/res/layout/user_session_fragment.xml (renamed from app/src/main/res/layout/fragment_user_session.xml)5
8 files changed, 5 insertions, 4 deletions
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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_account_circle.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_account_circle.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_account_circle.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_account_circle.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
Binary files differ
diff --git a/app/src/main/res/layout-xlarge/fragment_user_session.xml b/app/src/main/res/layout-xlarge/user_session_fragment.xml
index 30969219..30969219 100644
--- a/app/src/main/res/layout-xlarge/fragment_user_session.xml
+++ b/app/src/main/res/layout-xlarge/user_session_fragment.xml
diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/user_session_fragment.xml
index 5194e495..18eda6d9 100644
--- a/app/src/main/res/layout/fragment_user_session.xml
+++ b/app/src/main/res/layout/user_session_fragment.xml
@@ -33,11 +33,10 @@
<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"
+ android:src="@drawable/ic_account_circle"
+ android:color="@android:color/transparent"
class="mbanje.kurt.fabbutton.FabButton"
android:layout_gravity="center"
android:visibility="visible"