expo-linear-gradient 10.0.2 → 11.0.2

package/CHANGELOG.md

@@ -10,9 +10,24 @@
 
 ### 💡 Others
 
-## 10.0.2 — 2021-10-15
+## 11.0.2 — 2022-02-01
 
-_This version does not introduce any user-facing changes._
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+
+## 11.0.1 — 2022-01-27
+
+### 🐛 Bug fixes
+
+- Fix display issue on iOS when more than 2 colors are used without explicit locations. ([#15955](https://github.com/expo/expo/pull/15955) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+## 11.0.0 — 2021-12-03
+
+### 💡 Others
+
+- Rewrote code to Swift, removed legacy Objective-C module implementation and changed the pod name to `ExpoLinearGradient`. ([#15168](https://github.com/expo/expo/pull/15168) by [@tsapeta](https://github.com/tsapeta))
+- Rewrote module using Sweet API on Android. ([#15166](https://github.com/expo/expo/pull/15166) by [@lukmccall](https://github.com/lukmccall))
 
 ## 10.0.1 — 2021-10-01
 

package/README.md

@@ -13,7 +13,7 @@ For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.0.2'
+version = '11.0.2'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -20,27 +20,25 @@ buildscript {
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
@@ -53,11 +51,15 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 17
-    versionName "10.0.2"
+    versionName "11.0.2"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/lineargradient/LinearGradientModule.kt

@@ -0,0 +1,39 @@
+package expo.modules.lineargradient
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+typealias ViewType = LinearGradientView
+
+class LinearGradientModule : Module() {
+  override fun definition() = ModuleDefinition {
+    name("ExpoLinearGradient")
+    viewManager {
+      view { context ->
+        LinearGradientView(context)
+      }
+
+      prop("colors") { view: ViewType, colors: IntArray ->
+        view.setColors(colors)
+      }
+
+      prop("locations") { view: ViewType, locations: FloatArray? ->
+        locations?.let {
+          view.setLocations(it)
+        }
+      }
+
+      prop("startPoint") { view: ViewType, startPoint: Pair<Float, Float>? ->
+        view.setStartPosition(startPoint?.first ?: 0.5f, startPoint?.second ?: 0f)
+      }
+
+      prop("endPoint") { view: ViewType, endPoint: Pair<Float, Float>? ->
+        view.setEndPosition(endPoint?.first ?: 0.5f, endPoint?.second ?: 1f)
+      }
+
+      prop("borderRadii") { view: ViewType, borderRadii: FloatArray? ->
+        view.setBorderRadii(borderRadii ?: FloatArray(8) { 0f })
+      }
+    }
+  }
+}

package/android/src/main/java/expo/modules/lineargradient/LinearGradientView.java

@@ -1,7 +1,5 @@
 package expo.modules.lineargradient;
 
-import java.util.ArrayList;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.LinearGradient;
@@ -28,43 +26,31 @@ public class LinearGradientView extends View {
     super(context);
   }
 
-  public void setStartPosition(final ArrayList<Double> startPos) {
-    mStartPos = new float[]{startPos.get(0).floatValue(), startPos.get(1).floatValue()};
+  public void setStartPosition(final float x, final float y) {
+    mStartPos = new float[]{x, y};
     drawGradient();
   }
 
-  public void setEndPosition(final ArrayList<Double> endPos) {
-    mEndPos = new float[]{endPos.get(0).floatValue(), endPos.get(1).floatValue()};
+  public void setEndPosition(final float x, final float y) {
+    mEndPos = new float[]{x, y};
     drawGradient();
   }
 
-  public void setColors(final ArrayList<Double> colors) {
-    int[] _colors = new int[colors.size()];
-    for (int i=0; i < _colors.length; i++)
-    {
-      _colors[i] = colors.get(i).intValue();
-    }
-    mColors = _colors;
+  public void setColors(final int[] colors) {
+    mColors = colors;
     drawGradient();
   }
 
-  public void setLocations(final ArrayList<Double> locations) {
-    float[] _locations = new float[locations.size()];
-    for (int i=0; i < _locations.length; i++)
-    {
-      _locations[i] = locations.get(i).floatValue();
-    }
-    mLocations = _locations;
+  public void setLocations(final float[] locations) {
+    mLocations = locations;
     drawGradient();
   }
 
-  public void setBorderRadii(final ArrayList<Double> borderRadii) {
-    float[] _radii = new float[borderRadii.size()];
-    for (int i=0; i < _radii.length; i++)
-    {
-       _radii[i] = toPixelFromDIP(borderRadii.get(i).floatValue());
+  public void setBorderRadii(final float[] borderRadii) {
+    for (int i = 0; i < borderRadii.length; i++) {
+      borderRadii[i] = toPixelFromDIP(borderRadii[i]);
     }
-    mBorderRadii = _radii;
+    mBorderRadii = borderRadii;
     updatePath();
     drawGradient();
   }
@@ -74,9 +60,9 @@ public class LinearGradientView extends View {
   // having code similar to this littered throughout modules
   private float toPixelFromDIP(float value) {
     return TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP,
-        value,
-        getContext().getResources().getDisplayMetrics()
+      TypedValue.COMPLEX_UNIT_DIP,
+      value,
+      getContext().getResources().getDisplayMetrics()
     );
   }
 
@@ -92,13 +78,13 @@ public class LinearGradientView extends View {
     if (mColors == null || (mLocations != null && mColors.length != mLocations.length))
       return;
     LinearGradient mShader = new LinearGradient(
-        mStartPos[0] * mSize[0],
-        mStartPos[1] * mSize[1],
-        mEndPos[0] * mSize[0],
-        mEndPos[1] * mSize[1],
-        mColors,
-        mLocations,
-        Shader.TileMode.CLAMP);
+      mStartPos[0] * mSize[0],
+      mStartPos[1] * mSize[1],
+      mEndPos[0] * mSize[0],
+      mEndPos[1] * mSize[1],
+      mColors,
+      mLocations,
+      Shader.TileMode.CLAMP);
     mPaint.setShader(mShader);
     invalidate();
   }
@@ -111,9 +97,9 @@ public class LinearGradientView extends View {
     mPathForBorderRadius.reset();
     mTempRectForBorderRadius.set(0f, 0f, (float) mSize[0], (float) mSize[1]);
     mPathForBorderRadius.addRoundRect(
-        mTempRectForBorderRadius,
-        mBorderRadii,
-        Path.Direction.CW);
+      mTempRectForBorderRadius,
+      mBorderRadii,
+      Path.Direction.CW);
   }
 
   @Override

package/build/LinearGradient.d.ts

@@ -25,6 +25,7 @@ export declare type LinearGradientProps = ViewProps & {
     /**
      * An array that contains `number`s ranging from `0` to `1`, inclusive, and is the same length as the `colors` property.
      * Each number indicates a color-stop location where each respective color should be located.
+     * If not specified, the colors will be distributed evenly across the gradient.
      *
      * For example, `[0.5, 0.8]` would render:
      * - the first color, solid, from the beginning of the gradient view to 50% through (the middle);
@@ -32,18 +33,21 @@ export declare type LinearGradientProps = ViewProps & {
      * - the second color, solid, from the 80% point to the end of the gradient view.
      *
      * > The color-stop locations must be ascending from least to greatest.
+     * @default []
      */
     locations?: number[] | null;
     /**
      * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will start `10%` from the left and `20%` from the top.
      *
      * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the starting position.
+     * @default { x: 0.5, y: 0.0 }
      */
     start?: LinearGradientPoint | null;
     /**
      * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will end `10%` from the left and `20%` from the bottom.
      *
      * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the end position.
+     * @default { x: 0.5, y: 1.0 }
      */
     end?: LinearGradientPoint | null;
 };

package/build/LinearGradient.js.map

@@ -1 +1 @@
-{"version":3,"file":"LinearGradient.js","sourceRoot":"","sources":["../src/LinearGradient.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAa,MAAM,cAAc,CAAC;AAEjE,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAuD1D;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,KAAK,CAAC,SAA8B;IACtE,MAAM;QACJ,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/D,IAAI,iBAAiB,GAAG,SAAS,CAAC;QAClC,IAAI,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE;YACnD,OAAO,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;YAC9F,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;SACvD;QAED,OAAO,CACL,oBAAC,oBAAoB,OACf,KAAK,EACT,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;gBACtB,GAAG,EAAE,MAAa;gBAClB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;aAClC,CAAC,EACF,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,eAAe,CAAC,KAAK,CAAC,EAClC,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,GAC9B,CACH,CAAC;IACJ,CAAC;CACF;AAED,SAAS,eAAe,CACtB,KAA6C;IAE7C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;QAC7F,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC","sourcesContent":["import * as React from 'react';\nimport { Platform, processColor, ViewProps } from 'react-native';\n\nimport NativeLinearGradient from './NativeLinearGradient';\nimport { NativeLinearGradientPoint } from './NativeLinearGradient.types';\n\n// @needsAudit\n/**\n * An object `{ x: number; y: number }` or array `[x, y]` that represents the point\n * at which the gradient starts or ends, as a fraction of the overall size of the gradient ranging\n * from `0` to `1`, inclusive.\n */\nexport type LinearGradientPoint =\n  | {\n      /**\n       * A number ranging from `0` to `1`, representing the position of gradient transformation.\n       */\n      x: number;\n      /**\n       * A number ranging from `0` to `1`, representing the position of gradient transformation.\n       */\n      y: number;\n    }\n  | NativeLinearGradientPoint;\n\n// @needsAudit\nexport type LinearGradientProps = ViewProps & {\n  /**\n   * An array of colors that represent stops in the gradient. At least two colors are required\n   * (for a single-color background, use the `style.backgroundColor` prop on a `View` component).\n   */\n  colors: string[];\n  /**\n   * An array that contains `number`s ranging from `0` to `1`, inclusive, and is the same length as the `colors` property.\n   * Each number indicates a color-stop location where each respective color should be located.\n   *\n   * For example, `[0.5, 0.8]` would render:\n   * - the first color, solid, from the beginning of the gradient view to 50% through (the middle);\n   * - a gradient from the first color to the second from the 50% point to the 80% point; and\n   * - the second color, solid, from the 80% point to the end of the gradient view.\n   *\n   * > The color-stop locations must be ascending from least to greatest.\n   */\n  locations?: number[] | null;\n  /**\n   * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will start `10%` from the left and `20%` from the top.\n   *\n   * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the starting position.\n   */\n  start?: LinearGradientPoint | null;\n  /**\n   * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will end `10%` from the left and `20%` from the bottom.\n   *\n   * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the end position.\n   */\n  end?: LinearGradientPoint | null;\n};\n\n/**\n * Renders a native view that transitions between multiple colors in a linear direction.\n */\nexport class LinearGradient extends React.Component<LinearGradientProps> {\n  render() {\n    const { colors, locations, start, end, ...props } = this.props;\n    let resolvedLocations = locations;\n    if (locations && colors.length !== locations.length) {\n      console.warn('LinearGradient colors and locations props should be arrays of the same length');\n      resolvedLocations = locations.slice(0, colors.length);\n    }\n\n    return (\n      <NativeLinearGradient\n        {...props}\n        colors={Platform.select({\n          web: colors as any,\n          default: colors.map(processColor),\n        })}\n        locations={resolvedLocations}\n        startPoint={_normalizePoint(start)}\n        endPoint={_normalizePoint(end)}\n      />\n    );\n  }\n}\n\nfunction _normalizePoint(\n  point: LinearGradientPoint | null | undefined\n): NativeLinearGradientPoint | undefined {\n  if (!point) {\n    return undefined;\n  }\n\n  if (Array.isArray(point) && point.length !== 2) {\n    console.warn('start and end props for LinearGradient must be of the format [x,y] or {x, y}');\n    return undefined;\n  }\n\n  return Array.isArray(point) ? point : [point.x, point.y];\n}\n"]}
+{"version":3,"file":"LinearGradient.js","sourceRoot":"","sources":["../src/LinearGradient.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAa,MAAM,cAAc,CAAC;AAEjE,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AA2D1D;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,KAAK,CAAC,SAA8B;IACtE,MAAM;QACJ,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/D,IAAI,iBAAiB,GAAG,SAAS,CAAC;QAClC,IAAI,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE;YACnD,OAAO,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;YAC9F,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;SACvD;QAED,OAAO,CACL,oBAAC,oBAAoB,OACf,KAAK,EACT,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;gBACtB,GAAG,EAAE,MAAa;gBAClB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;aAClC,CAAC,EACF,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,eAAe,CAAC,KAAK,CAAC,EAClC,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,GAC9B,CACH,CAAC;IACJ,CAAC;CACF;AAED,SAAS,eAAe,CACtB,KAA6C;IAE7C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;QAC7F,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC","sourcesContent":["import * as React from 'react';\nimport { Platform, processColor, ViewProps } from 'react-native';\n\nimport NativeLinearGradient from './NativeLinearGradient';\nimport { NativeLinearGradientPoint } from './NativeLinearGradient.types';\n\n// @needsAudit\n/**\n * An object `{ x: number; y: number }` or array `[x, y]` that represents the point\n * at which the gradient starts or ends, as a fraction of the overall size of the gradient ranging\n * from `0` to `1`, inclusive.\n */\nexport type LinearGradientPoint =\n  | {\n      /**\n       * A number ranging from `0` to `1`, representing the position of gradient transformation.\n       */\n      x: number;\n      /**\n       * A number ranging from `0` to `1`, representing the position of gradient transformation.\n       */\n      y: number;\n    }\n  | NativeLinearGradientPoint;\n\n// @needsAudit\nexport type LinearGradientProps = ViewProps & {\n  /**\n   * An array of colors that represent stops in the gradient. At least two colors are required\n   * (for a single-color background, use the `style.backgroundColor` prop on a `View` component).\n   */\n  colors: string[];\n  /**\n   * An array that contains `number`s ranging from `0` to `1`, inclusive, and is the same length as the `colors` property.\n   * Each number indicates a color-stop location where each respective color should be located.\n   * If not specified, the colors will be distributed evenly across the gradient.\n   *\n   * For example, `[0.5, 0.8]` would render:\n   * - the first color, solid, from the beginning of the gradient view to 50% through (the middle);\n   * - a gradient from the first color to the second from the 50% point to the 80% point; and\n   * - the second color, solid, from the 80% point to the end of the gradient view.\n   *\n   * > The color-stop locations must be ascending from least to greatest.\n   * @default []\n   */\n  locations?: number[] | null;\n  /**\n   * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will start `10%` from the left and `20%` from the top.\n   *\n   * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the starting position.\n   * @default { x: 0.5, y: 0.0 }\n   */\n  start?: LinearGradientPoint | null;\n  /**\n   * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will end `10%` from the left and `20%` from the bottom.\n   *\n   * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the end position.\n   * @default { x: 0.5, y: 1.0 }\n   */\n  end?: LinearGradientPoint | null;\n};\n\n/**\n * Renders a native view that transitions between multiple colors in a linear direction.\n */\nexport class LinearGradient extends React.Component<LinearGradientProps> {\n  render() {\n    const { colors, locations, start, end, ...props } = this.props;\n    let resolvedLocations = locations;\n    if (locations && colors.length !== locations.length) {\n      console.warn('LinearGradient colors and locations props should be arrays of the same length');\n      resolvedLocations = locations.slice(0, colors.length);\n    }\n\n    return (\n      <NativeLinearGradient\n        {...props}\n        colors={Platform.select({\n          web: colors as any,\n          default: colors.map(processColor),\n        })}\n        locations={resolvedLocations}\n        startPoint={_normalizePoint(start)}\n        endPoint={_normalizePoint(end)}\n      />\n    );\n  }\n}\n\nfunction _normalizePoint(\n  point: LinearGradientPoint | null | undefined\n): NativeLinearGradientPoint | undefined {\n  if (!point) {\n    return undefined;\n  }\n\n  if (Array.isArray(point) && point.length !== 2) {\n    console.warn('start and end props for LinearGradient must be of the format [x,y] or {x, y}');\n    return undefined;\n  }\n\n  return Array.isArray(point) ? point : [point.x, point.y];\n}\n"]}

package/expo-module.config.json

@@ -3,5 +3,8 @@
   "platforms": ["ios", "android"],
   "ios": {
     "modulesClassNames": ["LinearGradientModule"]
+  },
+  "android": {
+    "modulesClassNames": ["expo.modules.lineargradient.LinearGradientModule"]
   }
 }

package/ios/{EXLinearGradient.podspec → ExpoLinearGradient.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXLinearGradient'
+  s.name           = 'ExpoLinearGradient'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -19,13 +19,14 @@ Pod::Spec.new do |s|
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES'
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
   }
 
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m,swift}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/ios/LinearGradientLayer.swift

@@ -0,0 +1,101 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import QuartzCore
+import CoreGraphics
+
+var defaultStartPoint = CGPoint(x: 0.5, y: 0.0)
+var defaultEndPoint = CGPoint(x: 0.5, y: 1.0)
+var defaultLocations: [CGFloat] = []
+
+final class LinearGradientLayer: CALayer {
+  var colors = [CGColor]()
+  var startPoint = defaultStartPoint
+  var endPoint = defaultEndPoint
+  var locations = defaultLocations
+
+  override init() {
+    super.init()
+    self.needsDisplayOnBoundsChange = true
+    self.masksToBounds = true
+  }
+
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  func setColors(_ colors: [CGColor]) {
+    self.colors = colors
+    setNeedsDisplay()
+  }
+
+  func setStartPoint(_ startPoint: CGPoint?) {
+    self.startPoint = startPoint ?? defaultStartPoint
+    setNeedsDisplay()
+  }
+
+  func setEndPoint(_ endPoint: CGPoint?) {
+    self.endPoint = endPoint ?? defaultEndPoint
+    setNeedsDisplay()
+  }
+
+  func setLocations(_ locations: [CGFloat]?) {
+    self.locations = locations ?? defaultLocations
+    setNeedsDisplay()
+  }
+
+  override func display() {
+    super.display()
+
+    if colors.isEmpty || bounds.size.width.isZero || bounds.size.height.isZero {
+      return
+    }
+    let hasAlpha = colors.reduce(false) { result, color in
+      return result || color.alpha < 1.0
+    }
+
+    UIGraphicsBeginImageContextWithOptions(bounds.size, !hasAlpha, 0.0)
+
+    guard let contextRef = UIGraphicsGetCurrentContext() else {
+      return
+    }
+
+    draw(in: contextRef)
+
+    guard let image = UIGraphicsGetImageFromCurrentImageContext() else {
+      return
+    }
+
+    self.contents = image.cgImage
+    self.contentsScale = image.scale
+
+    UIGraphicsEndImageContext()
+  }
+
+  override func draw(in ctx: CGContext) {
+    super.draw(in: ctx)
+
+    ctx.saveGState()
+
+    let colorSpace = CGColorSpaceCreateDeviceRGB()
+    let locations = colors.enumerated().map { (offset: Int, element: CGColor) -> CGFloat in
+      if self.locations.count > offset {
+        return self.locations[offset]
+      } else {
+        return CGFloat(offset) / CGFloat(colors.count - 1)
+      }
+    }
+
+    if let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: locations) {
+      let size = bounds.size
+
+      ctx.drawLinearGradient(
+        gradient,
+        start: CGPoint(x: startPoint.x * size.width, y: startPoint.y * size.height),
+        end: CGPoint(x: endPoint.x * size.width, y: endPoint.y * size.height),
+        options: [.drawsBeforeStartLocation, .drawsAfterEndLocation]
+      )
+    }
+
+    ctx.restoreGState()
+  }
+}

package/ios/LinearGradientModule.swift

@@ -0,0 +1,32 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import CoreGraphics
+import ExpoModulesCore
+
+public class LinearGradientModule: Module {
+  public func definition() -> ModuleDefinition {
+    name("ExpoLinearGradient")
+
+    viewManager {
+      view {
+        LinearGradientView()
+      }
+
+      prop("colors") { (view: LinearGradientView, colors: [CGColor]) in
+        view.gradientLayer.setColors(colors)
+      }
+
+      prop("startPoint") { (view: LinearGradientView, startPoint: CGPoint?) in
+        view.gradientLayer.setStartPoint(startPoint)
+      }
+
+      prop("endPoint") { (view: LinearGradientView, endPoint: CGPoint?) in
+        view.gradientLayer.setEndPoint(endPoint)
+      }
+
+      prop("locations") { (view: LinearGradientView, locations: [CGFloat]?) in
+        view.gradientLayer.setLocations(locations)
+      }
+    }
+  }
+}

package/ios/LinearGradientView.swift

@@ -0,0 +1,13 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+import UIKit
+
+final class LinearGradientView: UIView {
+  override class var layerClass: AnyClass {
+    return LinearGradientLayer.self
+  }
+
+  public var gradientLayer: LinearGradientLayer {
+    return layer as! LinearGradientLayer
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-linear-gradient",
-  "version": "10.0.2",
+  "version": "11.0.2",
   "description": "Provides a React component that renders a gradient view.",
   "main": "build/LinearGradient.js",
   "types": "build/LinearGradient.d.ts",
@@ -33,11 +33,11 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/linear-gradient/",
-  "dependencies": {
-    "expo-modules-core": "~0.4.3"
-  },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "d23e1ac491da96b51c25eb2533efcd56499ee287"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
 }

package/src/LinearGradient.tsx

@@ -33,6 +33,7 @@ export type LinearGradientProps = ViewProps & {
   /**
    * An array that contains `number`s ranging from `0` to `1`, inclusive, and is the same length as the `colors` property.
    * Each number indicates a color-stop location where each respective color should be located.
+   * If not specified, the colors will be distributed evenly across the gradient.
    *
    * For example, `[0.5, 0.8]` would render:
    * - the first color, solid, from the beginning of the gradient view to 50% through (the middle);
@@ -40,18 +41,21 @@ export type LinearGradientProps = ViewProps & {
    * - the second color, solid, from the 80% point to the end of the gradient view.
    *
    * > The color-stop locations must be ascending from least to greatest.
+   * @default []
    */
   locations?: number[] | null;
   /**
    * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will start `10%` from the left and `20%` from the top.
    *
    * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the starting position.
+   * @default { x: 0.5, y: 0.0 }
    */
   start?: LinearGradientPoint | null;
   /**
    * For example, `{ x: 0.1, y: 0.2 }` means that the gradient will end `10%` from the left and `20%` from the bottom.
    *
    * **On web**, this only changes the angle of the gradient because CSS gradients don't support changing the end position.
+   * @default { x: 0.5, y: 1.0 }
    */
   end?: LinearGradientPoint | null;
 };

package/android/src/main/java/expo/modules/lineargradient/LinearGradientManager.java

@@ -1,60 +0,0 @@
-package expo.modules.lineargradient;
-
-import android.content.Context;
-
-import expo.modules.core.ViewManager;
-import expo.modules.core.interfaces.ExpoProp;
-
-import java.util.ArrayList;
-
-public class LinearGradientManager extends ViewManager<LinearGradientView> {
-  public static final String VIEW_CLASS_NAME = "ExpoLinearGradient";
-  public static final String PROP_COLORS = "colors";
-  public static final String PROP_LOCATIONS = "locations";
-  public static final String PROP_START_POS = "startPoint";
-  public static final String PROP_END_POS = "endPoint";
-  public static final String PROP_BORDER_RADII = "borderRadii";
-
-  @Override
-  public String getName() {
-    return VIEW_CLASS_NAME;
-  }
-  @Override
-  public LinearGradientView createViewInstance(Context context) {
-    return new LinearGradientView(context);
-  }
-
-  @Override
-  public ViewManagerType getViewManagerType() {
-    return ViewManagerType.SIMPLE;
-  }
-
-  @ExpoProp(name = PROP_COLORS)
-  public void setColors(LinearGradientView view, final ArrayList<Double> colors) {
-    view.setColors(colors);
-  }
-
-  @ExpoProp(name = PROP_LOCATIONS)
-  public void setLocations(LinearGradientView view, final ArrayList<Double> locations) {
-    if (locations != null) {
-      view.setLocations(locations);
-    }
-  }
-
-  @ExpoProp(name = PROP_START_POS)
-  public void setStartPosition(LinearGradientView view, final ArrayList<Double> startPos) {
-    view.setStartPosition(startPos);
-  }
-
-  @ExpoProp(name = PROP_END_POS)
-  public void setEndPosition(LinearGradientView view, final ArrayList<Double> endPos) {
-    view.setEndPosition(endPos);
-  }
-
-  // temporary solution until following issue is resolved:
-  // https://github.com/facebook/react-native/issues/3198
-  @ExpoProp(name = PROP_BORDER_RADII)
-  public void setBorderRadii(LinearGradientView view, final ArrayList<Double> borderRadii) {
-    view.setBorderRadii(borderRadii);
-  }
-}

package/android/src/main/java/expo/modules/lineargradient/LinearGradientPackage.java

@@ -1,16 +0,0 @@
-package expo.modules.lineargradient;
-
-import android.content.Context;
-
-import java.util.Collections;
-import java.util.List;
-
-import expo.modules.core.BasePackage;
-import expo.modules.core.ViewManager;
-
-public class LinearGradientPackage extends BasePackage {
-  @Override
-  public List<ViewManager> createViewManagers(Context context) {
-    return Collections.singletonList((ViewManager) new LinearGradientManager());
-  }
-}

package/ios/EXLinearGradient/EXLinearGradient.h

@@ -1,12 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-#import <UIKit/UIKit.h>
-
-@interface EXLinearGradient : UIView
-
-- (void)setColors:(NSArray *)colorStrings;
-- (void)setLocations:(NSArray *)locations;
-- (void)setStartPoint:(CGPoint)start;
-- (void)setEndPoint:(CGPoint)end;
-
-@end

package/ios/EXLinearGradient/EXLinearGradient.m

@@ -1,53 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-#import <EXLinearGradient/EXLinearGradient.h>
-#import <EXLinearGradient/EXLinearGradientLayer.h>
-#import <UIKit/UIKit.h>
-#import <ExpoModulesCore/EXModuleRegistry.h>
-#import <ExpoModulesCore/EXAppLifecycleListener.h>
-#import <ExpoModulesCore/EXUtilities.h>
-
-@interface EXLinearGradient ()
-
-@end
-
-@implementation EXLinearGradient
-
-+ (Class)layerClass
-{
-  return [EXLinearGradientLayer class];
-}
-
-- (EXLinearGradientLayer *)gradientLayer
-{
-  return (EXLinearGradientLayer *)self.layer;
-}
-
-- (void)setColors:(NSArray *)colorStrings
-{
-  NSMutableArray *colors = [NSMutableArray arrayWithCapacity:colorStrings.count];
-  for (NSString *colorString in colorStrings) {
-    UIColor *convertedColor = [EXUtilities UIColor:colorString];
-    if (convertedColor) {
-      [colors addObject:convertedColor];
-    }
-  }
-  self.gradientLayer.colors = colors;
-}
-
-- (void)setStartPoint:(CGPoint)start
-{
-  self.gradientLayer.startPoint = start;
-}
-
-- (void)setEndPoint:(CGPoint)end
-{
-  self.gradientLayer.endPoint = end;
-}
-
-- (void)setLocations:(NSArray *)locations
-{
-  self.gradientLayer.locations = locations;
-}
-
-@end

package/ios/EXLinearGradient/EXLinearGradientLayer.h

@@ -1,14 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <Foundation/Foundation.h>
-#import <QuartzCore/QuartzCore.h>
-#import <UIKit/UIKit.h>
-
-@interface EXLinearGradientLayer : CALayer
-
-@property (nullable, nonatomic, copy) NSArray<UIColor *> *colors;
-@property (nullable, nonatomic, copy) NSArray<NSNumber *> *locations;
-@property (nonatomic) CGPoint startPoint;
-@property (nonatomic) CGPoint endPoint;
-
-@end

package/ios/EXLinearGradient/EXLinearGradientLayer.m

@@ -1,110 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXLinearGradient/EXLinearGradientLayer.h>
-
-@implementation EXLinearGradientLayer
-
-- (instancetype)init
-{
-  self = [super init];
-
-  if (self) {
-    self.needsDisplayOnBoundsChange = YES;
-    self.masksToBounds = YES;
-    _startPoint = CGPointMake(0.5, 0.0);
-    _endPoint = CGPointMake(0.5, 1.0);
-  }
-
-  return self;
-}
-
-- (void)setColors:(NSArray<id> *)colors
-{
-  _colors = colors;
-  [self setNeedsDisplay];
-}
-
-- (void)setLocations:(NSArray<NSNumber *> *)locations
-{
-  _locations = locations;
-  [self setNeedsDisplay];
-}
-
-- (void)setStartPoint:(CGPoint)startPoint
-{
-  _startPoint = startPoint;
-  [self setNeedsDisplay];
-}
-
-- (void)setEndPoint:(CGPoint)endPoint
-{
-  _endPoint = endPoint;
-  [self setNeedsDisplay];
-}
-
-- (void)display {
-  [super display];
-
-  BOOL hasAlpha = NO;
-
-  for (NSInteger i = 0; i < self.colors.count; i++) {
-    hasAlpha = hasAlpha || CGColorGetAlpha(self.colors[i].CGColor) < 1.0;
-  }
-
-  UIGraphicsBeginImageContextWithOptions(self.bounds.size, !hasAlpha, 0.0);
-  CGContextRef ref = UIGraphicsGetCurrentContext();
-  [self drawInContext:ref];
-
-  UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-  self.contents = (__bridge id _Nullable)(image.CGImage);
-  self.contentsScale = image.scale;
-
-  UIGraphicsEndImageContext();
-}
-
-- (void)drawInContext:(CGContextRef)ctx
-{
-  [super drawInContext:ctx];
-
-  CGContextSaveGState(ctx);
-
-  CGSize size = self.bounds.size;
-  if (!self.colors || self.colors.count == 0 || size.width == 0.0 || size.height == 0.0)
-    return;
-
-
-  CGFloat *locations = nil;
-
-  locations = malloc(sizeof(CGFloat) * self.colors.count);
-
-  for (NSInteger i = 0; i < self.colors.count; i++) {
-    if (self.locations.count > i) {
-      locations[i] = self.locations[i].floatValue;
-    } else {
-      locations[i] = (1.0 / (self.colors.count - 1)) * i;
-    }
-  }
-
-  CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-  NSMutableArray *colors = [[NSMutableArray alloc] initWithCapacity:self.colors.count];
-  for (UIColor *color in self.colors) {
-    [colors addObject:(id)color.CGColor];
-  }
-
-  CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (CFArrayRef)colors, locations);
-
-  free(locations);
-
-  CGPoint start = self.startPoint, end = self.endPoint;
-
-  CGContextDrawLinearGradient(ctx, gradient,
-                              CGPointMake(start.x * size.width, start.y * size.height),
-                              CGPointMake(end.x * size.width, end.y * size.height),
-                              kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation);
-  CGGradientRelease(gradient);
-  CGColorSpaceRelease(colorSpace);
-
-  CGContextRestoreGState(ctx);
-}
-
-@end

package/ios/EXLinearGradient/EXLinearGradientManager.h

@@ -1,8 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXViewManager.h>
-#import <ExpoModulesCore/EXExportedModule.h>
-
-@interface EXLinearGradientManager : EXViewManager
-
-@end

package/ios/EXLinearGradient/EXLinearGradientManager.m

@@ -1,45 +0,0 @@
-// Copyright 2015-present 650 Industries. All rights reserved.
-
-#import <EXLinearGradient/EXLinearGradientManager.h>
-#import <EXLinearGradient/EXLinearGradient.h>
-#import <ExpoModulesCore/EXUIManager.h>
-
-@interface EXLinearGradientManager ()
-
-@end
-
-@implementation EXLinearGradientManager
-
-EX_EXPORT_MODULE(ExpoLinearGradientManager);
-
-- (NSString *)viewName
-{
-  return @"ExpoLinearGradient";
-}
-
-- (UIView *)view
-{
-  return [[EXLinearGradient alloc] init];
-}
-
-EX_VIEW_PROPERTY(colors, NSArray *, EXLinearGradient) {
-  [view setColors:value];
-}
-
-// NOTE: startPoint and endPoint assume that the value is an array with exactly two floats
-
-EX_VIEW_PROPERTY(startPoint, NSArray *, EXLinearGradient) {
-  CGPoint point = CGPointMake([[value objectAtIndex:0] floatValue], [[value objectAtIndex:1] floatValue]);
-  [view setStartPoint:point];
-}
-
-EX_VIEW_PROPERTY(endPoint, NSArray *, EXLinearGradient) {
-  CGPoint point = CGPointMake([[value objectAtIndex:0] floatValue], [[value objectAtIndex:1] floatValue]);
-  [view setEndPoint:point];
-}
-
-EX_VIEW_PROPERTY(locations, NSArray *, EXLinearGradient) {
-  [view setLocations:value];
-}
-
-@end

package/ios/EXLinearGradient/LinearGradientModule.swift

@@ -1,29 +0,0 @@
-import ExpoModulesCore
-
-public class LinearGradientModule: Module {
-  public func definition() -> ModuleDefinition {
-    name("ExpoLinearGradient")
-
-    viewManager {
-      view {
-        EXLinearGradient()
-      }
-
-      prop("colors") { (view: EXLinearGradient, colors: [Int]) in
-        view.setColors(colors)
-      }
-
-      prop("startPoint") { (view: EXLinearGradient, startPoint: [Double]) in
-        view.setStart(CGPoint(x: startPoint[0], y: startPoint[1]))
-      }
-
-      prop("endPoint") { (view: EXLinearGradient, endPoint: [Double]) in
-        view.setEnd(CGPoint(x: endPoint[0], y: endPoint[1]))
-      }
-
-      prop("locations") { (view: EXLinearGradient, locations: [Double]) in
-        view.setLocations(locations)
-      }
-    }
-  }
-}

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-linear-gradient",
-  "platforms": ["ios", "android"]
-}