react-native-unit-components 1.9.1 → 1.11.0

package/android/build.gradle

@@ -3,26 +3,26 @@ buildscript {
   def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['UnitReactNativeComponents_kotlinVersion']
 
   repositories {
-      google()
-      mavenCentral()
+    google()
+    mavenCentral()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.3'
+    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"
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
-  apply plugin: 'com.facebook.react'
+  apply plugin: "com.facebook.react"
 }
 
 def getExtOrDefault(name) {
@@ -33,14 +33,34 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['UnitReactNativeComponents_' + 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 {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+  if (supportsNamespace()) {
+    namespace "com.unitreactnativecomponents"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
+    }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
-    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
   }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -48,7 +68,7 @@ android {
   }
 
   lintOptions {
-    disable 'GradleCompatible'
+    disable "GradleCompatible"
   }
 
   compileOptions {
@@ -60,86 +80,14 @@ android {
 repositories {
   mavenCentral()
   google()
-
-  def found = false
-  def defaultDir = null
-  def androidSourcesName = 'React Native sources'
-
-  if (rootProject.ext.has('reactNativeAndroidRoot')) {
-    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-  } else {
-    defaultDir = new File(
-      projectDir,
-      '/../../../node_modules/react-native/android'
-    )
-  }
-
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-    found = true
-  } else {
-    def parentDir = rootProject.projectDir
-
-    1.upto(5, {
-      if (found) return true
-      parentDir = parentDir.parentFile
-
-      def androidSourcesDir = new File(
-        parentDir,
-        'node_modules/react-native'
-      )
-
-      def androidPrebuiltBinaryDir = new File(
-        parentDir,
-        'node_modules/react-native/android'
-      )
-
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-        found = true
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-      "${project.name}: unable to locate React Native android sources. " +
-      "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
-  }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-    //noinspection GradleDynamicVersion
+  // 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"
-// From node_modules
-}
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "UnitReactNativeComponents"
-    codegenJavaPackageName = "com.unitreactnativecomponents"
-  }
 }

package/android/gradle.properties

@@ -1,5 +1,5 @@
 UnitReactNativeComponents_kotlinVersion=1.7.0
 UnitReactNativeComponents_minSdkVersion=21
-UnitReactNativeComponents_targetSdkVersion=31
-UnitReactNativeComponents_compileSdkVersion=31
+UnitReactNativeComponents_targetSdkVersion=33
+UnitReactNativeComponents_compileSdkVersion=33
 UnitReactNativeComponents_ndkversion=21.4.7075529

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <provider
+      android:name="androidx.core.content.FileProvider"
+      android:authorities="${applicationId}.provider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/file_paths">
+      </meta-data>
+    </provider>
+  </application>
+</manifest>

package/android/src/main/java/com/unitreactnativecomponents/UnitAddToWalletButtonViewManager.kt

@@ -5,7 +5,6 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.unitreactnativecomponents.visapresentation.UNGooglePayView
 
-
 class UnitAddToWalletButtonViewManager : SimpleViewManager<UNGooglePayView>() {
   override fun getName() = "UnitAddToWalletButtonView"
 
@@ -21,7 +20,8 @@ class UnitAddToWalletButtonViewManager : SimpleViewManager<UNGooglePayView>() {
 
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     return MapBuilder.of(
-      "onAddToWalletClicked", MapBuilder.of("registrationName","onAddToWalletClicked")
+      "onAddToWalletClicked",
+      MapBuilder.of("registrationName", "onAddToWalletClicked"),
     )
   }
 }

package/android/src/main/java/com/unitreactnativecomponents/UnitReactNativeComponentsEvent.kt

@@ -3,7 +3,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class UnitReactNativeComponentsEvent (surfaceId: Int, viewTag: Int) : Event<UnitReactNativeComponentsEvent>() {
+class UnitReactNativeComponentsEvent(surfaceId: Int, viewTag: Int) : Event<UnitReactNativeComponentsEvent>() {
   private val kEventName = "onAddToWalletClicked"
 
   init {
@@ -11,8 +11,8 @@ class UnitReactNativeComponentsEvent (surfaceId: Int, viewTag: Int) : Event<Unit
   }
 
   override fun getEventData(): WritableMap? {
-    //empty data response
-    return Arguments.createMap();
+    // empty data response
+    return Arguments.createMap()
   }
 
   override fun getEventName(): String {

package/android/src/main/java/com/unitreactnativecomponents/UnitReactNativeComponentsPackage.kt

@@ -4,20 +4,17 @@ import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 import com.unitreactnativecomponents.getapplicationid.UNAppInfoModule
-
 import com.unitreactnativecomponents.sharepdf.UNShareFile
 
-
 class UnitReactNativeComponentsPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        var modules: ArrayList<NativeModule> = ArrayList()
-        modules.add(UNShareFile(reactContext))
-        modules.add(UNAppInfoModule(reactContext))
-        return modules
-    }
-
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(UnitAddToWalletButtonViewManager())
-    }
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    val modules: ArrayList<NativeModule> = ArrayList()
+    modules.add(UNShareFile(reactContext))
+    modules.add(UNAppInfoModule(reactContext))
+    return modules
+  }
 
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return listOf(UnitAddToWalletButtonViewManager())
+  }
 }

package/android/src/main/java/com/unitreactnativecomponents/appInfo/UNAppInfoModule.kt

@@ -0,0 +1,59 @@
+package com.unitreactnativecomponents.getapplicationid
+
+import android.content.pm.PackageManager
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.unitreactnativecomponents.extensions.getAppIdentifier
+import com.unitreactnativecomponents.extensions.getAppName
+import com.unitreactnativecomponents.extensions.getVersionCode
+import com.unitreactnativecomponents.extensions.getVersionName
+
+class UNAppInfoModule(var reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+
+  @ReactMethod
+  fun getAppName(promise: Promise) {
+    try {
+      promise.resolve(reactContext.applicationContext.getAppName())
+    } catch (e: PackageManager.NameNotFoundException) {
+      promise.reject(e)
+    }
+  }
+
+  @ReactMethod
+  fun getAppIdentifier(promise: Promise) {
+    try {
+      promise.resolve(reactContext.applicationContext.getAppIdentifier())
+    } catch (e: PackageManager.NameNotFoundException) {
+      promise.reject(e)
+    }
+  }
+
+  @ReactMethod
+  fun getVersion(promise: Promise) {
+    try {
+      promise.resolve(reactContext.applicationContext.getVersionName())
+    } catch (e: PackageManager.NameNotFoundException) {
+      promise.reject(e)
+    }
+  }
+
+  @ReactMethod
+  fun getBuildNumber(promise: Promise) {
+    try {
+      promise.resolve(reactContext.applicationContext.getVersionCode().toString())
+    } catch (e: PackageManager.NameNotFoundException) {
+      promise.reject(e)
+    }
+  }
+
+  override fun getName(): String {
+    return REACT_CLASS
+  }
+
+  companion object {
+    private const val REACT_CLASS = "AndroidAppInfo"
+  }
+}

package/android/src/main/java/com/unitreactnativecomponents/extensions/ContextExtensions.kt

@@ -0,0 +1,35 @@
+package com.unitreactnativecomponents.extensions
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.os.Build
+
+fun Context.getPackageInfo(): PackageInfo {
+  return packageManager.getPackageInfo(packageName, 0)
+}
+
+fun Context.getAppName(): String = try {
+  applicationInfo.loadLabel(packageManager).toString()
+} catch (e: PackageManager.NameNotFoundException) {
+  "unknown"
+}
+
+fun Context.getAppIdentifier(): String = try {
+  getPackageInfo().packageName
+} catch (e: PackageManager.NameNotFoundException) {
+  "unknown"
+}
+
+fun Context.getVersionName(): String = try {
+  getPackageInfo().versionName
+} catch (e: PackageManager.NameNotFoundException) {
+  "unknown"
+}
+
+@Suppress("DEPRECATION")
+fun Context.getVersionCode(): Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+  getPackageInfo().longVersionCode.toInt()
+} else {
+  getPackageInfo().versionCode
+}