Skip to content

Commit 9cf0cb9

Browse files
m-bertm-bert
committed
Fix strange formatting
1 parent 585ac44 commit 9cf0cb9

10 files changed

Lines changed: 39 additions & 52 deletions

File tree

‎packages/react-native-gesture-handler/android/package77/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ class RNGestureHandlerPackage :
3333
)
3434
}
3535

36-
override fun createViewManagers(reactContext: ReactApplicationContext) = listOf<ViewManager<*, *>>(
37-
RNGestureHandlerRootViewManager(),
38-
RNGestureHandlerButtonViewManager(),
39-
)
36+
override fun createViewManagers(reactContext: ReactApplicationContext) =
37+
listOf<ViewManager<*, *>>(RNGestureHandlerRootViewManager(), RNGestureHandlerButtonViewManager())
4038

4139
override fun getViewManagerNames(reactContext: ReactApplicationContext) = viewManagers.keys.toList()
4240

@@ -46,13 +44,12 @@ class RNGestureHandlerPackage :
4644
override fun createViewManager(reactContext: ReactApplicationContext, viewManagerName: String) =
4745
viewManagers[viewManagerName]?.provider?.get() as? ViewManager<*, *>
4846

49-
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = if (name ==
50-
RNGestureHandlerModule.NAME
51-
) {
52-
RNGestureHandlerModule(reactContext)
53-
} else {
54-
null
55-
}
47+
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? =
48+
if (name == RNGestureHandlerModule.NAME) {
49+
RNGestureHandlerModule(reactContext)
50+
} else {
51+
null
52+
}
5653

5754
override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
5855
try {

‎packages/react-native-gesture-handler/android/packageDeprecated/src/main/java/com/swmansion/gesturehandler/RNGestureHandlerPackage.kt‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ class RNGestureHandlerPackage :
3333
)
3434
}
3535

36-
override fun createViewManagers(reactContext: ReactApplicationContext) = listOf<ViewManager<*, *>>(
37-
RNGestureHandlerRootViewManager(),
38-
RNGestureHandlerButtonViewManager(),
39-
)
36+
override fun createViewManagers(reactContext: ReactApplicationContext) =
37+
listOf<ViewManager<*, *>>(RNGestureHandlerRootViewManager(), RNGestureHandlerButtonViewManager())
4038

4139
override fun getViewManagerNames(reactContext: ReactApplicationContext?) = viewManagers.keys.toList()
4240

@@ -46,13 +44,12 @@ class RNGestureHandlerPackage :
4644
override fun createViewManager(reactContext: ReactApplicationContext?, viewManagerName: String?) =
4745
viewManagers[viewManagerName]?.provider?.get() as? ViewManager<*, *>
4846

49-
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = if (name ==
50-
RNGestureHandlerModule.NAME
51-
) {
52-
RNGestureHandlerModule(reactContext)
53-
} else {
54-
null
55-
}
47+
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? =
48+
if (name == RNGestureHandlerModule.NAME) {
49+
RNGestureHandlerModule(reactContext)
50+
} else {
51+
null
52+
}
5653

5754
override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
5855
try {

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
118118
}
119119

120120
fun setShouldCancelWhenOutside(shouldCancelWhenOutside: Boolean): ConcreteGestureHandlerT = applySelf {
121-
this.shouldCancelWhenOutside =
122-
shouldCancelWhenOutside
121+
this.shouldCancelWhenOutside = shouldCancelWhenOutside
123122
}
124123

125124
fun setEnabled(enabled: Boolean): ConcreteGestureHandlerT = applySelf {
@@ -135,8 +134,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
135134
}
136135

137136
fun setManualActivation(manualActivation: Boolean): ConcreteGestureHandlerT = applySelf {
138-
this.manualActivation =
139-
manualActivation
137+
this.manualActivation = manualActivation
140138
}
141139

