-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #48 from boschglobal/feature-20
feature: Optimize Views for Landscape
- Loading branch information
Showing
42 changed files
with
2,131 additions
and
772 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
app/src/main/kotlin/org/eclipse/kuksa/companion/extension/ConfigurationExtension.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import android.content.res.Configuration | ||
| import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi | ||
| import androidx.compose.material3.windowsizeclass.WindowSizeClass | ||
| import androidx.compose.ui.unit.DpSize | ||
| import androidx.compose.ui.unit.dp | ||
|
|
||
| @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) | ||
| val Configuration.windowSizeClass: WindowSizeClass | ||
| get() { | ||
| val screenWidth = screenWidthDp | ||
| val screenHeight = screenHeightDp | ||
| val size = DpSize(screenWidth.dp, screenHeight.dp) | ||
| return WindowSizeClass.calculateFromSize(size) | ||
| } |
29 changes: 29 additions & 0 deletions
29
app/src/main/kotlin/org/eclipse/kuksa/companion/extension/ModifierExtension.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.alpha | ||
|
|
||
| fun Modifier.isVisible(isVisible: Boolean): Modifier { | ||
| val alpha = if (isVisible) 1F else 0F | ||
|
|
||
| return then(Modifier.alpha(alpha)) | ||
| } |
32 changes: 32 additions & 0 deletions
32
app/src/main/kotlin/org/eclipse/kuksa/companion/extension/StringExtension.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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.toVertical(): String { | ||
| if (isEmpty()) return this | ||
|
|
||
| val charArray = toCharArray() | ||
| val builder = StringBuilder() | ||
| charArray.forEach { | ||
| builder.appendLine(it) | ||
| } | ||
|
|
||
| return builder.toString().dropLast(1) | ||
| } |
84 changes: 84 additions & 0 deletions
84
...otlin/org/eclipse/kuksa/companion/feature/connection/view/AdaptiveConnectionStatusView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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.feature.connection.view | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.material3.windowsizeclass.WindowSizeClass | ||
| import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| 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.windowSizeClass | ||
| import org.eclipse.kuksa.companion.feature.connection.viewModel.ConnectionStatusViewModel | ||
|
|
||
| @Composable | ||
| fun AdaptiveConnectionStatusView( | ||
| viewModel: ConnectionStatusViewModel, | ||
| windowSizeClass: WindowSizeClass, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| if (windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact) { | ||
| HorizontalConnectionStatusView(viewModel, modifier) | ||
| } else { | ||
| VerticalConnectionStatusView(viewModel, modifier) | ||
| } | ||
| } | ||
|
|
||
| @Preview(widthDp = PREVIEW_WIDTH_DP, heightDp = PREVIEW_HEIGHT_DP) | ||
| @Preview(widthDp = PREVIEW_HEIGHT_DP, heightDp = PREVIEW_WIDTH_DP) | ||
| @Composable | ||
| private fun AdaptiveDisconnectedPreview() { | ||
| val viewModel = ConnectionStatusViewModel() | ||
| viewModel.connectionState = ConnectionStatusViewModel.ConnectionState.DISCONNECTED | ||
|
|
||
| val windowSizeClass = LocalConfiguration.current.windowSizeClass | ||
| Box { | ||
| AdaptiveConnectionStatusView(viewModel = viewModel, windowSizeClass) | ||
| } | ||
| } | ||
|
|
||
| @Preview(widthDp = PREVIEW_WIDTH_DP, heightDp = PREVIEW_HEIGHT_DP) | ||
| @Preview(widthDp = PREVIEW_HEIGHT_DP, heightDp = PREVIEW_WIDTH_DP) | ||
| @Composable | ||
| private fun AdaptiveConnectingPreview() { | ||
| val viewModel = ConnectionStatusViewModel() | ||
| viewModel.connectionState = ConnectionStatusViewModel.ConnectionState.CONNECTING | ||
|
|
||
| val windowSizeClass = LocalConfiguration.current.windowSizeClass | ||
| Box { | ||
| AdaptiveConnectionStatusView(viewModel = viewModel, windowSizeClass) | ||
| } | ||
| } | ||
|
|
||
| @Preview(widthDp = PREVIEW_WIDTH_DP, heightDp = PREVIEW_HEIGHT_DP) | ||
| @Preview(widthDp = PREVIEW_HEIGHT_DP, heightDp = PREVIEW_WIDTH_DP) | ||
| @Composable | ||
| private fun AdaptiveConnectedStatusPreview() { | ||
| val viewModel = ConnectionStatusViewModel() | ||
| viewModel.connectionState = ConnectionStatusViewModel.ConnectionState.CONNECTED | ||
|
|
||
| val windowSizeClass = LocalConfiguration.current.windowSizeClass | ||
| Box { | ||
| AdaptiveConnectionStatusView(viewModel = viewModel, windowSizeClass) | ||
| } | ||
| } |
Oops, something went wrong.