feature: Optimize Views for Landscape

.editorconfig

@@ -29,3 +29,4 @@ ktlint_standard_annotation = disabled # false positive with @JvmOverloads and de
 ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_standard_multiline-expression-wrapping = disabled
 ktlint_standard_string-template-indent = disabled
+ktlint_standard_property-naming = disabled

app/build.gradle.kts

@@ -128,6 +128,8 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.androidx.lifecycle.runtime.compose)
 
+    implementation(libs.material)
+
     implementation(libs.ramses.aar)
 
     testImplementation(libs.junit)

app/src/main/kotlin/org/eclipse/kuksa/companion/CompanionApplication.kt

@@ -21,12 +21,15 @@ package org.eclipse.kuksa.companion
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import org.eclipse.kuksa.DataBrokerConnection
 
 const val PREVIEW_WIDTH_DP = 400
 const val PREVIEW_HEIGHT_DP = 900
 
-const val SHEET_EXPANDED_HEIGHT = 300
+const val SHEET_EXPANDED_HEIGHT = 350
 const val SHEET_COLLAPSED_HEIGHT = 50
 
 @HiltAndroidApp
-class CompanionApplication : Application()
+class CompanionApplication : Application() {
+    var dataBrokerConnection: DataBrokerConnection? = null
+}

app/src/main/kotlin/org/eclipse/kuksa/companion/MainActivity.kt

@@ -46,6 +46,7 @@ import org.eclipse.kuksa.companion.feature.door.viewModel.DoorControlViewModel.C
 import org.eclipse.kuksa.companion.feature.door.viewModel.DoorControlViewModel.Companion.TRUNK_CLOSED
 import org.eclipse.kuksa.companion.feature.door.viewModel.DoorControlViewModel.Companion.TRUNK_OPEN
 import org.eclipse.kuksa.companion.feature.home.view.AdaptiveAppScreen
+import org.eclipse.kuksa.companion.feature.home.view.navigation.NavigationViewModel
 import org.eclipse.kuksa.companion.feature.light.viewmodel.LightControlViewModel
 import org.eclipse.kuksa.companion.feature.settings.viewModel.SettingsViewModel
 import org.eclipse.kuksa.companion.feature.temperature.viewmodel.TemperatureViewModel
