Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Few fixes

Michael Rademaker28e10ba663bd
diff --git a/console/android/ORLib/build.gradle b/console/android/ORLib/build.gradle
index 9342b2114..742c051c9 100644
--- a/console/android/ORLib/build.gradle
+++ b/console/android/ORLib/build.gradle
@@ -23,6 +23,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+ buildFeatures {
+ viewBinding true
+ }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@@ -38,7 +41,9 @@ dependencies {
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
- testImplementation 'junit:junit:4.+'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+ implementation 'androidx.preference:preference-ktx:1.1.1'
+ implementation "com.google.android.gms:play-services-location:18.0.0"
+ implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8"
+ implementation platform('com.google.firebase:firebase-bom:26.0.0')
+ implementation 'com.google.firebase:firebase-messaging-ktx'
}
\ No newline at end of file
diff --git a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
index 2c6364c41..5000c1aee 100644
--- a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
+++ b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
@@ -40,7 +40,7 @@ import java.util.*
import java.util.logging.Level
import java.util.logging.Logger
-class OrMainActivity : Activity() {
+open class OrMainActivity : Activity() {
private lateinit var binding: ActivityOrMainBinding
@@ -497,7 +497,7 @@ class OrMainActivity : Activity() {
}
}
- private fun loadUrl(url: String?) {
+ public fun loadUrl(url: String?) {
webViewLoaded = false
val temp = url!!.replace(" ", "%20")
binding.webView.loadUrl(temp)