Skip to content

Commit f3b458c

Browse files
Isira-SeneviratneStypox
authored andcommitted
Bump compileSdk to 34
1 parent 00566ed commit f3b458c

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
}
1313

1414
android {
15-
compileSdk 33
15+
compileSdk 34
1616
namespace 'org.schabi.newpipe'
1717

1818
defaultConfig {

app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,12 @@ class MainPlayerGestureListener(
160160
}
161161

162162
override fun onScroll(
163-
initialEvent: MotionEvent,
163+
initialEvent: MotionEvent?,
164164
movingEvent: MotionEvent,
165165
distanceX: Float,
166166
distanceY: Float
167167
): Boolean {
168-
169-
if (!playerUi.isFullscreen) {
168+
if (initialEvent == null || !playerUi.isFullscreen) {
170169
return false
171170
}
172171

app/src/main/java/org/schabi/newpipe/player/gesture/PopupPlayerGestureListener.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class PopupPlayerGestureListener(
167167
}
168168

169169
override fun onFling(
170-
e1: MotionEvent,
170+
e1: MotionEvent?,
171171
e2: MotionEvent,
172172
velocityX: Float,
173173
velocityY: Float
@@ -218,11 +218,14 @@ class PopupPlayerGestureListener(
218218
}
219219

220220
override fun onScroll(
221-
initialEvent: MotionEvent,
221+
initialEvent: MotionEvent?,
222222
movingEvent: MotionEvent,
223223
distanceX: Float,
224224
distanceY: Float
225225
): Boolean {
226+
if (initialEvent == null) {
227+
return false
228+
}
226229

227230
if (isResizing) {
228231
return super.onScroll(initialEvent, movingEvent, distanceX, distanceY)

app/src/main/java/org/schabi/newpipe/player/notification/NotificationUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private void setLargeIcon(final NotificationCompat.Builder builder) {
364364
final Bitmap thumbnail = player.getThumbnail();
365365
if (thumbnail == null || !showThumbnail) {
366366
// since the builder is reused, make sure the thumbnail is unset if there is not one
367-
builder.setLargeIcon(null);
367+
builder.setLargeIcon((Bitmap) null);
368368
return;
369369
}
370370

app/src/main/java/org/schabi/newpipe/views/player/CircleClipTapView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ class CircleClipTapView(context: Context?, attrs: AttributeSet) : View(context,
8080
updatePathShape()
8181
}
8282

83-
override fun onDraw(canvas: Canvas?) {
83+
override fun onDraw(canvas: Canvas) {
8484
super.onDraw(canvas)
8585

86-
canvas?.clipPath(shapePath)
87-
canvas?.drawPath(shapePath, backgroundPaint)
86+
canvas.clipPath(shapePath)
87+
canvas.drawPath(shapePath, backgroundPaint)
8888
}
8989
}

0 commit comments

Comments
 (0)