diff --git a/app/src/main/java/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/java/info/appdev/chartexample/AnotherBarActivity.kt
index 52a88c8c6..ade04c3ae 100644
--- a/app/src/main/java/info/appdev/chartexample/AnotherBarActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/AnotherBarActivity.kt
@@ -6,7 +6,6 @@ import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -31,24 +30,20 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_barchart)
 
         title = "AnotherBarActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
 
         chart!!.description.isEnabled = false
 
diff --git a/app/src/main/java/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/java/info/appdev/chartexample/BarChartActivity.kt
index 68dfaa2ca..3a58c02f9 100644
--- a/app/src/main/java/info/appdev/chartexample/BarChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/BarChartActivity.kt
@@ -8,11 +8,11 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.components.Legend
@@ -45,24 +45,20 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_barchart)
 
         title = "BarChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarY!!.setOnSeekBarChangeListener(this)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
         chart!!.setRoundedBarRadius(50f)
 
@@ -141,7 +137,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
             val `val` = (sampleValues[i]!!.toFloat() * (range + 1))
 
             if (`val` * 100 < 25) {
-                values.add(BarEntry(i.toFloat(), `val`, getResources().getDrawable(R.drawable.star)))
+                values.add(BarEntry(i.toFloat(), `val`, ResourcesCompat.getDrawable(resources, R.drawable.star, null)))
             } else {
                 values.add(BarEntry(i.toFloat(), `val`))
             }
@@ -173,7 +169,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
             val endColor4 = ContextCompat.getColor(this, android.R.color.holo_red_dark)
             val endColor5 = ContextCompat.getColor(this, android.R.color.holo_orange_dark)
 
-            val gradientFills: MutableList<Fill?> = ArrayList<Fill?>()
+            val gradientFills: MutableList<Fill?> = ArrayList()
             gradientFills.add(Fill(startColor1, endColor1))
             gradientFills.add(Fill(startColor2, endColor2))
             gradientFills.add(Fill(startColor3, endColor3))
diff --git a/app/src/main/java/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/java/info/appdev/chartexample/BarChartActivityMultiDataset.kt
index dadef0a6c..243b413f4 100644
--- a/app/src/main/java/info/appdev/chartexample/BarChartActivityMultiDataset.kt
+++ b/app/src/main/java/info/appdev/chartexample/BarChartActivityMultiDataset.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -39,26 +38,22 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_barchart)
 
         title = "BarChartActivityMultiDataset"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
+        tvX = findViewById(R.id.tvXMax)
         tvX!!.textSize = 10f
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.max = 50
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
         chart!!.description.isEnabled = false
 
diff --git a/app/src/main/java/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/java/info/appdev/chartexample/BarChartActivitySinus.kt
index 7c99deccb..cc98dca98 100644
--- a/app/src/main/java/info/appdev/chartexample/BarChartActivitySinus.kt
+++ b/app/src/main/java/info/appdev/chartexample/BarChartActivitySinus.kt
@@ -7,7 +7,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -31,21 +30,17 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_barchart_sinus)
 
         title = "BarChartActivitySinus"
 
         data = FileUtils.loadBarEntriesFromAssets(assets, "othersine.txt")
 
-        tvX = findViewById<TextView>(R.id.tvValueCount)
+        tvX = findViewById(R.id.tvValueCount)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekbarValues)
+        seekBarX = findViewById(R.id.seekbarValues)
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
 
         chart!!.setDrawBarShadow(false)
         chart!!.setDrawValueAboveBar(true)
@@ -105,7 +100,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
         val entries = ArrayList<BarEntry?>()
 
         for (i in 0..<count) {
-            entries.add(data!!.get(i))
+            entries.add(data!![i])
         }
 
         val set: BarDataSet
diff --git a/app/src/main/java/info/appdev/chartexample/BarChartPositiveNegative.kt b/app/src/main/java/info/appdev/chartexample/BarChartPositiveNegative.kt
index 6a9c0ece7..c83bfd325 100644
--- a/app/src/main/java/info/appdev/chartexample/BarChartPositiveNegative.kt
+++ b/app/src/main/java/info/appdev/chartexample/BarChartPositiveNegative.kt
@@ -5,7 +5,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.components.AxisBase
@@ -27,15 +26,11 @@ class BarChartPositiveNegative : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_barchart_noseekbar)
 
         title = "BarChartPositiveNegative"
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setBackgroundColor(Color.WHITE)
         chart!!.extraTopOffset = -30f
         chart!!.extraBottomOffset = 10f
