SK-X: Update gradle and dependencies

build.gradle.kts

@@ -2,9 +2,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 
 buildscript {
     repositories {
-        mavenCentral()
-        google()
         maven { url = uri("https://repository.quickbirdstudios.com/repository/public") }
+        google()
+        mavenCentral()
     }
 
     dependencies {
@@ -14,8 +14,8 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenCentral()
         google()
+        mavenCentral()
     }
 
     tasks.withType(KotlinJvmCompile::class.java).all {

buildSrc/build.gradle.kts

@@ -1,16 +1,14 @@
-
-
 plugins {
     `kotlin-dsl`
 }
 
 repositories {
-    mavenCentral()
     google()
+    mavenCentral()
 }
 
 dependencies {
     implementation(gradleApi())
     implementation(localGroovy())
-    implementation("com.android.tools.build:gradle:4.0.2")
+    implementation("com.android.tools.build:gradle:8.0.2")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -1,26 +1,26 @@
 object Versions {
 
-    const val kotlin = "1.3.50"
-    const val coroutines = "1.3.0"
+    const val kotlin = "1.8.20"
+    const val coroutines = "1.7.0"
     const val test = "1.1.1"
     const val jUnit = "5.5.2"
     const val jUnitPlatform = "1.5.2"
     const val lottie = "3.0.7"
     const val espresso = "3.1.0"
 
     object AndroidSupport {
-        const val appCompat = "1.0.0"
-        const val constraintLayout = "1.1.3"
+        const val appCompat = "1.3.0"
+        const val constraintLayout = "2.0.4"
         const val annotation = "1.0.0"
-        const val recyclerView = "1.0.0"
+        const val recyclerView = "1.2.1"
     }
 
     object PlayServices {
         const val maps = "17.0.0"
     }
 
     object Google {
-        const val material = "1.2.1"
+        const val material = "1.4.0"
     }
 }
 

buildSrc/src/main/kotlin/Project.kt

@@ -1,8 +1,8 @@
 object Project {
     object Android {
-        const val compileSdkVersion = 28
-        const val targetSdkVersion = 28
-        const val minSdkVersion = 21
+        const val compileSdkVersion = "android-32"
+        const val targetSdkVersion = "32"
+        const val minSdkVersion = "21"
         const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 }

example/build.gradle.kts

@@ -3,27 +3,36 @@ import com.quickbirdstudios.surveykit.ApiKeys.yandexMapsKey
 
 plugins {
     id("com.android.application")
+    id("kotlin-parcelize")
     kotlin("android")
-    id("org.jetbrains.kotlin.android.extensions")
 }
 
-androidExtensions { isExperimental = true }
-
 android {
-    compileSdkVersion(Project.Android.compileSdkVersion)
+    compileSdkVersion = Project.Android.compileSdkVersion
 
     defaultConfig {
         versionName = Library.version
         versionCode = 1
-        minSdkVersion(Project.Android.minSdkVersion)
+        minSdkPreview = Project.Android.minSdkVersion
         targetSdkVersion(Project.Android.targetSdkVersion)
         testInstrumentationRunner = Project.Android.testInstrumentationRunner
         resValue("string", "google_api_key", googleMapsKey())
         resValue("string", "yandex_api_key", yandexMapsKey())
     }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
     packagingOptions {
-        exclude("META-INF/*kotlin*")
+        jniLibs {
+            excludes += setOf("META-INF/*kotlin*")
+        }
+        resources {
+            excludes += setOf("META-INF/*kotlin*")
+        }
     }
+    namespace = "com.quickbirdstudios.example"
 }
 
 dependencies {

example/src/main/AndroidManifest.xml

@@ -1,7 +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"
-    package="com.quickbirdstudios.example">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -27,7 +26,8 @@
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity"
             tools:replace="android:appComponentFactory"
-            tools:targetApi="p">
+            tools:targetApi="p"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

example/src/main/java/com/quickbirdstudios/example/ui/main/MainActivity.kt

@@ -6,12 +6,12 @@ import android.os.Parcelable
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.quickbirdstudios.example.R
+import com.quickbirdstudios.example.databinding.MainActivityBinding
 import com.quickbirdstudios.surveykit.AnswerFormat
 import com.quickbirdstudios.surveykit.FinishReason
 import com.quickbirdstudios.surveykit.Identifier
@@ -36,16 +36,13 @@ import kotlinx.android.parcel.Parcelize
 
 class MainActivity : AppCompatActivity() {
 
-    private lateinit var survey: SurveyView
-    private lateinit var container: ViewGroup
+    private lateinit var binding: MainActivityBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.main_activity)
-
-        survey = findViewById(R.id.survey_view)
-        container = findViewById(R.id.surveyContainer)
-        setupSurvey(survey)
+        binding = MainActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setupSurvey(binding.surveyView)
     }
 
     private fun setupSurvey(surveyView: SurveyView) {
@@ -194,7 +191,7 @@ class MainActivity : AppCompatActivity() {
             if (reason == FinishReason.Completed) {
                 taskResult.results.forEach { stepResult ->
                     Log.e("ASDF", "answer ${stepResult.results.firstOrNull()}")
-                    container.removeAllViews()
+                    binding.surveyContainer.removeAllViews()
                 }
             }
         }
@@ -216,7 +213,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         return if (keyCode == KeyEvent.KEYCODE_BACK) {
-            survey.backPressed()
+            binding.surveyView.backPressed()
             true
         } else false
     }

example/src/main/res/layout/main_activity.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/surveyContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:id="@+id/surveyContainer">
+    android:orientation="vertical">
 
     <com.quickbirdstudios.surveykit.survey.SurveyView
         android:id="@+id/survey_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent">
 
+    </com.quickbirdstudios.surveykit.survey.SurveyView>
 </LinearLayout>

gradle.properties

@@ -4,4 +4,7 @@ org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
 repositoryName=SurveyKit
-projectSummary=Create beautiful surveys on Android
+projectSummary=Create beautiful surveys on Android
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 01 15:38:24 CEST 2019
+#Thu Jun 01 14:36:42 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

settings.gradle

@@ -1,12 +1,14 @@
 buildscript {
     repositories {
-        mavenCentral()
         google()
+        mavenCentral()
         maven { url 'https://repository.quickbirdstudios.com/repository/public' }
     }
 
     dependencies {
         classpath("com.quickbirdstudios:gradle-publishing:0.1.0")
+        classpath("com.android.tools.build:gradle:8.0.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
     }
 }
 

survey/build.gradle.kts

@@ -3,25 +3,28 @@
 plugins {
     id("com.android.library")
     kotlin("android")
-    id("org.jetbrains.kotlin.android.extensions")
     id("gradle-publishing")
+    id("kotlin-parcelize")
 }
 
-androidExtensions { isExperimental = true }
-
 android {
-    compileSdkVersion(Project.Android.compileSdkVersion)
+    compileSdkVersion = Project.Android.compileSdkVersion
 
     defaultConfig {
         version = Library.version
-        minSdkVersion(Project.Android.minSdkVersion)
-        targetSdkVersion(Project.Android.targetSdkVersion)
+        minSdkPreview = Project.Android.minSdkVersion
+        targetSdkPreview = Project.Android.targetSdkVersion
         testInstrumentationRunner = Project.Android.testInstrumentationRunner
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     testOptions {
         animationsDisabled = true
     }
+    namespace = "com.quickbirdstudios.surveykit"
 }
 
 dependencies {

survey/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.quickbirdstudios.surveykit">
-</manifest>
+<manifest />

survey/src/main/java/com.quickbirdstudios.surveykit/backend/presenter/PresenterImpl.kt → survey/src/main/java/com/quickbirdstudios/surveykit/backend/presenter/PresenterImpl.kt

@@ -7,10 +7,10 @@ import com.quickbirdstudios.surveykit.StepIdentifier
 import com.quickbirdstudios.surveykit.SurveyTheme
 import com.quickbirdstudios.surveykit.backend.navigator.TaskNavigator
 import com.quickbirdstudios.surveykit.backend.presenter.animations.ViewAnimator
+import com.quickbirdstudios.surveykit.backend.views.step.QuestionView
 import com.quickbirdstudios.surveykit.backend.views.step.StepView
 import com.quickbirdstudios.surveykit.result.StepResult
 import com.quickbirdstudios.surveykit.steps.Step
-import kotlinx.android.synthetic.main.view_question.view.*
 import java.util.Date
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -101,8 +101,8 @@ internal class PresenterImpl(
 
         val previousQuestionView = currentQuestionView
 
-        if (!hasPreviousStep()) {
-            questionView.questionHeader?.canBack = false
+        if (!hasPreviousStep() && questionView is QuestionView) {
+            questionView.header.canBack = false
         }
 
         currentQuestionView = questionView

survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/main_parts/Content.kt → survey/src/main/java/com/quickbirdstudios/surveykit/backend/views/main_parts/Content.kt

@@ -2,12 +2,14 @@ package com.quickbirdstudios.surveykit.backend.views.main_parts
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.widget.NestedScrollView
 import com.quickbirdstudios.surveykit.R
 import com.quickbirdstudios.surveykit.SurveyTheme
+import com.quickbirdstudios.surveykit.databinding.LayoutContentBinding
 
 class Content @JvmOverloads constructor(
     context: Context,
@@ -16,10 +18,14 @@ class Content @JvmOverloads constructor(
 ) : NestedScrollView(context, attrs, defStyleRes), StyleablePart {
 
     //region Member
+    private val root = LayoutContentBinding.inflate(
+        LayoutInflater.from(context),
+        this,
+        true
+    )
 
-    private val root: View = View.inflate(context, R.layout.layout_content, this)
-    private val container: ViewGroup = root.findViewById(R.id.content_container)
-    private val footerContainer: ViewGroup = root.findViewById(R.id.footer_container)
+    private val container: ViewGroup = root.contentContainer
+    private val footerContainer: ViewGroup = root.footerContainer
     private val footer: Footer = Footer(context).apply { id = R.id.questionFooter }
 
     //endregion

survey/src/main/java/com.quickbirdstudios.surveykit/backend/views/main_parts/Footer.kt → survey/src/main/java/com/quickbirdstudios/surveykit/backend/views/main_parts/Footer.kt

@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.graphics.PorterDuff
 import android.graphics.drawable.GradientDrawable
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.Button
@@ -15,6 +16,7 @@ import com.quickbirdstudios.surveykit.R
 import com.quickbirdstudios.surveykit.SurveyTheme
 import com.quickbirdstudios.surveykit.backend.helpers.extensions.colorStroke
 import com.quickbirdstudios.surveykit.backend.helpers.extensions.px
+import com.quickbirdstudios.surveykit.databinding.LayoutFooterBinding
 
 class Footer @JvmOverloads constructor(
     context: Context,
@@ -60,15 +62,21 @@ class Footer @JvmOverloads constructor(
 
     //region Members
 
-    private val root: View = View.inflate(context, R.layout.layout_footer, this)
-    private val buttonContinue = root.findViewById<Button>(R.id.button_continue).apply {
+    private val root = LayoutFooterBinding.inflate(
+        LayoutInflater.from(context),
+        this,
+        true
+    )
+
+    private val buttonContinue = root.buttonContinue.apply {
         setOnClickListener {
             hideKeyboard()
             onContinue()
         }
         colorMainButtonEnabledState(true, themeColor)
     }
-    private val buttonSkip = root.findViewById<Button>(R.id.button_skip_question).apply {
+
+    private val buttonSkip = root.buttonSkipQuestion.apply {
         setOnClickListener {
             hideKeyboard()
             onSkip()