Updating state

.github/workflows/test-action.yml

@@ -0,0 +1,20 @@
+name: testing
+on: [pull_request]
+jobs:
+  test:
+    name: Running Unit Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+      - name: Clone repo
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+      - run: "./gradlew :shared:testDebugUnitTest"
+

atomik/src/commonMain/kotlin/com/kevinschildhorn/atomik/atomic/molecules/OutlinedTextFieldMolecule.kt

@@ -35,14 +35,14 @@ public open class OutlinedTextFieldMolecule(
     override val unFocusedBorderColor: AtomikColor = focusedBorderColor,
     override val radius: Int,
 ) : TextFieldMolecule(
-    textAtom,
-    backgroundColorAtom,
-    hintTextAtom,
-    errorTextAtom,
-    disabledColorAtom,
-    cursorColor,
-    errorColor,
-),
+        textAtom,
+        backgroundColorAtom,
+        hintTextAtom,
+        errorTextAtom,
+        disabledColorAtom,
+        cursorColor,
+        errorColor,
+    ),
     BorderedAtom,
     RoundedAtom {
     @Composable
@@ -56,26 +56,26 @@ public open class OutlinedTextFieldMolecule(
             textColor = textColor,
             backgroundColor = backgroundColor,
             placeholderColor =
-            hintTextAtom?.textColor?.composeColor ?: backgroundColor.copy(
-                ContentAlpha.medium,
-            ),
+                hintTextAtom?.textColor?.composeColor ?: backgroundColor.copy(
+                    ContentAlpha.medium,
+                ),
             cursorColor = cursorColor?.composeColor ?: textColor,
             focusedBorderColor = focusedBorderColor.composeColor,
             unfocusedBorderColor = unFocusedBorderColor.composeColor,
             disabledTextColor =
-            disabledColorAtom?.color?.composeColor
-                ?: textColor.copy(ContentAlpha.disabled),
+                disabledColorAtom?.color?.composeColor
+                    ?: textColor.copy(ContentAlpha.disabled),
             disabledBorderColor = disabledColorAtom?.color?.composeColor ?: disabledBackgroundColor,
             disabledLabelColor = disabledColorAtom?.color?.composeColor ?: disabledBackgroundColor,
             disabledLeadingIconColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             disabledPlaceholderColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             disabledTrailingIconColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             errorCursorColor = errorColor?.composeColor ?: errorTextColor,
             errorBorderColor = errorColor?.composeColor ?: errorTextColor,
             errorLabelColor = errorColor?.composeColor ?: errorTextColor,

atomik/src/commonMain/kotlin/com/kevinschildhorn/atomik/atomic/molecules/TextFieldMolecule.kt

@@ -44,26 +44,26 @@ public open class TextFieldMolecule(
             textColor = textColor,
             backgroundColor = backgroundColor,
             placeholderColor =
-            hintTextAtom?.textColor?.composeColor ?: backgroundColor.copy(
-                ContentAlpha.medium,
-            ),
+                hintTextAtom?.textColor?.composeColor ?: backgroundColor.copy(
+                    ContentAlpha.medium,
+                ),
             cursorColor = cursorColor?.composeColor ?: textColor,
             disabledTextColor =
-            disabledColorAtom?.color?.composeColor
-                ?: textColor.copy(ContentAlpha.disabled),
+                disabledColorAtom?.color?.composeColor
+                    ?: textColor.copy(ContentAlpha.disabled),
             disabledIndicatorColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             disabledLabelColor = disabledColorAtom?.color?.composeColor ?: disabledBackgroundColor,
             disabledLeadingIconColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             disabledPlaceholderColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             disabledTrailingIconColor =
-            disabledColorAtom?.color?.composeColor
-                ?: disabledBackgroundColor,
+                disabledColorAtom?.color?.composeColor
+                    ?: disabledBackgroundColor,
             errorCursorColor = errorColor?.composeColor ?: errorTextColor,
             errorIndicatorColor = errorColor?.composeColor ?: errorTextColor,
             errorLabelColor = errorColor?.composeColor ?: errorTextColor,

shared/build.gradle.kts

@@ -10,7 +10,8 @@ kotlin {
     applyDefaultHierarchyTemplate()
     androidTarget()
     jvm("desktop")
-    listOf(
+    /*
+    listOf( TODO re-add
         iosX64(),
         iosArm64(),
         iosSimulatorArm64(),
@@ -19,7 +20,7 @@ kotlin {
             baseName = "shared"
             isStatic = true
         }
-    }
+    }*/
 
     sourceSets {
         val commonMain by getting {
@@ -70,6 +71,7 @@ kotlin {
                 implementation("io.github.kevinschildhorn:atomik:0.0.6")
             }
         }
+        /*
         val iosX64Main by getting
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting
@@ -79,7 +81,7 @@ kotlin {
             iosArm64Main.dependsOn(this)
             iosSimulatorArm64Main.dependsOn(this)
             resources.srcDirs("src/commonMain/resources")
-        }
+        }*/
         val desktopMain by getting {
             dependsOn(jvmMain)
             dependencies {

shared/src/androidMain/kotlin/com/kevinschildhorn/fotopresenter/ui/compose/LoginPreviews.kt

@@ -8,8 +8,9 @@ import com.kevinschildhorn.fotopresenter.ui.compose.common.TitleView
 import com.kevinschildhorn.fotopresenter.ui.compose.login.FotoPasswordTextField
 import com.kevinschildhorn.fotopresenter.ui.compose.login.FotoTextField
 import com.kevinschildhorn.fotopresenter.ui.compose.login.LoginScreenForm
-import com.kevinschildhorn.fotopresenter.ui.state.LoginUiState
+import com.kevinschildhorn.fotopresenter.ui.state.LoginScreenState
 import com.kevinschildhorn.fotopresenter.ui.state.State
+import com.kevinschildhorn.fotopresenter.ui.state.UiState
 
 @Preview
 @Composable
@@ -38,8 +39,8 @@ fun FotoTextFieldPreview() {
 @Composable
 fun LoginScreenFormPreview() {
     LoginScreenForm(
-        LoginUiState(
-            state = State.ERROR("No Internet"),
+        LoginScreenState(
+            state = UiState.ERROR("No Internet"),
         ),
         {},
         {},

shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt

@@ -31,11 +31,17 @@ val commonModule =
         single { ImageRepository(get()) }
 
         // Domain
-        factory { ConnectToServerUseCase(get()) }
-        factory { ChangeDirectoryUseCase(get()) }
-        factory { AutoConnectUseCase(get(), get()) }
+        factory { ConnectToServerUseCase(get(), baseLogger.withTag("ConnectToServerUseCase")) }
+        factory { ChangeDirectoryUseCase(get(), baseLogger.withTag("ChangeDirectoryUseCase")) }
+        factory { AutoConnectUseCase(get(), get(), baseLogger.withTag("AutoConnectUseCase")) }
         factory { SaveCredentialsUseCase(get(), baseLogger.withTag("SaveCredentialsUseCase")) }
-        factory { RetrieveDirectoryContentsUseCase(get(), get()) }
+        factory {
+            RetrieveDirectoryContentsUseCase(
+                get(),
+                get(),
+                baseLogger.withTag("RetrieveDirectoryContentsUseCase"),
+            )
+        }
 
         // UI
         single { LoginViewModel(baseLogger.withTag("LoginViewModel"), get()) }

shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/AutoConnectUseCase.kt

@@ -1,5 +1,6 @@
 package com.kevinschildhorn.fotopresenter.domain
 
+import co.touchlab.kermit.Logger
 import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler
 import com.kevinschildhorn.fotopresenter.data.repositories.CredentialsRepository
 
@@ -9,6 +10,7 @@ Automatically connect to the server using saved credentials
 class AutoConnectUseCase(
     private val client: NetworkHandler,
     private val repository: CredentialsRepository,
+    private val logger: Logger,
 ) {
     suspend operator fun invoke(): Boolean =
         try {

shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ChangeDirectoryUseCase.kt

@@ -1,16 +1,18 @@
 package com.kevinschildhorn.fotopresenter.domain
 
-import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler
+import co.touchlab.kermit.Logger
+import com.kevinschildhorn.fotopresenter.data.datasources.DirectoryDataSource
 import com.kevinschildhorn.fotopresenter.data.network.NetworkHandlerException
 import kotlin.coroutines.cancellation.CancellationException
 
 class ChangeDirectoryUseCase(
-    private val client: NetworkHandler,
+    private val dataSource: DirectoryDataSource,
+    private val logger: Logger,
 ) {
     @Throws(NetworkHandlerException::class, CancellationException::class)
     suspend operator fun invoke(path: String) =
         try {
-            client.openDirectory(path)
+            dataSource.changeDirectory(path)
         } catch (e: Exception) {
             throw NetworkHandlerException(e.message ?: "")
         }

shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/ConnectToServerUseCase.kt

@@ -1,5 +1,6 @@
 package com.kevinschildhorn.fotopresenter.domain
 
+import co.touchlab.kermit.Logger
 import com.kevinschildhorn.fotopresenter.data.LoginCredentials
 import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler
 
@@ -8,11 +9,14 @@ Connect to Server using FTPS
  **/
 class ConnectToServerUseCase(
     private val client: NetworkHandler,
+    private val logger: Logger,
 ) {
     suspend operator fun invoke(credentials: LoginCredentials): Boolean =
         try {
+            logger.i { "Connecting to Client" }
             client.connect(credentials)
         } catch (e: Exception) {
+            logger.e(e) { "Something went wrong" }
             false
         }
 }

shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/domain/RetrieveDirectoryContentsUseCase.kt

@@ -1,23 +1,33 @@
 package com.kevinschildhorn.fotopresenter.domain
 
+import co.touchlab.kermit.Logger
 import com.kevinschildhorn.fotopresenter.data.DirectoryContents
 import com.kevinschildhorn.fotopresenter.data.ImageDirectoryContent
+import com.kevinschildhorn.fotopresenter.data.network.NetworkDirectory
 import com.kevinschildhorn.fotopresenter.data.repositories.DirectoryRepository
 import com.kevinschildhorn.fotopresenter.data.repositories.ImageRepository
+import com.kevinschildhorn.fotopresenter.ui.SharedImage
 
 /**
 Retrieving Directories from Location
  **/
 class RetrieveDirectoryContentsUseCase(
     private val directoryRepository: DirectoryRepository,
     private val imageRepository: ImageRepository,
+    private val logger: Logger,
 ) {
     suspend operator fun invoke(path: String): DirectoryContents {
         val directoryContents = directoryRepository.getDirectoryContents(path)
-        val imageDirectories =
-            directoryContents.images.map {
-                ImageDirectoryContent(it.directory, image = imageRepository.getImage(it.directory))
-            }
-        return directoryContents.copy(images = imageDirectories)
+        return directoryContents.updateImages {
+            imageRepository.getImage(it)
+        }
     }
 }
+
+private suspend fun DirectoryContents.updateImages(block: suspend (NetworkDirectory) -> SharedImage?): DirectoryContents =
+    this.copy(
+        images =
+            images.map {
+                ImageDirectoryContent(it.directory, image = block(it.directory))
+            },
+    )

shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/atoms/LoginScreenAtoms.kt

@@ -33,11 +33,11 @@ object LoginScreenAtoms {
             disabledColor = FotoColors.disabled,
             radius = 15,
             textAtom =
-            SimpleTextAtom(
-                textColor = FotoColors.primaryText,
-                typography = FotoTypography.button,
-                fontFamily = null,
-            ),
+                SimpleTextAtom(
+                    textColor = FotoColors.primaryText,
+                    typography = FotoTypography.button,
+                    fontFamily = null,
+                ),
         )
     val textFieldMolecule =
         OutlinedTextFieldMolecule(