@@ -76,7 +71,7 @@ class BarChartPositiveNegative : DemoBase() {
         chart!!.legend.isEnabled = false
 
         // THIS IS THE ORIGINAL DATA YOU WANT TO PLOT
-        val data: MutableList<Data> = ArrayList<Data>()
+        val data: MutableList<Data> = ArrayList()
         data.add(Data(0f, -224.1f, "12-29"))
         data.add(Data(1f, 238.5f, "12-30"))
         data.add(Data(2f, 1280.1f, "12-31"))
@@ -85,7 +80,7 @@ class BarChartPositiveNegative : DemoBase() {
 
         xAxis.valueFormatter = object : IAxisValueFormatter {
             override fun getFormattedValue(value: Float, axis: AxisBase?): String? {
-                return data.get(min(max(value.toInt(), 0), data.size - 1)).xAxisValue
+                return data[min(max(value.toInt(), 0), data.size - 1)].xAxisValue
             }
         }
 
@@ -100,7 +95,7 @@ class BarChartPositiveNegative : DemoBase() {
         val red = Color.rgb(211, 74, 88)
 
         for (i in dataList.indices) {
-            val d = dataList.get(i)
+            val d = dataList[i]
             val entry = BarEntry(d.xValue, d.yValue)
             values.add(entry)
 
@@ -140,11 +135,7 @@ class BarChartPositiveNegative : DemoBase() {
     private class Data(val xValue: Float, val yValue: Float, val xAxisValue: String?)
 
     private class ValueFormatter : IValueFormatter {
-        private val mFormat: DecimalFormat
-
-        init {
-            mFormat = DecimalFormat("######.0")
-        }
+        private val mFormat: DecimalFormat = DecimalFormat("######.0")
 
         override fun getFormattedValue(value: Float, entry: Entry?, dataSetIndex: Int, viewPortHandler: ViewPortHandler?): String {
             return mFormat.format(value.toDouble())
diff --git a/app/src/main/java/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/java/info/appdev/chartexample/BubbleChartActivity.kt
index 04e59177f..1c4435c0b 100644
--- a/app/src/main/java/info/appdev/chartexample/BubbleChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/BubbleChartActivity.kt
@@ -8,11 +8,11 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.BubbleChart
 import com.github.mikephil.charting.components.Legend
@@ -38,24 +38,20 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_bubblechart)
 
         title = "BubbleChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<BubbleChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.description.isEnabled = false
 
         chart!!.setOnChartValueSelectedListener(this)
@@ -112,7 +108,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
                     i.toFloat(),
                     (sampleValues[i + 1]!! * range).toFloat(),
                     (sampleValues[i]!!.toFloat() * range),
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
             values2.add(
@@ -120,7 +116,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
                     i.toFloat(),
                     (sampleValues[i + 2]!! * range).toFloat(),
                     (sampleValues[i + 1]!!.toFloat() * range),
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
             values3.add(BubbleEntry(i.toFloat(), (sampleValues[i]!! * range).toFloat(), (sampleValues[i + 2]!!.toFloat() * range)))
diff --git a/app/src/main/java/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/java/info/appdev/chartexample/CandleStickChartActivity.kt
index a0220e515..2d5f38853 100644
--- a/app/src/main/java/info/appdev/chartexample/CandleStickChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/CandleStickChartActivity.kt
@@ -8,11 +8,11 @@ import android.graphics.Paint
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import com.github.mikephil.charting.charts.CandleStickChart
 import com.github.mikephil.charting.components.XAxis.XAxisPosition
 import com.github.mikephil.charting.components.YAxis.AxisDependency
@@ -32,24 +32,20 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_candlechart)
 
         title = "CandleStickChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<CandleStickChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setBackgroundColor(Color.WHITE)
 
         chart!!.description.isEnabled = false
@@ -86,8 +82,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
     }
 
     override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-        var progress: Int
-        progress = (seekBarX!!.progress)
+        val progress: Int = (seekBarX!!.progress)
 
         tvX!!.text = progress.toString()
         tvY!!.text = seekBarY!!.progress.toString()
@@ -115,7 +110,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
                     `val` - low,
                     if (even) `val` + open else `val` - open,
                     if (even) `val` - close else `val` + close,
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
         }
diff --git a/app/src/main/java/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/java/info/appdev/chartexample/CombinedChartActivity.kt
index 248799a1c..42b2ab261 100644
--- a/app/src/main/java/info/appdev/chartexample/CombinedChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/CombinedChartActivity.kt
@@ -5,7 +5,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import com.github.mikephil.charting.charts.CombinedChart
 import com.github.mikephil.charting.charts.CombinedChart.DrawOrder
 import com.github.mikephil.charting.components.AxisBase
@@ -32,6 +31,7 @@ import com.github.mikephil.charting.utils.ColorTemplate
 import info.appdev.chartexample.DataTools.Companion.getValues
 import info.appdev.chartexample.notimportant.DemoBase
 import androidx.core.net.toUri
+import kotlin.math.roundToInt
 
 class CombinedChartActivity : DemoBase() {
     private var chart: CombinedChart? = null
@@ -40,15 +40,11 @@ class CombinedChartActivity : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_combined)
 
         title = "CombinedChartActivity"
 
-        chart = findViewById<CombinedChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.description.isEnabled = false
         chart!!.setBackgroundColor(Color.WHITE)
         chart!!.setDrawGridBackground(false)
@@ -57,7 +53,7 @@ class CombinedChartActivity : DemoBase() {
 
         // draw bars behind lines
         chart!!.setDrawOrder(
-            arrayOf<DrawOrder>(
+            arrayOf(
                 DrawOrder.BAR, DrawOrder.BUBBLE, DrawOrder.CANDLE, DrawOrder.LINE, DrawOrder.SCATTER
             )
         )
@@ -83,7 +79,7 @@ class CombinedChartActivity : DemoBase() {
         xAxis.setGranularity(1f)
         xAxis.valueFormatter = object : IAxisValueFormatter {
             override fun getFormattedValue(value: Float, axis: AxisBase?): String {
-                return months.get(value.toInt() % months.size)
+                return months[value.toInt() % months.size]
             }
         }
 
@@ -144,7 +140,7 @@ class CombinedChartActivity : DemoBase() {
         set1.axisDependency = YAxis.AxisDependency.LEFT
 
         val set2 = BarDataSet(entries2, "")
-        set2.stackLabels = arrayOf<String>("Stack 1", "Stack 2")
+        set2.stackLabels = arrayOf("Stack 1", "Stack 2")
         set2.setColors(Color.rgb(61, 165, 255), Color.rgb(23, 197, 255))
         set2.setValueTextColor(Color.rgb(61, 165, 255))
         set2.valueTextSize = 10f
@@ -171,7 +167,7 @@ class CombinedChartActivity : DemoBase() {
 
         var index = 0f
         while (index < sampleCount) {
-            entries.add(Entry(index + 0.25f, values[Math.round(index * 2)]!!.toFloat() * 10 + 55))
+            entries.add(Entry(index + 0.25f, values[(index * 2).roundToInt()]!!.toFloat() * 10 + 55))
             index += 0.5f
         }
 
diff --git a/app/src/main/java/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/CubicLineChartActivity.kt
index 8771f6de1..3162aea8c 100644
--- a/app/src/main/java/info/appdev/chartexample/CubicLineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/CubicLineChartActivity.kt
@@ -5,11 +5,9 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -24,6 +22,7 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
 import info.appdev.chartexample.DataTools.Companion.getMuchValues
 import info.appdev.chartexample.databinding.ActivityLinechartBinding
 import info.appdev.chartexample.notimportant.DemoBase
+import androidx.core.net.toUri
 
 class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
     private var tvX: TextView? = null
@@ -33,10 +32,6 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         binding = ActivityLinechartBinding.inflate(layoutInflater)
         val view = binding.root
         setContentView(view)
@@ -50,7 +45,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
         binding.chart1.setBackgroundColor(Color.rgb(104, 241, 175))
 
         // no description text
-        binding.chart1.getDescription().isEnabled = false
+        binding.chart1.description.isEnabled = false
 
         // enable touch gestures
         binding.chart1.setTouchEnabled(true)
@@ -63,12 +58,12 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
         binding.chart1.setPinchZoom(false)
 
         binding.chart1.setDrawGridBackground(false)
-        binding.chart1.setMaxHighlightDistance(300f)
+        binding.chart1.maxHighlightDistance = 300f
 
-        val x = binding.chart1.getXAxis()
+        val x = binding.chart1.xAxis
         x.isEnabled = false
 
-        val y = binding.chart1.getAxisLeft()
+        val y = binding.chart1.axisLeft
         y.typeface = tfLight
         y.setLabelCount(6, false)
         y.textColor = Color.WHITE
@@ -76,19 +71,19 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
         y.setDrawGridLines(false)
         y.axisLineColor = Color.WHITE
 
-        binding.chart1.getAxisRight().isEnabled = false
+        binding.chart1.axisRight.isEnabled = false
 
         // add data
         binding.seekBarY.setOnSeekBarChangeListener(this)
         binding.seekBarX.setOnSeekBarChangeListener(this)
 
         // lower max, as cubic runs significantly slower than linear
-        binding.seekBarX.setMax(700)
+        binding.seekBarX.max = 700
 
-        binding.seekBarX.setProgress(45)
-        binding.seekBarY.setProgress(100)
+        binding.seekBarX.progress = 45
+        binding.seekBarY.progress = 100
 
-        binding.chart1.getLegend().isEnabled = false
+        binding.chart1.legend.isEnabled = false
 
         binding.chart1.animateXY(2000, 2000)
 
@@ -156,7 +151,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
         when (item.itemId) {
             R.id.viewGithub -> {
                 val i = Intent(Intent.ACTION_VIEW)
-                i.setData(Uri.parse("https://github.com/AppDevNext/AndroidChart/blob/master/app/src/main/java/info/appdev/chartexample/CubicLineChartActivity.kt"))
+                i.data = "https://github.com/AppDevNext/AndroidChart/blob/master/app/src/main/java/info/appdev/chartexample/CubicLineChartActivity.kt".toUri()
                 startActivity(i)
             }
 
@@ -174,7 +169,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleFilled -> {
-                val sets = binding.chart1.data!!.getDataSets()
+                val sets = binding.chart1.data!!.dataSets
 
                 for (iSet in sets) {
                     val set = iSet as LineDataSet
@@ -186,7 +181,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleCircles -> {
-                val sets = binding.chart1.data!!.getDataSets()
+                val sets = binding.chart1.data!!.dataSets
 
                 for (iSet in sets) {
                     val set = iSet as LineDataSet
@@ -197,7 +192,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleCubic -> {
-                val sets = binding.chart1.data!!.getDataSets()
+                val sets = binding.chart1.data!!.dataSets
 
                 for (iSet in sets) {
                     val set = iSet as LineDataSet
@@ -210,7 +205,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleStepped -> {
-                val sets = binding.chart1.data!!.getDataSets()
+                val sets = binding.chart1.data!!.dataSets
 
                 for (iSet in sets) {
                     val set = iSet as LineDataSet
@@ -223,7 +218,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleHorizontalCubic -> {
-                val sets = binding.chart1.data!!.getDataSets()
+                val sets = binding.chart1.data!!.dataSets
 
                 for (iSet in sets) {
                     val set = iSet as LineDataSet
diff --git a/app/src/main/java/info/appdev/chartexample/DrawChartActivity.kt b/app/src/main/java/info/appdev/chartexample/DrawChartActivity.kt
index 272514c2c..c3bb6d55b 100644
--- a/app/src/main/java/info/appdev/chartexample/DrawChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/DrawChartActivity.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import androidx.core.content.ContextCompat
 import com.github.mikephil.charting.charts.Chart
 import com.github.mikephil.charting.data.DataSet
@@ -29,10 +28,6 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         binding = ActivityDrawChartBinding.inflate(layoutInflater)
         val view = binding.root
         setContentView(view)
diff --git a/app/src/main/java/info/appdev/chartexample/DynamicalAddingActivity.kt b/app/src/main/java/info/appdev/chartexample/DynamicalAddingActivity.kt
index 6b1cb3963..9708d03a9 100644
--- a/app/src/main/java/info/appdev/chartexample/DynamicalAddingActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/DynamicalAddingActivity.kt
@@ -7,7 +7,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.github.mikephil.charting.charts.LineChart
@@ -28,15 +27,11 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart_noseekbar)
 
         title = "DynamicalAddingActivity"
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
         chart!!.setDrawGridBackground(false)
         chart!!.description.isEnabled = false
@@ -121,7 +116,7 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
                 values.add(Entry(i.toFloat(), (sampleValues[cycleValue]!!.toFloat() * 50f) + 50f * count))
             }
 
-            val set = LineDataSet(values, "DataSet " + count)
+            val set = LineDataSet(values, "DataSet $count")
             set.setLineWidth(2.5f)
             set.circleRadius = 4.5f
 
diff --git a/app/src/main/java/info/appdev/chartexample/FilledLineActivity.kt b/app/src/main/java/info/appdev/chartexample/FilledLineActivity.kt
index 55ea461aa..98fd0a4eb 100644
--- a/app/src/main/java/info/appdev/chartexample/FilledLineActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/FilledLineActivity.kt
@@ -5,7 +5,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.components.YAxis
 import com.github.mikephil.charting.data.Entry
@@ -31,15 +30,11 @@ class FilledLineActivity : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart_noseekbar)
 
         title = "FilledLineActivity"
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setBackgroundColor(Color.WHITE)
         chart!!.setGridBackgroundColor(fillColor)
         chart!!.setDrawGridBackground(true)
diff --git a/app/src/main/java/info/appdev/chartexample/HalfPieChartActivity.kt b/app/src/main/java/info/appdev/chartexample/HalfPieChartActivity.kt
index d2d5f984f..83f05c253 100644
--- a/app/src/main/java/info/appdev/chartexample/HalfPieChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/HalfPieChartActivity.kt
@@ -11,7 +11,6 @@ import android.text.style.StyleSpan
 import android.util.DisplayMetrics
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.RelativeLayout
 import com.github.mikephil.charting.animation.Easing
 import com.github.mikephil.charting.charts.PieChart
@@ -30,10 +29,6 @@ class HalfPieChartActivity : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_piechart_half)
 
         title = "HalfPieChartActivity"
diff --git a/app/src/main/java/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/java/info/appdev/chartexample/HorizontalBarChartActivity.kt
index 956d0cb94..383e8548a 100644
--- a/app/src/main/java/info/appdev/chartexample/HorizontalBarChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/HorizontalBarChartActivity.kt
@@ -8,11 +8,11 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import com.github.mikephil.charting.charts.HorizontalBarChart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.XAxis.XAxisPosition
@@ -37,24 +37,20 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_horizontalbarchart)
 
         title = "HorizontalBarChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarY!!.setOnSeekBarChangeListener(this)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<HorizontalBarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
 
         // chart.setHighlightEnabled(false);
@@ -123,7 +119,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
             values.add(
                 BarEntry(
                     i * spaceForBar, `val`,
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
         }
diff --git a/app/src/main/java/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt b/app/src/main/java/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt
index 3ba29a88d..4ee1f04fd 100644
--- a/app/src/main/java/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt
@@ -8,11 +8,12 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.HorizontalBarChart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.XAxis.XAxisPosition
@@ -26,7 +27,6 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.utils.MPPointF
 import info.appdev.chartexample.DataTools.Companion.getValues
 import info.appdev.chartexample.notimportant.DemoBase
-import androidx.core.net.toUri
 
 class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
     private var chart: HorizontalBarChart? = null
@@ -37,24 +37,20 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener,
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_horizontalbarchart)
 
         title = "HorizontalBarChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarY!!.setOnSeekBarChangeListener(this)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<HorizontalBarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
 
         // chart.setHighlightEnabled(false);
@@ -121,7 +117,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener,
             values.add(
                 BarEntry(
                     i * spaceForBar, `val`,
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
         }
diff --git a/app/src/main/java/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/InvertedLineChartActivity.kt
index 2c4a43f08..3167f8bcf 100644
--- a/app/src/main/java/info/appdev/chartexample/InvertedLineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/InvertedLineChartActivity.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -35,24 +34,20 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart)
 
         title = "InvertedLineChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarY!!.setOnSeekBarChangeListener(this)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
         chart!!.setDrawGridBackground(false)
 
diff --git a/app/src/main/java/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/LineChartActivity.kt
index dd75105df..326d13d90 100644
--- a/app/src/main/java/info/appdev/chartexample/LineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/LineChartActivity.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import androidx.core.content.ContextCompat
@@ -38,7 +37,6 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
         super.onCreate(savedInstanceState)
         binding = ActivityLinechartBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
         title = "LineChartActivity1"
         binding.seekBarX.setOnSeekBarChangeListener(this)
         binding.seekBarY.max = 180
diff --git a/app/src/main/java/info/appdev/chartexample/LineChartActivityColored.kt b/app/src/main/java/info/appdev/chartexample/LineChartActivityColored.kt
index 125028867..c65e8755c 100644
--- a/app/src/main/java/info/appdev/chartexample/LineChartActivityColored.kt
+++ b/app/src/main/java/info/appdev/chartexample/LineChartActivityColored.kt
@@ -6,7 +6,6 @@ import android.graphics.Typeface
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.data.LineData
@@ -20,10 +19,6 @@ class LineChartActivityColored : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_colored_lines)
 
         title = "LineChartActivityColored"
diff --git a/app/src/main/java/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/java/info/appdev/chartexample/LineChartDualAxisActivity.kt
index 41111290c..499239614 100644
--- a/app/src/main/java/info/appdev/chartexample/LineChartDualAxisActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/LineChartDualAxisActivity.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -42,24 +41,20 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart)
 
         title = "LineChart DualAxis"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
 
         // no description text
diff --git a/app/src/main/java/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/java/info/appdev/chartexample/LineChartTimeActivity.kt
index e0c6b8b73..9a679c9ce 100644
--- a/app/src/main/java/info/appdev/chartexample/LineChartTimeActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/LineChartTimeActivity.kt
@@ -7,7 +7,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -29,6 +28,7 @@ import java.util.Date
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 import androidx.core.net.toUri
+import kotlin.math.roundToInt
 
 class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
     private var chart: LineChart? = null
@@ -37,19 +37,15 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart_time)
 
         title = "LineChartTime"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        tvX = findViewById(R.id.tvXMax)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
 
         // no description text
         chart!!.description.isEnabled = false
@@ -120,7 +116,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
         // count = hours
         val to = (now + count).toFloat()
 
-        val valuesData = getValues(Math.round(to))
+        val valuesData = getValues(to.roundToInt())
         // increment by 1 hour
         var x = now.toFloat()
         while (x < to) {
diff --git a/app/src/main/java/info/appdev/chartexample/ListViewBarChartActivity.kt b/app/src/main/java/info/appdev/chartexample/ListViewBarChartActivity.kt
index a358dfebe..ffe5f9ca7 100644
--- a/app/src/main/java/info/appdev/chartexample/ListViewBarChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/ListViewBarChartActivity.kt
@@ -10,7 +10,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.view.WindowManager
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import com.github.mikephil.charting.charts.BarChart
@@ -31,10 +30,6 @@ import androidx.core.net.toUri
 class ListViewBarChartActivity : DemoBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_listview_chart)
 
         title = "ListViewBarChartActivity"
@@ -66,7 +61,7 @@ class ListViewBarChartActivity : DemoBase() {
                 convertView = LayoutInflater.from(context).inflate(
                     R.layout.list_item_barchart, null
                 )
-                holder.chart = convertView.findViewById<BarChart>(R.id.chart)
+                holder.chart = convertView.findViewById(R.id.chart)
 
                 convertView.tag = holder
             } else {
@@ -126,7 +121,7 @@ class ListViewBarChartActivity : DemoBase() {
             entries.add(BarEntry(i.toFloat(), (sampleValues[i]!!.toFloat() * 70) + 30))
         }
 
-        val d = BarDataSet(entries, "New DataSet " + cnt)
+        val d = BarDataSet(entries, "New DataSet $cnt")
         d.setColors(*ColorTemplate.VORDIPLOM_COLORS)
         d.barShadowColor = Color.rgb(203, 203, 203)
 
diff --git a/app/src/main/java/info/appdev/chartexample/ListViewMultiChartActivity.kt b/app/src/main/java/info/appdev/chartexample/ListViewMultiChartActivity.kt
index 270a5877c..296abba45 100644
--- a/app/src/main/java/info/appdev/chartexample/ListViewMultiChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/ListViewMultiChartActivity.kt
@@ -8,7 +8,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.view.WindowManager
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import com.github.mikephil.charting.data.BarData
@@ -37,10 +36,6 @@ import androidx.core.net.toUri
 class ListViewMultiChartActivity : DemoBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_listview_chart)
 
         title = "ListViewMultiChartActivity"
diff --git a/app/src/main/java/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/MultiLineChartActivity.kt
index 51a5be09f..33030c577 100644
--- a/app/src/main/java/info/appdev/chartexample/MultiLineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/MultiLineChartActivity.kt
@@ -8,11 +8,11 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.data.Entry
@@ -26,7 +26,6 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.utils.ColorTemplate
 import info.appdev.chartexample.DataTools.Companion.getValues
 import info.appdev.chartexample.notimportant.DemoBase
-import androidx.core.net.toUri
 
 class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestureListener, OnChartValueSelectedListener {
     private var chart: LineChart? = null
@@ -37,24 +36,20 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart)
 
         title = "MultiLineChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
 
         chart!!.setDrawGridBackground(false)
@@ -123,9 +118,9 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
         }
 
         // make the first DataSet dashed
-        (dataSets.get(0) as LineDataSet).enableDashedLine(10f, 10f, 0f)
-        (dataSets.get(0) as LineDataSet).setColors(*ColorTemplate.VORDIPLOM_COLORS)
-        (dataSets.get(0) as LineDataSet).setCircleColors(*ColorTemplate.VORDIPLOM_COLORS)
+        (dataSets[0] as LineDataSet).enableDashedLine(10f, 10f, 0f)
+        (dataSets[0] as LineDataSet).setColors(*ColorTemplate.VORDIPLOM_COLORS)
+        (dataSets[0] as LineDataSet).setCircleColors(*ColorTemplate.VORDIPLOM_COLORS)
 
         val data = LineData(dataSets)
         chart!!.setData(data)
@@ -276,7 +271,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
     }
 
     override fun onChartGestureEnd(me: MotionEvent?, lastPerformedGesture: ChartGesture?) {
-        Log.i("Gesture", "END, lastGesture: " + lastPerformedGesture)
+        Log.i("Gesture", "END, lastGesture: $lastPerformedGesture")
 
         // un-highlight values after the gesture is finished and no single-tap
         if (lastPerformedGesture != ChartGesture.SINGLE_TAP) chart!!.highlightValues(null) // or highlightTouch(null) for callback to onNothingSelected(...)
@@ -295,28 +290,24 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
     }
 
     override fun onChartFling(me1: MotionEvent?, me2: MotionEvent?, velocityX: Float, velocityY: Float) {
-        Log.i("Fling", "Chart fling. VelocityX: " + velocityX + ", VelocityY: " + velocityY)
+        Log.i("Fling", "Chart fling. VelocityX: $velocityX, VelocityY: $velocityY")
     }
 
     override fun onChartScale(me: MotionEvent?, scaleX: Float, scaleY: Float) {
-        Log.i("Scale / Zoom", "ScaleX: " + scaleX + ", ScaleY: " + scaleY)
+        Log.i("Scale / Zoom", "ScaleX: $scaleX, ScaleY: $scaleY")
     }
 
     override fun onChartTranslate(me: MotionEvent?, dX: Float, dY: Float) {
-        Log.i("Translate / Move", "dX: " + dX + ", dY: " + dY)
+        Log.i("Translate / Move", "dX: $dX, dY: $dY")
     }
 
     override fun onValueSelected(e: Entry, h: Highlight) {
-        Log.i(
-            "VAL SELECTED",
-            ("Value: " + e.y + ", xIndex: " + e.x
-                    + ", DataSet index: " + h.dataSetIndex)
-        )
+        Log.i("VAL SELECTED", "Value: " + e.y + ", xIndex: " + e.x + ", DataSet index: " + h.dataSetIndex)
     }
 
-    override fun onNothingSelected() {}
+    override fun onNothingSelected() = Unit
 
-    override fun onStartTrackingTouch(seekBar: SeekBar?) {}
+    override fun onStartTrackingTouch(seekBar: SeekBar?) = Unit
 
-    override fun onStopTrackingTouch(seekBar: SeekBar?) {}
+    override fun onStopTrackingTouch(seekBar: SeekBar?) = Unit
 }
diff --git a/app/src/main/java/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/java/info/appdev/chartexample/PerformanceLineChart.kt
index 3bfb8a114..428fa72c5 100644
--- a/app/src/main/java/info/appdev/chartexample/PerformanceLineChart.kt
+++ b/app/src/main/java/info/appdev/chartexample/PerformanceLineChart.kt
@@ -5,7 +5,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -24,19 +23,15 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_performance_linechart)
 
         title = "PerformanceLineChart"
 
-        tvCount = findViewById<TextView>(R.id.tvValueCount)
-        seekBarValues = findViewById<SeekBar>(R.id.seekbarValues)
+        tvCount = findViewById(R.id.tvValueCount)
+        seekBarValues = findViewById(R.id.seekbarValues)
         seekBarValues!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setDrawGridBackground(false)
 
         // no description text
diff --git a/app/src/main/java/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/java/info/appdev/chartexample/PieChartActivity.kt
index 43495fcf7..59b38c839 100644
--- a/app/src/main/java/info/appdev/chartexample/PieChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/PieChartActivity.kt
@@ -13,11 +13,11 @@ import android.text.style.StyleSpan
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import com.github.mikephil.charting.animation.Easing
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.components.Legend
@@ -43,24 +43,20 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_piechart)
 
         title = "PieChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarX!!.setOnSeekBarChangeListener(this)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<PieChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setUsePercentValues(true)
         chart!!.description.isEnabled = false
         chart!!.setExtraOffsets(5f, 10f, 5f, 5f)
@@ -124,7 +120,7 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
                 PieEntry(
                     (sampleValues[i]!!.toFloat() * range) + range / 5,
                     parties[i % parties.size],
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
         }
diff --git a/app/src/main/java/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/java/info/appdev/chartexample/PieChartRoundedActivity.kt
index 188b89aeb..ebfc3014a 100644
--- a/app/src/main/java/info/appdev/chartexample/PieChartRoundedActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/PieChartRoundedActivity.kt
@@ -13,11 +13,11 @@ import android.text.style.StyleSpan
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.github.mikephil.charting.animation.Easing
 import com.github.mikephil.charting.charts.PieChart
@@ -44,24 +44,20 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_piechart)
 
         title = "PieChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = this.findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarX!!.setOnSeekBarChangeListener(this)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<PieChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setUsePercentValues(true)
         chart!!.description.isEnabled = false
         chart!!.setExtraOffsets(5f, 10f, 5f, 5f)
@@ -126,7 +122,7 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu
                 PieEntry(
                     (sampleValues[i]!!.toFloat() * range) + range / 5,
                     parties[i % parties.size],
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
         }
diff --git a/app/src/main/java/info/appdev/chartexample/PiePolylineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/PiePolylineChartActivity.kt
index e798b7d31..92f20a7ce 100644
--- a/app/src/main/java/info/appdev/chartexample/PiePolylineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/PiePolylineChartActivity.kt
@@ -13,7 +13,6 @@ import android.text.style.StyleSpan
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -44,24 +43,20 @@ class PiePolylineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVal
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_piechart)
 
         title = "PiePolylineChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarX = findViewById(R.id.seekBarX)
+        seekBarY = findViewById(R.id.seekBarY)
 
         seekBarX!!.setOnSeekBarChangeListener(this)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<PieChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setUsePercentValues(true)
         chart!!.description.isEnabled = false
         chart!!.setExtraOffsets(5f, 10f, 5f, 5f)
diff --git a/app/src/main/java/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/java/info/appdev/chartexample/RadarChartActivity.kt
index c13454d58..34f3f8679 100644
--- a/app/src/main/java/info/appdev/chartexample/RadarChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/RadarChartActivity.kt
@@ -7,7 +7,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.github.mikephil.charting.animation.Easing
@@ -29,10 +28,6 @@ class RadarChartActivity : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_radarchart)
 
         title = "RadarChartActivity"
@@ -139,7 +134,7 @@ class RadarChartActivity : DemoBase() {
         data.setValueTextColor(Color.WHITE)
 
         chart!!.setData(data)
-        val colorList: MutableList<Int?> = ArrayList<Int?>()
+        val colorList: MutableList<Int?> = ArrayList()
         colorList.add(Color.rgb(222, 166, 111))
         colorList.add(Color.rgb(220, 206, 138))
         colorList.add(Color.rgb(243, 255, 192))
diff --git a/app/src/main/java/info/appdev/chartexample/RealtimeLineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/RealtimeLineChartActivity.kt
index f26409969..9abbd2574 100644
--- a/app/src/main/java/info/appdev/chartexample/RealtimeLineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/RealtimeLineChartActivity.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
@@ -30,15 +29,11 @@ class RealtimeLineChartActivity : DemoBase(), OnChartValueSelectedListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_realtime_linechart)
 
         title = "RealtimeLineChartActivity"
 
-        chart = findViewById<LineChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
 
         // enable description text
@@ -144,27 +139,21 @@ class RealtimeLineChartActivity : DemoBase(), OnChartValueSelectedListener {
     private fun feedMultiple() {
         if (thread != null) thread!!.interrupt()
 
-        val runnable: Runnable = object : Runnable {
-            override fun run() {
-                addEntry()
-            }
-        }
+        val runnable = Runnable { addEntry() }
 
-        thread = Thread(object : Runnable {
-            override fun run() {
-                (0..999).forEach {
-                    // Don't generate garbage runnables inside the loop.
+        thread = Thread {
+            repeat((0..999).count()) {
+                // Don't generate garbage runnable inside the loop.
 
-                    runOnUiThread(runnable)
+                runOnUiThread(runnable)
 
-                    try {
-                        Thread.sleep(25)
-                    } catch (e: InterruptedException) {
-                        e.printStackTrace()
-                    }
+                try {
+                    Thread.sleep(25)
+                } catch (e: InterruptedException) {
+                    e.printStackTrace()
                 }
             }
-        })
+        }
 
         thread!!.start()
     }
diff --git a/app/src/main/java/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/java/info/appdev/chartexample/ScatterChartActivity.kt
index 1ebd4500b..e32ae3c17 100644
--- a/app/src/main/java/info/appdev/chartexample/ScatterChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/ScatterChartActivity.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -35,24 +34,20 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_scatterchart)
 
         title = "ScatterChartActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<ScatterChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.description.isEnabled = false
         chart!!.setOnChartValueSelectedListener(this)
 
diff --git a/app/src/main/java/info/appdev/chartexample/ScrollViewActivity.kt b/app/src/main/java/info/appdev/chartexample/ScrollViewActivity.kt
index 002816644..766cf91da 100644
--- a/app/src/main/java/info/appdev/chartexample/ScrollViewActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/ScrollViewActivity.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.components.XAxis.XAxisPosition
@@ -20,15 +19,11 @@ class ScrollViewActivity : DemoBase() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_scrollview)
 
         title = "ScrollViewActivity"
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
 
         chart!!.description.isEnabled = false
 
diff --git a/app/src/main/java/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/java/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
index c75728d0a..abafaff56 100644
--- a/app/src/main/java/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
@@ -10,7 +10,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
@@ -44,10 +43,6 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_linechart)
         tvX = findViewById<View>(R.id.tvXMax) as TextView
         tvY = findViewById<View>(R.id.tvYMax) as TextView
@@ -309,7 +304,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
     }
 
     override fun onChartLongPressed(me: MotionEvent) {
-        Log.i("LongPress", "Chart longpressed.")
+        Log.i("LongPress", "Chart long pressed.")
     }
 
     override fun onChartDoubleTapped(me: MotionEvent) {
diff --git a/app/src/main/java/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/java/info/appdev/chartexample/StackedBarActivity.kt
index 352dfdaaf..f1b048f9a 100644
--- a/app/src/main/java/info/appdev/chartexample/StackedBarActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/StackedBarActivity.kt
@@ -8,11 +8,11 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.components.Legend
@@ -39,21 +39,20 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_barchart)
 
         title = "StackedBarActivity"
 
-        tvX = findViewById<TextView>(R.id.tvXMax)
-        tvY = findViewById<TextView>(R.id.tvYMax)
+        tvX = findViewById(R.id.tvXMax)
+        tvY = findViewById(R.id.tvYMax)
 
-        seekBarX = findViewById<SeekBar>(R.id.seekBarX)
+        seekBarX = findViewById(R.id.seekBarX)
         seekBarX!!.setOnSeekBarChangeListener(this)
 
-        seekBarY = findViewById<SeekBar>(R.id.seekBarY)
+        seekBarY = findViewById(R.id.seekBarY)
         seekBarY!!.setOnSeekBarChangeListener(this)
 
-        chart = findViewById<BarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
 
         chart!!.description.isEnabled = false
@@ -115,7 +114,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
                 BarEntry(
                     i.toFloat(),
                     floatArrayOf(val1, val2, val3),
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, null)
                 )
             )
         }
