Merge branch 'main' into support-images-from-media-library

Author: bglgwyng

android/src/main/java/com/margelo/nitro/image/HybridImageView.kt

@@ -5,6 +5,19 @@ import android.view.View
 import android.widget.ImageView
 
 class HybridImageView(context: Context): HybridNitroImageViewSpec() {
+    override var resizeMode: ResizeMode? = ResizeMode.CONTAIN
+        set(value) {
+            field = value
+            imageView.scaleType = when (value) {
+                ResizeMode.COVER -> ImageView.ScaleType.CENTER_CROP
+                ResizeMode.CONTAIN -> ImageView.ScaleType.FIT_CENTER
+                ResizeMode.STRETCH -> ImageView.ScaleType.FIT_XY
+                ResizeMode.CENTER -> ImageView.ScaleType.CENTER
+                null -> ImageView.ScaleType.FIT_CENTER
+            }
+            updateImage()
+        }
+
     override var image: HybridImageSpec? = null
         set(value) {
             field = value

example/ios/Podfile.lock

@@ -2166,8 +2166,7 @@ SPEC CHECKSUMS:
   React-logger: 514fac028fee60c84591f951c7c04ba1c5023334
   React-Mapbuffer: fae8da2c01aeb7f26ad739731b6dba61fd02fd97
   React-microtasksnativemodule: 20454ffccff553f0ee73fd20873aa8555a5867fb
-  react-native-cameraroll: 41084e42ab4ec08940452737aca3fd5e0edc63fe
-  react-native-safe-area-context: 7e926a200d4bc9c56562275743705c6b56176455
+  react-native-safe-area-context: 5594ec631ede9c311c5c0efa244228eff845ce88
   React-NativeModulesApple: 65b2735133d6ce8a3cb5f23215ef85e427b0139c
   React-oscompat: f26aa2a4adc84c34212ab12c07988fe19e9cf16a
   React-perflogger: e15a0d43d1928e1c82f4f0b7fc05f7e9bccfede8
@@ -2200,7 +2199,7 @@ SPEC CHECKSUMS:
   ReactCodegen: 16c2bfcebf870208d7e29ff0c065f4c0fa03034d
   ReactCommon: e243aa261effc83c10208f0794bade55ca9ae5b6
   RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
-  RNScreens: d8f03344886bd566bba24b9e02dbd28979631d3e
+  RNScreens: 482e9707f9826230810c92e765751af53826d509
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748

example/package.json

@@ -5,7 +5,7 @@
     "scripts": {
         "android": "react-native run-android",
         "ios": "react-native run-ios",
-        "lint": "biome check . --fix",
+        "lint": "biome check .",
         "start": "react-native start --client-logs",
         "pods": "bundle install && cd ios && bundle exec pod install"
     },
@@ -37,4 +37,4 @@
     "engines": {
         "node": ">=18"
     }
-}
+}

example/src/NitroImageTab.tsx

@@ -1,14 +1,8 @@
-import React, { useMemo } from "react";
-import { FlatList, StyleSheet, Text, View } from "react-native";
-import { NitroImage, useWebImage } from "react-native-nitro-image";
+import { useMemo } from "react";
+import { FlatList, Text, View } from "react-native";
+import { NitroWebImage } from "react-native-nitro-image";
 import { createImageURLs } from "./createImageURLs";
 
-function AsyncImageImpl({ url }: { url: string }): React.ReactNode {
-    const image = useWebImage(url);
-    return <NitroImage style={styles.image} image={image} />;
-}
-const AsyncImage = React.memo(AsyncImageImpl);
-
 export function NitroImageTab() {
     const imageURLs = useMemo(() => createImageURLs(), []);
 
@@ -19,15 +13,10 @@ export function NitroImageTab() {
                 numColumns={4}
                 windowSize={3}
                 data={imageURLs}
-                renderItem={({ item: url }) => <AsyncImage url={url} />}
+                renderItem={({ item: url }) => (
+                    <NitroWebImage url={url} resizeMode="cover" />
+                )}
             />
         </View>
     );
 }
-
-const styles = StyleSheet.create({
-    image: {
-        width: "25%",
-        aspectRatio: 1,
-    },
-});

ios/HybridImageView.swift

@@ -12,6 +12,24 @@ class HybridImageView: HybridNitroImageViewSpec {
   let imageView = UIImageView(image: nil)
   var view: UIView { imageView }
 
+  var resizeMode: ResizeMode? {
+    didSet {
+      let mode = resizeMode ?? .contain
+      switch mode {
+        case .cover:
+            imageView.contentMode = .scaleAspectFill
+            imageView.clipsToBounds = true
+        case .contain:
+            imageView.contentMode = .scaleAspectFit
+        case .stretch:
+            imageView.contentMode = .scaleToFill
+        case .center:
+            imageView.contentMode = .center
+      }
+      updateImage()
+    }
+  }
+  
   var image: (any HybridImageSpec)? {
     didSet {
       updateImage()
@@ -23,7 +41,6 @@ class HybridImageView: HybridNitroImageViewSpec {
     print("Updating ImageView's image...")
 
     print("Frame: \(imageView.frame)")
-    imageView.contentMode = .scaleAspectFit
     imageView.image = hybridImage.uiImage
   }
 }