caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1543 from osodebailar/features/material_progressbar_and_stylefix

Browse source 
fix styling , corners of progressbar and progress now in full material style
This commit is contained in:
Milos Kozak 2022-04-04 09:12:15 +02:00 committed by GitHub
commit 77151766cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.androidaps.dialogs package info.nightscout.androidaps.dialogs
import android.content.res.Resources
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
import android.view.LayoutInflater import android.view.LayoutInflater
@ -83,6 +84,9 @@ class BolusProgressDialog : DaggerDialogFragment() {
isCancelable = false isCancelable = false
dialog?.setCanceledOnTouchOutside(false) dialog?.setCanceledOnTouchOutside(false)
val theme: Resources.Theme? = context?.theme
theme?.applyStyle(R.style.AppTheme, true)
_binding = DialogBolusprogressBinding.inflate(inflater, container, false) _binding = DialogBolusprogressBinding.inflate(inflater, container, false)
return binding.root return binding.root
} }

4
core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
View file

@ -1,10 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp" android:width="48dp"
android:height="48dp" android:height="48dp"
android:tint="#FFFFFF" android:tint="?attr/defaultTextColor"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="?attr/colorControlNormal" android:fillColor="?attr/defaultTextColor"
android:pathData="M22,12l-4,-4v3H3v2h15v3z" /> android:pathData="M22,12l-4,-4v3H3v2h15v3z" />
</vector> </vector>

2
core/src/main/res/layout/dialog_bolusprogress.xml
View file

@ -62,7 +62,7 @@
<ProgressBar <ProgressBar
android:id="@+id/progressbar" android:id="@+id/progressbar"
style="@android:style/Widget.ProgressBar.Horizontal" style="@android:style/Widget.Material.ProgressBar.Horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"