Compose desktop support

Author: aclassen

.gitignore

@@ -7,6 +7,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+.idea/artifacts/
 .idea/deploymentTargetDropDown.xml
 .DS_Store
 /build

.idea/.name

@@ -0,0 +1,36 @@
+import org.jetbrains.compose.compose
+
+plugins {
+    id("org.jetbrains.compose")
+    id("com.android.application")
+    kotlin("android")
+}
+
+dependencies {
+    implementation(project(":reorderable"))
+    implementation(compose.runtime)
+    implementation(compose.material)
+    implementation("androidx.activity:activity-compose:1.3.1")
+    implementation("com.google.android.material:material:1.4.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07")
+}
+
+android {
+    compileSdk = rootProject.extra.get("compileSdk") as Int
+    defaultConfig {
+        minSdk =  rootProject.extra.get("minVersion") as Int
+        targetSdk = rootProject.extra.get("targetSdk") as Int
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.burnoutcrew.android">
+    <application
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/Theme.LazyReorderList">
+            <activity android:name=".ui.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

.idea/gradle.xml

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.burnoutcrew.lazyreorderlist.ui
+package org.burnoutcrew.android.ui
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity

.idea/misc.xml

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.burnoutcrew.lazyreorderlist.ui
+package org.burnoutcrew.android.ui
 
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import io.burnoutcrew.lazyreorderlist.R
-import io.burnoutcrew.lazyreorderlist.ui.reorderlist.ReorderList
-import io.burnoutcrew.lazyreorderlist.ui.theme.ReorderListTheme
+import org.burnoutcrew.android.R
+import org.burnoutcrew.android.ui.reorderlist.ReorderList
+import org.burnoutcrew.android.ui.theme.ReorderListTheme
 
 @Composable
 fun Root() {

app/.gitignore renamed to android/.gitignore

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.burnoutcrew.lazyreorderlist.ui.reorderlist
+package org.burnoutcrew.android.ui.reorderlist
 
 import androidx.compose.runtime.Stable
 

android/build.gradle.kts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.burnoutcrew.lazyreorderlist.ui.reorderlist
+package org.burnoutcrew.android.ui.reorderlist
 
 
 import androidx.compose.foundation.Image
@@ -38,7 +38,8 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import io.burnoutcrew.reorderable.*
+import org.burnoutcrew.reorderable.*
+
 
 @Composable
 fun ReorderList(vm: ReorderListViewModel = viewModel()) {
@@ -63,13 +64,11 @@ fun HorizontalReorderList(
     state: ReorderableState = rememberReorderState(),
     onMove: (fromPos: Int, toPos: Int) -> (Unit),
 ) {
-    Reorderable(state, onMove)
     LazyRow(
         state = state.listState,
         horizontalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier
-            .detectListReorder(state, Orientation.Horizontal)
-            .then(modifier),
+        modifier = modifier
+            .then(Modifier.reorderable(state, onMove = onMove, orientation = Orientation.Horizontal)),
     ) {
         itemsIndexed(items) { idx, item ->
             Box(
@@ -83,6 +82,7 @@ fun HorizontalReorderList(
                     .scale(if (state.draggedIndex == null || state.draggedIndex == idx) 1f else .9f)
                     .clip(RoundedCornerShape(8.dp))
                     .background(MaterialTheme.colors.primary)
+                    .detectReorderAfterLongPress(state)
             ) {
                 Text(item.title)
             }
@@ -98,10 +98,10 @@ fun VerticalReorderList(
     onMove: (fromPos: Int, toPos: Int) -> (Unit),
     canDragOver: ((index: Int) -> Boolean),
 ) {
-    Reorderable(state, onMove, canDragOver)
     LazyColumn(
         state = state.listState,
         modifier = modifier
+            .then(Modifier.reorderable(state, onMove = onMove, canDragOver = canDragOver))
     ) {
         items(items, { it.key }) { item ->
             if (item.isLocked) {
@@ -121,21 +121,12 @@ fun VerticalReorderList(
                         .fillMaxWidth()
                         .draggedItem(state.offsetOf(item.key))
                         .background(MaterialTheme.colors.surface)
+                        .detectReorderAfterLongPress(state)
                 ) {
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
+                    Text(
+                        text = item.title,
                         modifier = Modifier.padding(16.dp)
-                    ) {
-                        Image(
-                            imageVector = Icons.Filled.Menu,
-                            contentDescription = "",
-                            modifier = Modifier.detectReorder(state, { item.key })
-                        )
-                        Text(
-                            text = item.title,
-                            modifier = Modifier.padding(start = 8.dp)
-                        )
-                    }
+                    )
                     Divider()
                 }
             }

android/src/main/AndroidManifest.xml

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.burnoutcrew.lazyreorderlist.ui.reorderlist
+package org.burnoutcrew.android.ui.reorderlist
 
 import androidx.compose.runtime.toMutableStateList
 import androidx.lifecycle.ViewModel
-import io.burnoutcrew.reorderable.move
+import org.burnoutcrew.reorderable.move
+
 
 class ReorderListViewModel : ViewModel() {
     val cats = List(500) { ItemData("Cat $it", "") }.toMutableStateList()

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/MainActivity.kt renamed to android/src/main/kotlin/org/burnoutcrew/android/ui/MainActivity.kt

@@ -1,4 +1,4 @@
-package io.burnoutcrew.lazyreorderlist.ui.theme
+package org.burnoutcrew.android.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/Root.kt renamed to android/src/main/kotlin/org/burnoutcrew/android/ui/Root.kt

@@ -1,4 +1,4 @@
-package io.burnoutcrew.lazyreorderlist.ui.theme
+package org.burnoutcrew.android.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/reorderlist/ItemData.kt renamed to android/src/main/kotlin/org/burnoutcrew/android/ui/reorderlist/ItemData.kt

@@ -1,4 +1,4 @@
-package io.burnoutcrew.lazyreorderlist.ui.theme
+package org.burnoutcrew.android.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/reorderlist/ReorderList.kt renamed to android/src/main/kotlin/org/burnoutcrew/android/ui/reorderlist/ReorderList.kt

@@ -1,4 +1,4 @@
-package io.burnoutcrew.lazyreorderlist.ui.theme
+package org.burnoutcrew.android.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle