Skip to content

Commit 5fe7f7a

Browse files
authored
Update android directory structure to match package name (#25)
* Update android directory structure to match package name * Update snapshot * Minor fixes
1 parent 5624f9f commit 5fe7f7a

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

modules/react-native-shopify-checkout-kit/android/src/main/java/com/shopifycheckoutkit/CustomCheckoutEventProcessor.java renamed to modules/react-native-shopify-checkout-kit/android/src/main/java/com/shopify/reactnative/checkoutkit/CustomCheckoutEventProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
3131
import com.facebook.react.bridge.ReactContextBaseJavaModule;
3232
import com.facebook.react.bridge.ReactContext;
3333
import com.facebook.react.bridge.WritableMap;
34-
import com.facebook.react.bridge.Arguments;
34+
import com.facebook.react.bridge.JavaOnlyMap;
3535
import org.jetbrains.annotations.Nullable;
3636

3737
public class CustomCheckoutEventProcessor extends DefaultCheckoutEventProcessor {
@@ -50,7 +50,7 @@ public void onCheckoutCompleted() {
5050

5151
@Override
5252
public void onCheckoutFailed(CheckoutException checkoutError) {
53-
WritableMap error = Arguments.createMap();
53+
JavaOnlyMap error = new JavaOnlyMap();
5454

5555
error.putString("message", checkoutError.getErrorDescription());
5656

modules/react-native-shopify-checkout-kit/android/src/main/java/com/shopifycheckoutkit/ShopifyCheckoutKitModule.java renamed to modules/react-native-shopify-checkout-kit/android/src/main/java/com/shopify/reactnative/checkoutkit/ShopifyCheckoutKitModule.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@ of this software and associated documentation files (the "Software"), to deal
2626
import android.app.Activity;
2727
import android.content.Context;
2828
import androidx.activity.ComponentActivity;
29-
import androidx.core.content.ContextCompat;
30-
import com.facebook.react.bridge.Arguments;
29+
import androidx.annotation.NonNull;
3130
import com.facebook.react.bridge.Promise;
3231
import com.facebook.react.bridge.ReactApplicationContext;
3332
import com.facebook.react.bridge.ReactContextBaseJavaModule;
3433
import com.facebook.react.bridge.ReactMethod;
3534
import com.facebook.react.bridge.ReadableMap;
3635
import com.facebook.react.bridge.WritableNativeMap;
37-
import org.jetbrains.annotations.NotNull;
38-
import android.net.Uri;
3936
import com.shopify.checkoutkit.*;
4037

4138
import java.util.HashMap;
@@ -46,14 +43,15 @@ public class ShopifyCheckoutKitModule extends ReactContextBaseJavaModule {
4643

4744
public static Configuration checkoutConfig = new Configuration();
4845

49-
private ReactApplicationContext reactContext;
46+
private final ReactApplicationContext reactContext;
5047

5148
public ShopifyCheckoutKitModule(ReactApplicationContext reactContext) {
5249
super(reactContext);
5350

5451
this.reactContext = reactContext;
5552
}
5653

54+
@NonNull
5755
@Override
5856
public String getName() {
5957
return MODULE_NAME;

modules/react-native-shopify-checkout-kit/android/src/main/java/com/shopifycheckoutkit/ShopifyCheckoutKitPackage.java renamed to modules/react-native-shopify-checkout-kit/android/src/main/java/com/shopify/reactnative/checkoutkit/ShopifyCheckoutKitPackage.java

File renamed without changes.

modules/react-native-shopify-checkout-kit/package.snapshot.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"android/gradle.properties",
66
"android/src/main/AndroidManifest.xml",
77
"android/src/main/AndroidManifestNew.xml",
8-
"android/src/main/java/com/shopifycheckoutkit/CustomCheckoutEventProcessor.java",
9-
"android/src/main/java/com/shopifycheckoutkit/ShopifyCheckoutKitModule.java",
10-
"android/src/main/java/com/shopifycheckoutkit/ShopifyCheckoutKitPackage.java",
8+
"android/src/main/java/com/shopify/reactnative/checkoutkit/CustomCheckoutEventProcessor.java",
9+
"android/src/main/java/com/shopify/reactnative/checkoutkit/ShopifyCheckoutKitModule.java",
10+
"android/src/main/java/com/shopify/reactnative/checkoutkit/ShopifyCheckoutKitPackage.java",
1111
"ios/ShopifyCheckoutKit-Bridging-Header.h",
1212
"ios/ShopifyCheckoutKit.mm",
1313
"ios/ShopifyCheckoutKit.swift",

0 commit comments

Comments
 (0)