Skip to content

armgit / core

Public Imported from GitHub
0

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

Restructured Android app in order to create custom apps with same code base

Michael Rademakera0c7a18cbe4a
diff --git a/console/android/GenericApp/ORLib/.gitignore b/console/android/GenericApp/ORLib/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/console/android/GenericApp/ORLib/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/build.gradle b/console/android/GenericApp/ORLib/build.gradle
new file mode 100644
index 000000000..5dd9ba975
--- /dev/null
+++ b/console/android/GenericApp/ORLib/build.gradle
@@ -0,0 +1,46 @@
+plugins {
+ id 'com.android.library'
+ id 'kotlin-android'
+}
+
+android {
+ compileSdkVersion 30
+ buildToolsVersion "30.0.3"
+
+ defaultConfig {
+ minSdkVersion 25
+ targetSdkVersion 30
+
+ consumerProguardFiles "consumer-rules.pro"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+ buildFeatures {
+ viewBinding true
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
+}
+
+dependencies {
+
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ implementation 'androidx.core:core-ktx:1.6.0'
+ implementation 'androidx.appcompat:appcompat:1.3.1'
+ implementation 'androidx.preference:preference-ktx:1.1.1'
+ implementation "com.google.android.gms:play-services-location:18.0.0"
+ implementation 'com.google.android.material:material:1.4.0'
+ implementation platform('com.google.firebase:firebase-bom:26.0.0')
+ implementation 'com.google.firebase:firebase-messaging-ktx'
+ implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8"
+}
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/consumer-rules.pro b/console/android/GenericApp/ORLib/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/console/android/GenericApp/ORLib/proguard-rules.pro b/console/android/GenericApp/ORLib/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/console/android/GenericApp/ORLib/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/AndroidManifest.xml b/console/android/GenericApp/ORLib/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..2d7b54215
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="io.openremote.orlib">
+
+</manifest>
\ No newline at end of file
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAlertAction.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt
similarity index 84%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAlertAction.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt
index c81b950b6..8a7c12289 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAlertAction.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.models
+package io.openremote.orlib.models
data class ORAlertAction(
val url: String,
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAlertButton.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt
similarity index 69%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAlertButton.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt
index 7d55c1f5c..6414e0d83 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAlertButton.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.models
+package io.openremote.orlib.models
data class ORAlertButton(
val title: String,
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAppConfig.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt
similarity index 90%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAppConfig.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt
index d58a1fe22..0b26f336e 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORAppConfig.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.models
+package io.openremote.orlib.models
data class ORAppConfig(
val id: Int,
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORLinkConfig.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt
similarity index 68%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORLinkConfig.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt
index cd04985b7..2ebe298c3 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/models/ORLinkConfig.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.models
+package io.openremote.orlib.models
data class ORLinkConfig(
val displayText: String,
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt
similarity index 98%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt
index 7652644da..01a98c1b6 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt
@@ -1,9 +1,9 @@
-package io.openremote.app.network
+package io.openremote.orlib.network
import android.net.Uri
import android.util.Log
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import io.openremote.app.models.ORAppConfig
+import io.openremote.orlib.models.ORAppConfig
import java.net.HttpURLConnection
import java.net.URL
import kotlin.concurrent.thread
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceBootCompleteReceiver.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt
similarity index 93%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceBootCompleteReceiver.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt
index e80c4164b..03579b893 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceBootCompleteReceiver.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt
@@ -18,12 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package io.openremote.app.service
+package io.openremote.orlib.service
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import io.openremote.app.service.GeofenceProvider
class GeofenceBootCompleteReceiver : BroadcastReceiver() {
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceProvider.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt
similarity index 99%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceProvider.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt
index 4387a9b7f..ce6b01463 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceProvider.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.service
+package io.openremote.orlib.service
import android.Manifest.permission.*
import android.annotation.SuppressLint
@@ -11,8 +11,8 @@ import androidx.appcompat.app.AlertDialog
import androidx.core.app.ActivityCompat
import com.fasterxml.jackson.databind.ObjectMapper
import com.google.android.gms.location.*
-import io.openremote.app.R
-import io.openremote.app.ui.MainActivity
+import io.openremote.orlib.R
+import io.openremote.orlib.ui.OrMainActivity
import java.net.URL
import java.util.*
import java.util.logging.Level
@@ -41,7 +41,7 @@ class GeofenceProvider(val context: Context) {
companion object {
val locationPermissionAskedKey = "LocationPermissionAsked"
val baseUrlKey = "baseUrl"
- val consoleIdKey = MainActivity.CONSOLE_ID_KEY
+ val consoleIdKey = OrMainActivity.CONSOLE_ID_KEY
val geofencesKey = "geofences"
val geofenceDisabledKey = "geofenceDisabled"
val locationResponseCode = 101
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceTransitionsIntentService.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt
similarity index 99%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceTransitionsIntentService.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt
index 1ed438139..a233f5269 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/GeofenceTransitionsIntentService.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.service
+package io.openremote.orlib.service
import android.content.BroadcastReceiver
import android.content.Context
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/NotificationResource.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt
similarity index 99%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/service/NotificationResource.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt
index 58219c3c2..98dfba805 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/NotificationResource.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.service
+package io.openremote.orlib.service
import android.content.Context
import android.content.SharedPreferences
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/ORFirebaseMessagingService.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
similarity index 96%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/service/ORFirebaseMessagingService.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
index c93c9d450..daeb32af7 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/ORFirebaseMessagingService.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.service
+package io.openremote.orlib.service
import android.app.NotificationChannel
import android.app.NotificationManager
@@ -13,10 +13,10 @@ import androidx.core.app.NotificationCompat
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.google.firebase.messaging.RemoteMessage
-import io.openremote.app.R
-import io.openremote.app.models.ORAlertAction
-import io.openremote.app.models.ORAlertButton
-import io.openremote.app.ui.MainActivity
+import io.openremote.orlib.R
+import io.openremote.orlib.models.ORAlertAction
+import io.openremote.orlib.models.ORAlertButton
+import io.openremote.orlib.ui.OrMainActivity
import java.util.logging.Level
import java.util.logging.Logger
@@ -89,7 +89,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
geofenceProvider.refreshGeofences()
}
else -> {
- val broadCastIntent = Intent(MainActivity.ACTION_BROADCAST)
+ val broadCastIntent = Intent(OrMainActivity.ACTION_BROADCAST)
broadCastIntent.putExtra("action", action)
sendBroadcast(broadCastIntent)
}
@@ -140,7 +140,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
@RequiresApi(Build.VERSION_CODES.O)
private fun createNotificationChannel() {
- val channelName = "OR Eindhoven Message Service"
+ val channelName = "OR Message Service"
val channel = NotificationChannel(
getString(R.string.NOTIFICATION_CHANNEL_ID),
channelName, NotificationManager.IMPORTANCE_HIGH
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/ORMessagingActionService.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt
similarity index 94%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/service/ORMessagingActionService.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt
index 26a84c363..2e85eb9a2 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/service/ORMessagingActionService.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt
@@ -1,12 +1,12 @@
-package io.openremote.app.service
+package io.openremote.orlib.service
import android.app.IntentService
import android.content.Intent
import android.app.NotificationManager
import android.net.Uri
-import io.openremote.app.R
+import io.openremote.orlib.R
import android.text.TextUtils
-import io.openremote.app.ui.MainActivity
+import io.openremote.orlib.ui.OrMainActivity
class ORMessagingActionService : IntentService("org.openremote.android.ORMessagingActionService") {
private var notificationResource: NotificationResource? = null
@@ -54,7 +54,7 @@ class ORMessagingActionService : IntentService("org.openremote.android.ORMessagi
notificationResource!!.executeRequest(httpMethod!!, appUrl, data)
}
else -> {
- val activityIntent = Intent(applicationContext, MainActivity::class.java)
+ val activityIntent = Intent(applicationContext, OrMainActivity::class.java)
activityIntent.addFlags(
Intent.FLAG_ACTIVITY_NEW_TASK or
Intent.FLAG_ACTIVITY_SINGLE_TOP
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/MainActivity.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
similarity index 97%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/ui/MainActivity.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
index 206273618..2c6364c41 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/MainActivity.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
@@ -1,4 +1,4 @@
-package io.openremote.app.ui
+package io.openremote.orlib.ui
import android.Manifest
import android.annotation.SuppressLint
@@ -29,20 +29,20 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.firebase.messaging.FirebaseMessaging
-import io.openremote.app.R
-import io.openremote.app.databinding.ActivityMainBinding
-import io.openremote.app.models.ORAppConfig
-import io.openremote.app.network.ApiManager
-import io.openremote.app.service.GeofenceProvider
+import io.openremote.orlib.R
+import io.openremote.orlib.databinding.ActivityOrMainBinding
+import io.openremote.orlib.models.ORAppConfig
+import io.openremote.orlib.network.ApiManager
+import io.openremote.orlib.service.GeofenceProvider
import org.json.JSONException
import org.json.JSONObject
import java.util.*
import java.util.logging.Level
import java.util.logging.Logger
-class MainActivity : Activity() {
+class OrMainActivity : Activity() {
- private lateinit var binding: ActivityMainBinding
+ private lateinit var binding: ActivityOrMainBinding
private val connectivityChangeReceiver: ConnectivityChangeReceiver =
ConnectivityChangeReceiver()
@@ -82,7 +82,7 @@ class MainActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- binding = ActivityMainBinding.inflate(layoutInflater)
+ binding = ActivityOrMainBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)
@@ -204,7 +204,7 @@ class MainActivity : Activity() {
}
floatingActionButton.setOnClickListener {
// We are showing only toast message. However, you can do anything you need.
- val popupMenu = PopupMenu(this@MainActivity, it)
+ val popupMenu = PopupMenu(this@OrMainActivity, it)
for ((index, link) in appConfig!!.links!!.withIndex()) {
popupMenu.menu.add(index, index, index, link.displayText)
}
@@ -402,7 +402,7 @@ class MainActivity : Activity() {
userGesture: Boolean,
resultMsg: Message
): Boolean {
- val newWebView = WebView(this@MainActivity)
+ val newWebView = WebView(this@OrMainActivity)
view.addView(newWebView)
val transport = resultMsg.obj as WebViewTransport
transport.webView = newWebView
@@ -422,7 +422,7 @@ class MainActivity : Activity() {
setDownloadListener { url, userAgent, contentDisposition, mimetype, contentLength ->
val writePermission = Manifest.permission.WRITE_EXTERNAL_STORAGE
if (ContextCompat.checkSelfPermission(
- this@MainActivity,
+ this@OrMainActivity,
writePermission
) != PackageManager.PERMISSION_GRANTED
) {
@@ -535,7 +535,7 @@ class MainActivity : Activity() {
LOG.fine("Received WebApp message, error: " + data?.getString("error"))
val mainHandler = Handler(mainLooper)
Toast.makeText(
- this@MainActivity,
+ this@OrMainActivity,
"Error occurred ${data?.getString("error")}",
Toast.LENGTH_LONG
).show()
@@ -575,7 +575,7 @@ class MainActivity : Activity() {
}
action.equals("PROVIDER_ENABLE", ignoreCase = true) -> {
val consoleId = data.getString("consoleId")
- (activity as MainActivity).consoleId = consoleId
+ (activity as OrMainActivity).consoleId = consoleId
val baseUrl = sharedPreferences?.let { pref ->
pref.getString("project", null)?.let { projectName ->
pref.getString("realm", null)?.let { realmName ->
@@ -583,7 +583,7 @@ class MainActivity : Activity() {
}
}
} ?: ""
- geofenceProvider?.enable(this@MainActivity, baseUrl,
+ geofenceProvider?.enable(this@OrMainActivity, baseUrl,
consoleId, object : GeofenceProvider.GeofenceCallback {
override fun accept(responseData: Map<String, Any>) {
notifyClient(responseData)
@@ -602,7 +602,7 @@ class MainActivity : Activity() {
}
action.equals("GET_LOCATION", ignoreCase = true) -> {
geofenceProvider?.getLocation(
- this@MainActivity,
+ this@OrMainActivity,
object : GeofenceProvider.GeofenceCallback {
override fun accept(responseData: Map<String, Any>) {
notifyClient(responseData)
@@ -765,7 +765,7 @@ class MainActivity : Activity() {
companion object {
private val LOG = Logger.getLogger(
- MainActivity::class.java.name
+ OrMainActivity::class.java.name
)
private const val WRITE_PERMISSION_FOR_DOWNLOAD = 999
private const val WRITE_PERMISSION_FOR_LOGGING = 1000
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/PrivacyPolicyActivity.kt b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt
similarity index 73%
rename from console/android/GenericApp/app/src/main/java/io/openremote/app/ui/PrivacyPolicyActivity.kt
rename to console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt
index 9260fcbde..87eb3e224 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/PrivacyPolicyActivity.kt
+++ b/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt
@@ -1,20 +1,20 @@
-package io.openremote.app.ui
+package io.openremote.orlib.ui
import android.content.Intent
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AppCompatActivity
-import io.openremote.app.databinding.ActivityPrivacyPolicyBinding
+import io.openremote.orlib.databinding.ActivityOrPrivacyPolicyBinding
-class PrivacyPolicyActivity : AppCompatActivity() {
+class OrPrivacyPolicyActivity : AppCompatActivity() {
- private lateinit var binding: ActivityPrivacyPolicyBinding
+ private lateinit var binding: ActivityOrPrivacyPolicyBinding
private var isAccepted = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- binding = ActivityPrivacyPolicyBinding.inflate(layoutInflater)
+ binding = ActivityOrPrivacyPolicyBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-hdpi/ic_notification.png b/console/android/GenericApp/ORLib/src/main/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 000000000..417e9cf46
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-mdpi/ic_notification.png b/console/android/GenericApp/ORLib/src/main/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 000000000..fd5a4282b
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml b/console/android/GenericApp/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..2b068d114
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:endX="85.84757"
+ android:endY="92.4963"
+ android:startX="42.9492"
+ android:startY="49.59793"
+ android:type="linear">
+ <item
+ android:color="#44000000"
+ android:offset="0.0" />
+ <item
+ android:color="#00000000"
+ android:offset="1.0" />
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-xhdpi/ic_notification.png b/console/android/GenericApp/ORLib/src/main/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 000000000..9a563a433
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png b/console/android/GenericApp/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 000000000..e9b08914a
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png b/console/android/GenericApp/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 000000000..e0107cd52
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/app_icon.xml b/console/android/GenericApp/ORLib/src/main/res/drawable/app_icon.xml
new file mode 100644
index 000000000..37d07f447
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/drawable/app_icon.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_notification">
+</bitmap>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/cog.png b/console/android/GenericApp/ORLib/src/main/res/drawable/cog.png
new file mode 100644
index 000000000..7d7d8c246
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable/cog.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/empty.xml b/console/android/GenericApp/ORLib/src/main/res/drawable/empty.xml
new file mode 100644
index 000000000..a8b409b1d
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/drawable/empty.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/ic_launcher_background.xml b/console/android/GenericApp/ORLib/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..07d5da9cb
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path
+ android:fillColor="#3DDC84"
+ android:pathData="M0,0h108v108h-108z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M9,0L9,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,0L19,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M29,0L29,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M39,0L39,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M49,0L49,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M59,0L59,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M69,0L69,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M79,0L79,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M89,0L89,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M99,0L99,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,9L108,9"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,19L108,19"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,29L108,29"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,39L108,39"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,49L108,49"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,59L108,59"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,69L108,69"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,79L108,79"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,89L108,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,99L108,99"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,29L89,29"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,39L89,39"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,49L89,49"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,59L89,59"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,69L89,69"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,79L89,79"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M29,19L29,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M39,19L39,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M49,19L49,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M59,19L59,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M69,19L69,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M79,19L79,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/ic_menu.xml b/console/android/GenericApp/ORLib/src/main/res/drawable/ic_menu.xml
new file mode 100644
index 000000000..e1c8eb120
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/drawable/ic_menu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#ffffff"
+ android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
+</vector>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/notification_icon.xml b/console/android/GenericApp/ORLib/src/main/res/drawable/notification_icon.xml
new file mode 100644
index 000000000..37d07f447
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/drawable/notification_icon.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_notification">
+</bitmap>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_app_icon.png b/console/android/GenericApp/ORLib/src/main/res/drawable/or_app_icon.png
new file mode 100644
index 000000000..34fed749a
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable/or_app_icon.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_logo.png b/console/android/GenericApp/ORLib/src/main/res/drawable/or_logo.png
new file mode 100644
index 000000000..d7154867e
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable/or_logo.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_push_icon.png b/console/android/GenericApp/ORLib/src/main/res/drawable/or_push_icon.png
new file mode 100644
index 000000000..e1020884e
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable/or_push_icon.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_splash.png b/console/android/GenericApp/ORLib/src/main/res/drawable/or_splash.png
new file mode 100644
index 000000000..0464d21b3
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/drawable/or_splash.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_main.xml b/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_main.xml
new file mode 100644
index 000000000..99446ed15
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_main.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/activity_web"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ android:padding="0dp"
+ tools:context=".ui.OrMainActivity">
+
+ <WebView
+ android:id="@+id/webView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentEnd="true">
+ </WebView>
+
+ <ProgressBar
+ android:id="@+id/webProgressBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="-7dp"
+ android:background="@android:color/transparent"
+ android:indeterminate="false"
+ android:max="100"
+ android:progress="1"/>
+
+</RelativeLayout>
diff --git a/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_privacy_policy.xml b/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_privacy_policy.xml
new file mode 100644
index 000000000..a16cd5dda
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_privacy_policy.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".ui.OrPrivacyPolicyActivity">
+
+ <WebView
+ android:id="@+id/webView"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toTopOf="@id/acceptView"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/acceptView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_margin="10dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/webView"
+ >
+
+ <CheckBox
+ android:id="@+id/checkbox"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:button="@null"
+ android:textColor="@color/medium_green"
+ android:background="?android:attr/listChoiceIndicatorMultiple"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/button_accept"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Button
+ android:id="@+id/button_accept"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:background="@color/medium_green"
+ android:minWidth="300dp"
+ android:text="@string/button_accept"
+ android:textColor="@color/white"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:enabled="false"/>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..036d09bc5
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..036d09bc5
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..54cd86b46
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..f4648418e
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..396d1025a
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..70392d057
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..34d62333b
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..3a0e7a10b
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..7f04802ee
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..eadf4e618
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..89b0e6c8f
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..57bc10b00
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..c4f34f813
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..86e48768d
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0dfb6a489
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..d854c0f84
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..eac166b6e
Binary files /dev/null and b/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/colors.xml b/console/android/GenericApp/ORLib/src/main/res/values/colors.xml
new file mode 100644
index 000000000..8f707b9e3
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/values/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <item name="black" type="color">#ff000000</item>
+ <item name="white" type="color">#ffffffff</item>
+
+ <item name="dark_grey" type="color">#ff455a64</item>
+ <item name="medium_grey" type="color">#ff919194</item>
+ <item name="light_grey" type="color">#ffcccccc</item>
+ <item name="bright_grey" type="color">#fff5f5f5</item>
+
+ <item name="dark_green" type="color">#ff006224</item>
+ <item name="medium_green" type="color">#ff49a942</item>
+ <item name="light_green" type="color">#ffc1d72f</item>
+
+ <item name="red" type="color">#ffe64a19</item>
+ <item name="yellow" type="color">#fffbc02d</item>
+ <item name="blue" type="color">#ff1976d2</item>
+ <item name="purple" type="color">#ff660092</item>
+</resources>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/dimens.xml b/console/android/GenericApp/ORLib/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..1a7ba4a1a
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/values/dimens.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!--
+ Because the window insets on round devices are larger than 15dp, this padding only applies
+ to square screens.
+ -->
+ <dimen name="box_inset_layout_padding">0dp</dimen>
+
+ <!--
+ This padding applies to both square and round screens. The total padding between the buttons
+ and the window insets is box_inset_layout_padding (above variable) on square screens and
+ inner_frame_layout_padding (below variable) on round screens.
+ -->
+ <dimen name="inner_frame_layout_padding">5dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/ic_launcher_background.xml b/console/android/GenericApp/ORLib/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 000000000..c5d5899fd
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/strings.xml b/console/android/GenericApp/ORLib/src/main/res/values/strings.xml
new file mode 100644
index 000000000..f4e631976
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/values/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">OpenRemote</string>
+ <string name="title_activity_project">Project</string>
+ <string name="Project">Project</string>
+ <string name="OR_CONSOLE_LOAD_ERROR_URL"></string>
+ <string name="OR_CONSOLE_LOAD_TIMEOUT">5000</string>
+ <string name="OR_CONSOLE_IGNORE_PAGE_ERRORS">true</string>
+ <string name="SHARED_PREF_REFRESH_TOKEN">REFRESH_TOKEN</string>
+ <string name="fatalError">Sorry, there is a problem.</string>
+ <string name="fatalErrorExplain">The service is not available, please try again later.</string>
+ <string name="httpError">Invalid response from service.</string>
+ <string name="httpErrorExplain">Can\'t connect to service.</string>
+ <string name="downloading_file">Downloading File</string>
+ <string name="downloading_enabled">Downloading enabled</string>
+ <string name="error_downloading">Error downloading file</string>
+ <string name="download_completed">Download completed</string>
+ <string name="background_location_alert_title">Background location needed</string>
+ <string name="background_location_alert_body">In order to receive these notifications when the app is running in the background, background location access is needed.\nNo location history is stored, only the latest location is saved.\nDo you want to enabled it in the settings?</string>
+ <string name="location_background_disabled_title">Background location disabled</string>
+ <string name="background_location_decline">No</string>
+ <string name="background_location_accept">Yes</string>
+ <string name="button_accept">Accept</string>
+ <string name="NOTIFICATION_CHANNEL_ID">OR</string>
+</resources>
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/styles.xml b/console/android/GenericApp/ORLib/src/main/res/values/styles.xml
new file mode 100644
index 000000000..b911207b3
--- /dev/null
+++ b/console/android/GenericApp/ORLib/src/main/res/values/styles.xml
@@ -0,0 +1,10 @@
+<resources>
+
+ <style name="OpenRemoteTheme" parent="Theme.AppCompat.Light.NoActionBar">
+ <item name="android:actionMenuTextColor">@color/dark_grey</item>
+ <item name="colorPrimary">@color/medium_green</item>
+ <item name="colorPrimaryDark">@color/dark_green</item>
+ <item name="colorAccent">@color/light_green</item>
+ </style>
+
+</resources>
\ No newline at end of file
diff --git a/console/android/GenericApp/app/build.gradle b/console/android/GenericApp/app/build.gradle
index ace155f61..e9e0c60d8 100644
--- a/console/android/GenericApp/app/build.gradle
+++ b/console/android/GenericApp/app/build.gradle
@@ -38,14 +38,15 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation 'androidx.core:core-ktx:1.3.2'
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+ implementation 'androidx.core:core-ktx:1.6.0'
+ implementation 'androidx.appcompat:appcompat:1.3.1'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
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'
- implementation 'com.google.android.material:material:1.3.0'
+ implementation 'com.google.android.material:material:1.4.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ implementation project(':ORLib')
}
\ No newline at end of file
diff --git a/console/android/GenericApp/app/src/main/AndroidManifest.xml b/console/android/GenericApp/app/src/main/AndroidManifest.xml
index effce8798..803441bec 100644
--- a/console/android/GenericApp/app/src/main/AndroidManifest.xml
+++ b/console/android/GenericApp/app/src/main/AndroidManifest.xml
@@ -48,23 +48,23 @@
android:name=".ui.ProjectActivity"
android:exported="true"
android:label="@string/title_activity_project" />
- <activity android:name=".ui.MainActivity" />
- <activity android:name=".ui.PrivacyPolicyActivity" />
+ <activity android:name="io.openremote.orlib.ui.OrMainActivity" />
+ <activity android:name="io.openremote.orlib.ui.OrPrivacyPolicyActivity" />
- <service android:name=".service.ORFirebaseMessagingService">
+ <service android:name="io.openremote.orlib.service.ORFirebaseMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
- <service android:name=".service.ORMessagingActionService"></service>
+ <service android:name="io.openremote.orlib.service.ORMessagingActionService"></service>
- <receiver android:name=".service.GeofenceBootCompleteReceiver">
+ <receiver android:name="io.openremote.orlib.service.GeofenceBootCompleteReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<receiver
- android:name=".service.GeofenceTransitionsIntentService"
+ android:name="io.openremote.orlib.service.GeofenceTransitionsIntentService"
android:enabled="true"
android:exported="true" />
</application>
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/ProjectActivity.kt b/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/ProjectActivity.kt
index 9c243e5f0..eb7727e1f 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/ProjectActivity.kt
+++ b/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/ProjectActivity.kt
@@ -10,7 +10,8 @@ import android.widget.Toast
import androidx.preference.PreferenceManager
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import io.openremote.app.databinding.ActivityProjectBinding
-import io.openremote.app.network.ApiManager
+import io.openremote.orlib.network.ApiManager
+import io.openremote.orlib.ui.OrMainActivity
class ProjectActivity : Activity() {
@@ -53,8 +54,8 @@ class ProjectActivity : Activity() {
if (statusCode in 200..299) {
sharedPreferences?.edit()?.putString("project", project)?.apply()
sharedPreferences?.edit()?.putString("realm", realm)?.apply()
- val intent = Intent(this@ProjectActivity, MainActivity::class.java)
- intent.putExtra(MainActivity.APP_CONFIG_KEY, jacksonObjectMapper().writeValueAsString(appConfig))
+ val intent = Intent(this@ProjectActivity, OrMainActivity::class.java)
+ intent.putExtra(OrMainActivity.APP_CONFIG_KEY, jacksonObjectMapper().writeValueAsString(appConfig))
startActivity(intent)
finish()
} else {
diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/SplashActivity.kt b/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/SplashActivity.kt
index 32e1c27a1..ea0afeb5e 100644
--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/SplashActivity.kt
+++ b/console/android/GenericApp/app/src/main/java/io/openremote/app/ui/SplashActivity.kt
@@ -7,8 +7,10 @@ import android.os.Bundle
import androidx.preference.PreferenceManager
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import io.openremote.app.databinding.ActivitySplashBinding
-import io.openremote.app.network.ApiManager
-import io.openremote.app.ui.MainActivity.Companion.APP_CONFIG_KEY
+import io.openremote.orlib.network.ApiManager
+import io.openremote.orlib.ui.OrMainActivity
+import io.openremote.orlib.ui.OrMainActivity.Companion.APP_CONFIG_KEY
+import io.openremote.orlib.ui.OrPrivacyPolicyActivity
class SplashActivity : Activity() {
@@ -29,7 +31,7 @@ class SplashActivity : Activity() {
val privacyPolicyAccepted = sharedPreferences!!.getBoolean("privacyPolicyAccepted", false)
if (!privacyPolicyAccepted) {
- val intent = Intent(this@SplashActivity, PrivacyPolicyActivity::class.java)
+ val intent = Intent(this@SplashActivity, OrPrivacyPolicyActivity::class.java)
startActivityForResult(intent, SHOW_CONDITIONS_REQUEST)
} else {
startNextActivity()
@@ -44,7 +46,7 @@ class SplashActivity : Activity() {
val apiManager = ApiManager("https://${project}.openremote.io/api/$realm")
apiManager.getAppConfig { statusCode, appConfig, error ->
if (statusCode in 200..299) {
- val intent = Intent(this@SplashActivity, MainActivity::class.java)
+ val intent = Intent(this@SplashActivity, OrMainActivity::class.java)
intent.putExtra(
APP_CONFIG_KEY, jacksonObjectMapper().writeValueAsString(
appConfig
diff --git a/console/android/GenericApp/app/src/main/res/layout/activity_main.xml b/console/android/GenericApp/app/src/main/res/layout/activity_main.xml
index be316fb52..15488598e 100644
--- a/console/android/GenericApp/app/src/main/res/layout/activity_main.xml
+++ b/console/android/GenericApp/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
android:clipChildren="false"
android:clipToPadding="false"
android:padding="0dp"
- tools:context=".ui.MainActivity">
+ tools:context="io.openremote.orlib.ui.MainActivity">
<WebView
android:id="@+id/webView"
diff --git a/console/android/GenericApp/app/src/main/res/layout/activity_privacy_policy.xml b/console/android/GenericApp/app/src/main/res/layout/activity_privacy_policy.xml
index b9879a747..7378056e3 100644
--- a/console/android/GenericApp/app/src/main/res/layout/activity_privacy_policy.xml
+++ b/console/android/GenericApp/app/src/main/res/layout/activity_privacy_policy.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.PrivacyPolicyActivity">
+ tools:context="io.openremote.orlib.ui.OrPrivacyPolicyActivity">
<WebView
android:id="@+id/webView"
diff --git a/console/android/GenericApp/build.gradle b/console/android/GenericApp/build.gradle
index efde564c6..cfd289e40 100644
--- a/console/android/GenericApp/build.gradle
+++ b/console/android/GenericApp/build.gradle
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = "1.4.32"
+ ext.kotlin_version = "1.5.20"
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.3'
+ classpath 'com.android.tools.build:gradle:4.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.google.gms:google-services:4.3.5'
+ classpath 'com.google.gms:google-services:4.3.10'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
diff --git a/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties b/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties
index fb9f02261..8ab921d54 100644
--- a/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties
+++ b/console/android/GenericApp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
diff --git a/console/android/GenericApp/settings.gradle b/console/android/GenericApp/settings.gradle
index 0279d6b9c..cdfc4e1a2 100644
--- a/console/android/GenericApp/settings.gradle
+++ b/console/android/GenericApp/settings.gradle
@@ -1,2 +1,3 @@
include ':app'
-rootProject.name = "GenericApp"
\ No newline at end of file
+rootProject.name = "GenericApp"
+include ':ORLib'