Cleanup separate modules

geoff-powell · Dec 15, 2023 · 9dfd6c2 · 9dfd6c2
1 parent 8f3f025
commit 9dfd6c2
Show file tree

Hide file tree

Showing 21 changed files with 131 additions and 388 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -27,7 +25,7 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew android:assembleDebug
+      run: ./gradlew composeApp:assembleDebug
 
   build-release:
     runs-on: ubuntu-latest
@@ -43,7 +41,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew android:assembleRelease
+        run: ./gradlew composeApp:assembleRelease
 
   test:
     runs-on: ubuntu-latest
@@ -59,4 +57,4 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew android:check
+        run: ./gradlew composeApp:check
diff --git a/.github/workflows/desktop-web.yml b/.github/workflows/desktop-web.yml
@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -31,7 +29,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew desktop:assemble
+        run: ./gradlew composeApp:desktopJar
 
   Build-Web:
     runs-on: ubuntu-latest
@@ -56,4 +54,4 @@ jobs:
           node-version: '10.x'
 
       - name: Build with Gradle
-        run: ./gradlew jsApp:assemble
+        run: ./gradlew composeApp:jsJar
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -4,9 +4,7 @@ on:
   push: 
     branches: 
       - main
-  pull_request: 
-    branches: 
-      - main
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -16,6 +14,9 @@ jobs:
   build: 
     runs-on: macos-latest
     steps:
+      - name: Check Xcode version
+        run: /usr/bin/xcodebuild -version
+
       - name: Checkout Repo
         uses: actions/checkout@v4
 
@@ -29,17 +30,12 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - shell: bash
-        run: ./gradlew generateDummyFramework
-
-      - name: Set up cocoapods
-        uses: maxim-lobanov/setup-cocoapods@v1
-        with: 
-          version: latest
-
-      - name: Install cocoapods
-        shell: bash
-        run: ./gradlew podInstall
-
-      - name: Build with Gradle
-        run: ./gradlew iosSimulatorArm64Binaries
+      - name: Build App
+        run: |
+          cd iosApp && \
+          xcodebuild -scheme "iosApp" \
+          -archivePath $RUNNER_TEMP/iosApp.xcarchive \
+          -sdk iphoneos \
+          -configuration Debug \
+          -destination generic/platform=iOS \
+          clean archive
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/java/com/greenmiststudios/tidy/Application.kt b/android/src/main/java/com/greenmiststudios/tidy/Application.kt
diff --git a/android/src/main/java/com/greenmiststudios/tidy/MainActivity.kt b/android/src/main/java/com/greenmiststudios/tidy/MainActivity.kt
diff --git a/...on/src/commonMain/kotlin/com/greenmiststudios/common/components/screens/EditListScreen.kt b/...on/src/commonMain/kotlin/com/greenmiststudios/common/components/screens/EditListScreen.kt
@@ -8,26 +8,25 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.rounded.Add
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.rounded.Add
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.DismissDirection.EndToStart
+import androidx.compose.material3.DismissValue.Default
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SwipeToDismiss
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
+import androidx.compose.material3.rememberDismissState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -38,6 +37,7 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.navigator.LocalNavigator
 import com.greenmiststudios.common.components.ActionButton
 import com.greenmiststudios.common.components.TopAppBarWithContent
+import com.greenmiststudios.common.data.TidyListItem
 import com.greenmiststudios.common.presenters.EditListPresenter
 import com.greenmiststudios.common.screens.Screen
 import com.greenmiststudios.common.screens.bindPresenter
@@ -47,6 +47,7 @@ import com.greenmiststudios.common.viewmodels.EditListViewEvent.DeleteList
 import com.greenmiststudios.common.viewmodels.EditListViewEvent.UpdateItemCompletion
 import com.greenmiststudios.common.viewmodels.EditListViewEvent.UpdateList
 import com.greenmiststudios.common.viewmodels.EditListViewModel
+import kotlin.reflect.KProperty
 
 public data class EditListScreen(override val params: Config) : Screen<EditListScreen.Config> {
   public sealed interface Config {
@@ -101,10 +102,7 @@ public fun EditListScreen(viewModel: EditListViewModel, onEvent: (EditListViewEv
             return@TopAppBarWithContent
           }
         }
-
-        require(viewModel is EditListViewModel.Loaded)
       }
-
     }
   }
 }
@@ -140,24 +138,46 @@ private fun CreateListScreen(
     LazyColumn {
       items(viewModel.items.size) {
         val item = viewModel.items[it]
-        Row {
-          Checkbox(
-            checked = item.completed,
-            onCheckedChange = { checked ->
-              onEvent(UpdateItemCompletion(item.id, checked))
-            }
-          )
-          TextField(
-            placeholder = { Text("Item") },
-            value = item.text,
-            onValueChange = { text -> onEvent(EditListViewEvent.UpdateItemText(item.id, text)) },
-          )
-        }
+        ListItem(item, onEvent)
       }
     }
   }
 }
 
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun ListItem(
+  item: TidyListItem,
+  onEvent: (EditListViewEvent) -> Unit
+) {
+  val dismissState = rememberDismissState(
+    initialValue = Default,
+    confirmValueChange = {
+      println("$it - ${item.text}")
+      true
+    }
+  )
+  SwipeToDismiss(state = dismissState, background = {
+    Row {
+      Checkbox(
+        checked = item.completed,
+        onCheckedChange = { checked ->
+          onEvent(UpdateItemCompletion(item.id, checked))
+        }
+      )
+      TextField(
+        placeholder = { Text("Item") },
+        value = item.text,
+        onValueChange = { text -> onEvent(EditListViewEvent.UpdateItemText(item.id, text)) },
+      )
+    }
+  }, dismissContent = {
+    IconButton({ }) {
+      Icon(rememberVectorPainter(Icons.Default.Delete), contentDescription = "Delete")
+    }
+  }, directions = setOf(EndToStart))
+}
+
 @Composable
 private fun EditListContentScreen(
   viewModel: EditListViewModel.Loaded.Edit,