summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2019-07-11 17:49:55 +0200
committercyBerta <cyberta@riseup.net>2019-07-11 17:49:55 +0200
commitf7daf88239dacd3194f95590ffb1015ed08f5e75 (patch)
tree4f01c1fec60e76a86a66f94fe3f38838eded2d63 /app/src/main/res
parentf0d697ee7b2413a09fd6b13495af81bed5fdf5a4 (diff)
change progress animation for a better progress visibility
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/progressbar_circle.xml89
-rw-r--r--app/src/main/res/layout/v_main_button.xml4
-rw-r--r--app/src/main/res/values/colors.xml1
3 files changed, 18 insertions, 76 deletions
diff --git a/app/src/main/res/drawable/progressbar_circle.xml b/app/src/main/res/drawable/progressbar_circle.xml
index 6257e3af..3d5f6026 100644
--- a/app/src/main/res/drawable/progressbar_circle.xml
+++ b/app/src/main/res/drawable/progressbar_circle.xml
@@ -1,83 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:id="@+id/progress1">
- <rotate
- android:fromDegrees="-90"
- android:pivotX="50%"
- android:pivotY="50%"
- android:toDegrees="90">
-
- <shape
- android:shape="ring"
- android:useLevel="true">
- <gradient
- android:endColor="#00c5e1a5"
- android:centerColor="#c5e1a5"
- android:startColor="#00ffe082"
- android:type="sweep"
- />
- </shape>
- </rotate>
- </item>
-
- <item android:id="@+id/progress2">
- <rotate
- android:fromDegrees="0"
- android:pivotX="50%"
- android:pivotY="50%"
- android:toDegrees="180">
-
- <shape
- android:shape="ring"
- android:useLevel="true">
- <gradient
- android:endColor="#00ffcc80"
- android:centerColor="#ffcc80"
- android:startColor="#00ffcc80"
- android:type="sweep"
- />
- </shape>
- </rotate>
- </item>
-
- <item android:id="@+id/progress3">
- <rotate
- android:fromDegrees="90"
- android:pivotX="50%"
- android:pivotY="50%"
- android:toDegrees="270">
+ <item>
+ <scale
+ android:scaleHeight="125%"
+ android:scaleWidth="125%"
+ android:scaleGravity="center"
+ >
<shape
- android:shape="ring"
- android:useLevel="true">
+ android:shape="oval"
+ android:useLevel="true"
+ >
<gradient
- android:endColor="#00ce93d8"
- android:centerColor="#ce93d8"
- android:startColor="#00ce93d8"
- android:type="sweep"
+ android:startColor="@color/colorPrimaryDark"
+ android:centerColor="@color/colorPrimary"
+ android:endColor="@color/black800_high_transparent"
+ android:gradientRadius="100dp"
+ android:type="radial"
/>
</shape>
- </rotate>
+ </scale>
</item>
-
- <item android:id="@+id/progress4">
- <rotate
- android:fromDegrees="180"
- android:pivotX="50%"
- android:pivotY="50%"
- android:toDegrees="0">
- <shape
- android:shape="ring"
- android:useLevel="true">
- <gradient
- android:endColor="#0081d4fa"
- android:centerColor="#81d4fa"
- android:startColor="#0081d4fa"
- android:type="sweep"
- />
- </shape>
- </rotate>
- </item>
-
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/layout/v_main_button.xml b/app/src/main/res/layout/v_main_button.xml
index ad1ac4ba..06504f3c 100644
--- a/app/src/main/res/layout/v_main_button.xml
+++ b/app/src/main/res/layout/v_main_button.xml
@@ -103,9 +103,9 @@
app:layout_constraintStart_toStartOf="@id/border_guideline_left"
app:layout_constraintTop_toTopOf="@id/border_guideline_top"
android:indeterminate="true"
- android:indeterminateDuration="2000"
+ android:indeterminateDuration="800"
android:indeterminateDrawable="@drawable/progressbar_circle"
- android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+ android:interpolator="@android:anim/decelerate_interpolator"
android:indeterminateBehavior="cycle"
/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 21c24663..d8873017 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
<color name="black800">#424242</color>
<color name="black800_secondary">#3b3b3b</color>
<color name="black800_transparent">#AA424242</color>
+ <color name="black800_high_transparent">#22424242</color>
<color name="red200">#ef9a9a</color>
<color name="pink200">#f48fb1</color>