Add vico:compose factory functions for BaseAxis.Size

Co-authored-by: Patrick Michalik <[email protected]>

vico/compose/src/main/java/com/patrykandpatrick/vico/compose/cartesian/axis/BaseAxis.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.compose.cartesian.axis
+
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.patrykandpatrick.vico.core.cartesian.axis.BaseAxis
+
+/** Creates a [BaseAxis.Size.Auto] instance. */
+public fun BaseAxis.Size.Companion.auto(
+  minSize: Dp = 0.dp,
+  maxSize: Dp = Float.MAX_VALUE.dp,
+): BaseAxis.Size.Auto = BaseAxis.Size.Auto(minSize.value, maxSize.value)
+
+/** Creates a [BaseAxis.Size.Exact] instance. */
+public fun BaseAxis.Size.Companion.exact(size: Dp): BaseAxis.Size.Exact =
+  BaseAxis.Size.Exact(size.value)
+
+/** Creates a [BaseAxis.Size.Fraction] instance. */
+public fun BaseAxis.Size.Companion.fraction(fraction: Float): BaseAxis.Size.Fraction =
+  BaseAxis.Size.Fraction(fraction)
+
+/** Creates a [BaseAxis.Size.Text] instance. */
+public fun BaseAxis.Size.Companion.text(text: String): BaseAxis.Size.Text = BaseAxis.Size.Text(text)

vico/compose/src/main/java/com/patrykandpatrick/vico/compose/cartesian/axis/HorizontalAxis.kt

@@ -39,7 +39,7 @@ public fun HorizontalAxis.Companion.rememberTop(
   tickLength: Dp = Defaults.AXIS_TICK_LENGTH.dp,
   guideline: LineComponent? = rememberAxisGuidelineComponent(),
   itemPlacer: HorizontalAxis.ItemPlacer = remember { HorizontalAxis.ItemPlacer.aligned() },
-  size: BaseAxis.Size = remember { BaseAxis.Size.Auto() },
+  size: BaseAxis.Size = BaseAxis.Size.auto(),
   titleComponent: TextComponent? = null,
   title: CharSequence? = null,
 ): HorizontalAxis<Axis.Position.Horizontal.Top> =
@@ -82,7 +82,7 @@ public fun HorizontalAxis.Companion.rememberBottom(
   tickLength: Dp = Defaults.AXIS_TICK_LENGTH.dp,
   guideline: LineComponent? = rememberAxisGuidelineComponent(),
   itemPlacer: HorizontalAxis.ItemPlacer = remember { HorizontalAxis.ItemPlacer.aligned() },
-  size: BaseAxis.Size = remember { BaseAxis.Size.Auto() },
+  size: BaseAxis.Size = BaseAxis.Size.auto(),
   titleComponent: TextComponent? = null,
   title: CharSequence? = null,
 ): HorizontalAxis<Axis.Position.Horizontal.Bottom> =

vico/compose/src/main/java/com/patrykandpatrick/vico/compose/cartesian/axis/VerticalAxis.kt

@@ -43,7 +43,7 @@ public fun VerticalAxis.Companion.rememberStart(
   tickLength: Dp = Defaults.AXIS_TICK_LENGTH.dp,
   guideline: LineComponent? = rememberAxisGuidelineComponent(),
   itemPlacer: VerticalAxis.ItemPlacer = remember { VerticalAxis.ItemPlacer.step() },
-  size: BaseAxis.Size = remember { BaseAxis.Size.Auto() },
+  size: BaseAxis.Size = BaseAxis.Size.auto(),
   titleComponent: TextComponent? = null,
   title: CharSequence? = null,
 ): VerticalAxis<Axis.Position.Vertical.Start> =
@@ -94,7 +94,7 @@ public fun VerticalAxis.Companion.rememberEnd(
   tickLength: Dp = Defaults.AXIS_TICK_LENGTH.dp,
   guideline: LineComponent? = rememberAxisGuidelineComponent(),
   itemPlacer: VerticalAxis.ItemPlacer = remember { VerticalAxis.ItemPlacer.step() },
-  size: BaseAxis.Size = remember { BaseAxis.Size.Auto() },
+  size: BaseAxis.Size = BaseAxis.Size.auto(),
   titleComponent: TextComponent? = null,
   title: CharSequence? = null,
 ): VerticalAxis<Axis.Position.Vertical.End> =

vico/core/src/main/java/com/patrykandpatrick/vico/core/cartesian/axis/BaseAxis.kt

@@ -175,5 +175,8 @@ public abstract class BaseAxis<P : Axis.Position>(
 
       override fun hashCode(): Int = text.hashCode()
     }
+
+    /** Provides access to [BaseAxis.Size] factory functions. */
+    public companion object
   }
 }