Skip to content

QA App Improvements: migrate to Kotlin and Jetpack Compose, add local test deeplink #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graciecooper wants to merge 1 commit into from
Closed

QA App Improvements: migrate to Kotlin and Jetpack Compose, add local test deeplink #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions OptimoveSDK/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
30 changes: 25 additions & 5 deletions OptimoveSDK/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
buildToolsVersion '30.0.3'
compileSdkVersion 34
buildToolsVersion '34.0.0'
defaultConfig {
applicationId "com.optimove.android.optimovemobilesdk"
minSdkVersion 21
targetSdkVersion 31
targetSdkVersion 34
versionCode Integer.parseInt("$sdk_version_code")
versionName "$sdk_version"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand All @@ -22,18 +23,37 @@ android {
flavorDimensions "version"

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion "1.4.8"
}
namespace 'com.optimove.android.optimovemobilesdk'
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':optimove-sdk')
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
testImplementation 'junit:junit:4.12'

implementation platform('androidx.compose:compose-bom:2023.10.01')
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-graphics'
implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.material3:material3'
implementation 'androidx.activity:activity-compose:1.8.2'
debugImplementation 'androidx.compose.ui:ui-tooling'

// LeakCanary for debug builds only
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'

Expand Down
14 changes: 12 additions & 2 deletions OptimoveSDK/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.optimove.android.optimovemobilesdk">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

Expand Down Expand Up @@ -32,6 +31,17 @@
<activity
android:name="com.optimove.android.optimovemobilesdk.EmbeddedMessagingActivity"
android:parentActivityName=".MainActivity"/>
<activity
android:name="com.optimove.android.optimovemobilesdk.DeeplinkTargetActivity"
android:parentActivityName=".MainActivity"
android:exported="true">
<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:scheme="optimoveapp" android:host="testdeeplink" />
</intent-filter>
</activity>

<!-- Optimobile FCM handler -->
<service android:name="com.optimove.android.optimobile.FirebaseMessagingService" android:exported="false">
Expand Down
29 changes: 29 additions & 0 deletions ...oveSDK/app/src/main/java/com/optimove/android/optimovemobilesdk/DeeplinkTargetActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.optimove.android.optimovemobilesdk

import android.content.Intent
import android.net.Uri
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import com.optimove.android.optimovemobilesdk.ui.DeeplinkTargetScreen
import com.optimove.android.optimovemobilesdk.ui.theme.AppTheme

class DeeplinkTargetActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val uri: String? = intent?.data?.toString()
setContent {
AppTheme {
DeeplinkTargetScreen(
openedViaUri = uri,
testUriHint = DEEPLINK_TEST_URI
)
}
}
}

companion object {
const val DEEPLINK_TEST_URI = "optimoveapp://testdeeplink"
}
}
177 changes: 0 additions & 177 deletions ...K/app/src/main/java/com/optimove/android/optimovemobilesdk/EmbeddedMessagingActivity.java
View file
Open in desktop

This file was deleted.

Loading
Loading