Merge pull request #19 from RLD-JL/1.0.9-a

Update sqldelight

androidApp/build.gradle.kts

@@ -45,8 +45,8 @@ android {
         applicationId = "com.rld.justlisten.android"
         minSdk = 21
         targetSdk = 34
-        versionCode = 25
-        versionName = "1.0.9"
+        versionCode = 26
+        versionName = "1.0.9-a"
         vectorDrawables {
             useSupportLibrary = true
         }

androidApp/src/main/java/com/rld/justlisten/android/ui/addplaylistscreen/components/PlaylistViewItem.kt

@@ -14,7 +14,7 @@ import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import coil.transform.RoundedCornersTransformation
 import com.rld.justlisten.android.R
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.datalayer.models.PlayListModel
 import com.rld.justlisten.viewmodel.Events
 import com.rld.justlisten.viewmodel.screens.library.getSongWithId

androidApp/src/main/java/com/rld/justlisten/android/ui/bottombars/playbar/PlayerBarSheetContent.kt

@@ -11,7 +11,7 @@ import com.rld.justlisten.android.exoplayer.MusicServiceConnection
 import com.rld.justlisten.android.ui.bottombars.playbar.components.PlayerBottomBar
 import com.rld.justlisten.android.ui.bottombars.sheets.BottomSheetScreen
 import com.rld.justlisten.android.ui.bottombars.sheets.SheetLayout
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.datalayer.models.SongIconList
 import com.rld.justlisten.datalayer.models.UserModel
 import com.rld.justlisten.viewmodel.Events

androidApp/src/main/java/com/rld/justlisten/android/ui/bottombars/playbar/components/addplaylist/AddPlaylistOption.kt

@@ -16,7 +16,7 @@ import com.rld.justlisten.android.ui.addplaylistscreen.components.AddPlaylistDia
 import com.rld.justlisten.android.ui.addplaylistscreen.components.AddPlaylistRow
 import com.rld.justlisten.android.ui.addplaylistscreen.components.PlaylistViewItem
 import com.rld.justlisten.android.ui.bottombars.playbar.components.more.TopSection
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.viewmodel.Events
 
 @Composable

androidApp/src/main/java/com/rld/justlisten/android/ui/bottombars/sheets/SheetLayout.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.ui.graphics.painter.Painter
 import com.rld.justlisten.android.ui.bottombars.playbar.components.addplaylist.AddPlaylistOption
 import com.rld.justlisten.android.ui.bottombars.playbar.components.more.PlayBarMoreAction
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.viewmodel.Events
 
 @Composable

androidApp/src/main/java/com/rld/justlisten/android/ui/settingsscreen/SettingsScreen.kt

@@ -101,7 +101,7 @@ fun SettingsScreen(
                 horizontalArrangement = Arrangement.Center
             )
             {
-                Text(text = "App version:1.0.9")
+                Text(text = "App version:1.0.9-a")
             }
         }
     }

build.gradle.kts

@@ -8,7 +8,6 @@ buildscript {
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlinVersion.get()}")
         classpath("com.android.tools.build:gradle:8.5.2")
-        classpath("com.squareup.sqldelight:gradle-plugin:1.5.3")
         classpath ("com.google.dagger:hilt-android-gradle-plugin:2.52")
     }
 }

