Merge pull request #4 from aclassen/desktop

Desktop support

.gitignore

@@ -7,10 +7,12 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+.idea/artifacts/
 .idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
-local.properties
+local.properties
+.idea/jarRepositories.xml

README.md

@@ -1,39 +1,43 @@
 # Compose LazyList reorder
 
-[![](https://jitpack.io/v/aclassen/ComposeReorderable.svg)](https://jitpack.io/#aclassen/ComposeReorderable)
 
-A Jetpack Compose modifier enabling reordering in a LazyList.
+A Jetpack Compose (Desktop) modifier enabling reordering in a LazyList.
 
 ![Sample](readme/sample.gif)
 
 ## Download
 
 ```
-repositories {
-    maven { setUrl("https://jitpack.io") }
-    // maven { url 'https://jitpack.io' } 
-}
-
-
 dependencies {
-    implementation("com.github.aclassen:ComposeReorderable:<latest_version>")
+    implementation("org.burnoutcrew.composereorderable:reorderable:<latest_version>")
 }
 ```
 
 ## How to use
 
-Add a `Reorderable` to your composition:
+Create `reorderState` and add the `reorderable` Modifier to the LazyList:
 
 ```
-val state: ReorderableState = rememberReorderState()
+val state = rememberReorderState()
 
-Reorderable(state, { from, to -> data.move(from, to) })
-LazyColumn(state = state.listState) {
+LazyColumn(
+    state = state.listState,
+    modifier = Modifier.reorderable(state, { from, to -> data.move(from, to) })) {
 ...
 }
 ```
 
-To apply the dragged item offset:
+To make an item reorderable/draggable add at least one drag modifier to the item:
+
+```
+ Modifier.detectReorder(state)
+ or
+ Modifier.detectReorderAfterLongPress(state)
+```
+
+> Adding one of the detect modifiers to the LazyList instead of an item , will make all items reordable.
+
+At least apply the dragged item offset:
 
 ```
 items(items, { it.key }) {item ->
@@ -43,33 +47,44 @@ items(items, { it.key }) {item ->
         ...
     }
 }
-```
 
-Make an item reorderable by adding at least one drag modifier to the item:
+or without keyed items:
 
-```
- Modifier.detectReorder(state, { item.key })
- or
- Modifier.detectReorderAfterLongPress(state, { item.key })
+itemsIndexed(items) { idx, item ->
+    Column(
+        modifier = Modifier.draggedItem(state.offsetOf(idx))
+    ) {
+        ...
+    }
+}
 ```
 
-If you want to use a non keyed item list `detectReorder` and `detectReorderAfterLongPress` will not work , use the `detectListReorder`
-modifier instead.
-
-Add this modifier to your LazyList , this will make the items reorderable after long press.
+> You can use `draggedItem` for a default dragged effect or create your own.
 
+Complete example:
 ```
-Reorderable(state, { from, to -> data.move(from, to) })
-LazyRow(
-    state = state.listState,
-    modifier = Modifier
-        .detectListReorder(state),
-    ) 
+@Composable
+fun ReorderableList(){
+    val state = rememberReorderState()
+    val data = List(100) { "item $it" }.toMutableStateList()
+    LazyColumn(
+        state = state.listState,
+        modifier = Modifier.reorderable(state, { a, b -> data.move(a, b) })
+    ) {
+        items(data, { it }) { item ->
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .draggedItem(state.offsetOf(item))
+                    .detectReorderAfterLongPress(state)
+            ) {
+                Text(text = item)
+            }
+        }
+    }
+}
 ```
 
-Use the item index, instead of the key , to find the offset `state.offsetOf(idx)`
-
-You can use `draggedItem` for a default dragged effect or create your own.
 
 ## Notes
 

android/build.gradle.kts

@@ -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"
+    }
+}

android/src/main/AndroidManifest.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>

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

@@ -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

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

@@ -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/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/reorderlist/ItemData.kt → android/src/main/kotlin/org/burnoutcrew/android/ui/reorderlist/ItemData.kt

@@ -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
 

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

@@ -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()
                 }
             }

app/src/main/kotlin/io/burnoutcrew/lazyreorderlist/ui/reorderlist/ReorderListViewModel.kt → android/src/main/kotlin/org/burnoutcrew/android/ui/reorderlist/ReorderListViewModel.kt

@@ -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/theme/Color.kt → android/src/main/kotlin/org/burnoutcrew/android/ui/theme/Color.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/theme/Shape.kt → android/src/main/kotlin/org/burnoutcrew/android/ui/theme/Shape.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