From 10ffcf78065d12ffb867cca61e629bd91f663de4 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 29 Apr 2024 11:33:28 +0200
Subject: [PATCH] Refactoring progress views

---
 .../activity_contab_doc_interni_edit.xml      |  8 ++--
 .../layout/activity_prod_dettaglio_linea.xml  |  8 ++--
 .../activity_pv_ordine_acquisto_edit.xml      |  8 ++--
 app/src/main/res/layout/activity_splash.xml   | 20 ++++++----
 .../main/res/layout/dialog_ask_linea_prod.xml |  5 ++-
 .../dialog_ask_position_of_lu__page1.xml      | 40 ++++++++++---------
 ...alog_bind_product_barcode_with_package.xml |  8 ++--
 .../main/res/layout/dialog_info_giacenza.xml  |  7 ++--
 app/src/main/res/layout/dialog_progress.xml   |  9 +++--
 ...og_row_info_prod_fabbisogno_linee_prod.xml | 15 ++-----
 app/src/main/res/layout/dialog_scan_art.xml   |  8 ++--
 .../res/layout/dialog_scan_codice_griglia.xml |  8 ++--
 .../res/layout/dialog_scan_or_create_lu.xml   |  8 ++--
 .../res/layout/dialog_start_production.xml    |  8 ++--
 app/src/main/res/layout/fragment_main.xml     | 19 ++++-----
 .../layout/fragment_main_versamento_merce.xml | 10 +++--
 .../fragment_prod_versamento_materiale.xml    |  8 ++--
 17 files changed, 111 insertions(+), 86 deletions(-)

diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
index 97ade67d..2c5a9d4b 100644
--- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
@@ -245,11 +245,13 @@
                     android:visibility="visible">
 
 
-                    <ProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
+                        style="?attr/circularProgressIndicatorStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/AppTheme.NewMaterial.Text"
diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
index 5d1fd624..7deee321 100644
--- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
+++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
@@ -314,11 +314,13 @@
                     app:layout_constraintEnd_toEndOf="parent">
 
 
-                    <ProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
+                        style="?attr/circularProgressIndicatorStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/AppTheme.NewMaterial.Text"
diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
index e4dc1857..25db50e4 100644
--- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
+++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
@@ -179,11 +179,13 @@
                 app:layout_constraintEnd_toEndOf="parent">
 
 
-                <ProgressBar
+                <com.google.android.material.progressindicator.CircularProgressIndicator
                     android:id="@+id/progressBar"
-                    style="?android:attr/progressBarStyle"
+                    style="?attr/circularProgressIndicatorStyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    app:trackCornerRadius="4dp"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/AppTheme.NewMaterial.Text"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 85185b20..638dcf06 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -49,17 +49,23 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.7" />
 
-    <ProgressBar
-        android:id="@+id/progressBar2"
-        style="?android:attr/progressBarStyleHorizontal"
+
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progressBar"
+        style="?attr/linearProgressIndicatorStyle"
         android:layout_width="0dp"
-        android:layout_height="8dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:indeterminate="true"
-        android:indeterminateDrawable="@drawable/curved_progress_bar"
+        app:trackCornerRadius="4dp"
+        app:trackThickness="8dp"
+        app:indicatorColor="@android:color/white"
+        app:trackColor="@color/colorPrimaryDark"
         app:layout_constraintLeft_toRightOf="@+id/guideline_left_progress"
         app:layout_constraintRight_toLeftOf="@+id/guideline_right_progress"
-        app:layout_constraintTop_toBottomOf="@id/imageView" />
+        app:layout_constraintTop_toBottomOf="@id/imageView"/>
+
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/loading_info_textview"
@@ -67,7 +73,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         tools:text="Caricamento DB"
-        app:layout_constraintTop_toBottomOf="@id/progressBar2"
+        app:layout_constraintTop_toBottomOf="@id/progressBar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/dialog_ask_linea_prod.xml b/app/src/main/res/layout/dialog_ask_linea_prod.xml
index cdb4f090..e841ed88 100644
--- a/app/src/main/res/layout/dialog_ask_linea_prod.xml
+++ b/app/src/main/res/layout/dialog_ask_linea_prod.xml
@@ -47,7 +47,8 @@
                     style="?attr/circularProgressIndicatorStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:indeterminate="true"/>
