Skip to content

Commit 1247004

Browse files
hannesa2hannesa2
committed
Deprecation getResources().getDrawable()
1 parent bcf5909 commit 1247004

11 files changed

+33
-11
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.SeekBar
1313
import android.widget.SeekBar.OnSeekBarChangeListener
1414
import android.widget.TextView
1515
import androidx.core.content.ContextCompat
16+
import androidx.core.content.res.ResourcesCompat
1617
import androidx.core.net.toUri
1718
import com.github.mikephil.charting.charts.BarChart
1819
import com.github.mikephil.charting.components.Legend
@@ -141,7 +142,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
141142
val `val` = (sampleValues[i]!!.toFloat() * (range + 1))
142143

143144
if (`val` * 100 < 25) {
144-
values.add(BarEntry(i.toFloat(), `val`, getResources().getDrawable(R.drawable.star)))
145+
values.add(BarEntry(i.toFloat(), `val`, ResourcesCompat.getDrawable(resources, R.drawable.star, null)))
145146
} else {
146147
values.add(BarEntry(i.toFloat(), `val`))
147148
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.SeekBar
1313
import android.widget.SeekBar.OnSeekBarChangeListener
1414
import android.widget.TextView
1515
import androidx.core.content.ContextCompat
16+
import androidx.core.content.res.ResourcesCompat
1617
import androidx.core.net.toUri
1718
import com.github.mikephil.charting.charts.BubbleChart
1819
import com.github.mikephil.charting.components.Legend
@@ -112,15 +113,15 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
112113
i.toFloat(),
113114
(sampleValues[i + 1]!! * range).toFloat(),
114115
(sampleValues[i]!!.toFloat() * range),
115-
getResources().getDrawable(R.drawable.star)
116+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
116117
)
117118
)
118119
values2.add(
119120
BubbleEntry(
120121
i.toFloat(),
121122
(sampleValues[i + 2]!! * range).toFloat(),
122123
(sampleValues[i + 1]!!.toFloat() * range),
123-
getResources().getDrawable(R.drawable.star)
124+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
124125
)
125126
)
126127
values3.add(BubbleEntry(i.toFloat(), (sampleValues[i]!! * range).toFloat(), (sampleValues[i + 2]!!.toFloat() * range)))

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.SeekBar
1313
import android.widget.SeekBar.OnSeekBarChangeListener
1414
import android.widget.TextView
1515
import androidx.core.content.ContextCompat
16+
import androidx.core.content.res.ResourcesCompat
1617
import com.github.mikephil.charting.charts.CandleStickChart
1718
import com.github.mikephil.charting.components.XAxis.XAxisPosition
1819
import com.github.mikephil.charting.components.YAxis.AxisDependency
@@ -114,7 +115,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
114115
`val` - low,
115116
if (even) `val` + open else `val` - open,
116117
if (even) `val` - close else `val` + close,
117-
getResources().getDrawable(R.drawable.star)
118+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
118119
)
119120
)
120121
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.SeekBar
1313
import android.widget.SeekBar.OnSeekBarChangeListener
1414
import android.widget.TextView
1515
import androidx.core.content.ContextCompat
16+
import androidx.core.content.res.ResourcesCompat
1617
import com.github.mikephil.charting.charts.HorizontalBarChart
1718
import com.github.mikephil.charting.components.Legend
1819
import com.github.mikephil.charting.components.XAxis.XAxisPosition
@@ -123,7 +124,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
123124
values.add(
124125
BarEntry(
125126
i * spaceForBar, `val`,
126-
getResources().getDrawable(R.drawable.star)
127+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
127128
)
128129
)
129130
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.SeekBar
1313
import android.widget.SeekBar.OnSeekBarChangeListener
1414
import android.widget.TextView
1515
import androidx.core.content.ContextCompat
16+
import androidx.core.content.res.ResourcesCompat
1617
import androidx.core.net.toUri
1718
import com.github.mikephil.charting.charts.HorizontalBarChart
1819
import com.github.mikephil.charting.components.Legend
@@ -121,7 +122,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener,
121122
values.add(
122123
BarEntry(
123124
i * spaceForBar, `val`,
124-
getResources().getDrawable(R.drawable.star)
125+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
125126
)
126127
)
127128
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ import android.text.style.StyleSpan
1313
import android.util.Log
1414
import android.view.Menu
1515
import android.view.MenuItem
16+
import android.view.WindowInsets
17+
import android.view.WindowInsetsController
1618
import android.view.WindowManager
1719
import android.widget.SeekBar
1820
import android.widget.SeekBar.OnSeekBarChangeListener
1921
import android.widget.TextView
2022
import androidx.core.content.ContextCompat
23+
import androidx.core.content.res.ResourcesCompat
2124
import com.github.mikephil.charting.animation.Easing
2225
import com.github.mikephil.charting.charts.PieChart
2326
import com.github.mikephil.charting.components.Legend
@@ -124,7 +127,7 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
124127
PieEntry(
125128
(sampleValues[i]!!.toFloat() * range) + range / 5,
126129
parties[i % parties.size],
127-
getResources().getDrawable(R.drawable.star)
130+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
128131
)
129132
)
130133
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import android.widget.SeekBar
1818
import android.widget.SeekBar.OnSeekBarChangeListener
1919
import android.widget.TextView
2020
import androidx.core.content.ContextCompat
21+
import androidx.core.content.res.ResourcesCompat
2122
import androidx.core.net.toUri
2223
import com.github.mikephil.charting.animation.Easing
2324
import com.github.mikephil.charting.charts.PieChart
@@ -126,7 +127,7 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu
126127
PieEntry(
127128
(sampleValues[i]!!.toFloat() * range) + range / 5,
128129
parties[i % parties.size],
129-
getResources().getDrawable(R.drawable.star)
130+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
130131
)
131132
)
132133
}

