Merge pull request #6 from Teavaro/VERSIONS_UPDATE

Versions update

app/build.gradle.kts

@@ -1,9 +1,8 @@
 plugins {
-    id(BuildSystem.plugins.
-    androidApplication)
+    id(BuildSystem.plugins.androidApplication)
     id(BuildSystem.plugins.kotlinAndroid)
-    id(BuildSystem.plugins.extensions)
     id("com.google.gms.google-services")
+    id("kotlin-kapt")
     id("org.jetbrains.kotlin.android")
 }
 
@@ -13,6 +12,8 @@ apply {
 
 android {
 
+    namespace = "com.teavaro.ecommDemoApp"
+
     defaultConfig {
         applicationId = "com.teavaro.ecommDemoApp"
         minSdk = BuildSystem.versions.minSdk
@@ -34,10 +35,14 @@ android {
     }
 
     viewBinding {
-        isEnabled = true
+        enable = true
+    }
+
+    buildFeatures {
+        buildConfig = true
     }
 
-    packagingOptions {
+    packaging {
         resources.excludes.addAll(listOf(
             "META-INF/DEPENDENCIES",
             "META-INF/LICENSE-notice.md",
@@ -62,6 +67,15 @@ android {
             }
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
 }
 
 dependencies {
@@ -82,26 +96,35 @@ dependencies {
      * Ref: https://stackoverflow.com/a/70870040/6927433
      */
     implementation(BuildSystem.libraries.androidXWorkRuntime)
-    // Hyperion debugger
-    debugImplementation(BuildSystem.libraries.hyperionCore)
-    debugImplementation(BuildSystem.libraries.hyperionSharedPreferences)
-    releaseImplementation(BuildSystem.libraries.hyperionNoop)
+    // Swrve
     implementation(BuildSystem.libraries.swrve)
     implementation(BuildSystem.libraries.swrveGeo)
-    implementation(BuildSystem.libraries.teavaroSDK)
     implementation(BuildSystem.libraries.googleServices)
 
+    //FunnelConnect and UTIQ
+    implementation("com.github.Teavaro.FunnelConnect-Mobile-SDK:funnelConnect:0.1.41")
+    {
+        exclude("com.github.Teavaro.FunnelConnect-Mobile-SDK", "core-android")
+    }
+    implementation("com.github.Utiq-tech.UTIQ-Mobile-SDK:utiq:0.1.55")
     //
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
-    implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
-    implementation ("com.google.code.gson:gson:2.8.2")
-
-    testImplementation("junit:junit:4.13.2")
+    val lifecycleVersion = "2.8.3"
+    val navigationVersion = "2.7.7"
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
+    implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion")
+    implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion")
+    implementation ("com.google.code.gson:gson:2.10.1")
 
-    val room_version = "2.3.0" // check latest version from docs
+    // Hyperion debugger
+    //debugImplementation(BuildSystem.libraries.hyperionCore)
+    //debugImplementation(BuildSystem.libraries.hyperionSharedPreferences)
+    //releaseImplementation(BuildSystem.libraries.hyperionNoop)
 
-    implementation("androidx.room:room-runtime:$room_version")
-    annotationProcessor("androidx.room:room-compiler:$room_version")
-}
+    testImplementation("junit:junit:4.13.2")
+    //Room
+    val roomVersion = "2.6.1"
+    implementation("androidx.room:room-runtime:$roomVersion")
+    annotationProcessor("androidx.room:room-compiler:$roomVersion")
+    kapt("androidx.room:room-compiler:$roomVersion")
+   }

app/src/androidTest/java/com/teavaro/ecommDemoApp/ExampleInstrumentedTest.kt

@@ -1,24 +1,24 @@
 package com.teavaro.ecommDemoApp
 
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.teavaro.teavarodemoapp", appContext.packageName)
-    }
-}
+//import androidx.test.platform.app.InstrumentationRegistry
+//import androidx.test.ext.junit.runners.AndroidJUnit4
+//
+//import org.junit.Test
+//import org.junit.runner.RunWith
+//
+//import org.junit.Assert.*
+//
+///**
+// * Instrumented test, which will execute on an Android device.
+// *
+// * See [testing documentation](http://d.android.com/tools/testing).
+// */
+//@RunWith(AndroidJUnit4::class)
+//class ExampleInstrumentedTest {
+//    @Test
+//    fun useAppContext() {
+//        // Context of the app under test.
+//        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+//        assertEquals("com.teavaro.teavarodemoapp", appContext.packageName)
+//    }
+//}

app/src/main/AndroidManifest.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.teavaro.ecommDemoApp"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.teavaro.ecommDemoApp">
+
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <uses-sdk
-        tools:overrideLibrary="com.swrve.sdk, com.swrve.sdk.conversations, com.swrve.sdk.push, com.swrve.swrvesdkcommon,com.swrve.sdk.geo"/>
+    <uses-sdk tools:overrideLibrary="com.swrve.sdk, com.swrve.sdk.conversations, com.swrve.sdk.push, com.swrve.swrvesdkcommon,com.swrve.sdk.geo" />
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_icon"
-        android:label="@string/app_name"
         android:name=".ui.FCApplication"
-        android:supportsRtl="true"
+        android:allowBackup="false"
+        android:icon="@mipmap/app_icon"
+        android:label="@string/app_name"
+        android:supportsRtl="false"
         android:theme="@style/Theme.TeavaroDemoApp">
-        <service android:name="com.swrve.sdk.SwrveFirebaseMessagingService"
+        <service
+            android:name="com.swrve.sdk.SwrveFirebaseMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
@@ -30,7 +31,16 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="www.teavarodemoapp.com"
+                    android:scheme="http" />
+            </intent-filter>
         </activity>
     </application>
-
 </manifest>

app/src/main/java/com/teavaro/ecommDemoApp/MyBroadcastReceiver.java

@@ -0,0 +1,15 @@
+package com.teavaro.ecommDemoApp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class MyBroadcastReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        // Handle the broadcast event
+        Log.d("MyBroadcastReceiver", "Broadcast received");
+    }
+}