spotless

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

ui/src/main/java/com/nextcloud/android/common/ui/color/ColorUtil.kt

@@ -76,13 +76,11 @@ class ColorUtil
 
         fun colorToHexString(
             @ColorInt color: Int
-        ): String {
-            return String.format(null, "#%06X", HEX_WHITE and color)
-        }
+        ): String = String.format(null, "#%06X", HEX_WHITE and color)
 
         @ColorInt
-        private fun String?.parseColorOrFallback(fallback: () -> Int): Int {
-            return if (this?.isNotBlank() == true) {
+        private fun String?.parseColorOrFallback(fallback: () -> Int): Int =
+            if (this?.isNotBlank() == true) {
                 try {
                     Color.parseColor(this)
                 } catch (e: IllegalArgumentException) {
@@ -92,20 +90,18 @@ class ColorUtil
             } else {
                 fallback()
             }
-        }
 
         @ColorInt
         fun adjustOpacity(
             color: Int,
             opacity: Float
-        ): Int {
-            return Color.argb(
+        ): Int =
+            Color.argb(
                 (Color.alpha(color) * opacity).roundToInt(),
                 Color.red(color),
                 Color.green(color),
                 Color.blue(color)
             )
-        }
 
         companion object {
             private const val HSL_SIZE: Int = 3

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

@@ -13,8 +13,7 @@ import hct.Hct
 import scheme.SchemeContent
 import scheme.SchemeTonalSpot
 
-internal class MaterialSchemesImpl :
-    MaterialSchemes {
+internal class MaterialSchemesImpl : MaterialSchemes {
     override val lightScheme: DynamicScheme
     override val darkScheme: DynamicScheme
 

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

@@ -15,7 +15,9 @@ import com.nextcloud.android.common.ui.util.PlatformThemeUtil
 import com.nextcloud.android.common.ui.util.extensions.toColorScheme
 import dynamiccolor.DynamicScheme
 
-open class ViewThemeUtilsBase(private val schemes: MaterialSchemes) {
+open class ViewThemeUtilsBase(
+    private val schemes: MaterialSchemes
+) {
     /**
      * Scheme for painting elements
      */

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

@@ -63,8 +63,10 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class AndroidViewThemeUtils
     @Inject
-    constructor(schemes: MaterialSchemes, private val colorUtil: ColorUtil) :
-    ViewThemeUtilsBase(schemes) {
+    constructor(
+        schemes: MaterialSchemes,
+        private val colorUtil: ColorUtil
+    ) : ViewThemeUtilsBase(schemes) {
         private val dynamicColor = MaterialDynamicColors()
 
         fun colorBottomNavigationView(bottomNavigationView: BottomNavigationView) {
@@ -128,11 +130,10 @@ class AndroidViewThemeUtils
             }
         }
 
-        fun getPrimaryColorDrawable(context: Context): Drawable {
-            return withScheme(context) { scheme ->
+        fun getPrimaryColorDrawable(context: Context): Drawable =
+            withScheme(context) { scheme ->
                 ColorDrawable(dynamicColor.primary().getArgb(scheme))
             }
-        }
 
         fun colorToolbarMenuIcon(
             context: Context,
@@ -196,20 +197,17 @@ class AndroidViewThemeUtils
         fun tintPrimaryDrawable(
             context: Context,
             @DrawableRes id: Int
-        ): Drawable? {
-            return tintDrawable(context, id, ColorRole.PRIMARY)
-        }
+        ): Drawable? = tintDrawable(context, id, ColorRole.PRIMARY)
 
         @JvmOverloads
         fun tintDrawable(
             context: Context,
             drawable: Drawable,
             colorRole: ColorRole = ColorRole.PRIMARY
-        ): Drawable {
-            return withScheme(context) { scheme: DynamicScheme ->
+        ): Drawable =
+            withScheme(context) { scheme: DynamicScheme ->
                 colorDrawable(drawable, colorRole.select(scheme))
             }
-        }
 
         @Deprecated(
             replaceWith =
@@ -222,9 +220,7 @@ class AndroidViewThemeUtils
         fun tintPrimaryDrawable(
             context: Context,
             drawable: Drawable?
-        ): Drawable? {
-            return drawable?.let { tintDrawable(context, it, ColorRole.PRIMARY) }
-        }
+        ): Drawable? = drawable?.let { tintDrawable(context, it, ColorRole.PRIMARY) }
 
         @Deprecated(
             replaceWith =
@@ -237,9 +233,7 @@ class AndroidViewThemeUtils
         fun tintTextDrawable(
             context: Context,
             drawable: Drawable?
-        ): Drawable? {
-            return drawable?.let { tintDrawable(context, it, ColorRole.ON_SURFACE) }
-        }
+        ): Drawable? = drawable?.let { tintDrawable(context, it, ColorRole.ON_SURFACE) }
 
         /**
          * Public for edge cases. For most cases use [tintDrawable] instead
@@ -696,11 +690,10 @@ class AndroidViewThemeUtils
         }
 
         @Deprecated("Don't do this, implement custom viewThemeUtils instead")
-        fun primaryColor(activity: Activity): Int {
-            return withScheme(activity) { scheme ->
+        fun primaryColor(activity: Activity): Int =
+            withScheme(activity) { scheme ->
                 dynamicColor.primary().getArgb(scheme)
             }
-        }
 
         companion object {
             private const val ON_SURFACE_OPACITY_BUTTON_DISABLED: Float = 0.38f

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

@@ -40,8 +40,7 @@ class AndroidXViewThemeUtils
     constructor(
         schemes: MaterialSchemes,
         private val androidViewThemeUtils: AndroidViewThemeUtils
-    ) :
-    ViewThemeUtilsBase(schemes) {
+    ) : ViewThemeUtilsBase(schemes) {
         private val dynamicColor = MaterialDynamicColors()
 
         fun colorSwitchCompat(switchCompat: SwitchCompat) {

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

@@ -13,7 +13,9 @@ import dynamiccolor.DynamicScheme
 /**
  * Parameter for library methods so that clients can choose color roles without accessing the Scheme directly
  */
-enum class ColorRole(internal val select: (DynamicScheme) -> Int) {
+enum class ColorRole(
+    internal val select: (DynamicScheme) -> Int
+) {
     PRIMARY({ dynamiccolor.MaterialDynamicColors().primary().getArgb(it) }),
     ON_PRIMARY({ dynamiccolor.MaterialDynamicColors().onPrimary().getArgb(it) }),
     PRIMARY_CONTAINER({ dynamiccolor.MaterialDynamicColors().primaryContainer().getArgb(it) }),

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

@@ -30,8 +30,9 @@ import javax.inject.Inject
  */
 class DialogViewThemeUtils
     @Inject
-    constructor(schemes: MaterialSchemes) :
-    ViewThemeUtilsBase(schemes) {
+    constructor(
+        schemes: MaterialSchemes
+    ) : ViewThemeUtilsBase(schemes) {
         private val dynamicColor = MaterialDynamicColors()
 
         fun colorMaterialAlertDialogBackground(

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

@@ -50,8 +50,10 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class MaterialViewThemeUtils
     @Inject
-    constructor(schemes: MaterialSchemes, private val colorUtil: ColorUtil) :
-    ViewThemeUtilsBase(schemes) {
+    constructor(
+        schemes: MaterialSchemes,
+        private val colorUtil: ColorUtil
+    ) : ViewThemeUtilsBase(schemes) {
         private val dynamicColor = MaterialDynamicColors()
 
         fun colorToolbarOverflowIcon(toolbar: MaterialToolbar) {

ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/SchemeExtensions.kt

@@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color
 import dynamiccolor.DynamicScheme
 import dynamiccolor.MaterialDynamicColors
 
-fun DynamicScheme.toColorScheme(): ColorScheme {
-    return ColorScheme(
+fun DynamicScheme.toColorScheme(): ColorScheme =
+    ColorScheme(
         primary = Color(MaterialDynamicColors().primary().getArgb(this)),
         onPrimary = Color(MaterialDynamicColors().onPrimary().getArgb(this)),
         primaryContainer = Color(MaterialDynamicColors().primaryContainer().getArgb(this)),
@@ -45,4 +45,3 @@ fun DynamicScheme.toColorScheme(): ColorScheme {
         outlineVariant = Color(MaterialDynamicColors().outlineVariant().getArgb(this)),
         scrim = Color(MaterialDynamicColors().scrim().getArgb(this))
     )
-}