Feature/android 16 compatibility

.gitignore

@@ -88,3 +88,5 @@ lint/tmp/
 # App
 app/google-services.json
 app/release/*
+
+.idea/

app/build.gradle

@@ -1,23 +1,28 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 33
+    namespace 'nl.appt'
+    compileSdkVersion 36
 
     defaultConfig {
         applicationId 'nl.appt'
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 36
         versionCode 200
         versionName '2.0.0'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         debug {
             buildConfigField "String", "BASE_URL", '"https://appt.org/"'
@@ -33,11 +38,11 @@ android {
         viewBinding true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
@@ -48,8 +53,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
@@ -60,6 +65,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.webkit:webkit:1.5.0'
     implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.activity:activity-ktx:1.9.0'
 
     // Room
     implementation("androidx.room:room-runtime:$room_version")

app/src/main/java/nl/appt/dialog/BaseDialog.kt

@@ -1,9 +1,24 @@
 package nl.appt.dialog
 
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 open class BaseDialog: BottomSheetDialogFragment() {
 
     // TODO: Improve landscape height with peekHeight
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Apply bottom system bar insets to dialog
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(bottom = insets.bottom)
+            windowInsets
+        }
+    }
 }

app/src/main/java/nl/appt/dialog/ItemsDialog.kt

@@ -5,8 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import kotlinx.android.synthetic.main.layout_list.view.*
 import nl.appt.R
 import nl.appt.extensions.addItemDecoration
 import nl.appt.helpers.itemAdapterDelegate
@@ -39,7 +39,7 @@ open class ItemsDialog(private val items: List<Item>) : BaseDialog() {
     ): View? {
         val view = inflater.inflate(R.layout.layout_list, container, false)
 
-        view.recyclerView.run {
+        view.findViewById<RecyclerView>(R.id.recyclerView).run {
             layoutManager = LinearLayoutManager(context)
             adapter = adapterDelegate
             addItemDecoration()

app/src/main/java/nl/appt/dialog/ListDialog.kt

@@ -4,7 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import kotlinx.android.synthetic.main.layout_list_dialog.view.*
+import android.widget.Button
+import android.widget.TextView
 import nl.appt.R
 
 abstract class ListDialog(val title: Int) : BaseDialog() {
@@ -16,9 +17,9 @@ abstract class ListDialog(val title: Int) : BaseDialog() {
     ): View? {
         val view = inflater.inflate(R.layout.layout_list_dialog, container, false)
 
-        view.titleView.setText(title)
+        view.findViewById<TextView>(R.id.titleView).setText(title)
 
-        view.closeButton.setOnClickListener {
+        view.findViewById<Button>(R.id.closeButton).setOnClickListener {
             dismiss()
         }
 

app/src/main/java/nl/appt/dialog/PageDialog.kt

@@ -4,8 +4,9 @@ import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.LiveData
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import kotlinx.android.synthetic.main.layout_list.view.recyclerView
+import nl.appt.R
 import nl.appt.database.Page
 import nl.appt.extensions.addItemDecoration
 import nl.appt.extensions.isLoading
@@ -35,7 +36,7 @@ abstract class PageDialog<T: Page>(title: Int) : ListDialog(title) {
             // TODO: Add empty state
 
             adapterDelegate.items = items
-            view.recyclerView?.run {
+            view.findViewById<RecyclerView>(R.id.recyclerView)?.run {
                 layoutManager = LinearLayoutManager(context)
                 adapter = adapterDelegate
                 addItemDecoration()

app/src/main/java/nl/appt/dialog/SettingsDialog.kt

@@ -3,8 +3,8 @@ package nl.appt.dialog
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import kotlinx.android.synthetic.main.layout_list.view.*
 import nl.appt.R
 import nl.appt.extensions.addItemDecoration
 import nl.appt.helpers.Preferences
@@ -25,8 +25,7 @@ class SettingsDialog() : ListDialog(R.string.settings) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        view.recyclerView.run {
+        view.findViewById<RecyclerView>(R.id.recyclerView).run {
             layoutManager = LinearLayoutManager(context)
             adapter = adapterDelegate
             addItemDecoration()

app/src/main/java/nl/appt/widgets/BaseActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.ktx.Firebase
@@ -26,6 +27,10 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // Enable edge-to-edge
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         firebaseAnalytics = Firebase.analytics
         events = Events(firebaseAnalytics)
 

app/src/main/java/nl/appt/widgets/ToolbarActivity.kt

@@ -1,8 +1,8 @@
 package nl.appt.widgets
 
 import android.view.MenuItem
+import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
-import kotlinx.android.synthetic.main.view_toolbar.view.*
 import nl.appt.R
 
 /**
@@ -41,15 +41,15 @@ abstract class ToolbarActivity : BaseActivity() {
     override fun setTitle(titleId: Int) {
         super.setTitle("")
 
-        toolbar?.toolbarTitle?.let {
+        toolbar?.findViewById<TextView>(R.id.toolbarTitle)?.let {
             it.text = getString(titleId)
         }
     }
 
     override fun setTitle(title: CharSequence?) {
         super.setTitle("")
 
-        toolbar?.toolbarTitle?.let {
+        toolbar?.findViewById<TextView>(R.id.toolbarTitle)?.let {
             it.text = title
         }
     }