feat: Re-add color variant and add samples

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

sample/src/main/java/com/nextcloud/android/common/sample/MainActivity.kt

@@ -109,6 +109,8 @@ class MainActivity : AppCompatActivity() {
         material.themeChipInput(binding.inputChip)
         material.themeChipSuggestion(binding.suggestionChip)
         material.themeChipFilter(binding.filterChip)
+        material.colorProgressBar(binding.circularProgressBar)
+        material.colorProgressBar(binding.linearProgressBar)
         material.colorMaterialButtonPrimaryFilled(binding.dialogBtn)
     }
 }

sample/src/main/res/layout/activity_main.xml

@@ -159,15 +159,39 @@
 
             </com.google.android.material.chip.ChipGroup>
 
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/circular_progress_bar"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:indeterminate="false"
+                android:indeterminateOnly="false"
+                android:progress="35"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/chipGroup"
+                app:trackCornerRadius="5dp"
+                app:trackThickness="5dp" />
+
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/linear_progress_bar"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="20dp"
+                android:indeterminate="false"
+                android:indeterminateOnly="false"
+                android:progress="35"
+                app:layout_constraintStart_toEndOf="@+id/circular_progress_bar"
+                app:layout_constraintTop_toBottomOf="@id/chipGroup"
+                app:trackCornerRadius="5dp"
+                app:trackStopIndicatorSize="0dp"
+                app:trackThickness="5dp" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/dialogBtn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/open_dialog"
-                android:layout_marginTop="@dimen/standard_half_margin"
-                android:layout_marginBottom="@dimen/standard_half_margin"
-                app:layout_constraintTop_toBottomOf="@id/chipGroup"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/circular_progress_bar" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>

ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt

@@ -378,29 +378,65 @@ class MaterialViewThemeUtils
         /**
          * Themes a [LinearProgressIndicator] using the provided [ColorRole].
          *
-         * @param progressIndicator The progress indicator to theme.
+         * @param linearProgressIndicator The progress indicator to theme.
          * @param colorRole The color role to be used for the active indicator part. Defaults to [ColorRole.PRIMARY].
          */
         fun colorProgressBar(
-            progressIndicator: LinearProgressIndicator,
+            linearProgressIndicator: LinearProgressIndicator,
             colorRole: ColorRole = ColorRole.PRIMARY
         ) {
-            withScheme(progressIndicator) { scheme ->
-                progressIndicator.setIndicatorColor(colorRole.select(scheme))
-                progressIndicator.trackColor = dynamicColor.secondaryContainer().getArgb(scheme)
+            withScheme(linearProgressIndicator) { scheme ->
+                colorProgressBar(linearProgressIndicator, colorRole.select(scheme))
             }
         }
 
+        /**
+         * Themes a [LinearProgressIndicator] using the provided color [Int].
+         *
+         * @param linearProgressIndicator The progress indicator to theme.
+         * @param color The color to be used for the active indicator part.
+         */
+        fun colorProgressBar(
+            linearProgressIndicator: LinearProgressIndicator,
+            @ColorInt color: Int
+        ) {
+            withScheme(linearProgressIndicator) { scheme ->
+                linearProgressIndicator.setIndicatorColor(color)
+                linearProgressIndicator.trackColor = dynamicColor.secondaryContainer().getArgb(scheme)
+            }
+        }
+
+        /**
+         * Themes a [CircularProgressIndicator] using the provided [ColorRole].
+         *
+         * @param circularProgressIndicator The progress indicator to theme.
+         * @param colorRole The color role to be used for the active indicator part. Defaults to [ColorRole.PRIMARY].
+         */
         fun colorProgressBar(
-            progressIndicator: CircularProgressIndicator,
+            circularProgressIndicator: CircularProgressIndicator,
             colorRole: ColorRole = ColorRole.PRIMARY
         ) {
-            withScheme(progressIndicator) { scheme ->
-                progressIndicator.setIndicatorColor(colorRole.select(scheme))
-                progressIndicator.trackColor = dynamicColor.secondaryContainer().getArgb(scheme)
+            withScheme(circularProgressIndicator) { scheme ->
+                colorProgressBar(circularProgressIndicator, colorRole.select(scheme))
             }
         }
 
+        /**
+         * Themes a [CircularProgressIndicator] using the provided color [Int].
+         *
+         * @param circularProgressIndicator The progress indicator to theme.
+         * @param color The color to be used for the active indicator part.
+         */
+        fun colorProgressBar(
+            circularProgressIndicator: CircularProgressIndicator,
+            @ColorInt color: Int
+        ) {
+            withScheme(circularProgressIndicator) { scheme ->
+            circularProgressIndicator.setIndicatorColor(color)
+            circularProgressIndicator.trackColor = dynamicColor.secondaryContainer().getArgb(scheme)
+        }
+    }
+
         fun colorTextInputLayout(textInputLayout: TextInputLayout) {
             withScheme(textInputLayout) { scheme ->
                 val errorColor = dynamicColor.error().getArgb(scheme)