Skip to content

armgit / core

Public Imported from GitHub
0

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

Proper project file structure

Michael Rademaker89c88b056b68
diff --git a/console/android/GenericApp/ORLib/.gitignore b/console/android/GenericApp/ORLib/.gitignore
deleted file mode 100644
index 42afabfd2..000000000
--- a/console/android/GenericApp/ORLib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/build.gradle b/console/android/GenericApp/ORLib/build.gradle
deleted file mode 100644
index 5dd9ba975..000000000
--- a/console/android/GenericApp/ORLib/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index e69de29bb..000000000
diff --git a/console/android/GenericApp/ORLib/proguard-rules.pro b/console/android/GenericApp/ORLib/proguard-rules.pro
deleted file mode 100644
index 481bb4348..000000000
--- a/console/android/GenericApp/ORLib/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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
deleted file mode 100644
index 2d7b54215..000000000
--- a/console/android/GenericApp/ORLib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/settings.gradle b/console/android/GenericApp/settings.gradle
index cdfc4e1a2..030188e83 100644
--- a/console/android/GenericApp/settings.gradle
+++ b/console/android/GenericApp/settings.gradle
@@ -1,3 +1,4 @@
include ':app'
rootProject.name = "GenericApp"
include ':ORLib'
+project(':ORLib').projectDir = file('../ORLib')
diff --git a/console/android/ORLib/.buildignore b/console/android/ORLib/.buildignore
new file mode 100644
index 000000000..5322bb279
--- /dev/null
+++ b/console/android/ORLib/.buildignore
@@ -0,0 +1 @@
+# Ignore this project in composite/superproject build
\ No newline at end of file
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/models/ORAlertAction.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/models/ORAlertButton.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/models/ORAppConfig.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/models/ORLinkConfig.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/network/ApiManager.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/service/GeofenceBootCompleteReceiver.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/service/GeofenceProvider.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/service/GeofenceTransitionsIntentService.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/service/NotificationResource.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/service/ORMessagingActionService.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt
diff --git a/console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt
rename to console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrPrivacyPolicyActivity.kt
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-hdpi/ic_notification.png b/console/android/ORLib/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable-hdpi/ic_notification.png
rename to console/android/ORLib/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-mdpi/ic_notification.png b/console/android/ORLib/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable-mdpi/ic_notification.png
rename to console/android/ORLib/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml b/console/android/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to console/android/ORLib/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-xhdpi/ic_notification.png b/console/android/ORLib/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable-xhdpi/ic_notification.png
rename to console/android/ORLib/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png b/console/android/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png
rename to console/android/ORLib/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png b/console/android/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png
rename to console/android/ORLib/src/main/res/drawable-xxxhdpi/ic_notification.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/app_icon.xml b/console/android/ORLib/src/main/res/drawable/app_icon.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/app_icon.xml
rename to console/android/ORLib/src/main/res/drawable/app_icon.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/cog.png b/console/android/ORLib/src/main/res/drawable/cog.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/cog.png
rename to console/android/ORLib/src/main/res/drawable/cog.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/empty.xml b/console/android/ORLib/src/main/res/drawable/empty.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/empty.xml
rename to console/android/ORLib/src/main/res/drawable/empty.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/ic_launcher_background.xml b/console/android/ORLib/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/ic_launcher_background.xml
rename to console/android/ORLib/src/main/res/drawable/ic_launcher_background.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/ic_menu.xml b/console/android/ORLib/src/main/res/drawable/ic_menu.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/ic_menu.xml
rename to console/android/ORLib/src/main/res/drawable/ic_menu.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/notification_icon.xml b/console/android/ORLib/src/main/res/drawable/notification_icon.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/notification_icon.xml
rename to console/android/ORLib/src/main/res/drawable/notification_icon.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_app_icon.png b/console/android/ORLib/src/main/res/drawable/or_app_icon.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/or_app_icon.png
rename to console/android/ORLib/src/main/res/drawable/or_app_icon.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_logo.png b/console/android/ORLib/src/main/res/drawable/or_logo.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/or_logo.png
rename to console/android/ORLib/src/main/res/drawable/or_logo.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_push_icon.png b/console/android/ORLib/src/main/res/drawable/or_push_icon.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/or_push_icon.png
rename to console/android/ORLib/src/main/res/drawable/or_push_icon.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/drawable/or_splash.png b/console/android/ORLib/src/main/res/drawable/or_splash.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/drawable/or_splash.png
rename to console/android/ORLib/src/main/res/drawable/or_splash.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_main.xml b/console/android/ORLib/src/main/res/layout/activity_or_main.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/layout/activity_or_main.xml
rename to console/android/ORLib/src/main/res/layout/activity_or_main.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/layout/activity_or_privacy_policy.xml b/console/android/ORLib/src/main/res/layout/activity_or_privacy_policy.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/layout/activity_or_privacy_policy.xml
rename to console/android/ORLib/src/main/res/layout/activity_or_privacy_policy.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to console/android/ORLib/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png b/console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png
rename to console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png b/console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to console/android/ORLib/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png b/console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png
rename to console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png b/console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to console/android/ORLib/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png b/console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to console/android/ORLib/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png b/console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to console/android/ORLib/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to console/android/ORLib/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/colors.xml b/console/android/ORLib/src/main/res/values/colors.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/values/colors.xml
rename to console/android/ORLib/src/main/res/values/colors.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/dimens.xml b/console/android/ORLib/src/main/res/values/dimens.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/values/dimens.xml
rename to console/android/ORLib/src/main/res/values/dimens.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/ic_launcher_background.xml b/console/android/ORLib/src/main/res/values/ic_launcher_background.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/values/ic_launcher_background.xml
rename to console/android/ORLib/src/main/res/values/ic_launcher_background.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/strings.xml b/console/android/ORLib/src/main/res/values/strings.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/values/strings.xml
rename to console/android/ORLib/src/main/res/values/strings.xml
diff --git a/console/android/GenericApp/ORLib/src/main/res/values/styles.xml b/console/android/ORLib/src/main/res/values/styles.xml
similarity index 100%
rename from console/android/GenericApp/ORLib/src/main/res/values/styles.xml
rename to console/android/ORLib/src/main/res/values/styles.xml