diff --git a/modules/react-native-ui-text-view/android/build.gradle b/modules/react-native-ui-text-view/android/build.gradle deleted file mode 100644 index beb57dba92..0000000000 --- a/modules/react-native-ui-text-view/android/build.gradle +++ /dev/null @@ -1,94 +0,0 @@ -buildscript { - // Buildscript is evaluated before everything else so we can't use getExtOrDefault - def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["UiTextView_kotlinVersion"] - - repositories { - google() - mavenCentral() - } - - dependencies { - classpath "com.android.tools.build:gradle:7.2.1" - // noinspection DifferentKotlinGradleVersion - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -def isNewArchitectureEnabled() { - return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true" -} - -apply plugin: "com.android.library" -apply plugin: "kotlin-android" - -if (isNewArchitectureEnabled()) { - apply plugin: "com.facebook.react" -} - -def getExtOrDefault(name) { - return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["UiTextView_" + name] -} - -def getExtOrIntegerDefault(name) { - return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["UiTextView_" + name]).toInteger() -} - -def supportsNamespace() { - def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.') - def major = parsed[0].toInteger() - def minor = parsed[1].toInteger() - - // Namespace support was added in 7.3.0 - return (major == 7 && minor >= 3) || major >= 8 -} - -android { - if (supportsNamespace()) { - namespace "com.uitextview" - - sourceSets { - main { - manifest.srcFile "src/main/AndroidManifestNew.xml" - } - } - } - - compileSdkVersion getExtOrIntegerDefault("compileSdkVersion") - - defaultConfig { - minSdkVersion getExtOrIntegerDefault("minSdkVersion") - targetSdkVersion getExtOrIntegerDefault("targetSdkVersion") - - } - - buildTypes { - release { - minifyEnabled false - } - } - - lintOptions { - disable "GradleCompatible" - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} - -repositories { - mavenCentral() - google() -} - -def kotlin_version = getExtOrDefault("kotlinVersion") - -dependencies { - // For < 0.71, this will be from the local maven repo - // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin - //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} - diff --git a/modules/react-native-ui-text-view/android/gradle.properties b/modules/react-native-ui-text-view/android/gradle.properties deleted file mode 100644 index f60fa36f9a..0000000000 --- a/modules/react-native-ui-text-view/android/gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -UiTextView_kotlinVersion=1.7.0 -UiTextView_minSdkVersion=21 -UiTextView_targetSdkVersion=31 -UiTextView_compileSdkVersion=31 -UiTextView_ndkversion=21.4.7075529 diff --git a/modules/react-native-ui-text-view/android/src/main/AndroidManifest.xml b/modules/react-native-ui-text-view/android/src/main/AndroidManifest.xml deleted file mode 100644 index 5fc0734b47..0000000000 --- a/modules/react-native-ui-text-view/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/modules/react-native-ui-text-view/android/src/main/AndroidManifestNew.xml b/modules/react-native-ui-text-view/android/src/main/AndroidManifestNew.xml deleted file mode 100644 index a2f47b6057..0000000000 --- a/modules/react-native-ui-text-view/android/src/main/AndroidManifestNew.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/modules/react-native-ui-text-view/android/src/main/java/com/uitextview/UiTextViewPackage.kt b/modules/react-native-ui-text-view/android/src/main/java/com/uitextview/UiTextViewPackage.kt deleted file mode 100644 index 58eb101f2f..0000000000 --- a/modules/react-native-ui-text-view/android/src/main/java/com/uitextview/UiTextViewPackage.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.uitextview - -import com.facebook.react.ReactPackage -import com.facebook.react.bridge.NativeModule -import com.facebook.react.bridge.ReactApplicationContext -import com.facebook.react.uimanager.ViewManager - - -class UiTextViewPackage : ReactPackage { - override fun createNativeModules(reactContext: ReactApplicationContext): List { - return emptyList() - } - - override fun createViewManagers(reactContext: ReactApplicationContext): List> { - return listOf(UiTextViewViewManager()) - } -} diff --git a/modules/react-native-ui-text-view/android/src/main/java/com/uitextview/UiTextViewViewManager.kt b/modules/react-native-ui-text-view/android/src/main/java/com/uitextview/UiTextViewViewManager.kt deleted file mode 100644 index f7202fd1b1..0000000000 --- a/modules/react-native-ui-text-view/android/src/main/java/com/uitextview/UiTextViewViewManager.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.uitextview - -import android.graphics.Color -import android.view.View -import com.facebook.react.uimanager.SimpleViewManager -import com.facebook.react.uimanager.ThemedReactContext -import com.facebook.react.uimanager.annotations.ReactProp - -class UiTextViewViewManager : SimpleViewManager() { - override fun getName() = "UiTextViewView" - - override fun createViewInstance(reactContext: ThemedReactContext): View { - return View(reactContext) - } - - @ReactProp(name = "color") - fun setColor(view: View, color: String) { - view.setBackgroundColor(Color.parseColor(color)) - } -} diff --git a/modules/react-native-ui-text-view/package.json b/modules/react-native-ui-text-view/package.json index a21bdf7055..b855df83b6 100644 --- a/modules/react-native-ui-text-view/package.json +++ b/modules/react-native-ui-text-view/package.json @@ -1,9 +1,8 @@ { "name": "react-native-ui-text-view", - "version": "0.0.0", + "version": "0.1.0", "description": "UITextView in React Native on iOS", "main": "src/index", - "author": " <> ()", - "license": "UNLICENSED", - "homepage": "#readme" + "license": "MIT", + "homepage": "https://github.com/bluesky-social/social-app/modules/react-native-ui-text-view" } diff --git a/modules/react-native-ui-text-view/src/UITextView.tsx b/modules/react-native-ui-text-view/src/UITextView.tsx index 79df9dc172..42dbcf6e1e 100644 --- a/modules/react-native-ui-text-view/src/UITextView.tsx +++ b/modules/react-native-ui-text-view/src/UITextView.tsx @@ -1,5 +1,5 @@ import React from 'react' -import {StyleSheet, TextProps, ViewStyle} from 'react-native' +import {Platform, StyleSheet, TextProps, ViewStyle} from 'react-native' import {RNUITextView, RNUITextViewChild} from './index' const TextAncestorContext = React.createContext<[boolean, ViewStyle]>([ @@ -22,6 +22,10 @@ export function UITextView({style, children, ...rest}: TextProps) { [rootStyle, style], ) + if (Platform.OS !== 'ios') { + throw new Error('UITextView is only available on iOS') + } + if (!isAncestor) { return (