+                    android:indeterminate="true"
+                    app:trackCornerRadius="4dp"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
@@ -58,7 +59,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_horizontal"
                     style="@style/TextAppearance.Material3.BodyMedium"
-                    android:text="Scansiona il codice a barre di una linea di produzione"/>
+                    android:text="Scansiona il codice a barre di una linea/lotto di produzione"/>
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml b/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml
index ccec187b..b724206d 100644
--- a/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml
+++ b/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center"
     android:layout_margin="16dp"
+    android:gravity="center"
+    android:orientation="horizontal"
     android:weightSum="10">
 
 
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progressBar"
+        style="?attr/circularProgressIndicatorStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:trackCornerRadius="4dp" />
 
-            <ProgressBar
-                android:id="@+id/progressBar"
-                style="?android:attr/progressBarStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/description_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="16sp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="12dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_horizontal"
-                style="@style/TextViewMaterial"
-                tools:text="Scansiona il codice a barre di uno Scaffale"/>
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/description_text"
+        style="@style/TextViewMaterial"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="12dp"
+        android:gravity="center_horizontal"
+        android:textSize="16sp"
+        tools:text="Scansiona il codice a barre di uno Scaffale" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bind_product_barcode_with_package.xml b/app/src/main/res/layout/dialog_bind_product_barcode_with_package.xml
index 295405d7..c7cdb7d3 100644
--- a/app/src/main/res/layout/dialog_bind_product_barcode_with_package.xml
+++ b/app/src/main/res/layout/dialog_bind_product_barcode_with_package.xml
@@ -50,11 +50,13 @@
                 android:orientation="horizontal">
 
 
-                <ProgressBar
+                <com.google.android.material.progressindicator.CircularProgressIndicator
                     android:id="@+id/progressBar"
-                    style="?android:attr/progressBarStyle"
+                    style="?attr/circularProgressIndicatorStyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    app:trackCornerRadius="4dp"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/AppTheme.NewMaterial.Text"
diff --git a/app/src/main/res/layout/dialog_info_giacenza.xml b/app/src/main/res/layout/dialog_info_giacenza.xml
index 8dcfb051..d74458f5 100644
--- a/app/src/main/res/layout/dialog_info_giacenza.xml
+++ b/app/src/main/res/layout/dialog_info_giacenza.xml
@@ -34,13 +34,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <ProgressBar
+
+                <com.google.android.material.progressindicator.LinearProgressIndicator
                     android:id="@+id/progressBar"
-                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    style="?attr/linearProgressIndicatorStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:indeterminate="true"
-                    tools:visibility="gone"/>
+                    app:trackCornerRadius="4dp"/>
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml
index b5236a63..c112153b 100644
--- a/app/src/main/res/layout/dialog_progress.xml
+++ b/app/src/main/res/layout/dialog_progress.xml
@@ -47,14 +47,15 @@
             tools:text="@string/loading" />
 
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/progressBar"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
+            style="?attr/linearProgressIndicatorStyle"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:indeterminate="true"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="24dp"
-            android:indeterminate="true" />
+            app:trackCornerRadius="4dp"/>
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
index bea176ef..936337a8 100644
--- a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
@@ -36,19 +36,12 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                    <!--                    <androidx.appcompat.widget.AppCompatTextView-->
-                    <!--                        style="@style/TextViewMaterial.Dialog.HeadlineText"-->
-                    <!--                        android:layout_width="match_parent"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:gravity="center_horizontal"-->
-                    <!--                        android:text="@string/loading" />-->
-
-                    <ProgressBar
-                        android:id="@+id/progressBar"
-                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                        style="?attr/linearProgressIndicatorStyle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:indeterminate="true" />
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/dialog_scan_art.xml b/app/src/main/res/layout/dialog_scan_art.xml
index 2d8a7115..0816d677 100644
--- a/app/src/main/res/layout/dialog_scan_art.xml
+++ b/app/src/main/res/layout/dialog_scan_art.xml
@@ -42,11 +42,13 @@
                     android:orientation="horizontal">
 
 
-                    <ProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
+                        style="?attr/circularProgressIndicatorStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/AppTheme.NewMaterial.Text"
diff --git a/app/src/main/res/layout/dialog_scan_codice_griglia.xml b/app/src/main/res/layout/dialog_scan_codice_griglia.xml
index a69b457a..a09194ac 100644
--- a/app/src/main/res/layout/dialog_scan_codice_griglia.xml
+++ b/app/src/main/res/layout/dialog_scan_codice_griglia.xml
@@ -53,11 +53,13 @@
                     android:orientation="horizontal">
 
 
