Skip to content
Snippets Groups Projects
Commit ed2256ef authored by Parménides GV's avatar Parménides GV
Browse files

Merge branch 'feature/Put-an-icon-in-the-user-status-FabButton-#6923' into develop

parents f5f2e770 4bf4f2e0
No related branches found
No related tags found
No related merge requests found
......@@ -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) {
......
......@@ -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);
}
......
app/src/main/res/drawable-hdpi/ic_account_circle.png

1 KiB | W: | H:

app/src/main/res/drawable-hdpi/ic_account_circle.png

1.6 KiB | W: | H:

app/src/main/res/drawable-hdpi/ic_account_circle.png
app/src/main/res/drawable-hdpi/ic_account_circle.png
app/src/main/res/drawable-hdpi/ic_account_circle.png
app/src/main/res/drawable-hdpi/ic_account_circle.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-mdpi/ic_account_circle.png

669 B | W: | H:

app/src/main/res/drawable-mdpi/ic_account_circle.png

951 B | W: | H:

app/src/main/res/drawable-mdpi/ic_account_circle.png
app/src/main/res/drawable-mdpi/ic_account_circle.png
app/src/main/res/drawable-mdpi/ic_account_circle.png
app/src/main/res/drawable-mdpi/ic_account_circle.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xhdpi/ic_account_circle.png

1.41 KiB | W: | H:

app/src/main/res/drawable-xhdpi/ic_account_circle.png

2.06 KiB | W: | H:

app/src/main/res/drawable-xhdpi/ic_account_circle.png
app/src/main/res/drawable-xhdpi/ic_account_circle.png
app/src/main/res/drawable-xhdpi/ic_account_circle.png
app/src/main/res/drawable-xhdpi/ic_account_circle.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/ic_account_circle.png

2.28 KiB | W: | H:

app/src/main/res/drawable-xxhdpi/ic_account_circle.png

3.3 KiB | W: | H:

app/src/main/res/drawable-xxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxhdpi/ic_account_circle.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxxhdpi/ic_account_circle.png

3.58 KiB | W: | H:

app/src/main/res/drawable-xxxhdpi/ic_account_circle.png

4.72 KiB | W: | H:

app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
  • 2-up
  • Swipe
  • Onion skin
<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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment