fix: Android build fixes (#4984)

packages/android/app/build.gradle.kts

@@ -52,6 +52,10 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.constraintlayout)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

packages/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <application
         android:allowBackup="true"
@@ -11,12 +11,11 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Theme.Demo"
-        tools:targetApi="31">
+        tools:targetApi="31" >
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustPan"
-            android:theme="@style/Theme.Demo">
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

packages/android/app/src/main/java/com/formbricks/demo/MainActivity.kt

@@ -1,31 +1,21 @@
 package com.formbricks.demo
 
 import android.os.Bundle
-import androidx.activity.compose.setContent
+import android.widget.Button
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.fragment.app.FragmentActivity
-import com.formbricks.demo.ui.theme.DemoTheme
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.formbricks.formbrickssdk.Formbricks
 import com.formbricks.formbrickssdk.helper.FormbricksConfig
 import java.util.UUID
 
-class MainActivity : FragmentActivity() {
+class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
 
-        val config = FormbricksConfig.Builder("[API_HOST]","[ENVIRONMENT_ID]")
+        val config = FormbricksConfig.Builder("[appUrl]","[environmentId]")
             .setLoggingEnabled(true)
             .setFragmentManager(supportFragmentManager)
         Formbricks.setup(this, config.build())
@@ -33,39 +23,16 @@ class MainActivity : FragmentActivity() {
         Formbricks.logout()
         Formbricks.setUserId(UUID.randomUUID().toString())
 
-        enableEdgeToEdge()
-        setContent {
-            Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                DemoTheme {
-                    FormbricksDemo()
-                }
-            }
+        setContentView(R.layout.activity_main)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
         }
-    }
-}
 
-@Composable
-fun FormbricksDemo() {
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Button(onClick = {
+        val button = findViewById<Button>(R.id.button)
+        button.setOnClickListener {
             Formbricks.track("click_demo_button")
-        }) {
-            Text(
-                text = "Click me!",
-                modifier = Modifier.padding(16.dp)
-            )
         }
     }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    DemoTheme {
-        FormbricksDemo()
-    }
 }

packages/android/app/src/main/java/com/formbricks/demo/ui/theme/Color.kt

@@ -1,11 +0,0 @@
-package com.formbricks.demo.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)

packages/android/app/src/main/java/com/formbricks/demo/ui/theme/Theme.kt

@@ -1,51 +0,0 @@
-package com.formbricks.demo.ui.theme
-
-import android.app.Activity
-import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80, secondary = PurpleGrey80, tertiary = Pink80
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40, secondary = PurpleGrey40, tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
-)
-
-@Composable
-fun DemoTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true, content: @Composable () -> Unit
-) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme, typography = Typography, content = content
-    )
-}

packages/android/app/src/main/java/com/formbricks/demo/ui/theme/Type.kt

@@ -1,33 +0,0 @@
-package com.formbricks.demo.ui.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )/* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)

packages/android/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,21 @@
+<?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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Click me!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="158dp"
+        tools:layout_editor_absoluteY="336dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>

packages/android/formbricksSDK/consumer-rules.pro

@@ -1,2 +1,3 @@
 -keep class com.formbricks.formbrickssdk.DataBinderMapperImpl { *; }
--keep class com.formbricks.formbrickssdk.Formbricks { *; }
+-keep class com.formbricks.formbrickssdk.Formbricks { *; }
+-keep class com.formbricks.formbrickssdk.helper.FormbricksConfig { *; }

packages/android/formbricksSDK/proguard-rules.pro

@@ -19,9 +19,6 @@
 -keep class !androidx.legacy.**,!com.google.android.**,!androidx.** { *; }
 -keep class android.support.v4.app.** { *; }
 
-
-
-
 # Retrofit
 -dontwarn okio.**
 -keep class com.squareup.okhttp.** { *; }
@@ -32,4 +29,8 @@
 -keep class retrofit.** { *; }
 -keepclasseswithmembers class * {
     @retrofit.http.* <methods>;
-}
+}
+
+-keep class com.formbricks.formbrickssdk.DataBinderMapperImpl { *; }
+-keep class com.formbricks.formbrickssdk.Formbricks { *; }
+-keep class com.formbricks.formbrickssdk.helper.FormbricksConfig { *; }

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/model/environment/ActionClass.kt

@@ -1,13 +1,9 @@
 package com.formbricks.formbrickssdk.model.environment
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 
-@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-@JsonIgnoreUnknownKeys
 data class ActionClass(
     @SerializedName("id") val id: String?,
     @SerializedName("type") val type: String?,

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/model/environment/ActionClassReference.kt

@@ -1,13 +1,9 @@
 package com.formbricks.formbrickssdk.model.environment
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 
-@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-@JsonIgnoreUnknownKeys
 data class ActionClassReference(
     @SerializedName("name") val name: String?
 )

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/model/environment/EnvironmentData.kt

@@ -1,13 +1,9 @@
 package com.formbricks.formbrickssdk.model.environment
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 
-@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-@JsonIgnoreUnknownKeys
 data class EnvironmentData(
     @SerializedName("surveys") val surveys: List<Survey>?,
     @SerializedName("actionClasses") val actionClasses: List<ActionClass>?,

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/model/environment/EnvironmentResponseData.kt

@@ -1,13 +1,9 @@
 package com.formbricks.formbrickssdk.model.environment
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 
-@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-@JsonIgnoreUnknownKeys
 data class EnvironmentResponseData(
     @SerializedName("data") val data: EnvironmentData,
     @SerializedName("expiresAt") val expiresAt: String?

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/model/environment/Project.kt

@@ -1,13 +1,9 @@
 package com.formbricks.formbrickssdk.model.environment
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 
-@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-@JsonIgnoreUnknownKeys
 data class Project(
     @SerializedName("id") val id: String?,
     @SerializedName("recontactDays") val recontactDays: Double?,

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/model/environment/Survey.kt

@@ -1,14 +1,9 @@
 package com.formbricks.formbrickssdk.model.environment
 
 import com.google.gson.annotations.SerializedName
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 
-@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-@JsonIgnoreUnknownKeys
 data class Survey(
     @SerializedName("id") val id: String,
     @SerializedName("name") val name: String,

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/network/FormbricksApiService.kt

@@ -28,10 +28,10 @@ open class FormbricksApiService {
             retrofit.create(FormbricksService::class.java)
                 .getEnvironmentState(environmentId)
         }
-
+        val json = Json { ignoreUnknownKeys = true }
         val resultMap = result.getOrThrow()
         val resultJson = mapToJsonElement(resultMap).jsonObject
-        val environmentResponse = Json.decodeFromJsonElement<EnvironmentResponse>(resultJson)
+        val environmentResponse = json.decodeFromJsonElement<EnvironmentResponse>(resultJson)
         val data = EnvironmentDataHolder(environmentResponse.data, resultMap)
         return Result.success(data)
     }
@@ -49,6 +49,7 @@ open class FormbricksApiService {
             val body = call.body()
             if (body == null) {
                 Result.failure(RuntimeException("Invalid response"))
+
             } else {
                 Result.success(body)
             }

packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/FormbricksFragment.kt

@@ -137,6 +137,8 @@ class FormbricksFragment : BottomSheetDialogFragment() {
         behavior.isFitToContents = false
         behavior.setState(BottomSheetBehavior.STATE_EXPANDED)
 
+        dialog?.setCancelable(false)
+
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
     }
 

packages/android/gradle/libs.versions.toml

@@ -26,6 +26,8 @@ lifecycleLivedataKtx = "2.8.7"
 lifecycleViewmodelKtx = "2.8.7"
 fragmentKtx = "1.8.5"
 databindingCommon = "8.8.0"
+activity = "1.10.1"
+constraintlayout = "2.1.4"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -58,6 +60,8 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
 androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
 androidx-databinding-common = { group = "androidx.databinding", name = "databinding-common", version.ref = "databindingCommon" }
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }