Merge pull request #99 from esensar/sdk-34-migration

Upgrade targetSdkVersion to 34
This commit is contained in:
Tibor Kaputa 2023-07-30 23:16:55 +02:00 committed by GitHub
commit 308d9841eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions

View File

@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdkVersion 33 compileSdkVersion 34
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.launcher" applicationId "com.simplemobiletools.launcher"
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 33 targetSdkVersion 34
versionCode 8 versionCode 8
versionName "5.0.6" versionName "5.0.6"
setProperty("archivesBaseName", "launcher") setProperty("archivesBaseName", "launcher")

View File

@ -667,7 +667,7 @@ class MainActivity : SimpleActivity(), FlingListener {
return super.onSingleTapUp(event) return super.onSingleTapUp(event)
} }
override fun onFling(event1: MotionEvent, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { override fun onFling(event1: MotionEvent?, event2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
// ignore fling events just after releasing an icon from dragging // ignore fling events just after releasing an icon from dragging
if (System.currentTimeMillis() - mLastUpEvent < 500L) { if (System.currentTimeMillis() - mLastUpEvent < 500L) {
return true return true

View File

@ -673,11 +673,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
private fun getFakeHeight() = height - sideMargins.top - sideMargins.bottom private fun getFakeHeight() = height - sideMargins.top - sideMargins.bottom
@SuppressLint("DrawAllocation") @SuppressLint("DrawAllocation")
override fun onDraw(canvas: Canvas?) { override fun onDraw(canvas: Canvas) {
if (canvas == null) {
return
}
super.onDraw(canvas) super.onDraw(canvas)
if (cellXCoords.isEmpty()) { if (cellXCoords.isEmpty()) {
fillCellSizes() fillCellSizes()