From 14b663a7fabd38f98bf25051b81e4e2bf45eb405 Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Sun, 3 Apr 2022 16:29:36 +0200
Subject: [PATCH] fix styling , corners and progress now in full material style

---
 .../info/nightscout/androidaps/dialogs/BolusProgressDialog.kt | 4 ++++
 core/src/main/res/drawable/ic_trending_flat_white_48dp.xml    | 4 ++--
 core/src/main/res/layout/dialog_bolusprogress.xml             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 8634e6982f..df12961048 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.res.Resources
 import android.os.Bundle
 import android.os.SystemClock
 import android.view.LayoutInflater
@@ -83,6 +84,9 @@ class BolusProgressDialog : DaggerDialogFragment() {
         isCancelable = false
         dialog?.setCanceledOnTouchOutside(false)
 
+        val theme: Resources.Theme? = context?.theme
+        theme?.applyStyle(R.style.AppTheme,  true)
+
         _binding = DialogBolusprogressBinding.inflate(inflater, container, false)
         return binding.root
     }
diff --git a/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml b/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
index 4e09f3b696..616da59765 100644
--- a/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
+++ b/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
-    android:tint="#FFFFFF"
+    android:tint="?attr/defaultTextColor"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="?attr/defaultTextColor"
         android:pathData="M22,12l-4,-4v3H3v2h15v3z" />
 </vector>
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index c27c9eb665..a0da8dbf80 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -62,7 +62,7 @@
 
     <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_height="20dp"
         android:layout_marginLeft="5dp"