mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-01 13:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to Wear Device specific preview (#3906)

Browse source
This commit is contained in:
Daniel Shokouhi 2023-10-02 15:23:48 -07:00 committed by GitHub
parent b290d568ef
commit f9c7bceac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle/libs.versions.toml
View file

@ -60,6 +60,7 @@ wear = "1.3.0"
wear-compose-foundation = "1.2.0"
wear-protolayout = "1.0.0"
wear-tiles = "1.2.0"
wear-tooling = "1.0.0-alpha01"
wearPhoneInteractions = "1.0.1"
wearInput = "1.2.0-alpha02"
webkit = "1.8.0"
@ -165,6 +166,7 @@ wear-protolayout-main = { module = "androidx.wear.protolayout:protolayout", vers
wear-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "wear-protolayout" }
wear-remote-interactions = { module = "androidx.wear:wear-remote-interactions", version.ref = "wear-remote-interactions" }
wear-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "wear-tiles" }
wear-tooling = { module = "androidx.wear:wear-tooling-preview", version.ref = "wear-tooling" }
webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
[bundles]

1
wear/build.gradle.kts
View file

@ -107,6 +107,7 @@ dependencies {
implementation(libs.wear.compose.foundation)
implementation(libs.wear.compose.material)
implementation(libs.wear.compose.navigation)
implementation(libs.wear.tooling)
implementation(libs.bundles.horologist)

4
wear/src/main/java/io/homeassistant/companion/android/complications/views/ComplicationConfigMainView.kt
View file

@ -7,7 +7,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.Button
@ -21,6 +20,7 @@ import androidx.wear.compose.material.ToggleChipDefaults
import androidx.wear.compose.navigation.SwipeDismissableNavHost
import androidx.wear.compose.navigation.composable
import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.common.R
@ -190,7 +190,7 @@ fun MainConfigView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
fun PreviewMainConfigView() {
MainConfigView(

4
wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt
View file

@ -31,7 +31,6 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@ -47,6 +46,7 @@ import androidx.wear.compose.material.Text
import androidx.wear.compose.navigation.SwipeDismissableNavHost
import androidx.wear.compose.navigation.composable
import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.common.R
@ -274,7 +274,7 @@ fun ConversationPipelinesView(
}
}
@Preview(device = Devices.WEAR_OS_SMALL_ROUND)
@Preview(device = WearDevices.SMALL_ROUND)
@Composable
fun PreviewSpeechBubble() {
ScalingLazyColumn(horizontalAlignment = Alignment.Start) {

5
wear/src/main/java/io/homeassistant/companion/android/home/views/DetailsPanelView.kt
View file

@ -14,16 +14,15 @@ import androidx.compose.ui.hapticfeedback.HapticFeedback
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.InlineSlider
import androidx.wear.compose.material.InlineSliderDefaults
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleButton
import androidx.wear.compose.material.ToggleButtonDefaults
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.common.R
@ -360,7 +359,7 @@ private fun onSliderChangedFeedback(
)
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewDetailsPaneView() {
CompositionLocalProvider {

4
wear/src/main/java/io/homeassistant/companion/android/home/views/EntityListView.kt
View file

@ -4,12 +4,12 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.foundation.lazy.items
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.Text
import androidx.wear.tooling.preview.devices.WearDevices
import io.homeassistant.companion.android.common.data.integration.Entity
import io.homeassistant.companion.android.theme.WearAppTheme
import io.homeassistant.companion.android.util.playPreviewEntityScene1
@ -100,7 +100,7 @@ private fun PreviewEntityListView() {
)
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewEntityListScenes() {
EntityViewList(

4
wear/src/main/java/io/homeassistant/companion/android/home/views/EntityUi.kt
View file

@ -11,7 +11,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
@ -19,6 +18,7 @@ import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleChip
import androidx.wear.compose.material.ToggleChipDefaults
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.data.integration.Entity
@ -144,7 +144,7 @@ fun EntityUi(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewEntityUI() {
Column {

4
wear/src/main/java/io/homeassistant/companion/android/home/views/RefreshIntervalPickerView.kt
View file

@ -9,7 +9,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@ -18,6 +17,7 @@ import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Picker
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.rememberPickerState
import androidx.wear.tooling.preview.devices.WearDevices
import com.google.android.horologist.annotations.ExperimentalHorologistApi
import com.google.android.horologist.composables.picker.toRotaryScrollAdapter
import com.google.android.horologist.compose.rotaryinput.rotaryWithSnap
@ -73,7 +73,7 @@ fun RefreshIntervalPickerView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewRefreshIntervalPickerView() {
CompositionLocalProvider {

6
wear/src/main/java/io/homeassistant/companion/android/home/views/SelectCameraTileView.kt
View file

@ -5,12 +5,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.foundation.lazy.itemsIndexed
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.Text
import androidx.wear.tooling.preview.devices.WearDevices
import io.homeassistant.companion.android.database.wear.CameraTile
import io.homeassistant.companion.android.theme.WearAppTheme
import io.homeassistant.companion.android.views.ListHeader
@ -55,7 +55,7 @@ fun SelectCameraTileView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSelectCameraTileViewOne() {
SelectCameraTileView(
@ -66,7 +66,7 @@ private fun PreviewSelectCameraTileViewOne() {
)
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSelectCameraTileViewEmpty() {
SelectCameraTileView(tiles = emptyList(), onSelectTile = {})

6
wear/src/main/java/io/homeassistant/companion/android/home/views/SelectShortcutsTileView.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.foundation.lazy.itemsIndexed
import androidx.wear.compose.material.Chip
@ -15,6 +14,7 @@ import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleChip
import androidx.wear.compose.material.ToggleChipDefaults
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.theme.WearAppTheme
@ -96,7 +96,7 @@ fun SelectShortcutsTileView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSelectShortcutsTileView() {
SelectShortcutsTileView(
@ -111,7 +111,7 @@ private fun PreviewSelectShortcutsTileView() {
)
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSelectShortcutsTileEmptyView() {
SelectShortcutsTileView(

4
wear/src/main/java/io/homeassistant/companion/android/home/views/SensorManagerUi.kt
View file

@ -8,10 +8,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.CircularProgressIndicator
import androidx.wear.tooling.preview.devices.WearDevices
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.sensors.SensorManager
import io.homeassistant.companion.android.database.sensor.Sensor
@ -71,7 +71,7 @@ fun SensorManagerUi(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSensorManagerUI() {
CompositionLocalProvider {

6
wear/src/main/java/io/homeassistant/companion/android/home/views/SensorUi.kt
View file

@ -1,6 +1,7 @@
package io.homeassistant.companion.android.home.views
import android.Manifest
import android.annotation.SuppressLint
import android.os.Build
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
@ -11,18 +12,19 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleChip
import androidx.wear.compose.material.ToggleChipDefaults
import androidx.wear.tooling.preview.devices.WearDevices
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.sensors.SensorManager
import io.homeassistant.companion.android.database.sensor.Sensor
import io.homeassistant.companion.android.util.batterySensorManager
import kotlinx.coroutines.runBlocking
@SuppressLint("InlinedApi")
@Composable
fun SensorUi(
sensor: Sensor?,
@ -98,7 +100,7 @@ fun SensorUi(
)
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSensorUI() {
val context = LocalContext.current

4
wear/src/main/java/io/homeassistant/companion/android/home/views/SensorsView.kt
View file

@ -7,11 +7,11 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.Text
import androidx.wear.tooling.preview.devices.WearDevices
import io.homeassistant.companion.android.common.sensors.SensorManager
import io.homeassistant.companion.android.sensors.SensorReceiver
import io.homeassistant.companion.android.theme.WearAppTheme
@ -55,7 +55,7 @@ fun getSensorManagers(): List<SensorManager> {
return SensorReceiver.MANAGERS.sortedBy { context.getString(it.name) }.filter { it.hasSensor(context) }
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSensorsView() {
CompositionLocalProvider {

4
wear/src/main/java/io/homeassistant/companion/android/home/views/SetShortcutsTileView.kt
View file

@ -9,7 +9,6 @@ import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.Button
@ -17,6 +16,7 @@ import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.Text
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.data.SimplifiedEntity
@ -87,7 +87,7 @@ fun SetShortcutsTileView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSetTileShortcutsView() {
SetShortcutsTileView(

4
wear/src/main/java/io/homeassistant/companion/android/home/views/SettingsView.kt
View file

@ -8,7 +8,6 @@ import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
@ -16,6 +15,7 @@ import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleChip
import androidx.wear.compose.material.ToggleChipDefaults
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.IIcon
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
@ -297,7 +297,7 @@ fun SettingsView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewSettingsView() {
SettingsView(

4
wear/src/main/java/io/homeassistant/companion/android/home/views/TemplateTileSettingsView.kt
View file

@ -8,11 +8,11 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.Text
import androidx.wear.tooling.preview.devices.WearDevices
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.common.R
@ -69,7 +69,7 @@ fun TemplateTileSettingsView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewTemplateTileSettingView() {
CompositionLocalProvider {

4
wear/src/main/java/io/homeassistant/companion/android/home/views/TimeText.kt
View file

@ -3,12 +3,12 @@ package io.homeassistant.companion.android.home.views
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.wear.compose.foundation.lazy.ScalingLazyListState
import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
import androidx.wear.compose.material.TimeText
import androidx.wear.compose.material.scrollAway
import androidx.wear.tooling.preview.devices.WearDevices
@Composable
fun TimeText(
@ -19,7 +19,7 @@ fun TimeText(
)
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
private fun PreviewTimeText() {
CompositionLocalProvider {

4
wear/src/main/java/io/homeassistant/companion/android/onboarding/phoneinstall/PhoneInstallView.kt
View file

@ -9,13 +9,13 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.Text
import androidx.wear.tooling.preview.devices.WearDevices
import io.homeassistant.companion.android.R
import io.homeassistant.companion.android.views.ThemeLazyColumn
import io.homeassistant.companion.android.common.R as commonR
@ -73,7 +73,7 @@ fun PhoneInstallView(
}
}
@Preview(device = Devices.WEAR_OS_LARGE_ROUND)
@Preview(device = WearDevices.LARGE_ROUND)
@Composable
fun PhoneInstallViewPreview() {
PhoneInstallView(