Merge pull request #57 from NordicPlayground/mock_fix

Mock fix
NordicPlayground · Jul 7, 2023 · 2ba3a6b · 2ba3a6b
2 parents 2c6f449 + 358a5ee
commit 2ba3a6b
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 287 deletions.
diff --git a/.github/workflows/deploy-to-nexus.yml b/.github/workflows/deploy-to-nexus.yml
@@ -31,3 +31,9 @@ jobs:
           echo "${{ secrets.GPG_FILE }}" > sec.gpg.asc
           gpg -d --passphrase "${{ secrets.GPG_FILE_PSWD }}" --batch sec.gpg.asc > sec.gpg
           fastlane deployNexus
+      - name: Nexus release
+        uses: Propromp/nexus-release@1
+        with:
+          groupId: "no.nordicsemi.android.common" # Group id of the repository
+          nexusUsername: ${{ secrets.OSSR_USERNAME }} # User name of the nexus repository manager
+          nexusPassword: ${{ secrets.OSSR_PASSWORD }} # Password of the nexus repository manager
diff --git a/navigation/src/main/java/no/nordicsemi/android/common/navigation/di/NavigationModule.kt b/navigation/src/main/java/no/nordicsemi/android/common/navigation/di/NavigationModule.kt
@@ -42,7 +42,7 @@ import no.nordicsemi.android.common.navigation.internal.NavigationManager
 
 @Module
 @InstallIn(ActivityRetainedComponent::class)
-internal interface NavigationModule {
+interface NavigationModule {
 
     @Binds
     fun bindNavigator(navigator: NavigationManager): Navigator

diff --git a/...ation/src/main/java/no/nordicsemi/android/common/navigation/internal/NavigationManager.kt b/...ation/src/main/java/no/nordicsemi/android/common/navigation/internal/NavigationManager.kt
@@ -59,7 +59,7 @@ import javax.inject.Inject
  * result.
  */
 @ActivityRetainedScoped
-internal class NavigationManager @Inject constructor(
+class NavigationManager @Inject constructor(
     @ApplicationContext private val context: Context,
 ) : Navigator {
     /** The navigation events class. */

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -49,7 +49,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:1.5.10")
+            from("no.nordicsemi.android.gradle:version-catalog:1.6.5")
         }
     }
 }

diff --git a/uilogger/src/main/java/no/nordicsemi/android/common/logger/LoggerLauncher.kt b/uilogger/src/main/java/no/nordicsemi/android/common/logger/LoggerLauncher.kt
diff --git a/uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicBlekLogger.kt b/uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicBlekLogger.kt
diff --git a/uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicLogger.kt b/uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicLogger.kt
diff --git a/uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicLoggerFactory.kt b/uilogger/src/main/java/no/nordicsemi/android/common/logger/NordicLoggerFactory.kt
diff --git a/uilogger/src/main/java/no/nordicsemi/android/common/logger/view/LoggerAppBarIcon.kt b/uilogger/src/main/java/no/nordicsemi/android/common/logger/view/LoggerAppBarIcon.kt
@@ -46,4 +46,4 @@ fun LoggerAppBarIcon(
         contentDescription = stringResource(id = R.string.open_logger),
         onClick = onClick
     )
-}
+}
diff --git a/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerScreen.kt b/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerScreen.kt
@@ -40,7 +40,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
 import no.nordicsemi.android.common.ui.scanner.main.DeviceListItem
 import no.nordicsemi.android.common.ui.scanner.view.ScannerAppBar
-import no.nordicsemi.android.kotlin.ble.scanner.data.BleScanResults
+import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
 
 @Composable
 fun ScannerScreen(

diff --git a/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerScreenResult.kt b/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerScreenResult.kt
@@ -31,7 +31,7 @@
 
 package no.nordicsemi.android.common.ui.scanner
 
-import no.nordicsemi.android.kotlin.ble.scanner.data.BleScanResults
+import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
 
 sealed interface ScannerScreenResult
 

diff --git a/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerView.kt b/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/ScannerView.kt
@@ -56,7 +56,7 @@ import no.nordicsemi.android.common.ui.scanner.main.DevicesListView
 import no.nordicsemi.android.common.ui.scanner.main.viewmodel.ScannerViewModel
 import no.nordicsemi.android.common.ui.scanner.repository.ScanningState
 import no.nordicsemi.android.common.ui.scanner.view.internal.FilterView
-import no.nordicsemi.android.kotlin.ble.scanner.data.BleScanResults
+import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable

diff --git a/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/main/DeviceListItems.kt b/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/main/DeviceListItems.kt
@@ -35,7 +35,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -46,7 +45,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.common.ui.scanner.R
 import no.nordicsemi.android.common.ui.scanner.repository.ScanningState
-import no.nordicsemi.android.kotlin.ble.scanner.data.BleScanResults
+import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
 
 @Suppress("FunctionName")
 fun LazyListScope.DeviceListItems(
@@ -65,8 +64,8 @@ fun LazyListScope.DeviceListItems(
                 modifier = Modifier.padding(start = 8.dp, bottom = 8.dp)
             )
         }
-        items(bondedDevices) { device ->
-            ClickableDeviceItem(device, onClick, deviceView)
+        items(bondedDevices.size) {
+            ClickableDeviceItem(bondedDevices[it], onClick, deviceView)
         }
     }
 
@@ -79,8 +78,8 @@ fun LazyListScope.DeviceListItems(
             )
         }
 
-        items(discoveredDevices) { device ->
-            ClickableDeviceItem(device, onClick, deviceView)
+        items(discoveredDevices.size) {
+            ClickableDeviceItem(discoveredDevices[it], onClick, deviceView)
         }
     }
 }

diff --git a/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/main/DevicesListView.kt b/uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/main/DevicesListView.kt
@@ -41,7 +41,7 @@ import no.nordicsemi.android.common.theme.NordicTheme
 import no.nordicsemi.android.common.ui.scanner.repository.ScanningState
 import no.nordicsemi.android.common.ui.scanner.view.internal.ScanEmptyView
 import no.nordicsemi.android.common.ui.scanner.view.internal.ScanErrorView
-import no.nordicsemi.android.kotlin.ble.scanner.data.BleScanResults
+import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
 
 @Composable
 fun DevicesListView(
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ fun LoggerAppBarIcon( @@
             contentDescription = stringResource(id = R.string.open_logger),
             onClick = onClick
         )
-    }
+    }