Merge branch '318-slider-adjustments-for-multiple-gas-stations-in-range' into 'master'

Resolve "Slider adjustments for multiple gas stations in range"

Closes #318

See merge request pace/mobile/android/pace-cloud-sdk!347

Author: melanieatpace

library/src/main/java/cloud/pace/sdk/appkit/app/api/AppRepository.kt

@@ -143,7 +143,8 @@ class AppRepositoryImpl(
                     textBackgroundColor = manifest?.themeColor,
                     display = manifest?.display,
                     poiId = it.key,
-                    distance = distance
+                    distance = distance,
+                    brandUrl = appUrl
                 )
             }
     }

library/src/main/java/cloud/pace/sdk/appkit/app/drawer/ui/AppDrawerHost.kt

@@ -39,7 +39,6 @@ fun AppDrawerHost(
     )
 }
 
-@OptIn(KoinInternalApi::class)
 @Composable
 fun AppDrawerHost(
     modifier: Modifier = Modifier,
@@ -48,43 +47,52 @@ fun AppDrawerHost(
         AppDrawer(app, appCount, callback)
     }
 ) {
-    PACETheme {
-        CompositionLocalProvider(
-            LocalKoinApplication provides KoinConfig.cloudSDKKoinApp.koin,
-            LocalKoinScope provides KoinConfig.cloudSDKKoinApp.koin.scopeRegistry.rootScope
+    AppDrawerHost { apps ->
+        BoxWithConstraints(
+            modifier = modifier,
+            contentAlignment = Alignment.BottomEnd
         ) {
-            val viewModel = koinViewModel<AppDrawerViewModel>()
+            val space = dimensionResource(id = R.dimen.app_drawer_spacing)
+            val drawerHeight = dimensionResource(id = R.dimen.app_drawer_height)
+            val size = remember(maxHeight) {
+                // Calculate number of elements that fit into max height
+                maxHeight.div(space + drawerHeight).toInt().coerceAtLeast(0)
+            }
 
-            BoxWithConstraints(
-                modifier = modifier,
-                contentAlignment = Alignment.BottomEnd
+            Column(
+                verticalArrangement = Arrangement.spacedBy(
+                    space = space,
+                    alignment = Alignment.Bottom
+                ),
+                horizontalAlignment = Alignment.End
             ) {
-                val space = dimensionResource(id = R.dimen.app_drawer_spacing)
-                val drawerHeight = dimensionResource(id = R.dimen.app_drawer_height)
-                val size = remember(maxHeight) {
-                    // Calculate number of elements that fit into max height
-                    maxHeight.div(space + drawerHeight).toInt().coerceAtLeast(0)
-                }
-
-                Column(
-                    verticalArrangement = Arrangement.spacedBy(
-                        space = space,
-                        alignment = Alignment.Bottom
-                    ),
-                    horizontalAlignment = Alignment.End
-                ) {
-                    val apps by viewModel.apps.collectAsStateWithLifecycle(minActiveState = Lifecycle.State.RESUMED)
-                    val maxApps = apps.take(size)
+                val maxApps = apps.take(size)
 
-                    maxApps.forEach {
-                        appDrawer(it, maxApps.size)
-                    }
+                maxApps.forEach {
+                    appDrawer(it, maxApps.size)
+                }
 
-                    LaunchedEffect(maxApps, callback) {
-                        callback.onShow(maxApps)
-                    }
+                LaunchedEffect(maxApps, callback) {
+                    callback.onShow(maxApps)
                 }
             }
         }
     }
 }
+
+@OptIn(KoinInternalApi::class)
+@Composable
+fun AppDrawerHost(
+    content: @Composable (apps: List<App>) -> Unit
+) {
+    PACETheme {
+        CompositionLocalProvider(
+            LocalKoinApplication provides KoinConfig.cloudSDKKoinApp.koin,
+            LocalKoinScope provides KoinConfig.cloudSDKKoinApp.koin.scopeRegistry.rootScope
+        ) {
+            val viewModel = koinViewModel<AppDrawerViewModel>()
+            val apps by viewModel.apps.collectAsStateWithLifecycle(minActiveState = Lifecycle.State.RESUMED)
+            content(apps)
+        }
+    }
+}

library/src/main/java/cloud/pace/sdk/appkit/app/drawer/ui/AppDrawerHostView.kt

@@ -6,7 +6,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.AbstractComposeView
 import cloud.pace.sdk.appkit.AppKit.defaultAppCallback
 
@@ -20,9 +19,6 @@ class AppDrawerHostView @JvmOverloads constructor(
 
     @Composable
     override fun Content() {
-        AppDrawerHost(
-            modifier = Modifier,
-            callback = callback
-        )
+        AppDrawerHost(callback = callback)
     }
 }

library/src/main/java/cloud/pace/sdk/appkit/model/App.kt

@@ -11,5 +11,6 @@ data class App(
     val textColor: String? = null,
     val display: String? = null,
     val poiId: String? = null,
-    val distance: Int? = null
+    val distance: Int? = null,
+    val brandUrl: String? = null
 )