rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix progress for Android < 5

Browse Source
This commit is contained in:
J-Jamet
2020-01-18 15:23:51 +01:00
parent f266e1de4c
commit 52ba2c53f1
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/res/drawable-v21/foreground_progress_circle.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="270"
android:toDegrees="270">
<shape
android:shape="ring"
android:innerRadiusRatio="2.5"
android:thickness="2dp"
android:useLevel="true">
<solid android:color="?attr/colorAccent" />
</shape>
</rotate>

2
app/src/main/res/drawable/foreground_progress_circle.xml
View File

@@ -7,6 +7,6 @@
android:innerRadiusRatio="2.5" android:innerRadiusRatio="2.5"
android:thickness="2dp" android:thickness="2dp"
android:useLevel="true"> android:useLevel="true">
<solid android:color="?attr/colorAccent" /> <solid android:color="@color/orange" />
</shape> </shape>
</rotate> </rotate>

9
app/src/main/res/layout/item_attachment.xml
View File

@@ -26,8 +26,7 @@
android:gravity="end" android:gravity="end"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/item_attachment_icon" app:layout_constraintEnd_toStartOf="@+id/item_attachment_icon" >
>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/item_attachment_size" android:id="@+id/item_attachment_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -63,11 +62,9 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="@style/KeepassDXStyle.ProgressBar.Circle"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:max="100" android:max="100"
android:progress="60" android:progress="60" />
android:progressDrawable="@drawable/foreground_progress_circle"
android:background="@drawable/background_progress_circle" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/values/styles.xml
View File

@@ -328,4 +328,10 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<!-- Progress bar -->
<style name="KeepassDXStyle.ProgressBar.Circle" parent="Widget.AppCompat.ProgressBar.Horizontal">
<item name="android:progressDrawable">@drawable/foreground_progress_circle</item>
<item name="android:background">@drawable/background_progress_circle</item>
</style>
</resources> </resources>