From 1cdfe59137b6e4c5c2244a6db8d895dd0ba36e54 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 19 Aug 2023 07:30:47 -0300 Subject: [PATCH] refactor: update `@Previews` to private functions --- app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt | 2 +- .../main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt | 2 +- .../geeksville/mesh/ui/components/config/AudioConfigItemList.kt | 2 +- .../mesh/ui/components/config/BluetoothConfigItemList.kt | 2 +- .../mesh/ui/components/config/CannedMessageConfigItemList.kt | 2 +- .../mesh/ui/components/config/ChannelSettingsItemList.kt | 2 +- .../mesh/ui/components/config/DeviceConfigItemList.kt | 2 +- .../mesh/ui/components/config/DisplayConfigItemList.kt | 2 +- .../geeksville/mesh/ui/components/config/EditChannelDialog.kt | 2 +- .../mesh/ui/components/config/EditDeviceProfileDialog.kt | 2 +- .../ui/components/config/ExternalNotificationConfigItemList.kt | 2 +- .../geeksville/mesh/ui/components/config/LoRaConfigItemList.kt | 2 +- .../geeksville/mesh/ui/components/config/MQTTConfigItemList.kt | 2 +- .../mesh/ui/components/config/NeighborInfoConfigItemList.kt | 2 +- .../mesh/ui/components/config/NetworkConfigItemList.kt | 2 +- .../mesh/ui/components/config/PacketResponseStateDialog.kt | 2 +- .../mesh/ui/components/config/PositionConfigItemList.kt | 2 +- .../geeksville/mesh/ui/components/config/PowerConfigItemList.kt | 2 +- .../mesh/ui/components/config/RangeTestConfigItemList.kt | 2 +- .../mesh/ui/components/config/RemoteHardwareConfigItemList.kt | 2 +- .../mesh/ui/components/config/SerialConfigItemList.kt | 2 +- .../mesh/ui/components/config/StoreForwardConfigItemList.kt | 2 +- .../mesh/ui/components/config/TelemetryConfigItemList.kt | 2 +- .../geeksville/mesh/ui/components/config/UserConfigItemList.kt | 2 +- .../java/com/geeksville/mesh/ui/map/components/CacheLayout.kt | 2 +- .../com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt index ef96289d8..42835ec70 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt @@ -424,6 +424,6 @@ fun ChannelScreen( @Preview(showBackground = true) @Composable -fun ChannelScreenPreview() { +private fun ChannelScreenPreview() { // ChannelScreen() } diff --git a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt index a8c4439c6..322f7f826 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt @@ -808,6 +808,6 @@ fun RadioSettingsScreen( @Preview(showBackground = true) @Composable -fun RadioSettingsScreenPreview() { +private fun RadioSettingsScreenPreview() { RadioSettingsScreen() } diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt index 2da8b71d3..e0120d38c 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt @@ -109,7 +109,7 @@ fun AudioConfigItemList( @Preview(showBackground = true) @Composable -fun AudioConfigPreview(){ +private fun AudioConfigPreview() { AudioConfigItemList( audioConfig = AudioConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt index 57f0a2352..148dbf162 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt @@ -80,7 +80,7 @@ fun BluetoothConfigItemList( @Preview(showBackground = true) @Composable -fun BluetoothConfigPreview(){ +private fun BluetoothConfigPreview() { BluetoothConfigItemList( bluetoothConfig = BluetoothConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt index a0ec78045..5c25efa67 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt @@ -194,7 +194,7 @@ fun CannedMessageConfigItemList( @Preview(showBackground = true) @Composable -fun CannedMessageConfigPreview(){ +private fun CannedMessageConfigPreview() { CannedMessageConfigItemList( messages = "", cannedMessageConfig = CannedMessageConfig.getDefaultInstance(), diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt index dbbb499ab..44d1f7124 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt @@ -186,7 +186,7 @@ fun ChannelSettingsItemList( @Preview(showBackground = true) @Composable -fun ChannelSettingsPreview() { +private fun ChannelSettingsPreview() { ChannelSettingsItemList( settingsList = listOf( channelSettings { diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt index 66e455b29..8609a6f21 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt @@ -138,7 +138,7 @@ fun DeviceConfigItemList( @Preview(showBackground = true) @Composable -fun DeviceConfigPreview(){ +private fun DeviceConfigPreview() { DeviceConfigItemList( deviceConfig = DeviceConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt index b281d0aab..cf6fda390 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt @@ -145,7 +145,7 @@ fun DisplayConfigItemList( @Preview(showBackground = true) @Composable -fun DisplayConfigPreview(){ +private fun DisplayConfigPreview() { DisplayConfigItemList( displayConfig = DisplayConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt index be65708e4..301a811a9 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt @@ -182,7 +182,7 @@ fun EditChannelDialog( @Preview(showBackground = true) @Composable -fun EditChannelDialogPreview() { +private fun EditChannelDialogPreview() { EditChannelDialog( channelSettings = channelSettings { psk = Channel.default.settings.psk diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt index 67d1b1f8d..7755d925b 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt @@ -105,7 +105,7 @@ fun EditDeviceProfileDialog( @Preview(showBackground = true) @Composable -fun EditDeviceProfileDialogPreview() { +private fun EditDeviceProfileDialogPreview() { EditDeviceProfileDialog( title = "Export configuration", deviceProfile = deviceProfile { }, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt index 6728d4a67..d6921a287 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt @@ -216,7 +216,7 @@ fun ExternalNotificationConfigItemList( @Preview(showBackground = true) @Composable -fun ExternalNotificationConfigPreview(){ +private fun ExternalNotificationConfigPreview() { ExternalNotificationConfigItemList( ringtone = "", extNotificationConfig = ExternalNotificationConfig.getDefaultInstance(), diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt index d7ea369de..b0f322691 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt @@ -197,7 +197,7 @@ fun LoRaConfigItemList( @Preview(showBackground = true) @Composable -fun LoRaConfigPreview() { +private fun LoRaConfigPreview() { LoRaConfigItemList( loraConfig = Channel.default.loraConfig, primarySettings = Channel.default.settings, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt index d06f0952e..834200bdd 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt @@ -141,7 +141,7 @@ fun MQTTConfigItemList( @Preview(showBackground = true) @Composable -fun MQTTConfigPreview() { +private fun MQTTConfigPreview() { MQTTConfigItemList( mqttConfig = MQTTConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt index 25f60c5bf..ba7b7cf04 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt @@ -69,7 +69,7 @@ fun NeighborInfoConfigItemList( @Preview(showBackground = true) @Composable -fun NeighborInfoConfigPreview(){ +private fun NeighborInfoConfigPreview() { NeighborInfoConfigItemList( neighborInfoConfig = ModuleConfigProtos.ModuleConfig.NeighborInfoConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt index 054c76792..f1c474987 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt @@ -180,7 +180,7 @@ fun NetworkConfigItemList( @Preview(showBackground = true) @Composable -fun NetworkConfigPreview(){ +private fun NetworkConfigPreview() { NetworkConfigItemList( networkConfig = NetworkConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt index eb3a10b66..3683c7ee3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt @@ -72,7 +72,7 @@ fun PacketResponseStateDialog( @Preview(showBackground = true) @Composable -fun PacketResponseStateDialogPreview() { +private fun PacketResponseStateDialogPreview() { PacketResponseStateDialog( state = PacketResponseState.Loading.apply { total = 17 diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt index 0c822525b..d19a7a134 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt @@ -190,7 +190,7 @@ fun PositionConfigItemList( @Preview(showBackground = true) @Composable -fun PositionConfigPreview(){ +private fun PositionConfigPreview() { PositionConfigItemList( location = null, positionConfig = PositionConfig.getDefaultInstance(), diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt index 0a94e15ab..1478a0439 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt @@ -115,7 +115,7 @@ fun PowerConfigItemList( @Preview(showBackground = true) @Composable -fun PowerConfigPreview(){ +private fun PowerConfigPreview() { PowerConfigItemList( powerConfig = PowerConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt index 94b9e1d9c..5f72c7365 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt @@ -73,7 +73,7 @@ fun RangeTestConfigItemList( @Preview(showBackground = true) @Composable -fun RangeTestConfig(){ +private fun RangeTestConfig() { RangeTestConfigItemList( rangeTestConfig = RangeTestConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt index 9632244a2..be0aebd5f 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt @@ -83,7 +83,7 @@ fun RemoteHardwareConfigItemList( @Preview(showBackground = true) @Composable -fun RemoteHardwareConfigPreview(){ +private fun RemoteHardwareConfigPreview() { RemoteHardwareConfigItemList( remoteHardwareConfig = RemoteHardwareConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt index 563ec2c5d..c353891cc 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt @@ -122,7 +122,7 @@ fun SerialConfigItemList( @Preview(showBackground = true) @Composable -fun SerialConfigPreview(){ +private fun SerialConfigPreview() { SerialConfigItemList( serialConfig = SerialConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt index 9db7ec6c4..f3a62df1b 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt @@ -95,7 +95,7 @@ fun StoreForwardConfigItemList( @Preview(showBackground = true) @Composable -fun StoreForwardConfigPreview(){ +private fun StoreForwardConfigPreview() { StoreForwardConfigItemList( storeForwardConfig = StoreForwardConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt index b406b0d77..efb9613e2 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt @@ -119,7 +119,7 @@ fun TelemetryConfigItemList( @Preview(showBackground = true) @Composable -fun TelemetryConfigPreview(){ +private fun TelemetryConfigPreview() { TelemetryConfigItemList( telemetryConfig = TelemetryConfig.getDefaultInstance(), enabled = true, diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt index 05be9fba3..535598d22 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt @@ -106,7 +106,7 @@ fun UserConfigItemList( @Preview(showBackground = true) @Composable -fun UserConfigPreview(){ +private fun UserConfigPreview() { UserConfigItemList( userConfig = user { id = "!a280d9c8" diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/components/CacheLayout.kt b/app/src/main/java/com/geeksville/mesh/ui/map/components/CacheLayout.kt index 887635e5a..f33164eeb 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/map/components/CacheLayout.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/map/components/CacheLayout.kt @@ -146,7 +146,7 @@ fun ToggleButton( @Preview(showBackground = true) @Composable -fun CacheLayoutPreview() { +private fun CacheLayoutPreview() { CacheLayout( cacheEstimate = "100 tiles", onExecuteJob = { }, diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt index 0b9ed74e5..152ae973c 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt @@ -159,7 +159,7 @@ fun EditWaypointDialog( @Preview(showBackground = true) @Composable -fun EditWaypointFormPreview() { +private fun EditWaypointFormPreview() { AppTheme { EditWaypointDialog( waypoint = waypoint {