expo-store-review 6.0.0 → 6.2.0

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 6.2.0 — 2023-02-03
+
+### 💡 Others
+
+- On Android bump `compileSdkVersion` and `targetSdkVersion` to `33`. ([#20721](https://github.com/expo/expo/pull/20721) by [@lukmccall](https://github.com/lukmccall))
+
+## 6.1.0 — 2022-12-30
+
+### 🎉 New features
+
+- Migrated Android implementation to Expo Modules API. ([#19898](https://github.com/expo/expo/pull/19898) by [@alanhughes](https://github.com/alanjhughes))
+
 ## 6.0.0 — 2022-10-25
 
 ### 🛠 Breaking changes

package/README.md

@@ -4,7 +4,7 @@
 
 # API documentation
 
-- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/storereview.md)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/storereview.mdx)
 - [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/storereview/)
 
 # Installation in managed Expo projects

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '6.0.0'
+version = '6.2.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -59,7 +59,7 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 31)
+  compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11
@@ -72,9 +72,9 @@ android {
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 31)
+    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 4
-    versionName "6.0.0"
+    versionName "6.2.0"
   }
   lintOptions {
     abortOnError false
@@ -84,6 +84,8 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  api 'com.google.android.gms:play-services-base:17.3.0'
-  api 'com.google.android.play:core:1.8.0'
+
+  implementation "com.google.android.play:review:2.0.1"
+  implementation "com.google.android.play:review-ktx:2.0.0"
+  api "com.google.android.gms:play-services-base:17.3.0"
 }

package/android/src/main/java/expo/modules/storereview/StoreReviewExceptions.kt

@@ -0,0 +1,12 @@
+package expo.modules.storereview
+
+import expo.modules.kotlin.exception.CodedException
+
+internal class MissingCurrentActivityException :
+  CodedException("Activity which was provided during module initialization is no longer available")
+
+internal class RMTaskException :
+  CodedException("Android ReviewManager task failed")
+
+internal class RMUnsuccessfulTaskException :
+  CodedException("Android ReviewManager task was not successful")

package/android/src/main/java/expo/modules/storereview/StoreReviewModule.kt

@@ -6,65 +6,59 @@ import android.os.Build
 import com.google.android.gms.common.GooglePlayServicesUtil
 import com.google.android.play.core.review.ReviewManager
 import com.google.android.play.core.review.ReviewManagerFactory
-import expo.modules.core.ExportedModule
-import expo.modules.core.ModuleRegistry
-import expo.modules.core.Promise
-import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.ExpoMethod
+import expo.modules.kotlin.Promise
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 
-class StoreReviewModule(private val mContext: Context) :
-  ExportedModule(mContext) {
-  companion object {
-    private const val NAME = "ExpoStoreReview"
-  }
+class StoreReviewModule : Module() {
+  private val context: Context
+    get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
 
-  private lateinit var mActivityProvider: ActivityProvider
+  private val currentActivity
+    get() = appContext.activityProvider?.currentActivity
+      ?: throw MissingCurrentActivityException()
 
-  override fun getName(): String {
-    return NAME
-  }
+  override fun definition() = ModuleDefinition {
+    Name("ExpoStoreReview")
 
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    mActivityProvider = moduleRegistry.getModule(ActivityProvider::class.java)
-  }
+    AsyncFunction("isAvailableAsync") {
+      return@AsyncFunction Build.VERSION.SDK_INT >= 21 && isPlayStoreInstalled()
+    }
 
-  @ExpoMethod
-  fun isAvailableAsync(promise: Promise) {
-    if (Build.VERSION.SDK_INT >= 21 && isPlayStoreInstalled()) {
-      promise.resolve(true)
-    } else {
-      promise.resolve(false)
+    AsyncFunction("requestReview") { promise: Promise ->
+      requestReview(promise)
     }
   }
 
-  @ExpoMethod
-  fun requestReview(promise: Promise) {
-    val manager: ReviewManager = ReviewManagerFactory.create(mContext)
+  private fun requestReview(promise: Promise) {
+    val manager: ReviewManager = ReviewManagerFactory.create(context)
     val request = manager.requestReviewFlow()
+
     request.addOnCompleteListener { task ->
       if (task.isSuccessful) {
         val reviewInfo = task.result
-        val flow = manager.launchReviewFlow(mActivityProvider.currentActivity, reviewInfo)
-        flow.addOnCompleteListener { task ->
-          if (task.isSuccessful) {
-            promise.resolve(null)
-          } else {
-            promise.reject("ERR_STORE_REVIEW_FAILED", "Android ReviewManager task failed")
+        reviewInfo?.let {
+          val flow = manager.launchReviewFlow(currentActivity, it)
+          flow.addOnCompleteListener { result ->
+            if (result.isSuccessful) {
+              promise.resolve(null)
+            } else {
+              promise.reject(RMTaskException())
+            }
           }
-        }
+        } ?: promise.reject(RMTaskException())
       } else {
-        promise.reject("ERR_STORE_REVIEW_FAILED", "Android ReviewManager task was not successful")
+        promise.reject(RMUnsuccessfulTaskException())
       }
     }
   }
 
-  private fun isPlayStoreInstalled(): Boolean {
-    return try {
-      mContext.packageManager
-        .getPackageInfo(GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE, 0)
-      true
-    } catch (e: PackageManager.NameNotFoundException) {
-      false
-    }
+  private fun isPlayStoreInstalled(): Boolean = try {
+    context.packageManager
+      .getPackageInfo(GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE, 0)
+    true
+  } catch (e: PackageManager.NameNotFoundException) {
+    false
   }
 }

package/expo-module.config.json

@@ -3,5 +3,8 @@
   "platforms": ["ios", "android"],
   "ios": {
     "modules": ["StoreReviewModule"]
+  },
+  "android": {
+    "modules": ["expo.modules.storereview.StoreReviewModule"]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-store-review",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "description": "ExpoStoreReview standalone module",
   "main": "build/StoreReview.js",
   "types": "build/StoreReview.d.ts",
@@ -36,5 +36,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "eab2b09c735fb0fc2bf734a3f29a6593adba3838"
+  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
 }

package/android/src/main/java/expo/modules/storereview/StoreReviewPackage.kt

@@ -1,8 +0,0 @@
-package expo.modules.storereview
-
-import android.content.Context
-import expo.modules.core.BasePackage
-
-class StoreReviewPackage : BasePackage() {
-  override fun createExportedModules(context: Context) = listOf(StoreReviewModule(context))
-}