Replace deprecated resource getters

Author: zacharee

MPChartLib/src/main/java/com/github/mikephil/charting/components/MarkerImage.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.withTranslation
 import com.github.mikephil.charting.charts.Chart
 import com.github.mikephil.charting.data.Entry
@@ -20,7 +21,7 @@ import java.lang.ref.WeakReference
  */
 class MarkerImage(private var mContext: Context, drawableResourceId: Int) : IMarker {
     private var mDrawable: Drawable =
-        mContext.resources.getDrawable(drawableResourceId, null)
+        ResourcesCompat.getDrawable(mContext.resources, drawableResourceId, mContext.theme)!!
 
     private var mOffset: MPPointF = MPPointF()
     private val mOffset2 = MPPointF()

MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.DashPathEffect
 import android.util.Log
+import androidx.core.content.res.ResourcesCompat
 import com.github.mikephil.charting.formatter.DefaultFillFormatter
 import com.github.mikephil.charting.formatter.IFillFormatter
 import com.github.mikephil.charting.interfaces.datasets.ILineDataSet
@@ -253,7 +254,7 @@ open class LineDataSet(yVals: MutableList<Entry>, label: String) : LineRadarData
         clrs.clear()
 
         for (color in colors) {
-            clrs.add(c.resources.getColor(color))
+            clrs.add(ResourcesCompat.getColor(c.resources, color, c.theme))
         }
 
         this.circleColors = clrs

MPChartLib/src/main/java/com/github/mikephil/charting/utils/ColorTemplate.kt

@@ -2,6 +2,7 @@ package com.github.mikephil.charting.utils
 
 import android.content.res.Resources
 import android.graphics.Color
+import androidx.core.content.res.ResourcesCompat
 
 /**
  * Class that holds predefined color integer arrays (e.g.
@@ -103,7 +104,7 @@ object ColorTemplate {
         val result: MutableList<Int?> = ArrayList()
 
         for (i in colors) {
-            result.add(r.getColor(i))
+            result.add(ResourcesCompat.getColor(r, i, r.newTheme()))
         }
 
         return result

app/src/main/java/info/appdev/chartexample/BarChartActivity.kt

@@ -13,6 +13,7 @@ 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
@@ -141,7 +142,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, theme)))
             } else {
                 values.add(BarEntry(i.toFloat(), `val`))
             }

app/src/main/java/info/appdev/chartexample/BubbleChartActivity.kt

@@ -13,6 +13,7 @@ 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
@@ -112,14 +113,13 @@ 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, theme)
                 )
             )
             values2.add(
                 BubbleEntry(
-                    i.toFloat(), (sampleValues[i + 2] * range).toFloat(), (sampleValues[i + 1].toFloat() * range), getResources().getDrawable(
-                        R.drawable.star
-                    )
+                    i.toFloat(), (sampleValues[i + 2] * range).toFloat(), (sampleValues[i + 1].toFloat() * range),
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, theme)
                 )
             )
             values3.add(BubbleEntry(i.toFloat(), (sampleValues[i] * range).toFloat(), (sampleValues[i + 2].toFloat() * range)))

app/src/main/java/info/appdev/chartexample/CandleStickChartActivity.kt

@@ -13,6 +13,7 @@ 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.CandleStickChart
 import com.github.mikephil.charting.components.XAxis.XAxisPosition
@@ -114,7 +115,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, theme)
                 )
             )
         }

app/src/main/java/info/appdev/chartexample/HorizontalBarChartActivity.kt

@@ -13,6 +13,7 @@ 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
@@ -123,7 +124,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
             values.add(
                 BarEntry(
                     i * spaceForBar, `val`,
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, theme)
                 )
             )
         }

app/src/main/java/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt

@@ -13,6 +13,7 @@ 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
@@ -121,7 +122,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener,
             values.add(
                 BarEntry(
                     i * spaceForBar, `val`,
-                    getResources().getDrawable(R.drawable.star)
+                    ResourcesCompat.getDrawable(resources, R.drawable.star, theme)
                 )
             )
         }

app/src/main/java/info/appdev/chartexample/PieChartActivity.kt

@@ -18,6 +18,7 @@ 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
@@ -125,7 +126,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, theme)
                 )
             )
         }

app/src/main/java/info/appdev/chartexample/PieChartRoundedActivity.kt

@@ -18,6 +18,7 @@ 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
@@ -127,7 +128,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, theme)
                 )
             )
         }