diff --git a/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt
index cc84a3cd6..141429f03 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt
@@ -1,12 +1,11 @@
 package info.appdev.chartexample
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import info.appdev.chartexample.databinding.ActivityGradientBinding
 import info.appdev.chartexample.notimportant.DemoBase
-import info.appdev.charting.charts.LineChart
 import info.appdev.charting.data.Entry
 import info.appdev.charting.data.LineData
 import info.appdev.charting.data.LineDataSet
@@ -17,10 +16,12 @@ import info.appdev.charting.utils.Utils
 
 class GradientActivity : DemoBase() {
 
+    private lateinit var binding: ActivityGradientBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        setContentView(R.layout.activity_gradient)
+        binding = ActivityGradientBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
@@ -30,13 +31,11 @@ class GradientActivity : DemoBase() {
 
         Utils.init(this)
 
-        val chart: LineChart = findViewById(R.id.chart)
-
         // Minimal chart setup
-        chart.description.isEnabled = false
-        chart.legend.isEnabled = false
-        chart.axisRight.isEnabled = false
-        chart.setDrawGridBackground(false)
+        binding.chart.description.isEnabled = false
+        binding.chart.legend.isEnabled = false
+        binding.chart.axisRight.isEnabled = false
+        binding.chart.setDrawGridBackground(false)
 
         // -----------------------------
         // Linear function
@@ -65,13 +64,13 @@ class GradientActivity : DemoBase() {
                 override fun getFillLinePosition(
                     dataSet: ILineDataSet?,
                     dataProvider: LineDataProvider
-                ): Float = chart.axisLeft.axisMinimum
+                ): Float = binding.chart.axisLeft.axisMinimum
             }
         }
 
-        chart.axisLeft.axisMinimum = 0f
-        chart.setData(LineData(dataSet))
-        chart.invalidate()
+        binding.chart.axisLeft.axisMinimum = 0f
+        binding.chart.setData(LineData(dataSet))
+        binding.chart.invalidate()
     }
 
     override fun saveToGallery() = Unit
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt
index 0193ea03a..80810115f 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt
@@ -6,25 +6,29 @@ import android.graphics.Typeface
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.core.net.toUri
+import info.appdev.chartexample.DataTools.Companion.getValues
+import info.appdev.chartexample.databinding.ActivityColoredLinesBinding
+import info.appdev.chartexample.notimportant.DemoBase
 import info.appdev.charting.charts.LineChart
 import info.appdev.charting.data.Entry
 import info.appdev.charting.data.LineData
 import info.appdev.charting.data.LineDataSet
-import info.appdev.chartexample.DataTools.Companion.getValues
-import info.appdev.chartexample.notimportant.DemoBase
-import androidx.core.net.toUri
 
 class LineChartActivityColored : DemoBase() {
-    private val charts = arrayOfNulls<LineChart>(4)
+    private val charts = mutableListOf<LineChart>()
+
+    private lateinit var binding: ActivityColoredLinesBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_colored_lines)
+        binding = ActivityColoredLinesBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-        charts[0] = findViewById<LineChart?>(R.id.chart1)
-        charts[1] = findViewById<LineChart?>(R.id.chart2)
-        charts[2] = findViewById<LineChart?>(R.id.chart3)
-        charts[3] = findViewById<LineChart?>(R.id.chart4)
+        charts.add(binding.chart1)
+        charts.add(binding.chart2)
+        charts.add(binding.chart3)
+        charts.add(binding.chart4)
 
         val mTf = Typeface.createFromAsset(assets, "OpenSans-Bold.ttf")
 
@@ -33,7 +37,7 @@ class LineChartActivityColored : DemoBase() {
             data.setValueTypeface(mTf)
 
             // add some transparency to the color with "& 0x90FFFFFF"
-            setupChart(charts[i]!!, data, colors[i % colors.size])
+            setupChart(charts[i], data, colors[i % colors.size])
         }
     }
 
diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt
index 8f99ba48c..954bdbbf5 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt
@@ -13,21 +13,25 @@ import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import androidx.viewpager.widget.ViewPager
 import com.google.android.material.snackbar.Snackbar
 import info.appdev.chartexample.R
+import info.appdev.chartexample.databinding.ActivityAwesomedesignBinding
 import info.appdev.chartexample.notimportant.DemoBase
 
 /**
  * Demonstrates how to keep your charts straight forward, simple and beautiful with the AndroidChart library.
  */
 class ViewPagerSimpleChartDemo : DemoBase() {
+
+    private lateinit var binding: ActivityAwesomedesignBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_awesomedesign)
-        val pager = findViewById<ViewPager>(R.id.pager)
-        pager.offscreenPageLimit = 3
-        pager.adapter = PageAdapter(supportFragmentManager)
+        binding = ActivityAwesomedesignBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.pager.offscreenPageLimit = 3
+        binding.pager.adapter = PageAdapter(supportFragmentManager)
 
         showSnackbar("Swipe left and right for more awesome design examples!")
     }
diff --git a/screenshotsToCompare9/StartTest_smokeTestStart-42-GradientActivity-Gradient-1SampleClick.png b/screenshotsToCompare9/StartTest_smokeTestStart-42-GradientActivity-Gradient-1SampleClick.png
index b3fdc8bb6..6a15cb1a6 100644
Binary files a/screenshotsToCompare9/StartTest_smokeTestStart-42-GradientActivity-Gradient-1SampleClick.png and b/screenshotsToCompare9/StartTest_smokeTestStart-42-GradientActivity-Gradient-1SampleClick.png differ