Skip to content

api 36 #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 2 commits into from
Nov 30, 2025
Merged

api 36 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f548b
onBackPressed deprecated
hannesa2 Sep 9, 2025
8a1e556
api36
hannesa2 Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MPChartLib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {
namespace = "com.github.mikephil.charting"
defaultConfig {
minSdk = 21
compileSdk = 35
compileSdk = 36

// VERSION_NAME no longer available as of 4.1
// https://issuetracker.google.com/issues/158695880
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
defaultConfig {
applicationId = "info.appdev.chartexample"
minSdk = 21
compileSdk = 35
targetSdk = 35
compileSdk = 36
targetSdk = 36
versionCode = getGitCommitCount()
versionName = getVersionText()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/java/info/appdev/chartexample/notimportant/DemoBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import com.github.mikephil.charting.charts.Chart
Expand Down Expand Up @@ -39,6 +40,8 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio

tfRegular = Typeface.createFromAsset(assets, "OpenSans-Regular.ttf")
tfLight = Typeface.createFromAsset(assets, "OpenSans-Light.ttf")

onBackPressedDispatcher.addCallback(this, backPressedCallback)
}

override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
Expand All @@ -51,9 +54,12 @@ abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissio
return super.onPrepareOptionsMenu(menu)
}

override fun onBackPressed() {
super.onBackPressed()
overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
private val backPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
overridePendingTransition(R.anim.move_left_in_activity, R.anim.move_right_out_activity)
isEnabled = false
onBackPressedDispatcher.onBackPressed()
}
}

override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
Expand Down
Loading