‎app/src/main/java/info/appdev/chartexample/StackedBarActivity.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.SeekBar
1313
import android.widget.SeekBar.OnSeekBarChangeListener
1414
import android.widget.TextView
1515
import androidx.core.content.ContextCompat
16+
import androidx.core.content.res.ResourcesCompat
1617
import androidx.core.net.toUri
1718
import com.github.mikephil.charting.charts.BarChart
1819
import com.github.mikephil.charting.components.Legend
@@ -115,7 +116,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
115116
BarEntry(
116117
i.toFloat(),
117118
floatArrayOf(val1, val2, val3),
118-
getResources().getDrawable(R.drawable.star)
119+
ResourcesCompat.getDrawable(resources, R.drawable.star, null)
119120
)
120121
)
121122
}

‎app/src/main/java/info/appdev/chartexample/StackedBarActivityNegative.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.view.Menu
1010
import android.view.MenuItem
1111
import android.view.WindowManager
1212
import androidx.core.content.ContextCompat
13+
import androidx.core.content.res.ResourcesCompat
1314
import androidx.core.net.toUri
1415
import com.github.mikephil.charting.charts.HorizontalBarChart
1516
import com.github.mikephil.charting.components.AxisBase
@@ -97,7 +98,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener {
9798
values.add(BarEntry(25f, floatArrayOf(-15f, 15f)))
9899
values.add(BarEntry(35f, floatArrayOf(-17f, 17f)))
99100
values.add(BarEntry(45f, floatArrayOf(-19f, 20f)))
100-
values.add(BarEntry(45f, floatArrayOf(-19f, 20f), getResources().getDrawable(R.drawable.star)))
101+
values.add(BarEntry(45f, floatArrayOf(-19f, 20f), ResourcesCompat.getDrawable(resources, R.drawable.star, null)))
101102
values.add(BarEntry(55f, floatArrayOf(-19f, 19f)))
102103
values.add(BarEntry(65f, floatArrayOf(-16f, 16f)))
103104
values.add(BarEntry(75f, floatArrayOf(-13f, 14f)))

‎app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,16 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
5656

5757
private val backPressedCallback = object : OnBackPressedCallback(true) {
5858
override fun handleOnBackPressed() {
59-
overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
59+
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
60+
overrideActivityTransition(
61+
OVERRIDE_TRANSITION_CLOSE,
62+
R.anim.move_left_in_activity,
63+
R.anim.move_right_out_activity
64+
)
65+
} else {
66+
@Suppress("DEPRECATION")
67+
overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
68+
}
6069
isEnabled = false
6170
onBackPressedDispatcher.onBackPressed()
6271
}

0 commit comments

Comments
 (0)