shared/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     kotlin("plugin.serialization") version libs.versions.kotlinVersion.get()
-    id("com.squareup.sqldelight")
+    id("app.cash.sqldelight") version "2.0.2"
 }
 
 kotlin {
@@ -42,7 +42,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation("io.ktor:ktor-client-android:${libs.versions.ktorVersion.get()}")
-                implementation("com.squareup.sqldelight:android-driver:1.5.3")
+                implementation("app.cash.sqldelight:android-driver:2.0.2")
             }
         }
         val androidUnitTest by getting {
@@ -54,17 +54,18 @@ kotlin {
         val iosMain by getting {
             dependencies {
                 implementation("io.ktor:ktor-client-ios:${libs.versions.ktorVersion.get()}")
-                implementation("com.squareup.sqldelight:native-driver:2.0.2")
+                implementation("app.cash.sqldelight:native-driver:2.0.2")
             }
         }
         val iosTest by getting
     }
 }
 
 sqldelight {
-    database("LocalDb") {
-        packageName = "myLocal.db"
-        sourceFolders = listOf("kotlin")
+    databases {
+        create("LocalDb") {
+            packageName.set("com.rld.justlisten")
+        }
     }
 }
 

shared/src/androidMain/kotlin/com/rld/justlisten/shared/viewmodel/AudiusViewModelForAndroid.kt

@@ -1,10 +1,10 @@
 package com.rld.justlisten.shared.viewmodel
 
 import android.content.Context
+import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import com.rld.justlisten.LocalDb
 import com.rld.justlisten.datalayer.Repository
 import com.rld.justlisten.viewmodel.JustListenViewModel
-import com.squareup.sqldelight.android.AndroidSqliteDriver
-import myLocal.db.LocalDb
 
 fun JustListenViewModel.Factory.getAndroidInstance(context : Context) : JustListenViewModel {
     val sqlDriver = AndroidSqliteDriver(LocalDb.Schema, context, "Local.db")

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/Repository.kt

@@ -1,16 +1,16 @@
 package com.rld.justlisten.datalayer
 
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
-import com.rld.justlisten.datalayer.localdb.libraryscreen.Library
-import com.rld.justlisten.datalayer.localdb.playlistdetail.PlaylistDetail
+import app.cash.sqldelight.ColumnAdapter
+import app.cash.sqldelight.db.SqlDriver
 import com.rld.justlisten.datalayer.models.SongIconList
 import com.rld.justlisten.datalayer.models.UserModel
 import com.rld.justlisten.datalayer.webservices.ApiClient
-import com.squareup.sqldelight.ColumnAdapter
-import com.squareup.sqldelight.db.SqlDriver
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import myLocal.db.LocalDb
+import com.rld.justlisten.LocalDb
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
+import com.rld.justlisten.database.libraryscreen.Library
+import com.rld.justlisten.database.playlistdetail.PlaylistDetail
 
 
 class Repository(

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/datacalls/addplaylistscreen/AddPlaylistCalls.kt

@@ -1,5 +1,6 @@
 package com.rld.justlisten.datalayer.datacalls.addplaylistscreen
 
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.datalayer.Repository
 import com.rld.justlisten.datalayer.localdb.addplaylistscreen.*
 

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/datacalls/settings/SettingsCalls.kt

@@ -1,7 +1,7 @@
 package com.rld.justlisten.datalayer.datacalls.settings
 
+import com.rld.justlisten.database.settingsscreen.SettingsInfo
 import com.rld.justlisten.datalayer.Repository
-import com.rld.justlisten.datalayer.localdb.settingsscreen.SettingsInfo
 import com.rld.justlisten.datalayer.localdb.settingsscreen.getSettingsInfo
 import com.rld.justlisten.datalayer.localdb.settingsscreen.saveSettingsInfo
 

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/addplaylistscreen/AddPlaylistFunctions.kt

@@ -1,6 +1,7 @@
 package com.rld.justlisten.datalayer.localdb.addplaylistscreen
 
-import myLocal.db.LocalDb
+import com.rld.justlisten.LocalDb
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 
 fun LocalDb.savePlaylist(
     playlistName: String, playlistDescription: String?

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/libraryscreen/LibraryFunctions.kt

@@ -3,7 +3,7 @@ package com.rld.justlisten.datalayer.localdb.libraryscreen
 import com.rld.justlisten.datalayer.models.PlayListModel
 import com.rld.justlisten.datalayer.models.SongIconList
 import com.rld.justlisten.datalayer.models.UserModel
-import myLocal.db.LocalDb
+import com.rld.justlisten.LocalDb
 
 fun LocalDb.saveSongToFavorites(
     id: String, title: String, user: UserModel, songImgList: SongIconList,

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/playlistdetail/PlaylistDetailFunctions.kt

@@ -1,7 +1,7 @@
 package com.rld.justlisten.datalayer.localdb.playlistdetail
 
+import com.rld.justlisten.LocalDb
 import com.rld.justlisten.datalayer.models.PlayListModel
-import myLocal.db.LocalDb
 
 fun LocalDb.getPlaylistDetail() : List<PlayListModel> {
   return  playlistDetailQueries.getPlaylistDetail(mapper = ::PlayListModel).executeAsList()

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/searchscreen/SearchScreenFunctions.kt

@@ -1,6 +1,6 @@
 package com.rld.justlisten.datalayer.localdb.searchscreen
 
-import myLocal.db.LocalDb
+import com.rld.justlisten.LocalDb
 
 fun LocalDb.saveSearchInfo(searchFor: String) {
     searchScreenInfoQueries.transaction {

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/settingsscreen/SettingsScreenFunctions.kt

@@ -1,6 +1,8 @@
 package com.rld.justlisten.datalayer.localdb.settingsscreen
 
-import myLocal.db.LocalDb
+import com.rld.justlisten.LocalDb
+import com.rld.justlisten.database.settingsscreen.SettingsInfo
+
 
 fun LocalDb.saveSettingsInfo(hasNavigationDonationOn: Boolean, isDarkThemeOn: Boolean, palletColor: String) {
     settingsScreenQueries.transaction {

shared/src/commonMain/kotlin/com/rld/justlisten/viewmodel/screens/addplaylist/AddPlaylistEvents.kt

@@ -1,9 +1,9 @@
 package com.rld.justlisten.viewmodel.screens.addplaylist
 
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.datalayer.datacalls.addplaylistscreen.getAddPlaylist
 import com.rld.justlisten.datalayer.datacalls.addplaylistscreen.savePlaylist
 import com.rld.justlisten.datalayer.datacalls.addplaylistscreen.updatePlaylistSongs
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
 import com.rld.justlisten.viewmodel.Events
 
 fun Events.addPlaylist(

shared/src/commonMain/kotlin/com/rld/justlisten/viewmodel/screens/addplaylist/AddPlaylistState.kt

@@ -1,7 +1,7 @@
 package com.rld.justlisten.viewmodel.screens.addplaylist
 
 import com.rld.justlisten.ScreenState
-import com.rld.justlisten.datalayer.localdb.addplaylistscreen.AddPlaylist
+import com.rld.justlisten.database.addplaylistscreen.AddPlaylist
 
 data class AddPlaylistState(
     val isLoading: Boolean = false,

shared/src/commonMain/kotlin/com/rld/justlisten/viewmodel/screens/settings/SettingsEvent.kt

@@ -1,8 +1,8 @@
 package com.rld.justlisten.viewmodel.screens.settings
 
+import com.rld.justlisten.database.settingsscreen.SettingsInfo
 import com.rld.justlisten.datalayer.datacalls.settings.getSettingsInfo
 import com.rld.justlisten.datalayer.datacalls.settings.saveSettingsInfo
-import com.rld.justlisten.datalayer.localdb.settingsscreen.SettingsInfo
 import com.rld.justlisten.viewmodel.Events
 
 fun Events.saveSettingsInfo(hasNavigationFundOn: Boolean, isDarkThemeOn: Boolean, palletColor: String) {

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/addplaylistscreen/AddPlaylist.sq → shared/src/commonMain/sqldelight/com/rld/justlisten/database/addplaylistscreen/AddPlaylist.sq

@@ -1,4 +1,5 @@
 import kotlin.collections.List;
+import kotlin.String;
 
 CREATE TABLE AddPlaylist  (
        playlistName TEXT NOT NULL PRIMARY KEY ,

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/libraryscreen/Library.sq → shared/src/commonMain/sqldelight/com/rld/justlisten/database/libraryscreen/Library.sq

@@ -1,5 +1,6 @@
 import com.rld.justlisten.datalayer.models.SongIconList;
 import com.rld.justlisten.datalayer.models.UserModel;
+import kotlin.Boolean;
 
 CREATE TABLE Library  (
      id TEXT NOT NULL PRIMARY KEY,

shared/src/commonMain/kotlin/com/rld/justlisten/datalayer/localdb/settingsscreen/SettingsScreen.sq → shared/src/commonMain/sqldelight/com/rld/justlisten/database/settingsscreen/SettingsScreen.sq

@@ -1,3 +1,5 @@
+import kotlin.Boolean;
+
 CREATE TABLE SettingsInfo (
      id INTEGER PRIMARY KEY DEFAULT 1,
      hasNavigationDonationOn INTEGER AS Boolean NOT NULL,