diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a76dc3b..3a75048 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,6 +2,8 @@ import java.io.FileInputStream import java.util.Properties import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + + val keystoreProperties = Properties () keystoreProperties . load ( FileInputStream ( rootProject . file ("keystore.properties") ) ) diff --git a/app/src/main/java/com/kernelmaft/zanbur/app-state.kt b/app/src/main/java/com/kernelmaft/zanbur/app-state.kt index 94858e4..52c4991 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/app-state.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/app-state.kt @@ -1,6 +1,7 @@ package com.kernelmaft.zanbur + object AppState { val groups : List get () = groupsAsMutable private var groupsAsMutable : List = emptyList () diff --git a/app/src/main/java/com/kernelmaft/zanbur/main.kt b/app/src/main/java/com/kernelmaft/zanbur/main.kt index 9e47d82..6dc4534 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/main.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/main.kt @@ -22,6 +22,7 @@ import androidx.datastore.preferences.core.stringPreferencesKey import androidx.lifecycle.lifecycleScope + class MainActivity : ComponentActivity () { override fun onCreate ( savedInstanceState : Bundle ? ) { super . onCreate (savedInstanceState) diff --git a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt b/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt index d48f3ba..aa9ddd6 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt @@ -14,6 +14,7 @@ import mqtt.packets.Qos.AT_MOST_ONCE import mqtt.packets.mqtt.MQTTPublish + typealias MqttPublishHandler = ( MQTTPublish , Json ) -> Unit object MqttClient { diff --git a/app/src/main/java/com/kernelmaft/zanbur/ontology.kt b/app/src/main/java/com/kernelmaft/zanbur/ontology.kt index 7567355..4bec33e 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/ontology.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/ontology.kt @@ -1,6 +1,7 @@ package com.kernelmaft.zanbur + data class Group ( val id : Int , val name : String , diff --git a/app/src/main/java/com/kernelmaft/zanbur/persistence.kt b/app/src/main/java/com/kernelmaft/zanbur/persistence.kt index f825059..c318acc 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/persistence.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/persistence.kt @@ -6,4 +6,5 @@ import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.preferencesDataStore + val Context. dataStore : DataStore by preferencesDataStore ("state") diff --git a/app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt b/app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt index 9243ab5..12a0a92 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/zigbee2mqtt.kt @@ -6,6 +6,7 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json + fun publishSceneChange ( group : Group , newScene : Scene ) { val topic = Config . MQTT_TOPIC + "/" + group . name + "/set" val packet = Json . encodeToString ( SceneRecallPacket ( newScene . id ) ) diff --git a/settings.gradle.kts b/settings.gradle.kts index 3c7e692..03d4b5d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,22 +2,22 @@ pluginManagement { repositories { google { content { - includeGroupByRegex("com\\.android.*") - includeGroupByRegex("com\\.google.*") - includeGroupByRegex("androidx.*") + includeGroupByRegex ("com\\.android.*") + includeGroupByRegex ("com\\.google.*") + includeGroupByRegex ("androidx.*") } } - mavenCentral() - gradlePluginPortal() + mavenCentral () + gradlePluginPortal () } } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositoriesMode . set ( RepositoriesMode . FAIL_ON_PROJECT_REPOS ) repositories { - google() - mavenCentral() + google () + mavenCentral () } } -rootProject.name = "Zanbur" -include(":app") +rootProject . name = "Zanbur" +include (":app")