@@ -67,16 +68,21 @@ import javax.inject.Inject
 @AndroidEntryPoint
 @VssDefinition("vss_rel_4.0.yaml")
 class MainActivity : ComponentActivity() {
+    private val companionApplication
+        get() = applicationContext as CompanionApplication
+
     @Inject
     lateinit var connectionInfoRepository: ConnectionInfoRepository
 
     private lateinit var doorVehicleScene: DoorVehicleScene
 
     private val disconnectListener = DisconnectListener {
+        dataBrokerConnection = null
         connectionStatusViewModel.connectionState = ConnectionState.DISCONNECTED
     }
 
     private val connectionStatusViewModel: ConnectionStatusViewModel by viewModels()
+    private val navigationViewModel: NavigationViewModel by viewModels()
 
     private val doorControlViewModel: DoorControlViewModel by viewModels()
     private val temperatureViewModel: TemperatureViewModel by viewModels()
@@ -85,7 +91,13 @@ class MainActivity : ComponentActivity() {
 
     private val settingsViewModel: SettingsViewModel by viewModels()
 
-    private var dataBrokerConnection: DataBrokerConnection? = null
+    // storing the connection in the Application keeps the Connection alive on orientation changes
+    private var dataBrokerConnection: DataBrokerConnection?
+        get() = companionApplication.dataBrokerConnection
+        set(value) {
+            companionApplication.dataBrokerConnection = value
+        }
+
     private val dataBrokerConnectorFactory = DataBrokerConnectorFactory()
 
     private val doorVehicleSurface = DoorVehicleSurface()
@@ -150,6 +162,7 @@ class MainActivity : ComponentActivity() {
                 AdaptiveAppScreen(
                     callback = doorVehicleSurface,
                     connectionStatusViewModel = connectionStatusViewModel,
+                    navigationViewModel = navigationViewModel,
                     doorControlViewModel = doorControlViewModel,
                     temperatureViewModel = temperatureViewModel,
                     lightControlViewModel = lightControlViewModel,
@@ -252,6 +265,8 @@ class MainActivity : ComponentActivity() {
 
     private fun subscribe() {
         dataBrokerConnection?.apply {
+            disconnectListeners.register(disconnectListener)
+
             subscribe(VssDoor(), listener = vssDoorListener)
             subscribe(VssTrunk(), listener = vssTrunkListener)
             subscribe(VssHvac(), listener = vssTemperatureListener)
@@ -286,6 +301,12 @@ class MainActivity : ComponentActivity() {
     }
 
     private fun connectToDataBroker(onConnected: () -> Unit = {}) {
+        // dataBrokerConnection is already established e.g. after an orientation change
+        if (dataBrokerConnection != null) {
+            onConnected()
+            return
+        }
+
         lifecycleScope.launch {
             val connectionInfo = connectionInfoRepository.connectionInfoFlow.first()
 
@@ -295,9 +316,7 @@ class MainActivity : ComponentActivity() {
                 connectionStatusViewModel.connectionState = ConnectionState.CONNECTING
                 val context = this@MainActivity
                 val dataBrokerConnector = dataBrokerConnectorFactory.create(context, connectionInfo)
-                dataBrokerConnection = dataBrokerConnector.connect().apply {
-                    disconnectListeners.register(disconnectListener)
-                }
+                dataBrokerConnection = dataBrokerConnector.connect()
                 connectionStatusViewModel.connectionState = ConnectionState.CONNECTED
                 onConnected()
             } catch (e: DataBrokerException) {

app/src/main/kotlin/org/eclipse/kuksa/companion/extension/ConfigurationExtension.kt

@@ -22,15 +22,14 @@ package org.eclipse.kuksa.companion.extension
 import android.content.res.Configuration
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 
 @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
-@Composable
-fun Configuration.getWindowSizeClass(): WindowSizeClass {
-    val screenWidth = screenWidthDp
-    val screenHeight = screenHeightDp
-    val size = DpSize(screenWidth.dp, screenHeight.dp)
-    return WindowSizeClass.calculateFromSize(size)
-}
+val Configuration.windowSizeClass: WindowSizeClass
+    get() {
+        val screenWidth = screenWidthDp
+        val screenHeight = screenHeightDp
+        val size = DpSize(screenWidth.dp, screenHeight.dp)
+        return WindowSizeClass.calculateFromSize(size)
+    }

app/src/main/kotlin/org/eclipse/kuksa/companion/extension/StringExtension.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.eclipse.kuksa.companion.extension
+
+fun String.convertToVerticalString(): String {
+    if (isEmpty()) return this
+
+    val charArray = toCharArray()
+    val builder = StringBuilder()
+    charArray.forEach {
+        builder.appendLine(it)
+    }
+
+    return builder.toString().dropLast(1)
+}

app/src/main/kotlin/org/eclipse/kuksa/companion/feature/connection/view/AdaptiveConnectionStatusView.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.tooling.preview.Preview
 import org.eclipse.kuksa.companion.PREVIEW_HEIGHT_DP
 import org.eclipse.kuksa.companion.PREVIEW_WIDTH_DP
-import org.eclipse.kuksa.companion.extension.getWindowSizeClass
+import org.eclipse.kuksa.companion.extension.windowSizeClass
 import org.eclipse.kuksa.companion.feature.connection.viewModel.ConnectionStatusViewModel
 
 @Composable
@@ -47,11 +47,11 @@ fun AdaptiveConnectionStatusView(
 @Preview(widthDp = PREVIEW_WIDTH_DP, heightDp = PREVIEW_HEIGHT_DP)
 @Preview(widthDp = PREVIEW_HEIGHT_DP, heightDp = PREVIEW_WIDTH_DP)
 @Composable
-private fun AdaptiveConnectionStatusViewPreview_Disconnected() {
+private fun AdaptiveDisconnectedPreview() {
     val viewModel = ConnectionStatusViewModel()
     viewModel.connectionState = ConnectionStatusViewModel.ConnectionState.DISCONNECTED
 
-    val windowSizeClass = LocalConfiguration.current.getWindowSizeClass()
+    val windowSizeClass = LocalConfiguration.current.windowSizeClass
     Box {
         AdaptiveConnectionStatusView(viewModel = viewModel, windowSizeClass)
     }
@@ -60,11 +60,11 @@ private fun AdaptiveConnectionStatusViewPreview_Disconnected() {
 @Preview(widthDp = PREVIEW_WIDTH_DP, heightDp = PREVIEW_HEIGHT_DP)
 @Preview(widthDp = PREVIEW_HEIGHT_DP, heightDp = PREVIEW_WIDTH_DP)
 @Composable
-private fun AdaptiveConnectionStatusViewPreview_Connecting() {
+private fun AdaptiveConnectingPreview() {
     val viewModel = ConnectionStatusViewModel()
     viewModel.connectionState = ConnectionStatusViewModel.ConnectionState.CONNECTING
 
-    val windowSizeClass = LocalConfiguration.current.getWindowSizeClass()
+    val windowSizeClass = LocalConfiguration.current.windowSizeClass
     Box {
         AdaptiveConnectionStatusView(viewModel = viewModel, windowSizeClass)
     }
@@ -73,11 +73,11 @@ private fun AdaptiveConnectionStatusViewPreview_Connecting() {
 @Preview(widthDp = PREVIEW_WIDTH_DP, heightDp = PREVIEW_HEIGHT_DP)
 @Preview(widthDp = PREVIEW_HEIGHT_DP, heightDp = PREVIEW_WIDTH_DP)
 @Composable
-private fun AdaptiveConnectionStatusViewPreview_Connected() {
+private fun AdaptiveConnectedStatusPreview() {
     val viewModel = ConnectionStatusViewModel()
     viewModel.connectionState = ConnectionStatusViewModel.ConnectionState.CONNECTED
 
-    val windowSizeClass = LocalConfiguration.current.getWindowSizeClass()
+    val windowSizeClass = LocalConfiguration.current.windowSizeClass
     Box {
         AdaptiveConnectionStatusView(viewModel = viewModel, windowSizeClass)
     }

app/src/main/kotlin/org/eclipse/kuksa/companion/feature/connection/view/AnimatedLoadingText.kt

@@ -24,19 +24,18 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import kotlinx.coroutines.delay
-import org.eclipse.kuksa.companion.feature.connection.viewModel.ConnectionStatusViewModel.ConnectionState
 import kotlin.time.Duration.Companion.milliseconds
 
-private const val MAX_NUMBER_OF_DOTS = 3
+private const val MaxNumberDots = 3
 private val DelayDuration = 500.milliseconds
 
 @Composable
 fun animateLoadingText(
-    connectionState: ConnectionState,
+    isAnimating: Boolean,
     text: String,
 ): String {
     var animatedText = text
-    if (connectionState == ConnectionState.CONNECTING) {
+    if (isAnimating) {
         val numberOfDots = remember {
             mutableIntStateOf(0)
         }
@@ -45,7 +44,7 @@ fun animateLoadingText(
         }
         LaunchedEffect(Unit) {
             while (true) {
-                if (numberOfDots.intValue < MAX_NUMBER_OF_DOTS) {
+                if (numberOfDots.intValue < MaxNumberDots) {
                     numberOfDots.intValue += 1
                 } else {
                     numberOfDots.intValue = 0

app/src/main/kotlin/org/eclipse/kuksa/companion/feature/connection/view/HorizontalConnectionStatusView.kt

@@ -61,8 +61,9 @@ fun HorizontalConnectionStatusView(
                 viewModel.onClickReconnect()
             },
     ) {
+        val isAnimating = connectionState == ConnectionState.CONNECTING
         var text = connectionStateLabel
-        text = animateLoadingText(connectionState = connectionState, text = text)
+        text = animateLoadingText(isAnimating, text)
 
         ConstraintLayout(modifier = Modifier.height(StatusBarHeight)) {
             val (textRef, imageRef) = createRefs()
@@ -103,7 +104,7 @@ fun HorizontalConnectionStatusView(
 
 @Preview
 @Composable
-private fun HorizontalConnectionStatusPreview_Disconnected() {
+private fun HorizontalDisconnectedPreview() {
     val viewModel = ConnectionStatusViewModel()
     viewModel.connectionState = ConnectionState.DISCONNECTED
 
@@ -112,15 +113,15 @@ private fun HorizontalConnectionStatusPreview_Disconnected() {
 
 @Preview
 @Composable
-private fun HorizontalConnectionStatusPreview_Connecting() {
+private fun HorizontalConnectingPreview() {
     val viewModel = ConnectionStatusViewModel()
     viewModel.connectionState = ConnectionState.CONNECTING
     HorizontalConnectionStatusView(viewModel = viewModel)
 }
 
 @Preview
 @Composable
-private fun HorizontalConnectionStatusPreview_Connected() {
+private fun HorizontalConnectedPreview() {
     val viewModel = ConnectionStatusViewModel()
     viewModel.connectionState = ConnectionState.CONNECTED
     HorizontalConnectionStatusView(viewModel = viewModel)