@@ -133,7 +132,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
             set1 = BarDataSet(values, "Statistics Vienna 2014")
             set1.setDrawIcons(false)
             set1.setColors(*this.colors)
-            set1.stackLabels = arrayOf<String>("Births", "Divorces", "Marriages")
+            set1.stackLabels = arrayOf("Births", "Divorces", "Marriages")
 
             val dataSets = ArrayList<IBarDataSet?>()
             dataSets.add(set1)
diff --git a/app/src/main/java/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/java/info/appdev/chartexample/StackedBarActivityNegative.kt
index 9dab790ef..3d2d9335f 100644
--- a/app/src/main/java/info/appdev/chartexample/StackedBarActivityNegative.kt
+++ b/app/src/main/java/info/appdev/chartexample/StackedBarActivityNegative.kt
@@ -8,8 +8,8 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.WindowManager
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.github.mikephil.charting.charts.HorizontalBarChart
 import com.github.mikephil.charting.components.AxisBase
@@ -34,15 +34,11 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_age_distribution)
 
         title = "StackedBarActivityNegative"
 
-        chart = findViewById<HorizontalBarChart>(R.id.chart1)
+        chart = findViewById(R.id.chart1)
         chart!!.setOnChartValueSelectedListener(this)
         chart!!.setDrawGridBackground(false)
         chart!!.description.isEnabled = false
