diff --git a/app/build.gradle b/app/build.gradle index 994f8b7b00252be103ae7dc1f9fc6838ccf7dd1d..9acd5ab13e61faadc166f2a8e7ecac1af6fdcb11 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { compile 'com.intellij:annotations:12.0' compile 'com.google.code.gson:gson:2.3.1' compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0' - compile 'mbanje.kurt:fabbutton:1.1.1' + compile 'mbanje.kurt:fabbutton:1.1.4' } def processFileInplace(file, Closure processText) { diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java index 1bf1847c570e745dec75f43330dc827b0fab466e..d1c56dee199509c33ece36cf3d6216d9d4d0e6dc 100644 --- a/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java +++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java @@ -22,12 +22,6 @@ public class FabButton extends mbanje.kurt.fabbutton.FabButton { super(context, attrs, defStyle); } - @Override - protected void init(Context context, AttributeSet attrs, int defStyle) { - super.init(context, attrs, defStyle); - super.init(context, attrs, defStyle); - } - private CircleImageView getImage() { return (CircleImageView) findViewById(R.id.fabbutton_circle); } diff --git a/app/src/main/res/drawable-hdpi/ic_account_circle.png b/app/src/main/res/drawable-hdpi/ic_account_circle.png index 60e50a034f37d321cd100410e3c97455cdc9ec1d..db02b319a5217d3faf8c3092fb2dce22a54e751e 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_account_circle.png 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 index 9cc9f0b5e594e7bc61bbb284034d62d7eb13fdae..2489c7031fbae16bbf85a46bd3917fed07417504 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_account_circle.png 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 index 8af556048fc6f8501e1000800b877a22c4000cc0..848a4fdaa5408bc50e3893627c5d19a61f4a7941 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_account_circle.png 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 index 6e81a76b24e3c5bbbb33f524381338501c6d9dc2..a886b553c5d26409301863ddd6313f28965e694d 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_circle.png 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 index 9511ae3afb1433d681ecb7d7b4d2915b8955eedb..c8feac66e6cd4a6225e692eed38969ef09320578 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png and b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png differ diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml index 300683816eadb77eaa218a3008a0a869b07d849b..d33f9b9a289966fc8777ccd2fa649742903357aa 100644 --- a/app/src/main/res/layout/user_session_fragment.xml +++ b/app/src/main/res/layout/user_session_fragment.xml @@ -1,5 +1,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" @@ -27,17 +28,19 @@ <view android:id="@+id/user.status.icon" - android:layout_width="50dp" - android:layout_height="50dp" + android:layout_width="32dp" + android:layout_height="32dp" 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:layout_gravity="center" android:indeterminate="true" - fbb_progressColor="@android:color/holo_blue_dark" - fbb_progressWidthRatio="0.1" + app:fbb_progressColor="@android:color/holo_green_dark" + app:fbb_progressWidthRatio="0.2" + app:fbb_showShadow="false" /> </LinearLayout>