summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-16 11:21:07 +0200
committerParménides GV <parmegv@sdf.org>2015-06-16 11:21:07 +0200
commitbdbd8b264eb4f82b9d87dc9bf3d05641a96a19f2 (patch)
treeab21e0f2c13b2f9b7a2a5866b79f3a9b5c548cec
parentfe1b2fd32d93bbe0bd7d884cd903e7955f770c33 (diff)
parented2256ef0ef71fb9e1a35c2328a467d423f588ad (diff)
Merge branch 'develop' into release-0.9.4
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java6
-rw-r--r--app/src/main/res/drawable-hdpi/ic_account_circle.pngbin1028 -> 1634 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_account_circle.pngbin669 -> 951 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_account_circle.pngbin1447 -> 2114 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_account_circle.pngbin2339 -> 3382 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/ic_account_circle.pngbin3663 -> 4838 bytes
-rw-r--r--app/src/main/res/layout/user_session_fragment.xml11
8 files changed, 8 insertions, 11 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 994f8b7b..9acd5ab1 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 1bf1847c..d1c56dee 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 60e50a03..db02b319 100644
--- a/app/src/main/res/drawable-hdpi/ic_account_circle.png
+++ 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
index 9cc9f0b5..2489c703 100644
--- a/app/src/main/res/drawable-mdpi/ic_account_circle.png
+++ 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
index 8af55604..848a4fda 100644
--- a/app/src/main/res/drawable-xhdpi/ic_account_circle.png
+++ 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
index 6e81a76b..a886b553 100644
--- a/app/src/main/res/drawable-xxhdpi/ic_account_circle.png
+++ 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
index 9511ae3a..c8feac66 100644
--- a/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
Binary files differ
diff --git a/app/src/main/res/layout/user_session_fragment.xml b/app/src/main/res/layout/user_session_fragment.xml
index 30068381..d33f9b9a 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>