diff options
author | Samuel Newman <mozzius@protonmail.com> | 2025-08-13 22:15:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-08-13 22:15:08 +0300 |
commit | d5cc19f282b1e7656cf5ea60eb689819fdac2671 (patch) | |
tree | f099dadd85eccda73107d86922525d6ba5894bb7 /modules | |
parent | edd205483d24b4806e4ef436f5bcfe48e32d0f4a (diff) | |
download | voidsky-d5cc19f282b1e7656cf5ea60eb689819fdac2671.tar.zst |
run `lint-native:fix` (#8836)
Diffstat (limited to 'modules')
6 files changed, 112 insertions, 106 deletions
diff --git a/modules/BlueskyClip/ViewController.swift b/modules/BlueskyClip/ViewController.swift index e8adb5325..ef17765a4 100644 --- a/modules/BlueskyClip/ViewController.swift +++ b/modules/BlueskyClip/ViewController.swift @@ -43,7 +43,7 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele let payload = try? JSONDecoder().decode(WebViewActionPayload.self, from: data) else { return } - + switch payload.action { case .present: self.presentAppStoreOverlay() @@ -65,18 +65,18 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele guard let url = navigationAction.request.url else { return .allow } - + // Store the previous one to compare later, but only set starterPackUrl when we find the right one prevUrl = url // pathComponents starts with "/" as the first component, then each path name. so... // ["/", "start", "name", "rkey"] - if isStarterPackUrl(url){ + if isStarterPackUrl(url) { self.starterPackUrl = url } - + return .allow } - + func isStarterPackUrl(_ url: URL) -> Bool { var host: String? if #available(iOS 16.0, *) { @@ -84,11 +84,11 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele } else { host = url.host } - + switch host { case "bsky.app": if url.pathComponents.count == 4, - (url.pathComponents[1] == "start" || url.pathComponents[1] == "starter-pack") { + url.pathComponents[1] == "start" || url.pathComponents[1] == "starter-pack" { return true } return false diff --git a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt index 31eb739a6..6db6e35fa 100644 --- a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt +++ b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt @@ -19,7 +19,6 @@ import expo.modules.kotlin.AppContext import expo.modules.kotlin.viewevent.EventDispatcher import expo.modules.kotlin.views.ExpoView - class BottomSheetView( context: Context, appContext: AppContext, @@ -31,12 +30,14 @@ class BottomSheetView( private lateinit var dialogRootViewGroup: DialogRootViewGroup private var eventDispatcher: EventDispatcher? = null - private val rawScreenHeight = context.resources.displayMetrics.heightPixels.toFloat() + private val rawScreenHeight = + context.resources.displayMetrics.heightPixels + .toFloat() private val safeScreenHeight = (rawScreenHeight - getNavigationBarHeight()).toFloat() private fun getNavigationBarHeight(): Int { - val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android") - return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0 + val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android") + return if (resourceId > 0) resources.getDimensionPixelSize(resourceId) else 0 } private val onAttemptDismiss by EventDispatcher() @@ -45,7 +46,7 @@ class BottomSheetView( // Props var disableDrag = false - set (value) { + set(value) { field = value this.setDraggable(!value) } @@ -157,8 +158,8 @@ class BottomSheetView( // Presentation - private fun getHalfExpandedRatio(contentHeight: Float): Float { - return when { + private fun getHalfExpandedRatio(contentHeight: Float): Float = + when { // Full height sheets contentHeight >= safeScreenHeight -> 0.99f // Medium height sheets (>50% but <100%) @@ -168,7 +169,6 @@ class BottomSheetView( else -> this.clampRatio(this.getTargetHeight() / rawScreenHeight) } - } private fun present() { if (this.isOpen || this.isOpening || this.isClosing) return diff --git a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt index 4b02bae9f..60b9aac08 100644 --- a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt +++ b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt @@ -139,7 +139,10 @@ class DialogRootViewGroup( return super.onHoverEvent(event) } - override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) { + override fun onChildStartedNativeGesture( + childView: View?, + ev: MotionEvent, + ) { eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) } jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher) } diff --git a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt index 6c93981a1..575358ccf 100644 --- a/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt +++ b/modules/expo-bluesky-gif-view/android/src/main/java/expo/modules/blueskygifview/GifView.kt @@ -16,8 +16,8 @@ import expo.modules.kotlin.viewevent.EventDispatcher import expo.modules.kotlin.views.ExpoView class GifView( - context: Context, - appContext: AppContext, + context: Context, + appContext: AppContext, ) : ExpoView(context, appContext) { // Events private val onPlayerStateChange by EventDispatcher() @@ -82,65 +82,65 @@ class GifView( } this.webpRequest = - glide.load(source) - .diskCacheStrategy(DiskCacheStrategy.DATA) - .skipMemoryCache(false) - .listener( - object : RequestListener<Drawable> { - override fun onResourceReady( - resource: Drawable, - model: Any, - target: Target<Drawable>?, - dataSource: DataSource, - isFirstResource: Boolean - ): Boolean { - placeholderRequest?.let { glide.clear(it) } - return false - } - - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target<Drawable>, - isFirstResource: Boolean - ): Boolean = true - } - ) - .into(this.imageView) + glide + .load(source) + .diskCacheStrategy(DiskCacheStrategy.DATA) + .skipMemoryCache(false) + .listener( + object : RequestListener<Drawable> { + override fun onResourceReady( + resource: Drawable, + model: Any, + target: Target<Drawable>?, + dataSource: DataSource, + isFirstResource: Boolean, + ): Boolean { + placeholderRequest?.let { glide.clear(it) } + return false + } + + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target<Drawable>, + isFirstResource: Boolean, + ): Boolean = true + }, + ).into(this.imageView) if (this.imageView.drawable == null || this.imageView.drawable !is Animatable) { this.placeholderRequest = - glide.load(placeholderSource) - .diskCacheStrategy(DiskCacheStrategy.DATA) - // Let's not bloat the memory cache with placeholders - .skipMemoryCache(true) - .listener( - object : RequestListener<Drawable> { - override fun onResourceReady( - resource: Drawable, - model: Any, - target: Target<Drawable>?, - dataSource: DataSource, - isFirstResource: Boolean - ): Boolean { - // Incase this request finishes after the webp, let's just not set - // the drawable. This shouldn't happen because the request should - // get cancelled - if (imageView.drawable == null) { - imageView.setImageDrawable(resource) - } - return true - } - - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target<Drawable>, - isFirstResource: Boolean - ): Boolean = true - }, - ) - .submit() + glide + .load(placeholderSource) + .diskCacheStrategy(DiskCacheStrategy.DATA) + // Let's not bloat the memory cache with placeholders + .skipMemoryCache(true) + .listener( + object : RequestListener<Drawable> { + override fun onResourceReady( + resource: Drawable, + model: Any, + target: Target<Drawable>?, + dataSource: DataSource, + isFirstResource: Boolean, + ): Boolean { + // Incase this request finishes after the webp, let's just not set + // the drawable. This shouldn't happen because the request should + // get cancelled + if (imageView.drawable == null) { + imageView.setImageDrawable(resource) + } + return true + } + + override fun onLoadFailed( + e: GlideException?, + model: Any?, + target: Target<Drawable>, + isFirstResource: Boolean, + ): Boolean = true + }, + ).submit() } } @@ -174,10 +174,10 @@ class GifView( fun firePlayerStateChange() { onPlayerStateChange( - mapOf( - "isPlaying" to this.isPlaying, - "isLoaded" to this.isLoaded, - ), + mapOf( + "isPlaying" to this.isPlaying, + "isLoaded" to this.isLoaded, + ), ) } diff --git a/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt index ebdc7a35e..57e4d1349 100644 --- a/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt +++ b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt @@ -5,11 +5,12 @@ import expo.modules.kotlin.modules.ModuleDefinition import java.net.URL class EmojiPickerModule : Module() { - override fun definition() = ModuleDefinition { - Name("EmojiPicker") + override fun definition() = + ModuleDefinition { + Name("EmojiPicker") - View(EmojiPickerModuleView::class) { - Events("onEmojiSelected") - } + View(EmojiPickerModuleView::class) { + Events("onEmojiSelected") + } } } diff --git a/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt index a6e5a066f..7ccc57b3b 100644 --- a/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt +++ b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt @@ -8,33 +8,35 @@ import expo.modules.kotlin.AppContext import expo.modules.kotlin.viewevent.EventDispatcher import expo.modules.kotlin.views.ExpoView - @SuppressLint("ViewConstructor") -class EmojiPickerModuleView(context: Context, appContext: AppContext) : - ExpoView(context, appContext) { - private var emojiView: EmojiPickerView = EmojiPickerView(context) - private val onEmojiSelected by EventDispatcher() +class EmojiPickerModuleView( + context: Context, + appContext: AppContext, +) : ExpoView(context, appContext) { + private var emojiView: EmojiPickerView = EmojiPickerView(context) + private val onEmojiSelected by EventDispatcher() - init { - setupView() - } + init { + setupView() + } - private fun setupView() { - addView( - emojiView, LayoutParams( - LayoutParams.MATCH_PARENT, - LayoutParams.MATCH_PARENT - ) - ) + private fun setupView() { + addView( + emojiView, + LayoutParams( + LayoutParams.MATCH_PARENT, + LayoutParams.MATCH_PARENT, + ), + ) - emojiView.setOnEmojiPickedListener { emoji -> - onEmojiSelected(mapOf("emoji" to emoji.emoji)) - } + emojiView.setOnEmojiPickedListener { emoji -> + onEmojiSelected(mapOf("emoji" to emoji.emoji)) } + } - override fun onConfigurationChanged(newConfig: Configuration?) { - super.onConfigurationChanged(newConfig) - removeView(emojiView) - setupView() - } + override fun onConfigurationChanged(newConfig: Configuration?) { + super.onConfigurationChanged(newConfig) + removeView(emojiView) + setupView() + } } |