-                    <ProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
+                        style="?attr/circularProgressIndicatorStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/AppTheme.NewMaterial.Text"
diff --git a/app/src/main/res/layout/dialog_scan_or_create_lu.xml b/app/src/main/res/layout/dialog_scan_or_create_lu.xml
index 866af6c0..d22864a3 100644
--- a/app/src/main/res/layout/dialog_scan_or_create_lu.xml
+++ b/app/src/main/res/layout/dialog_scan_or_create_lu.xml
@@ -51,11 +51,13 @@
                 android:gravity="center_horizontal">
 
 
-                <ProgressBar
+                <com.google.android.material.progressindicator.CircularProgressIndicator
                     android:id="@+id/progressBar"
-                    style="?android:attr/progressBarStyle"
+                    style="?attr/circularProgressIndicatorStyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    app:trackCornerRadius="4dp"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/MaterialAlertDialog.Material3.Body.Text"
diff --git a/app/src/main/res/layout/dialog_start_production.xml b/app/src/main/res/layout/dialog_start_production.xml
index a06b151c..32dd4146 100644
--- a/app/src/main/res/layout/dialog_start_production.xml
+++ b/app/src/main/res/layout/dialog_start_production.xml
@@ -52,11 +52,13 @@
                     android:orientation="horizontal">
 
 
-                    <ProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
+                        style="?attr/circularProgressIndicatorStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/scan_label"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index bf27e443..113a1ee6 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -146,7 +146,7 @@
                                             android:src="@drawable/ic_black_recover"
                                             android:tint="@android:color/white" />
 
-                                        <LinearLayout
+                                        <androidx.appcompat.widget.LinearLayoutCompat
                                             android:layout_width="match_parent"
                                             android:layout_height="wrap_content"
                                             android:orientation="vertical">
@@ -158,16 +158,17 @@
                                                 android:text="@string/recovering_data"
                                                 android:textColor="@android:color/white" />
 
-
-                                            <ProgressBar
-                                                android:id="@+id/progressBar2"
-                                                style="?android:attr/progressBarStyleHorizontal"
+                                            <com.google.android.material.progressindicator.LinearProgressIndicator
+                                                android:id="@+id/progressBar"
+                                                style="?attr/linearProgressIndicatorStyle"
                                                 android:layout_width="match_parent"
-                                                android:layout_height="8dp"
+                                                android:layout_height="wrap_content"
                                                 android:layout_marginTop="4dp"
                                                 android:indeterminate="true"
-                                                android:indeterminateDrawable="@drawable/curved_progress_bar" />
-
+                                                app:trackThickness="8dp"
+                                                app:trackCornerRadius="4dp"
+                                                app:indicatorColor="@android:color/white"
+                                                app:trackColor="@color/colorPrimaryDark"/>
 
                                             <androidx.appcompat.widget.AppCompatTextView
                                                 style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
@@ -176,7 +177,7 @@
                                                 android:layout_marginTop="2dp"
                                                 android:text="@string/wait_a_moment" />
 
-                                        </LinearLayout>
+                                        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_main_versamento_merce.xml b/app/src/main/res/layout/fragment_main_versamento_merce.xml
index aa8be283..0737963b 100644
--- a/app/src/main/res/layout/fragment_main_versamento_merce.xml
+++ b/app/src/main/res/layout/fragment_main_versamento_merce.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
 
         <variable
@@ -153,11 +153,13 @@
                     android:weightSum="10">
 
 
-                    <ProgressBar
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
                         android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
+                        style="?attr/circularProgressIndicatorStyle"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true"
+                        app:trackCornerRadius="4dp"/>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
index 1e0c26ee..b156f7c0 100644
--- a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
@@ -37,11 +37,13 @@
                 android:gravity="center_horizontal">
 
 
-                <ProgressBar
+                <com.google.android.material.progressindicator.CircularProgressIndicator
                     android:id="@+id/progressBar"
-                    style="?android:attr/progressBarStyle"
+                    style="?attr/circularProgressIndicatorStyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true"
+                    app:trackCornerRadius="4dp"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/MaterialAlertDialog.Material3.Body.Text"