142140
fun setHitSlop(
@@ -174,8 +172,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
174172
setHitSlop(padding, padding, padding, padding, HIT_SLOP_NONE, HIT_SLOP_NONE)
175173

176174
fun setInteractionController(controller: GestureHandlerInteractionController?): ConcreteGestureHandlerT = applySelf {
177-
interactionController =
178-
controller
175+
interactionController = controller
179176
}
180177

181178
fun setMouseButton(mouseButton: Int) = apply {
@@ -268,9 +265,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
268265
actionIndex = event.actionIndex
269266
val actionPointer = event.getPointerId(actionIndex)
270267
action = if (trackedPointerIDs[actionPointer] != -1) {
271-
if (trackedPointersIDsCount ==
272-
1
273-
) {
268+
if (trackedPointersIDsCount == 1) {
274269
MotionEvent.ACTION_DOWN
275270
} else {
276271
MotionEvent.ACTION_POINTER_DOWN
@@ -282,7 +277,11 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
282277
actionIndex = event.actionIndex
283278
val actionPointer = event.getPointerId(actionIndex)
284279
action = if (trackedPointerIDs[actionPointer] != -1) {
285-
if (trackedPointersIDsCount == 1) MotionEvent.ACTION_UP else MotionEvent.ACTION_POINTER_UP
280+
if (trackedPointersIDsCount == 1) {
281+
MotionEvent.ACTION_UP
282+
} else {
283+
MotionEvent.ACTION_POINTER_UP
284+
}
286285
} else {
287286
MotionEvent.ACTION_MOVE
288287
}

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,11 @@ class GestureHandlerOrchestrator(
8686
}
8787

8888
private fun hasOtherHandlerToWaitFor(handler: GestureHandler<*>) = gestureHandlers.any {
89-
!isFinished(it.state) &&
90-
shouldHandlerWaitForOther(handler, it)
89+
!isFinished(it.state) && shouldHandlerWaitForOther(handler, it)
9190
}
9291

9392
private fun shouldBeCancelledByFinishedHandler(handler: GestureHandler<*>) = gestureHandlers.any {
94-
shouldHandlerWaitForOther(handler, it) &&
95-
it.state == GestureHandler.STATE_END
93+
shouldHandlerWaitForOther(handler, it) && it.state == GestureHandler.STATE_END
9694
}
9795

9896
private fun shouldBeCancelledByActiveHandler(handler: GestureHandler<*>) = gestureHandlers.any {

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureUtils.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import kotlin.math.cos
55

66
object GestureUtils {
77
fun getLastPointerX(event: MotionEvent, averageTouches: Boolean): Float {
8-
val excludeIndex = if (event.actionMasked ==
9-
MotionEvent.ACTION_POINTER_UP
10-
) {
8+
val excludeIndex = if (event.actionMasked == MotionEvent.ACTION_POINTER_UP) {
119
event.actionIndex
1210
} else {
1311
-1

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/LongPressGestureHandler.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ class LongPressGestureHandler(context: Context) : GestureHandler<LongPressGestur
101101
}
102102
}
103103

104-
if (state == STATE_BEGAN &&
105-
currentPointers == numberOfPointersRequired &&
104+
if (state == STATE_BEGAN && currentPointers == numberOfPointersRequired &&
106105
(
107106
sourceEvent.actionMasked == MotionEvent.ACTION_DOWN ||
108107
sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_DOWN

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
243243
}
244244

245245
override fun afterGestureEnd(event: MotionEvent) {
246-
if ((event.x - startX) * (event.x - startX) + (event.y - startY) * (event.y - startY) <
247-
touchSlopSquared
246+
if (
247+
(event.x - startX) * (event.x - startX) + (event.y - startY) * (event.y - startY) < touchSlopSquared
248248
) {
249249
editText.requestFocusFromJS()
250250
}

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/Extensions.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,5 @@ val ReactContext.deviceEventEmitter: DeviceEventManagerModule.RCTDeviceEventEmit
1212
val ReactContext.UIManager: UIManagerModule
1313
get() = this.getNativeModule(UIManagerModule::class.java)!!
1414

15-
fun Context.isScreenReaderOn() = (
16-
getSystemService(
17-
Context.ACCESSIBILITY_SERVICE,
18-
) as AccessibilityManager
19-
).isTouchExplorationEnabled
15+
fun Context.isScreenReaderOn() =
16+
(getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager).isTouchExplorationEnabled

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,7 @@ class RNGestureHandlerButtonViewManager :
324324
}
325325

326326
val layerDrawable = LayerDrawable(
327-
if (selectable !=
328-
null
329-
) {
327+
if (selectable != null) {
330328
arrayOf(colorDrawable, selectable, borderDrawable)
331329
} else {
332330
arrayOf(colorDrawable, borderDrawable)

‎packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerEvent.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ class RNGestureHandlerEvent private constructor() : Event<RNGestureHandlerEvent>
4242
EVENTS_POOL.release(this)
4343
}
4444

45-
override fun getEventName() = if (useTopPrefixedName) NATIVE_ANIMATED_EVENT_NAME else EVENT_NAME
45+
override fun getEventName() = if (useTopPrefixedName) {
46+
NATIVE_ANIMATED_EVENT_NAME
47+
} else {
48+
EVENT_NAME
49+
}
4650

4751
override fun canCoalesce() = true
4852

0 commit comments

Comments
 (0)