summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-16 13:02:06 +0200
committerParménides GV <parmegv@sdf.org>2015-04-22 12:36:39 +0200
commitcdeaf6c2ae2fa96a2ef1e0ae6c931c6d50b27271 (patch)
tree636af5c404a07142a4950ce770611ba20bb31cc3 /app/src/main/res
parente5e9ac6e43b9cdec0f362711bb33747ab73fc297 (diff)
Button with circle progress, added.
Next step: a bit of UI design, removing the switch.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/eip_service_fragment.xml20
-rw-r--r--app/src/main/res/values/dimens.xml1
2 files changed, 21 insertions, 0 deletions
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 6adcfab0..0cc1df7d 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -48,4 +48,24 @@
android:layout_toRightOf="@+id/status_message"
android:layout_toEndOf="@+id/status_message" />
+ <view
+ android:id="@+id/vpn.Status.Image"
+ android:layout_width="@dimen/progress_button"
+ android:color="@android:color/holo_blue_dark"
+ android:layout_height="@dimen/progress_button"
+ class="mbanje.kurt.fabbutton.FabButton"
+ android:layout_gravity="center"
+ android:visibility="visible"
+ android:layout_centerInParent="true"
+ android:indeterminate="true"
+ android:max="100"
+ fbb_autoStart="true"
+ fbb_progressColor="#ff170aff"
+ fbb_progressWidthRatio="0.1"
+ fbb_showEndBitmap="true"
+ android:layout_toRightOf="@id/eipSwitch"
+ android:layout_toEndOf="@id/eipSwitch"
+ android:layout_alignTop="@id/eipSwitch"
+ />
+
</RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 727f5a78..4e8dad45 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,4 +17,5 @@
<dimen name="round_button_diameter">56dp</dimen>
<dimen name="switchbar_pad">16dp</dimen>
<dimen name="vpn_setting_padding">16dp</dimen>
+ <dimen name="progress_button">32dp</dimen>
</resources> \ No newline at end of file