From 6fc401edc22433a1b884533cc9ddab05e415284d Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Thu, 19 Dec 2024 19:06:55 +0100 Subject: [PATCH] Reorganisation into subpackages --- app/src/main/AndroidManifest.xml | 2 +- .../java/com/kernelmaft/zanbur/{ => common}/app-state.kt | 2 +- .../java/com/kernelmaft/zanbur/{ => common}/config.kt | 2 +- .../java/com/kernelmaft/zanbur/{ => common}/ontology.kt | 2 +- .../main/java/com/kernelmaft/zanbur/{ => network}/mqtt.kt | 8 ++++---- .../com/kernelmaft/zanbur/{ => network}/zigbee2mqtt.kt | 5 +++-- .../java/com/kernelmaft/zanbur/{ => ui}/components.kt | 3 ++- .../java/com/kernelmaft/zanbur/{ => ui}/compose-state.kt | 3 ++- .../java/com/kernelmaft/zanbur/{ => ui}/main-activity.kt | 6 ++++-- app/src/main/java/com/kernelmaft/zanbur/{ => ui}/theme.kt | 2 +- 10 files changed, 20 insertions(+), 15 deletions(-) rename app/src/main/java/com/kernelmaft/zanbur/{ => common}/app-state.kt (96%) rename app/src/main/java/com/kernelmaft/zanbur/{ => common}/config.kt (92%) rename app/src/main/java/com/kernelmaft/zanbur/{ => common}/ontology.kt (83%) rename app/src/main/java/com/kernelmaft/zanbur/{ => network}/mqtt.kt (85%) rename app/src/main/java/com/kernelmaft/zanbur/{ => network}/zigbee2mqtt.kt (77%) rename app/src/main/java/com/kernelmaft/zanbur/{ => ui}/components.kt (94%) rename app/src/main/java/com/kernelmaft/zanbur/{ => ui}/compose-state.kt (87%) rename app/src/main/java/com/kernelmaft/zanbur/{ => ui}/main-activity.kt (84%) rename app/src/main/java/com/kernelmaft/zanbur/{ => ui}/theme.kt (96%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5894132..90a24a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:supportsRtl = "true" > diff --git a/app/src/main/java/com/kernelmaft/zanbur/app-state.kt b/app/src/main/java/com/kernelmaft/zanbur/common/app-state.kt similarity index 96% rename from app/src/main/java/com/kernelmaft/zanbur/app-state.kt rename to app/src/main/java/com/kernelmaft/zanbur/common/app-state.kt index 41e2d98..6abdb42 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/app-state.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/common/app-state.kt @@ -1,4 +1,4 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.common diff --git a/app/src/main/java/com/kernelmaft/zanbur/config.kt b/app/src/main/java/com/kernelmaft/zanbur/common/config.kt similarity index 92% rename from app/src/main/java/com/kernelmaft/zanbur/config.kt rename to app/src/main/java/com/kernelmaft/zanbur/common/config.kt index ef1f384..3e4ddda 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/config.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/common/config.kt @@ -1,4 +1,4 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.common diff --git a/app/src/main/java/com/kernelmaft/zanbur/ontology.kt b/app/src/main/java/com/kernelmaft/zanbur/common/ontology.kt similarity index 83% rename from app/src/main/java/com/kernelmaft/zanbur/ontology.kt rename to app/src/main/java/com/kernelmaft/zanbur/common/ontology.kt index 4bec33e..86e8a1c 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/ontology.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/common/ontology.kt @@ -1,4 +1,4 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.common diff --git a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt b/app/src/main/java/com/kernelmaft/zanbur/network/mqtt.kt similarity index 85% rename from app/src/main/java/com/kernelmaft/zanbur/mqtt.kt rename to app/src/main/java/com/kernelmaft/zanbur/network/mqtt.kt index eda0cec..212d73a 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/network/mqtt.kt @@ -1,8 +1,8 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.network -import com.kernelmaft.zanbur.Config.MQTT_SERVER_HOST -import com.kernelmaft.zanbur.Config.MQTT_SERVER_PORT -import com.kernelmaft.zanbur.Config.MQTT_TOPIC +import com.kernelmaft.zanbur.common.Config.MQTT_SERVER_HOST +import com.kernelmaft.zanbur.common.Config.MQTT_SERVER_PORT +import com.kernelmaft.zanbur.common.Config.MQTT_TOPIC import io.github.davidepianca98.* import io.github.davidepianca98.mqtt.* import io.github.davidepianca98.mqtt.MQTTVersion.* diff --git a/app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt b/app/src/main/java/com/kernelmaft/zanbur/network/zigbee2mqtt.kt similarity index 77% rename from app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt rename to app/src/main/java/com/kernelmaft/zanbur/network/zigbee2mqtt.kt index 0dc2d88..e59269f 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/network/zigbee2mqtt.kt @@ -1,6 +1,7 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.network -import com.kernelmaft.zanbur.Config.MQTT_TOPIC +import com.kernelmaft.zanbur.common.* +import com.kernelmaft.zanbur.common.Config.MQTT_TOPIC import kotlinx.serialization.* import kotlinx.serialization.json.* diff --git a/app/src/main/java/com/kernelmaft/zanbur/components.kt b/app/src/main/java/com/kernelmaft/zanbur/ui/components.kt similarity index 94% rename from app/src/main/java/com/kernelmaft/zanbur/components.kt rename to app/src/main/java/com/kernelmaft/zanbur/ui/components.kt index e2d54e9..03fc6ac 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/components.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/ui/components.kt @@ -1,4 +1,4 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.ui import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.Arrangement.Center @@ -9,6 +9,7 @@ import androidx.compose.material3.ButtonDefaults.shape import androidx.compose.runtime.* import androidx.compose.ui.* import androidx.compose.ui.Alignment.Companion.CenterHorizontally +import com.kernelmaft.zanbur.common.* diff --git a/app/src/main/java/com/kernelmaft/zanbur/compose-state.kt b/app/src/main/java/com/kernelmaft/zanbur/ui/compose-state.kt similarity index 87% rename from app/src/main/java/com/kernelmaft/zanbur/compose-state.kt rename to app/src/main/java/com/kernelmaft/zanbur/ui/compose-state.kt index bd2a3e3..212f254 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/compose-state.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/ui/compose-state.kt @@ -1,6 +1,7 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.ui import androidx.compose.runtime.* +import com.kernelmaft.zanbur.common.* diff --git a/app/src/main/java/com/kernelmaft/zanbur/main-activity.kt b/app/src/main/java/com/kernelmaft/zanbur/ui/main-activity.kt similarity index 84% rename from app/src/main/java/com/kernelmaft/zanbur/main-activity.kt rename to app/src/main/java/com/kernelmaft/zanbur/ui/main-activity.kt index 5d12e11..147fd0c 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/main-activity.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/ui/main-activity.kt @@ -1,4 +1,4 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.ui import android.os.* import androidx.activity.compose.* @@ -6,7 +6,9 @@ import androidx.compose.foundation.layout.* import androidx.compose.ui.* import androidx.compose.ui.unit.* import androidx.lifecycle.* -import com.kernelmaft.zanbur.ChangeSource.* +import com.kernelmaft.zanbur.common.* +import com.kernelmaft.zanbur.common.ChangeSource.* +import com.kernelmaft.zanbur.network.* diff --git a/app/src/main/java/com/kernelmaft/zanbur/theme.kt b/app/src/main/java/com/kernelmaft/zanbur/ui/theme.kt similarity index 96% rename from app/src/main/java/com/kernelmaft/zanbur/theme.kt rename to app/src/main/java/com/kernelmaft/zanbur/ui/theme.kt index 8a95cbc..0b882a2 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/theme.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/ui/theme.kt @@ -1,4 +1,4 @@ -package com.kernelmaft.zanbur +package com.kernelmaft.zanbur.ui import android.os.* import androidx.activity.*