Refactoring progress views

This commit is contained in:
Giuseppe Scorrano 2024-04-29 11:33:28 +02:00
parent 392dd18338
commit 10ffcf7806
17 changed files with 111 additions and 86 deletions

View File

@ -245,11 +245,13 @@
android:visibility="visible"> android:visibility="visible">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text" style="@style/AppTheme.NewMaterial.Text"

View File

@ -314,11 +314,13 @@
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text" style="@style/AppTheme.NewMaterial.Text"

View File

@ -179,11 +179,13 @@
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text" style="@style/AppTheme.NewMaterial.Text"

View File

@ -49,17 +49,23 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintGuide_percent="0.7" /> 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_width="0dp"
android:layout_height="8dp" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:indeterminate="true" 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_constraintLeft_toRightOf="@+id/guideline_left_progress"
app:layout_constraintRight_toLeftOf="@+id/guideline_right_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 <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/loading_info_textview" android:id="@+id/loading_info_textview"
@ -67,7 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
tools:text="Caricamento DB" tools:text="Caricamento DB"
app:layout_constraintTop_toBottomOf="@id/progressBar2" app:layout_constraintTop_toBottomOf="@id/progressBar"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:textColor="@android:color/white" android:textColor="@android:color/white"

View File

@ -47,7 +47,8 @@
style="?attr/circularProgressIndicatorStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:indeterminate="true"/> android:indeterminate="true"
app:trackCornerRadius="4dp"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -58,7 +59,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_horizontal" android:gravity="center_horizontal"
style="@style/TextAppearance.Material3.BodyMedium" 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> </androidx.appcompat.widget.LinearLayoutCompat>

View File

@ -1,31 +1,33 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:layout_margin="16dp" android:layout_margin="16dp"
android:gravity="center"
android:orientation="horizontal"
android:weightSum="10"> 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 <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/progressBar" android:id="@+id/description_text"
style="?android:attr/progressBarStyle" style="@style/TextViewMaterial"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
<androidx.appcompat.widget.AppCompatTextView android:layout_marginStart="8dp"
android:id="@+id/description_text" android:layout_marginEnd="12dp"
android:layout_width="wrap_content" android:gravity="center_horizontal"
android:layout_height="wrap_content" android:textSize="16sp"
android:textSize="16sp" tools:text="Scansiona il codice a barre di uno Scaffale" />
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.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

View File

@ -50,11 +50,13 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text" style="@style/AppTheme.NewMaterial.Text"

View File

@ -34,13 +34,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="?attr/linearProgressIndicatorStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:indeterminate="true" android:indeterminate="true"
tools:visibility="gone"/> app:trackCornerRadius="4dp"/>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

View File

@ -47,14 +47,15 @@
tools:text="@string/loading" /> tools:text="@string/loading" />
<ProgressBar <com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="?attr/linearProgressIndicatorStyle"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:indeterminate="true"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:indeterminate="true" /> app:trackCornerRadius="4dp"/>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

View File

@ -36,19 +36,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<!-- <androidx.appcompat.widget.AppCompatTextView--> <com.google.android.material.progressindicator.LinearProgressIndicator
<!-- style="@style/TextViewMaterial.Dialog.HeadlineText"--> style="?attr/linearProgressIndicatorStyle"
<!-- 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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:indeterminate="true" /> android:indeterminate="true"
app:trackCornerRadius="4dp"/>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

View File

@ -42,11 +42,13 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text" style="@style/AppTheme.NewMaterial.Text"

View File

@ -53,11 +53,13 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text" style="@style/AppTheme.NewMaterial.Text"

View File

@ -51,11 +51,13 @@
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/MaterialAlertDialog.Material3.Body.Text" style="@style/MaterialAlertDialog.Material3.Body.Text"

View File

@ -52,11 +52,13 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/scan_label" android:id="@+id/scan_label"

View File

@ -146,7 +146,7 @@
android:src="@drawable/ic_black_recover" android:src="@drawable/ic_black_recover"
android:tint="@android:color/white" /> android:tint="@android:color/white" />
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@ -158,16 +158,17 @@
android:text="@string/recovering_data" android:text="@string/recovering_data"
android:textColor="@android:color/white" /> android:textColor="@android:color/white" />
<com.google.android.material.progressindicator.LinearProgressIndicator
<ProgressBar android:id="@+id/progressBar"
android:id="@+id/progressBar2" style="?attr/linearProgressIndicatorStyle"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="8dp" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:indeterminate="true" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard" style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
@ -176,7 +177,7 @@
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:text="@string/wait_a_moment" /> android:text="@string/wait_a_moment" />
</LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout> <layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<variable <variable
@ -153,11 +153,13 @@
android:weightSum="10"> android:weightSum="10">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

View File

@ -37,11 +37,13 @@
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<ProgressBar <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar" android:id="@+id/progressBar"
style="?android:attr/progressBarStyle" style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content" 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 <androidx.appcompat.widget.AppCompatTextView
style="@style/MaterialAlertDialog.Material3.Body.Text" style="@style/MaterialAlertDialog.Material3.Body.Text"