From 6d2e86277cdf02d3c731d963656e2c4a0f8fea5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= 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 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 @@ - - - - - - -