common: migrate to Android-only

common/build.gradle.kts

@@ -1,13 +1,10 @@
-@file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
 
-import org.jetbrains.compose.compose
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.pushingpixels.aurora.tools.svgtranscoder.gradle.TranscodeTask
 
 plugins {
-  kotlin("multiplatform")
-  alias(libs.plugins.compose)
+  kotlin("android")
   id("dev.msfjarvis.claw.kotlin-common")
   id("dev.msfjarvis.claw.android-library")
   alias(libs.plugins.aurora.svg.transcoder)
@@ -15,7 +12,7 @@ plugins {
 
 val transcodeTask =
   tasks.register<TranscodeTask>("transcodeSvgs") {
-    inputDirectory = file("src/commonMain/svgs/")
+    inputDirectory = file("svgs")
     outputDirectory = file("src/gen/kotlin/dev/msfjarvis/claw/common/res/clawicons")
     outputPackageName = "dev.msfjarvis.claw.common.res.clawicons"
     transcode()
@@ -23,37 +20,35 @@ val transcodeTask =
 
 tasks.withType<KotlinCompile>().configureEach { dependsOn(transcodeTask) }
 
-kotlin {
-  android()
-  jvm("desktop")
-  sourceSets["commonMain"].apply {
-    dependencies {
-      api(compose.foundation)
-      api(compose.material)
-      api(compose.material3)
-      api(compose.runtime)
+dependencies {
+  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.material)
+  implementation(libs.androidx.compose.material3)
+  implementation(libs.androidx.compose.runtime)
+  implementation(libs.androidx.compose.ui.ui.text)
   api(libs.napier)
-      api(projects.database)
-      api(projects.model)
-      implementation(libs.kotlinx.coroutines.core)
-      implementation(libs.kotlinx.datetime)
+  implementation(projects.database)
+  implementation(projects.model)
+  implementation(libs.accompanist.flowlayout)
+  implementation(libs.androidx.browser)
+  implementation(libs.coil.compose)
   implementation(libs.compose.richtext.markdown)
   implementation(libs.compose.richtext.material3)
   implementation(libs.compose.richtext.ui)
-    }
-    kotlin.srcDir("src/gen/kotlin/")
-  }
-  sourceSets["androidMain"].apply {
-    dependencies {
-      implementation(libs.androidx.browser)
-      implementation(libs.coil.compose)
-    }
-  }
-  sourceSets["desktopMain"].apply { dependencies { implementation(libs.kamel.image) } }
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinx.datetime)
 }
 
 android {
-  buildFeatures { androidResources = true }
+  buildFeatures {
+    androidResources = true
+    compose = true
+  }
+  composeOptions {
+    useLiveLiterals = false
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+  }
   namespace = "dev.msfjarvis.claw.common"
-  sourceSets["main"].apply { manifest.srcFile("src/androidMain/AndroidManifest.xml") }
+  sourceSets { getByName("main") { kotlin.srcDir("src/gen/kotlin") } }
 }

common/src/androidMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt

@@ -1,19 +0,0 @@
-@file:JvmName("AndroidType")
-
-package dev.msfjarvis.claw.common.theme
-
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import dev.msfjarvis.claw.common.R
-
-actual fun createFontFamily() =
-  FontFamily(
-    Font(R.font.manrope_bold, FontWeight.Bold),
-    Font(R.font.manrope_extrabold, FontWeight.ExtraBold),
-    Font(R.font.manrope_extralight, FontWeight.ExtraLight),
-    Font(R.font.manrope_light, FontWeight.Light),
-    Font(R.font.manrope_medium, FontWeight.Medium),
-    Font(R.font.manrope_regular, FontWeight.Normal),
-    Font(R.font.manrope_semibold, FontWeight.SemiBold),
-  )

common/src/commonMain/kotlin/com/google/accompanist/flowlayout/Flow.kt

@@ -1,306 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * 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
- *
- *      https://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.google.accompanist.flowlayout
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.layout.Placeable
-import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.LayoutDirection
-import androidx.compose.ui.unit.dp
-import kotlin.math.max
-
-/**
- * A composable that places its children in a horizontal flow. Unlike [Row], if the horizontal space
- * is too small to put all the children in one row, multiple rows may be used.
- *
- * Note that just like [Row], flex values cannot be used with [FlowRow].
- *
- * @param modifier The modifier to be applied to the FlowRow.
- * @param mainAxisSize The size of the layout in the main axis direction.
- * @param mainAxisAlignment The alignment of each row's children in the main axis direction.
- * @param mainAxisSpacing The main axis spacing between the children of each row.
- * @param crossAxisAlignment The alignment of each row's children in the cross axis direction.
- * @param crossAxisSpacing The cross axis spacing between the rows of the layout.
- * @param lastLineMainAxisAlignment Overrides the main axis alignment of the last row.
- */
-@Composable
-fun FlowRow(
-  modifier: Modifier = Modifier,
-  mainAxisSize: SizeMode = SizeMode.Wrap,
-  mainAxisAlignment: FlowMainAxisAlignment = FlowMainAxisAlignment.Start,
-  mainAxisSpacing: Dp = 0.dp,
-  crossAxisAlignment: FlowCrossAxisAlignment = FlowCrossAxisAlignment.Start,
-  crossAxisSpacing: Dp = 0.dp,
-  lastLineMainAxisAlignment: FlowMainAxisAlignment = mainAxisAlignment,
-  content: @Composable () -> Unit
-) {
-  Flow(
-    modifier = modifier,
-    orientation = LayoutOrientation.Horizontal,
-    mainAxisSize = mainAxisSize,
-    mainAxisAlignment = mainAxisAlignment,
-    mainAxisSpacing = mainAxisSpacing,
-    crossAxisAlignment = crossAxisAlignment,
-    crossAxisSpacing = crossAxisSpacing,
-    lastLineMainAxisAlignment = lastLineMainAxisAlignment,
-    content = content
-  )
-}
-
-/**
- * A composable that places its children in a vertical flow. Unlike [Column], if the vertical space
- * is too small to put all the children in one column, multiple columns may be used.
- *
- * Note that just like [Column], flex values cannot be used with [FlowColumn].
- *
- * @param modifier The modifier to be applied to the FlowColumn.
- * @param mainAxisSize The size of the layout in the main axis direction.
- * @param mainAxisAlignment The alignment of each column's children in the main axis direction.
- * @param mainAxisSpacing The main axis spacing between the children of each column.
- * @param crossAxisAlignment The alignment of each column's children in the cross axis direction.
- * @param crossAxisSpacing The cross axis spacing between the columns of the layout.
- * @param lastLineMainAxisAlignment Overrides the main axis alignment of the last column.
- */
-@Composable
-fun FlowColumn(
-  modifier: Modifier = Modifier,
-  mainAxisSize: SizeMode = SizeMode.Wrap,
-  mainAxisAlignment: FlowMainAxisAlignment = FlowMainAxisAlignment.Start,
-  mainAxisSpacing: Dp = 0.dp,
-  crossAxisAlignment: FlowCrossAxisAlignment = FlowCrossAxisAlignment.Start,
-  crossAxisSpacing: Dp = 0.dp,
-  lastLineMainAxisAlignment: FlowMainAxisAlignment = mainAxisAlignment,
-  content: @Composable () -> Unit
-) {
-  Flow(
-    modifier = modifier,
-    orientation = LayoutOrientation.Vertical,
-    mainAxisSize = mainAxisSize,
-    mainAxisAlignment = mainAxisAlignment,
-    mainAxisSpacing = mainAxisSpacing,
-    crossAxisAlignment = crossAxisAlignment,
-    crossAxisSpacing = crossAxisSpacing,
-    lastLineMainAxisAlignment = lastLineMainAxisAlignment,
-    content = content
-  )
-}
-
-/** Used to specify the alignment of a layout's children, in cross axis direction. */
-enum class FlowCrossAxisAlignment {
-  /** Place children such that their center is in the middle of the cross axis. */
-  Center,
-  /** Place children such that their start edge is aligned to the start edge of the cross axis. */
-  Start,
-  /** Place children such that their end edge is aligned to the end edge of the cross axis. */
-  End,
-}
-
-typealias FlowMainAxisAlignment = MainAxisAlignment
-
-/** Layout model that arranges its children in a horizontal or vertical flow. */
-@Composable
-private fun Flow(
-  modifier: Modifier,
-  orientation: LayoutOrientation,
-  mainAxisSize: SizeMode,
-  mainAxisAlignment: FlowMainAxisAlignment,
-  mainAxisSpacing: Dp,
-  crossAxisAlignment: FlowCrossAxisAlignment,
-  crossAxisSpacing: Dp,
-  lastLineMainAxisAlignment: FlowMainAxisAlignment,
-  content: @Composable () -> Unit
-) {
-  fun Placeable.mainAxisSize() = if (orientation == LayoutOrientation.Horizontal) width else height
-  fun Placeable.crossAxisSize() = if (orientation == LayoutOrientation.Horizontal) height else width
-
-  Layout(content, modifier) { measurables, outerConstraints ->
-    val sequences = mutableListOf<List<Placeable>>()
-    val crossAxisSizes = mutableListOf<Int>()
-    val crossAxisPositions = mutableListOf<Int>()
-
-    var mainAxisSpace = 0
-    var crossAxisSpace = 0
-
-    val currentSequence = mutableListOf<Placeable>()
-    var currentMainAxisSize = 0
-    var currentCrossAxisSize = 0
-
-    val constraints = OrientationIndependentConstraints(outerConstraints, orientation)
-
-    val childConstraints =
-      if (orientation == LayoutOrientation.Horizontal) {
-        Constraints(maxWidth = constraints.mainAxisMax)
-      } else {
-        Constraints(maxHeight = constraints.mainAxisMax)
-      }
-
-    // Return whether the placeable can be added to the current sequence.
-    fun canAddToCurrentSequence(placeable: Placeable) =
-      currentSequence.isEmpty() ||
-        currentMainAxisSize + mainAxisSpacing.roundToPx() + placeable.mainAxisSize() <=
-          constraints.mainAxisMax
-
-    // Store current sequence information and start a new sequence.
-    fun startNewSequence() {
-      if (sequences.isNotEmpty()) {
-        crossAxisSpace += crossAxisSpacing.roundToPx()
-      }
-      sequences += currentSequence.toList()
-      crossAxisSizes += currentCrossAxisSize
-      crossAxisPositions += crossAxisSpace
-
-      crossAxisSpace += currentCrossAxisSize
-      mainAxisSpace = max(mainAxisSpace, currentMainAxisSize)
-
-      currentSequence.clear()
-      currentMainAxisSize = 0
-      currentCrossAxisSize = 0
-    }
-
-    for (measurable in measurables) {
-      // Ask the child for its preferred size.
-      val placeable = measurable.measure(childConstraints)
-
-      // Start a new sequence if there is not enough space.
-      if (!canAddToCurrentSequence(placeable)) startNewSequence()
-
-      // Add the child to the current sequence.
-      if (currentSequence.isNotEmpty()) {
-        currentMainAxisSize += mainAxisSpacing.roundToPx()
-      }
-      currentSequence.add(placeable)
-      currentMainAxisSize += placeable.mainAxisSize()
-      currentCrossAxisSize = max(currentCrossAxisSize, placeable.crossAxisSize())
-    }
-
-    if (currentSequence.isNotEmpty()) startNewSequence()
-
-    val mainAxisLayoutSize =
-      if (constraints.mainAxisMax != Constraints.Infinity && mainAxisSize == SizeMode.Expand) {
-        constraints.mainAxisMax
-      } else {
-        max(mainAxisSpace, constraints.mainAxisMin)
-      }
-    val crossAxisLayoutSize = max(crossAxisSpace, constraints.crossAxisMin)
-
-    val layoutWidth =
-      if (orientation == LayoutOrientation.Horizontal) {
-        mainAxisLayoutSize
-      } else {
-        crossAxisLayoutSize
-      }
-    val layoutHeight =
-      if (orientation == LayoutOrientation.Horizontal) {
-        crossAxisLayoutSize
-      } else {
-        mainAxisLayoutSize
-      }
-
-    layout(layoutWidth, layoutHeight) {
-      sequences.forEachIndexed { i, placeables ->
-        val childrenMainAxisSizes =
-          IntArray(placeables.size) { j ->
-            placeables[j].mainAxisSize() +
-              if (j < placeables.lastIndex) mainAxisSpacing.roundToPx() else 0
-          }
-        val arrangement =
-          if (i < sequences.lastIndex) {
-            mainAxisAlignment.arrangement
-          } else {
-            lastLineMainAxisAlignment.arrangement
-          }
-        // TODO(soboleva): rtl support
-        // Handle vertical direction
-        val mainAxisPositions = IntArray(childrenMainAxisSizes.size) { 0 }
-        with(arrangement) { arrange(mainAxisLayoutSize, childrenMainAxisSizes, mainAxisPositions) }
-        placeables.forEachIndexed { j, placeable ->
-          val crossAxis =
-            when (crossAxisAlignment) {
-              FlowCrossAxisAlignment.Start -> 0
-              FlowCrossAxisAlignment.End -> crossAxisSizes[i] - placeable.crossAxisSize()
-              FlowCrossAxisAlignment.Center ->
-                Alignment.Center.align(
-                    IntSize.Zero,
-                    IntSize(width = 0, height = crossAxisSizes[i] - placeable.crossAxisSize()),
-                    LayoutDirection.Ltr
-                  )
-                  .y
-            }
-          if (orientation == LayoutOrientation.Horizontal) {
-            placeable.place(x = mainAxisPositions[j], y = crossAxisPositions[i] + crossAxis)
-          } else {
-            placeable.place(x = crossAxisPositions[i] + crossAxis, y = mainAxisPositions[j])
-          }
-        }
-      }
-    }
-  }
-}
-
-/** Used to specify how a layout chooses its own size when multiple behaviors are possible. */
-// TODO(popam): remove this when Flow is reworked
-enum class SizeMode {
-  /**
-   * Minimize the amount of free space by wrapping the children, subject to the incoming layout
-   * constraints.
-   */
-  Wrap,
-  /**
-   * Maximize the amount of free space by expanding to fill the available space, subject to the
-   * incoming layout constraints.
-   */
-  Expand
-}
-
-/** Used to specify the alignment of a layout's children, in main axis direction. */
-enum class MainAxisAlignment(internal val arrangement: Arrangement.Vertical) {
-  // TODO(soboleva) support RTl in Flow
-  // workaround for now - use Arrangement that equals to previous Arrangement
-  /** Place children such that they are as close as possible to the middle of the main axis. */
-  Center(Arrangement.Center),
-
-  /** Place children such that they are as close as possible to the start of the main axis. */
-  Start(Arrangement.Top),
-
-  /** Place children such that they are as close as possible to the end of the main axis. */
-  End(Arrangement.Bottom),
-
-  /**
-   * Place children such that they are spaced evenly across the main axis, including free space
-   * before the first child and after the last child.
-   */
-  SpaceEvenly(Arrangement.SpaceEvenly),
-
-  /**
-   * Place children such that they are spaced evenly across the main axis, without free space before
-   * the first child or after the last child.
-   */
-  SpaceBetween(Arrangement.SpaceBetween),
-
-  /**
-   * Place children such that they are spaced evenly across the main axis, including free space
-   * before the first child and after the last child, but half the amount of space existing
-   * otherwise between two consecutive children.
-   */
-  SpaceAround(Arrangement.SpaceAround)
-}

common/src/commonMain/kotlin/com/google/accompanist/flowlayout/Layout.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * 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
- *
- *      https://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.google.accompanist.flowlayout
-
-import androidx.compose.ui.unit.Constraints
-
-internal enum class LayoutOrientation {
-  Horizontal,
-  Vertical
-}
-
-internal data class OrientationIndependentConstraints(
-  val mainAxisMin: Int,
-  val mainAxisMax: Int,
-  val crossAxisMin: Int,
-  val crossAxisMax: Int
-) {
-  constructor(
-    c: Constraints,
-    orientation: LayoutOrientation
-  ) : this(
-    if (orientation === LayoutOrientation.Horizontal) c.minWidth else c.minHeight,
-    if (orientation === LayoutOrientation.Horizontal) c.maxWidth else c.maxHeight,
-    if (orientation === LayoutOrientation.Horizontal) c.minHeight else c.minWidth,
-    if (orientation === LayoutOrientation.Horizontal) c.maxHeight else c.maxWidth
-  )
-}

common/src/commonMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt

@@ -1,11 +0,0 @@
-package dev.msfjarvis.claw.common.ui
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-
-@Composable
-expect fun NetworkImage(
-  url: String,
-  contentDescription: String,
-  modifier: Modifier,
-)

common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/theme/Type.kt

@@ -1,18 +0,0 @@
-@file:JvmName("DesktopType")
-
-package dev.msfjarvis.claw.common.theme
-
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.platform.Font
-
-actual fun createFontFamily() =
-  FontFamily(
-    Font("font/manrope_bold.ttf", FontWeight.Bold),
-    Font("font/manrope_extrabold.ttf", FontWeight.ExtraBold),
-    Font("font/manrope_extralight.ttf", FontWeight.ExtraLight),
-    Font("font/manrope_light.ttf", FontWeight.Light),
-    Font("font/manrope_medium.ttf", FontWeight.Medium),
-    Font("font/manrope_regular.ttf", FontWeight.Normal),
-    Font("font/manrope_semibold.ttf", FontWeight.SemiBold),
-  )

common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt

@@ -1,19 +0,0 @@
-package dev.msfjarvis.claw.common.ui
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import io.kamel.image.KamelImage
-import io.kamel.image.lazyPainterResource
-
-@Composable
-actual fun NetworkImage(
-  url: String,
-  contentDescription: String,
-  modifier: Modifier,
-) {
-  KamelImage(
-    resource = lazyPainterResource(url),
-    contentDescription = contentDescription,
-    modifier = modifier,
-  )
-}

common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/urllauncher/UrlLauncher.kt

@@ -1,22 +0,0 @@
-package dev.msfjarvis.claw.common.urllauncher
-
-import androidx.compose.ui.platform.UriHandler
-import io.github.aakira.napier.Napier
-import java.awt.Desktop
-import java.io.IOException
-import java.net.URI
-
-class UrlLauncher : UriHandler {
-  override fun openUri(uri: String) {
-    if (Desktop.isDesktopSupported()) {
-      val desktop = Desktop.getDesktop()
-      if (desktop.isSupported(Desktop.Action.BROWSE)) {
-        try {
-          desktop.browse(URI(uri))
-        } catch (e: IOException) {
-          Napier.d(tag = "UrlLauncher") { "Failed to open URL: $uri" }
-        }
-      }
-    }
-  }
-}

common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Type.kt

@@ -2,13 +2,22 @@ package dev.msfjarvis.claw.common.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
+import dev.msfjarvis.claw.common.R
 
-expect fun createFontFamily(): FontFamily
-
-private val Manrope = createFontFamily()
+private val Manrope =
+  FontFamily(
+    Font(R.font.manrope_bold, FontWeight.Bold),
+    Font(R.font.manrope_extrabold, FontWeight.ExtraBold),
+    Font(R.font.manrope_extralight, FontWeight.ExtraLight),
+    Font(R.font.manrope_light, FontWeight.Light),
+    Font(R.font.manrope_medium, FontWeight.Medium),
+    Font(R.font.manrope_regular, FontWeight.Normal),
+    Font(R.font.manrope_semibold, FontWeight.SemiBold),
+  )
 
 val AppTypography =
   Typography(

common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkImage.kt

@@ -7,7 +7,7 @@ import androidx.compose.ui.draw.clip
 import coil.compose.AsyncImage
 
 @Composable
-actual fun NetworkImage(
+fun NetworkImage(
   url: String,
   contentDescription: String,
   modifier: Modifier,

settings.gradle.kts

@@ -98,6 +98,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 include(
   "api",
+  "common",
   "database",
   "model",
 )