Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.13.0" apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
id("com.android.library") version "8.13.0" apply false
id("com.google.gms.google-services") version "4.4.1" apply false
// OWASP dependency check removed - using Dependabot for vulnerability scanning
Expand Down
9 changes: 8 additions & 1 deletion samplejava/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@ android {
}

dependencies {
implementation("io.axept.android:android-sdk:2.0.8")
// Use local SDK sources for development, published SDK for CI
if (project.findProject(":android") != null) {
// Local development with SDK sources
implementation(project(":android"))
} else {
// CI/CD or production builds - use published SDK
implementation("io.axept.android:android-sdk:2.0.9")
}

implementation(platform("com.google.firebase:firebase-bom:32.7.2"))
implementation("com.google.firebase:firebase-analytics")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.axept.android.library.AxeptioEventListener;
import io.axept.android.library.AxeptioSDK;
import io.axept.android.library.AxeptioService;
import io.axept.android.library.WidgetType;

public class MainActivity extends AppCompatActivity {

Expand All @@ -56,7 +57,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
targetService,
BuildConfig.AXEPTIO_CLIENT_ID,
BuildConfig.AXEPTIO_COOKIES_VERSION,
null
null,
WidgetType.PRODUCTION,
null,
190,
false
);
setGoogleConsent();

Expand Down
3 changes: 2 additions & 1 deletion samplekotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose")
id("com.google.gms.google-services")
// OWASP dependency check removed - using Dependabot for vulnerability scanning
// id("org.owasp.dependencycheck")
Expand Down Expand Up @@ -81,7 +82,7 @@ dependencies {
implementation(project(":android"))
} else {
// CI/CD or production builds - use published SDK
implementation("io.axept.android:android-sdk:2.0.8")
implementation("io.axept.android:android-sdk:2.0.9")
}


Expand Down
50 changes: 31 additions & 19 deletions samplekotlin/src/main/java/io/axept/samplekotlin/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package io.axept.samplekotlin

import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.viewModels
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.TextFieldColors
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
import androidx.navigation.compose.rememberNavController
import com.google.android.gms.ads.AdError
import com.google.android.gms.ads.AdRequest
import com.google.android.gms.ads.FullScreenContentCallback
import com.google.android.gms.ads.LoadAdError
import com.google.android.gms.ads.interstitial.InterstitialAd
import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback
import com.google.firebase.Firebase
import com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus
import com.google.firebase.analytics.FirebaseAnalytics.ConsentType
Expand All @@ -20,12 +18,13 @@ import io.axept.android.googleconsent.GoogleConsentStatus
import io.axept.android.googleconsent.GoogleConsentType
import io.axept.android.library.AxeptioEventListener
import io.axept.android.library.AxeptioSDK
import io.axept.android.library.AxeptioService
import io.axept.samplekotlin.config.ConfigurationManager
import io.axept.samplekotlin.navigation.AppNavHost
import io.axept.samplekotlin.screen.MainScreen
import io.axept.samplekotlin.screen.MainViewModel
import io.axept.samplekotlin.ui.theme.SampleKotlinTheme
import io.axept.samplekotlin.config.ConfigurationManager

val LocalAppTextFieldColors = staticCompositionLocalOf<TextFieldColors?> {
null
}

class MainActivity : ComponentActivity() {

Expand All @@ -39,21 +38,34 @@ class MainActivity : ComponentActivity() {

setContent {
SampleKotlinTheme {
val navController = rememberNavController()
AppNavHost(
navController = navController,
targetService = targetService
)
CompositionLocalProvider(
LocalAppTextFieldColors provides OutlinedTextFieldDefaults.colors(
focusedBorderColor = Color.Black,
unfocusedBorderColor = MaterialTheme.colorScheme.outline,
focusedLabelColor = Color.Black,
cursorColor = Color.Black,
)
) {
val navController = rememberNavController()

AppNavHost(
navController = navController,
targetService = targetService
)
}
}
}


AxeptioSDK.instance().initialize(
activity = this,
targetService = targetService,
clientId = currentConfig.clientId,
cookiesVersion = currentConfig.cookiesVersion,
token = currentConfig.token
token = currentConfig.token,
widgetType = currentConfig.widgetType,
prId = currentConfig.prId,
consentExpirationDays = currentConfig.consentExpirationDays.toInt(),
shouldUpdateConsentExpiration = currentConfig.consentExpirationAccepted,
)

// Google consent v2 implementation
Expand Down
Loading