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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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
fb2d93e
onBackPressed deprecated
hannesa2 Sep 9, 2025
0e02deb
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
4 changes: 2 additions & 2 deletions MPChartLib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ android {
namespace "com.github.mikephil.charting"
defaultConfig {
minSdkVersion 21
compileSdk 35
targetSdkVersion 35
compileSdk 36
targetSdkVersion 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
defaultConfig {
applicationId "info.appdev.chartexample"
minSdkVersion 21
compileSdk 35
targetSdkVersion 35
compileSdk 36
targetSdkVersion 36
versionCode getGitCommitCount()
versionName getTag()
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
17 changes: 12 additions & 5 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,12 +8,15 @@ 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
import com.google.android.material.snackbar.Snackbar
import info.appdev.chartexample.R
import java.text.DateFormatSymbols
import androidx.core.view.size
import androidx.core.view.get

abstract class DemoBase : AppCompatActivity(), ActivityCompat.OnRequestPermissionsResultCallback {

Expand All @@ -37,21 +40,25 @@ 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 {
menu?.let {
for (i in 0 until menu.size()) {
val menuItem: MenuItem = menu.getItem(i)
for (i in 0 until menu.size) {
val menuItem: MenuItem = menu[i]
optionMenus.add(menuItem.title.toString())
}
}
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)
onBackPressedDispatcher.onBackPressed()
}
}

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