@@ -97,7 +93,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener {
         values.add(BarEntry(25f, floatArrayOf(-15f, 15f)))
         values.add(BarEntry(35f, floatArrayOf(-17f, 17f)))
         values.add(BarEntry(45f, floatArrayOf(-19f, 20f)))
-        values.add(BarEntry(45f, floatArrayOf(-19f, 20f), getResources().getDrawable(R.drawable.star)))
+        values.add(BarEntry(45f, floatArrayOf(-19f, 20f), ResourcesCompat.getDrawable(resources, R.drawable.star, null)))
         values.add(BarEntry(55f, floatArrayOf(-19f, 19f)))
         values.add(BarEntry(65f, floatArrayOf(-16f, 16f)))
         values.add(BarEntry(75f, floatArrayOf(-13f, 14f)))
@@ -111,9 +107,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener {
         set.valueTextSize = 7f
         set.axisDependency = YAxis.AxisDependency.RIGHT
         set.setColors(Color.rgb(67, 67, 72), Color.rgb(124, 181, 236))
-        set.stackLabels = arrayOf<String>(
-            "Men", "Women"
-        )
+        set.stackLabels = arrayOf("Men", "Women")
 
         val data = BarData(set)
         data.barWidth = 8.5f
@@ -227,20 +221,16 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener {
     }
 
     private class CustomFormatter : IValueFormatter, IAxisValueFormatter {
-        private val mFormat: DecimalFormat
-
-        init {
-            mFormat = DecimalFormat("###")
-        }
+        private val decimalFormat: DecimalFormat = DecimalFormat("###")
 
         // data
         override fun getFormattedValue(value: Float, entry: Entry?, dataSetIndex: Int, viewPortHandler: ViewPortHandler?): String {
-            return mFormat.format(abs(value).toDouble()) + "m"
+            return decimalFormat.format(abs(value).toDouble()) + "m"
         }
 
         // YAxis
         override fun getFormattedValue(value: Float, axis: AxisBase?): String {
-            return mFormat.format(abs(value).toDouble()) + "m"
+            return decimalFormat.format(abs(value).toDouble()) + "m"
         }
     }
 }
diff --git a/app/src/main/java/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt b/app/src/main/java/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt
index 396736ca7..8f99ba48c 100644
--- a/app/src/main/java/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt
+++ b/app/src/main/java/info/appdev/chartexample/fragments/ViewPagerSimpleChartDemo.kt
@@ -6,7 +6,6 @@ import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.view.WindowManager
 import android.widget.FrameLayout
 import android.widget.Toast
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -25,10 +24,6 @@ import info.appdev.chartexample.notimportant.DemoBase
 class ViewPagerSimpleChartDemo : DemoBase() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
         setContentView(R.layout.activity_awesomedesign)
         val pager = findViewById<ViewPager>(R.id.pager)
         pager.offscreenPageLimit = 3
@@ -37,7 +32,7 @@ class ViewPagerSimpleChartDemo : DemoBase() {
         showSnackbar("Swipe left and right for more awesome design examples!")
     }
 
-    private inner class PageAdapter(fm: FragmentManager?) : FragmentPagerAdapter(fm!!) {
+    private class PageAdapter(fm: FragmentManager?) : FragmentPagerAdapter(fm!!) {
         override fun getItem(pos: Int): Fragment {
             var f: Fragment? = null
             when (pos) {
diff --git a/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt b/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
index a8b0796a9..a18253841 100644
--- a/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
+++ b/app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
@@ -7,6 +7,9 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.WindowInsets
+import android.view.WindowInsetsController
+import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
@@ -36,6 +39,21 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // Enable fullscreen mode using modern API
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
+            window.insetsController?.let {
+                it.hide(WindowInsets.Type.statusBars())
+                it.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            }
+        } else {
+            @Suppress("DEPRECATION")
+            window.setFlags(
+                WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN
+            )
+        }
+
         optionMenus.clear()
 
         tfRegular = Typeface.createFromAsset(assets, "OpenSans-Regular.ttf")
@@ -56,7 +74,16 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
 
     private val backPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                overrideActivityTransition(
+                    OVERRIDE_TRANSITION_CLOSE,
+                    R.anim.move_left_in_activity,
+                    R.anim.move_right_out_activity
+                )
+            } else {
+                @Suppress("DEPRECATION")
+                overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
+            }
             isEnabled = false
             onBackPressedDispatcher.onBackPressed()
         }
diff --git a/app/src/main/java/info/appdev/chartexample/notimportant/MainActivity.kt b/app/src/main/java/info/appdev/chartexample/notimportant/MainActivity.kt
index 1a336d9ad..e164ece22 100644
--- a/app/src/main/java/info/appdev/chartexample/notimportant/MainActivity.kt
+++ b/app/src/main/java/info/appdev/chartexample/notimportant/MainActivity.kt
@@ -6,6 +6,8 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.WindowInsets
+import android.view.WindowInsetsController
 import android.view.WindowManager
 import android.widget.AdapterView
 import android.widget.AdapterView.OnItemClickListener
@@ -52,10 +54,21 @@ class MainActivity : AppCompatActivity(), OnItemClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_FULLSCREEN,
-            WindowManager.LayoutParams.FLAG_FULLSCREEN
-        )
+
+        // Enable fullscreen mode using modern API
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
+            window.insetsController?.let {
+                it.hide(WindowInsets.Type.statusBars())
+                it.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            }
+        } else {
+            @Suppress("DEPRECATION")
+            window.setFlags(
+                WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN
+            )
+        }
+
         setContentView(R.layout.activity_main)
 
         // initialize the utilities
@@ -69,7 +82,16 @@ class MainActivity : AppCompatActivity(), OnItemClickListener {
     override fun onItemClick(av: AdapterView<*>?, v: View, pos: Int, arg3: Long) {
         val intent = Intent(this, menuItems[pos].clazz)
         startActivity(intent)
-        overridePendingTransition(R.anim.move_right_in_activity, R.anim.move_left_out_activity)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            overrideActivityTransition(
+                OVERRIDE_TRANSITION_OPEN,
+                R.anim.move_right_in_activity,
+                R.anim.move_left_out_activity
+            )
+        } else {
+            @Suppress("DEPRECATION")
+            overridePendingTransition(R.anim.move_right_in_activity, R.anim.move_left_out_activity)
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {