👕 format code

theapache64 · Jul 11, 2022 · c7ae0b3 · c7ae0b3
1 parent 5967f57
commit c7ae0b3
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 40 deletions.
diff --git a/.fleet/run.json b/.fleet/run.json
@@ -1,9 +1,11 @@
 {
-    "configurations": [
-        {
-            "type": "gradle",
-            "name": "Run App",
-            "tasks": ["run"]
-        }
-    ]
+  "configurations": [
+    {
+      "type": "gradle",
+      "name": "Run App",
+      "tasks": [
+        "run"
+      ]
+    }
+  ]
 }
diff --git a/README.md b/README.md
@@ -25,7 +25,8 @@
 | Windows    |[![Download Button](https://img.shields.io/static/v1?label=Windows&message=Stackzy.msi&color=30A3E6)](https://github.com/theapache64/stackzy/releases/latest)| Experimental | 
 | MacOS    |[![Download Button](https://img.shields.io/static/v1?label=MacOS&message=Stackzy.jar&color=30A3E6)](https://github.com/theapache64/stackzy/releases/latest) | Experimental | 
 
-> ℹ️ To run the `jar`, you need Java 15 or above. If you hate running jar, you can clone the repo and execute `./gradlew createDistributable` to
+> ℹ️ To run the `jar`, you need Java 15 or above. If you hate running jar, you can clone the repo and
+> execute `./gradlew createDistributable` to
 > build executable for your system.
 
 ## 🏋 Dependency

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -83,10 +83,10 @@ tasks.test {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
-    kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.foundation.ExperimentalFoundationApi"
-    kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.ui.ExperimentalComposeUiApi"
-    kotlinOptions.freeCompilerArgs += "-Xuse-experimental=kotlin.io.path.ExperimentalPathApi"
+    kotlinOptions.jvmTarget = "15"
+    // kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.foundation.ExperimentalFoundationApi"
+    // kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.ui.ExperimentalComposeUiApi"
+    // kotlinOptions.freeCompilerArgs += "-Xuse-experimental=kotlin.io.path.ExperimentalPathApi"
 }
 
 tasks.withType<org.gradle.jvm.tasks.Jar> {

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -53,8 +53,8 @@ dependencies {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
-    kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.foundation.ExperimentalFoundationApi"
-    kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.ui.ExperimentalComposeUiApi"
-    kotlinOptions.freeCompilerArgs += "-Xuse-experimental=kotlin.io.path.ExperimentalPathApi"
+    kotlinOptions.jvmTarget = "15"
+    // kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.foundation.ExperimentalFoundationApi"
+    // kotlinOptions.freeCompilerArgs += "-Xuse-experimental=androidx.compose.ui.ExperimentalComposeUiApi"
+    // kotlinOptions.freeCompilerArgs += "-Xuse-experimental=kotlin.io.path.ExperimentalPathApi"
 }
diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/common/Selectable.kt b/src/main/kotlin/com/theapache64/stackzy/ui/common/Selectable.kt
@@ -51,12 +51,12 @@ fun Modifier.addHoverEffect(
     }
 
     return this.background(normalColor.copy(alpha = backgroundAlpha), RoundedCornerShape(cornerRadius)).clickable {
-            onClicked()
-        }.onPointerEvent(eventType = PointerEventType.Enter, onEvent = {
-            isHovered = true
-        }).onPointerEvent(eventType = PointerEventType.Exit, onEvent = {
-            isHovered = false
-        })
+        onClicked()
+    }.onPointerEvent(eventType = PointerEventType.Enter, onEvent = {
+        isHovered = true
+    }).onPointerEvent(eventType = PointerEventType.Exit, onEvent = {
+        isHovered = false
+    })
 }
 
 // Preview
@@ -102,8 +102,8 @@ fun <T : AlphabetCircle> Selectable(
 ) {
 
     Row(modifier = modifier.fillMaxWidth().addHoverEffect(onClicked = {
-            onSelected(data)
-        }).padding(padding), verticalAlignment = Alignment.CenterVertically) {
+        onSelected(data)
+    }).padding(padding), verticalAlignment = Alignment.CenterVertically) {
 
         if (data.imageUrl() == null) {
             // Show only alphabet

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListScreen.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListScreen.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.foundation.lazy.items
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Search

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/devicelist/DeviceListViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/devicelist/DeviceListViewModel.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/libdetail/LibraryDetailViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/libdetail/LibraryDetailViewModel.kt
@@ -14,7 +14,6 @@ import com.theapache64.stackzy.util.R
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/liblist/LibraryListScreen.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/liblist/LibraryListScreen.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.foundation.lazy.items
 import androidx.compose.material.Icon
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/liblist/LibraryListViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/liblist/LibraryListViewModel.kt
@@ -10,7 +10,6 @@ import com.theapache64.stackzy.ui.util.getSingularOrPlural
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import java.util.*
 import javax.inject.Inject

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/login/LogInScreenViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/login/LogInScreenViewModel.kt
@@ -6,7 +6,6 @@ import com.theapache64.stackzy.data.util.calladapter.flow.Resource
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import java.awt.Desktop

diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/splash/SplashViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/splash/SplashViewModel.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import java.io.IOException
 import javax.inject.Inject

diff --git a/src/main/kotlin/com/theapache64/stackzy/util/flow/EventFlow.kt b/src/main/kotlin/com/theapache64/stackzy/util/flow/EventFlow.kt
@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 
 /**
  * To fire events.
- * This flow won't fire the last value for each collect call. 
+ * This flow won't fire the last value for each collect call.
  * This observer will only be invoked on `tryEmit` calls.
  * (replacement for SingleLiveEvent :D)
  * Created by theapache64 : Jan 08 Fri,2021 @ 01:40

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/AdbRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/AdbRepoTest.kt
@@ -8,7 +8,6 @@ import com.theapache64.stackzy.test.MyDaggerMockRule
 import com.theapache64.stackzy.test.NATIVE_KOTLIN_PACKAGE_NAME
 import com.theapache64.stackzy.test.runBlockingUnitTest
 import it.cosenonjaviste.daggermock.InjectFromComponent
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
 import org.junit.Rule

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/AuthRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/AuthRepoTest.kt
@@ -9,7 +9,6 @@ import com.toxicbakery.logging.Arbor
 import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Rule
 import org.junit.Test
-import kotlinx.coroutines.flow.collect
 
 
 class AuthRepoTest {

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/ConfigRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/ConfigRepoTest.kt
@@ -8,7 +8,6 @@ import com.toxicbakery.logging.Arbor
 import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Rule
 import org.junit.Test
-import kotlinx.coroutines.flow.collect
 
 
 class ConfigRepoTest {

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/LibrariesRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/LibrariesRepoTest.kt
@@ -7,7 +7,6 @@ import com.theapache64.stackzy.test.runBlockingUnitTest
 import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Rule
 import org.junit.Test
-import kotlinx.coroutines.flow.collect
 
 internal class LibrariesRepoTest {
 

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/PlayStoreRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/PlayStoreRepoTest.kt
@@ -12,7 +12,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.TestInstance
-import kotlinx.coroutines.flow.collect
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class PlayStoreRepoTest {

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/ResultsRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/ResultsRepoTest.kt
@@ -17,7 +17,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.api.BeforeAll
 import kotlin.io.path.createTempDirectory
-import kotlinx.coroutines.flow.collect
 
 class ResultsRepoTest {
 

diff --git a/src/test/kotlin/com/theapache64/stackzy/data/repo/UntrackedLibsRepoTest.kt b/src/test/kotlin/com/theapache64/stackzy/data/repo/UntrackedLibsRepoTest.kt
@@ -8,7 +8,6 @@ import com.theapache64.stackzy.test.runBlockingUnitTest
 import it.cosenonjaviste.daggermock.InjectFromComponent
 import org.junit.Rule
 import org.junit.Test
-import kotlinx.coroutines.flow.collect
 
 internal class UntrackedLibsRepoTest {
 

diff --git a/src/test/kotlin/com/theapache64/stackzy/util/LibrariesRepoExt.kt b/src/test/kotlin/com/theapache64/stackzy/util/LibrariesRepoExt.kt
@@ -4,7 +4,6 @@ import com.theapache64.stackzy.data.remote.Library
 import com.theapache64.stackzy.data.repo.LibrariesRepo
 import com.theapache64.stackzy.data.util.calladapter.flow.Resource
 import com.toxicbakery.logging.Arbor
-import kotlinx.coroutines.flow.collect
 
 suspend fun LibrariesRepo.loadLibs(onLibsLoaded: suspend (List<Library>) -> Unit) {
     getRemoteLibraries().collect {