ReVanced-Mirror
/
revanced-integrations
mirror of https://github.com/revanced/revanced-integrations.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: ktlint reformat

This commit is contained in:
LisoUseInAIKyrios 2024-04-01 02:34:46 +04:00
parent 2e65ad234c
commit acd1c725a2
20 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/revanced/integrations/youtube/shared/PlayerControlsVisibilityObserver.kt
View File

@ -12,7 +12,7 @@ import java.lang.ref.WeakReference
* @param activity activity that contains the controls_layout view * @param activity activity that contains the controls_layout view
*/ */
class PlayerControlsVisibilityObserverImpl( class PlayerControlsVisibilityObserverImpl(
private val activity: Activity, private val activity: Activity
) : PlayerControlsVisibilityObserver { ) : PlayerControlsVisibilityObserver {
/** /**

20
app/src/main/java/app/revanced/integrations/youtube/shared/PlayerOverlays.kt
View File

@ -42,8 +42,8 @@ object PlayerOverlays {
ChildrenChangeEventArgs( ChildrenChangeEventArgs(
parent, parent,
child, child,
false, false
), )
) )
} }
} }
@ -54,8 +54,8 @@ object PlayerOverlays {
ChildrenChangeEventArgs( ChildrenChangeEventArgs(
parent, parent,
child, child,
true, true
), )
) )
} }
} }
@ -69,15 +69,15 @@ object PlayerOverlays {
oldLeft, oldLeft,
oldTop, oldTop,
oldRight - oldLeft, oldRight - oldLeft,
oldBottom - oldTop, oldBottom - oldTop
), ),
Rectangle( Rectangle(
newLeft, newLeft,
newTop, newTop,
newRight - newLeft, newRight - newLeft,
newBottom - newTop, newBottom - newTop
), )
), )
) )
} }
} }
@ -87,11 +87,11 @@ object PlayerOverlays {
data class ChildrenChangeEventArgs( data class ChildrenChangeEventArgs(
val overlaysLayout: ViewGroup, val overlaysLayout: ViewGroup,
val childView: View, val childView: View,
val wasChildRemoved: Boolean, val wasChildRemoved: Boolean
) )
data class LayoutChangeEventArgs( data class LayoutChangeEventArgs(
val overlaysLayout: ViewGroup, val overlaysLayout: ViewGroup,
val oldRect: Rectangle, val oldRect: Rectangle,
val newRect: Rectangle, val newRect: Rectangle
) )

2
app/src/main/java/app/revanced/integrations/youtube/shared/PlayerType.kt
View File

@ -44,7 +44,7 @@ enum class PlayerType {
*/ */
INLINE_MINIMAL, INLINE_MINIMAL,
VIRTUAL_REALITY_FULLSCREEN, VIRTUAL_REALITY_FULLSCREEN,
WATCH_WHILE_PICTURE_IN_PICTURE, WATCH_WHILE_PICTURE_IN_PICTURE
; ;
companion object { companion object {

2
app/src/main/java/app/revanced/integrations/youtube/shared/VideoState.kt
View File

@ -16,7 +16,7 @@ enum class VideoState {
/** /**
* @see [VideoInformation.isAtEndOfVideo] * @see [VideoInformation.isAtEndOfVideo]
*/ */
ENDED, ENDED
; ;

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt
View File

@ -11,7 +11,7 @@ import app.revanced.integrations.youtube.shared.PlayerType
* @param context the context to create in * @param context the context to create in
*/ */
class SwipeControlsConfigurationProvider( class SwipeControlsConfigurationProvider(
private val context: Context, private val context: Context
) { ) {
//region swipe enable //region swipe enable
/** /**

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity.kt
View File

@ -143,7 +143,7 @@ class SwipeControlsHostActivity : Activity() {
contentRoot.x.toInt(), contentRoot.x.toInt(),
contentRoot.y.toInt(), contentRoot.y.toInt(),
contentRoot.width, contentRoot.width,
contentRoot.height, contentRoot.height
) )
} }

4
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/AudioVolumeController.kt
View File

@ -15,7 +15,7 @@ import kotlin.properties.Delegates
*/ */
class AudioVolumeController( class AudioVolumeController(
context: Context, context: Context,
private val targetStream: Int = AudioManager.STREAM_MUSIC, private val targetStream: Int = AudioManager.STREAM_MUSIC
) { ) {
/** /**
@ -36,7 +36,7 @@ class AudioVolumeController(
minimumVolumeIndex = minimumVolumeIndex =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
audioManager.getStreamMinVolume( audioManager.getStreamMinVolume(
targetStream, targetStream
) )
} else { } else {
0 0

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/ScreenBrightnessController.kt
View File

@ -10,7 +10,7 @@ import app.revanced.integrations.youtube.swipecontrols.misc.clamp
* @param host the host activity of which the brightness is adjusted * @param host the host activity of which the brightness is adjusted
*/ */
class ScreenBrightnessController( class ScreenBrightnessController(
private val host: Activity, private val host: Activity
) { ) {
/** /**
* screen brightness saved by [save] * screen brightness saved by [save]

10
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/SwipeZonesController.kt
View File

@ -36,7 +36,7 @@ import kotlin.math.min
@Suppress("PrivatePropertyName") @Suppress("PrivatePropertyName")
class SwipeZonesController( class SwipeZonesController(
private val host: Activity, private val host: Activity,
private val fallbackScreenRect: () -> Rectangle, private val fallbackScreenRect: () -> Rectangle
) { ) {
/** /**
* 20dp, in pixels * 20dp, in pixels
@ -74,7 +74,7 @@ class SwipeZonesController(
p.x + _20dp, p.x + _20dp,
p.y + _40dp, p.y + _40dp,
p.width - _20dp, p.width - _20dp,
p.height - _20dp - _80dp, p.height - _20dp - _80dp
) )
} }
@ -89,7 +89,7 @@ class SwipeZonesController(
eRect.right - zoneWidth, eRect.right - zoneWidth,
eRect.top, eRect.top,
zoneWidth, zoneWidth,
eRect.height, eRect.height
) )
} }
@ -103,7 +103,7 @@ class SwipeZonesController(
effectiveSwipeRect.left, effectiveSwipeRect.left,
effectiveSwipeRect.top, effectiveSwipeRect.top,
zoneWidth, zoneWidth,
effectiveSwipeRect.height, effectiveSwipeRect.height
) )
} }
@ -137,7 +137,7 @@ class SwipeZonesController(
playerView.x.toInt(), playerView.x.toInt(),
playerView.y.toInt(), playerView.y.toInt(),
min(playerView.width, playerWidthWithPadding), min(playerView.width, playerWidthWithPadding),
playerView.height, playerView.height
) )
} }
} }

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/VolumeKeysController.kt
View File

@ -9,7 +9,7 @@ import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity
* @param controller main controller instance * @param controller main controller instance
*/ */
class VolumeKeysController( class VolumeKeysController(
private val controller: SwipeControlsHostActivity, private val controller: SwipeControlsHostActivity
) { ) {
/** /**
* key event handler * key event handler

4
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt
View File

@ -15,7 +15,7 @@ import app.revanced.integrations.youtube.swipecontrols.misc.toPoint
* @param controller reference to the main swipe controller * @param controller reference to the main swipe controller
*/ */
class ClassicSwipeController( class ClassicSwipeController(
private val controller: SwipeControlsHostActivity, private val controller: SwipeControlsHostActivity
) : BaseGestureController(controller), ) : BaseGestureController(controller),
PlayerControlsVisibilityObserver by PlayerControlsVisibilityObserverImpl(controller) { PlayerControlsVisibilityObserver by PlayerControlsVisibilityObserverImpl(controller) {
/** /**
@ -98,7 +98,7 @@ class ClassicSwipeController(
from: MotionEvent, from: MotionEvent,
to: MotionEvent, to: MotionEvent,
distanceX: Double, distanceX: Double,
distanceY: Double, distanceY: Double
): Boolean { ): Boolean {
// cancel if not vertical // cancel if not vertical
if (currentSwipe != SwipeDetector.SwipeDirection.VERTICAL) return false if (currentSwipe != SwipeDetector.SwipeDirection.VERTICAL) return false

4
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt
View File

@ -13,7 +13,7 @@ import app.revanced.integrations.youtube.swipecontrols.misc.toPoint
* @param controller reference to the main swipe controller * @param controller reference to the main swipe controller
*/ */
class PressToSwipeController( class PressToSwipeController(
private val controller: SwipeControlsHostActivity, private val controller: SwipeControlsHostActivity
) : BaseGestureController(controller) { ) : BaseGestureController(controller) {
/** /**
* monitors if the user is currently in a swipe session. * monitors if the user is currently in a swipe session.
@ -59,7 +59,7 @@ class PressToSwipeController(
from: MotionEvent, from: MotionEvent,
to: MotionEvent, to: MotionEvent,
distanceX: Double, distanceX: Double,
distanceY: Double, distanceY: Double
): Boolean { ): Boolean {
// cancel if not in swipe session or vertical // cancel if not in swipe session or vertical
if (!isInSwipeSession || currentSwipe != SwipeDetector.SwipeDirection.VERTICAL) return false if (!isInSwipeSession || currentSwipe != SwipeDetector.SwipeDirection.VERTICAL) return false

12
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt
View File

@ -11,11 +11,11 @@ import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity
* @param controller reference to the main swipe controller * @param controller reference to the main swipe controller
*/ */
abstract class BaseGestureController( abstract class BaseGestureController(
private val controller: SwipeControlsHostActivity, private val controller: SwipeControlsHostActivity
) : GestureController, ) : GestureController,
GestureDetector.SimpleOnGestureListener(), GestureDetector.SimpleOnGestureListener(),
SwipeDetector by SwipeDetectorImpl( SwipeDetector by SwipeDetectorImpl(
controller.config.swipeMagnitudeThreshold.toDouble(), controller.config.swipeMagnitudeThreshold.toDouble()
), ),
VolumeAndBrightnessScroller by VolumeAndBrightnessScrollerImpl( VolumeAndBrightnessScroller by VolumeAndBrightnessScrollerImpl(
controller, controller,
@ -23,7 +23,7 @@ abstract class BaseGestureController(
controller.screen, controller.screen,
controller.overlay, controller.overlay,
10, 10,
1, 1
) { ) {
/** /**
@ -85,7 +85,7 @@ abstract class BaseGestureController(
from: MotionEvent, from: MotionEvent,
to: MotionEvent, to: MotionEvent,
distanceX: Float, distanceX: Float,
distanceY: Float, distanceY: Float
): Boolean { ): Boolean {
// submit to swipe detector // submit to swipe detector
submitForSwipe(from, to, distanceX, distanceY) submitForSwipe(from, to, distanceX, distanceY)
@ -96,7 +96,7 @@ abstract class BaseGestureController(
from, from,
to, to,
distanceX.toDouble(), distanceX.toDouble(),
distanceY.toDouble(), distanceY.toDouble()
) )
// if the swipe was consumed, cancel downstream events once // if the swipe was consumed, cancel downstream events once
@ -151,6 +151,6 @@ abstract class BaseGestureController(
from: MotionEvent, from: MotionEvent,
to: MotionEvent, to: MotionEvent,
distanceX: Double, distanceX: Double,
distanceY: Double, distanceY: Double
): Boolean ): Boolean
} }

8
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt
View File

@ -25,7 +25,7 @@ interface SwipeDetector {
from: MotionEvent, from: MotionEvent,
to: MotionEvent, to: MotionEvent,
distanceX: Float, distanceX: Float,
distanceY: Float, distanceY: Float
) )
/** /**
@ -50,7 +50,7 @@ interface SwipeDetector {
/** /**
* swipe along the Y- Axes * swipe along the Y- Axes
*/ */
VERTICAL, VERTICAL
} }
} }
@ -60,7 +60,7 @@ interface SwipeDetector {
* @param swipeMagnitudeThreshold minimum magnitude before a swipe is detected as such * @param swipeMagnitudeThreshold minimum magnitude before a swipe is detected as such
*/ */
class SwipeDetectorImpl( class SwipeDetectorImpl(
private val swipeMagnitudeThreshold: Double, private val swipeMagnitudeThreshold: Double
) : SwipeDetector { ) : SwipeDetector {
override var currentSwipe = SwipeDetector.SwipeDirection.NONE override var currentSwipe = SwipeDetector.SwipeDirection.NONE
@ -68,7 +68,7 @@ class SwipeDetectorImpl(
from: MotionEvent, from: MotionEvent,
to: MotionEvent, to: MotionEvent,
distanceX: Float, distanceX: Float,
distanceY: Float, distanceY: Float
) { ) {
if (currentSwipe == SwipeDetector.SwipeDirection.NONE) { if (currentSwipe == SwipeDetector.SwipeDirection.NONE) {
// no swipe direction was detected yet, try to detect one // no swipe direction was detected yet, try to detect one

10
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt
View File

@ -48,7 +48,7 @@ class VolumeAndBrightnessScrollerImpl(
private val screenController: ScreenBrightnessController?, private val screenController: ScreenBrightnessController?,
private val overlayController: SwipeControlsOverlay, private val overlayController: SwipeControlsOverlay,
volumeDistance: Int = 10, volumeDistance: Int = 10,
brightnessDistance: Int = 1, brightnessDistance: Int = 1
) : VolumeAndBrightnessScroller { ) : VolumeAndBrightnessScroller {
// region volume // region volume
@ -56,8 +56,8 @@ class VolumeAndBrightnessScrollerImpl(
ScrollDistanceHelper( ScrollDistanceHelper(
volumeDistance.applyDimension( volumeDistance.applyDimension(
context, context,
TypedValue.COMPLEX_UNIT_DIP, TypedValue.COMPLEX_UNIT_DIP
), )
) { _, _, direction -> ) { _, _, direction ->
volumeController?.run { volumeController?.run {
volume += direction volume += direction
@ -73,8 +73,8 @@ class VolumeAndBrightnessScrollerImpl(
ScrollDistanceHelper( ScrollDistanceHelper(
brightnessDistance.applyDimension( brightnessDistance.applyDimension(
context, context,
TypedValue.COMPLEX_UNIT_DIP, TypedValue.COMPLEX_UNIT_DIP
), )
) { _, _, direction -> ) { _, _, direction ->
screenController?.run { screenController?.run {
if (screenBrightness > 0 || direction > 0) { if (screenBrightness > 0 || direction > 0) {

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Point.kt
View File

@ -7,7 +7,7 @@ import android.view.MotionEvent
*/ */
data class Point( data class Point(
val x: Int, val x: Int,
val y: Int, val y: Int
) )
/** /**

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Rectangle.kt
View File

@ -7,7 +7,7 @@ data class Rectangle(
val x: Int, val x: Int,
val y: Int, val y: Int,
val width: Int, val width: Int,
val height: Int, val height: Int
) { ) {
val left = x val left = x
val right = x + width val right = x + width

4
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/ScrollDistanceHelper.kt
View File

@ -11,7 +11,7 @@ import kotlin.math.sign
*/ */
class ScrollDistanceHelper( class ScrollDistanceHelper(
private val unitDistance: Int, private val unitDistance: Int,
private val callback: (oldDistance: Double, newDistance: Double, direction: Int) -> Unit, private val callback: (oldDistance: Double, newDistance: Double, direction: Int) -> Unit
) { ) {
/** /**
@ -35,7 +35,7 @@ class ScrollDistanceHelper(
callback.invoke( callback.invoke(
oldDistance, oldDistance,
scrolledDistance, scrolledDistance,
sign(scrolledDistance).toInt(), sign(scrolledDistance).toInt()
) )
} }
} }

2
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/SwipeControlsUtils.kt
View File

@ -20,6 +20,6 @@ fun Int.applyDimension(context: Context, unit: Int): Int {
return TypedValue.applyDimension( return TypedValue.applyDimension(
unit, unit,
this.toFloat(), this.toFloat(),
context.resources.displayMetrics, context.resources.displayMetrics
).roundToInt() ).roundToInt()
} }

16
app/src/main/java/app/revanced/integrations/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt
View File

@ -24,7 +24,7 @@ import kotlin.math.round
*/ */
class SwipeControlsOverlayLayout( class SwipeControlsOverlayLayout(
context: Context, context: Context,
private val config: SwipeControlsConfigurationProvider, private val config: SwipeControlsConfigurationProvider
) : RelativeLayout(context), SwipeControlsOverlay { ) : RelativeLayout(context), SwipeControlsOverlay {
/** /**
* DO NOT use this, for tools only * DO NOT use this, for tools only
@ -40,14 +40,14 @@ class SwipeControlsOverlayLayout(
private fun getDrawable(name: String, width: Int, height: Int): Drawable { private fun getDrawable(name: String, width: Int, height: Int): Drawable {
return resources.getDrawable( return resources.getDrawable(
Utils.getResourceIdentifier(context, name, "drawable"), Utils.getResourceIdentifier(context, name, "drawable"),
context.theme, context.theme
).apply { ).apply {
setTint(config.overlayForegroundColor) setTint(config.overlayForegroundColor)
setBounds( setBounds(
0, 0,
0, 0,
width, width,
height, height
) )
} }
} }
@ -59,14 +59,14 @@ class SwipeControlsOverlayLayout(
feedbackTextView = TextView(context).apply { feedbackTextView = TextView(context).apply {
layoutParams = LayoutParams( layoutParams = LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
).apply { ).apply {
addRule(CENTER_IN_PARENT, TRUE) addRule(CENTER_IN_PARENT, TRUE)
setPadding( setPadding(
feedbackTextViewPadding, feedbackTextViewPadding,
feedbackTextViewPadding, feedbackTextViewPadding,
feedbackTextViewPadding, feedbackTextViewPadding,
feedbackTextViewPadding, feedbackTextViewPadding
) )
} }
background = GradientDrawable().apply { background = GradientDrawable().apply {
@ -108,7 +108,7 @@ class SwipeControlsOverlayLayout(
icon, icon,
null, null,
null, null,
null, null
) )
visibility = VISIBLE visibility = VISIBLE
} }
@ -117,7 +117,7 @@ class SwipeControlsOverlayLayout(
override fun onVolumeChanged(newVolume: Int, maximumVolume: Int) { override fun onVolumeChanged(newVolume: Int, maximumVolume: Int) {
showFeedbackView( showFeedbackView(
"$newVolume", "$newVolume",
if (newVolume > 0) normalVolumeIcon else mutedVolumeIcon, if (newVolume > 0) normalVolumeIcon else mutedVolumeIcon
) )
} }
@ -134,7 +134,7 @@ class SwipeControlsOverlayLayout(
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
performHapticFeedback( performHapticFeedback(
HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.LONG_PRESS,
HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING
) )
} }
} }