Merged in release/16.1.0 (pull request #74)

Release/16.1.0

Author: mstanic-shake

android/build.gradle

@@ -76,5 +76,5 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    api "$System.env.ANDROID_DEPENDENCY:16.0.+"
+    api "$System.env.ANDROID_DEPENDENCY:16.1.+"
 }

android/src/main/java/com/shakebugs/react/ShakeModule.java

@@ -12,7 +12,6 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.UIBlock;
@@ -34,6 +33,7 @@
 import com.shakebugs.shake.privacy.NotificationEventsFilter;
 import com.shakebugs.shake.report.ShakeFile;
 import com.shakebugs.shake.report.ShakeReportData;
+import com.shakebugs.shake.theme.ShakeTheme;
 
 import java.util.List;
 import java.util.Map;
@@ -115,6 +115,27 @@ public void run() {
         });
     }
 
+    @ReactMethod
+    public void setShakeTheme(final ReadableMap shakeThemeMap) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                ShakeTheme shakeTheme = mapper.mapMapToShakeTheme(shakeThemeMap);
+                Shake.getReportConfiguration().setTheme(shakeTheme);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void setHomeSubtitle(final String subtitle) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Shake.getReportConfiguration().setHomeSubtitle(subtitle);
+            }
+        });
+    }
+
     @ReactMethod
     public void isUserFeedbackEnabled(Promise promise) {
         promise.resolve(Shake.isUserFeedbackEnabled());

android/src/main/java/com/shakebugs/react/utils/Constants.java

@@ -3,5 +3,5 @@
 public class Constants {
     public static final String PLATFORM = "ReactNative";
     public static final String VERSION_CODE = "1";
-    public static final String VERSION_NAME = "16.0.0";
+    public static final String VERSION_NAME = "16.1.0";
 }

android/src/main/java/com/shakebugs/react/utils/Converter.java

@@ -2,6 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
+import android.util.DisplayMetrics;
 
 public class Converter {
     public static int stringToInt(String string) {
@@ -38,4 +40,19 @@ public static Integer stringToRes(Context context, String resName, String type)
         }
         return iconRes;
     }
+
+    public static Float convertDpToPixels(Context context, Double dp) {
+        if (dp == null) return null;
+        return dp.floatValue() * (context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
+    public static Float convertPixelsToDp(Context context, Double px) {
+        if (px == null) return null;
+        return px.floatValue() / (context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
+    public static Integer stringToColor(String color) {
+        if (color == null) return null;
+        return Color.parseColor(color);
+    }
 }

android/src/main/java/com/shakebugs/react/utils/Mapper.java

@@ -2,7 +2,6 @@
 
 import static com.shakebugs.react.utils.Converter.resToString;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 
 import com.facebook.react.bridge.ReadableArray;
@@ -28,6 +27,7 @@
 import com.shakebugs.shake.internal.domain.models.NetworkRequest;
 import com.shakebugs.shake.internal.domain.models.NotificationEvent;
 import com.shakebugs.shake.report.ShakeFile;
+import com.shakebugs.shake.theme.ShakeTheme;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -283,6 +283,37 @@ public WritableMap mapShakeFormToMap(ShakeForm shakeForm) {
         return shakeFormMap;
     }
 
+    public ShakeTheme mapMapToShakeTheme(ReadableMap shakeThemeMap) {
+        if (shakeThemeMap == null) return null;
+
+        String fontFamilyBold = shakeThemeMap.hasKey("fontFamilyBold") ? shakeThemeMap.getString("fontFamilyBold") : null;
+        String fontFamilyMedium = shakeThemeMap.hasKey("fontFamilyMedium") ? shakeThemeMap.getString("fontFamilyMedium") : null;
+        String backgroundColor = shakeThemeMap.hasKey("backgroundColor") ? shakeThemeMap.getString("backgroundColor") : null;
+        String secondaryBackgroundColor = shakeThemeMap.hasKey("secondaryBackgroundColor") ? shakeThemeMap.getString("secondaryBackgroundColor") : null;
+        String textColor = shakeThemeMap.hasKey("textColor") ? shakeThemeMap.getString("textColor") : null;
+        String secondaryTextColor = shakeThemeMap.hasKey("secondaryTextColor") ? shakeThemeMap.getString("secondaryTextColor") : null;
+        String accentColor = shakeThemeMap.hasKey("accentColor") ? shakeThemeMap.getString("accentColor") : null;
+        String accentTextColor = shakeThemeMap.hasKey("accentTextColor") ? shakeThemeMap.getString("accentTextColor") : null;
+        String outlineColor = shakeThemeMap.hasKey("outlineColor") ? shakeThemeMap.getString("outlineColor") : null;
+        Double borderRadius = shakeThemeMap.hasKey("borderRadius") ? shakeThemeMap.getDouble("borderRadius") : null;
+        Double elevation = shakeThemeMap.hasKey("elevation") ? shakeThemeMap.getDouble("elevation") : null;
+
+        ShakeTheme shakeTheme = new ShakeTheme();
+        shakeTheme.setFontFamilyBoldValue(findAssetPath(context, fontFamilyBold));
+        shakeTheme.setFontFamilyMediumValue(findAssetPath(context, fontFamilyMedium));
+        shakeTheme.setBackgroundColorValue(Converter.stringToColor(backgroundColor));
+        shakeTheme.setSecondaryBackgroundColorValue(Converter.stringToColor(secondaryBackgroundColor));
+        shakeTheme.setTextColorValue(Converter.stringToColor(textColor));
+        shakeTheme.setSecondaryTextColorValue(Converter.stringToColor(secondaryTextColor));
+        shakeTheme.setAccentColorValue(Converter.stringToColor(accentColor));
+        shakeTheme.setAccentTextColorValue(Converter.stringToColor(accentTextColor));
+        shakeTheme.setOutlineColorValue(Converter.stringToColor(outlineColor));
+        shakeTheme.setBorderRadiusValue(Converter.convertDpToPixels(context, borderRadius));
+        shakeTheme.setElevationValue(Converter.convertDpToPixels(context, elevation));
+
+        return shakeTheme;
+    }
+
     public NetworkRequest mapToNetworkRequest(ReadableMap object) {
         if (object == null) return null;
 
@@ -426,4 +457,22 @@ private Object[] toArray(ReadableArray readableArray) {
 
         return array;
     }
+
+    private String findAssetPath(Context context, String assetName) {
+        if (assetName == null) return null;
+
+        String[] assetPaths = new String[]{"fonts", "images", "sounds"};
+        for (String assetPath : assetPaths) {
+            try {
+                String[] assets = context.getAssets().list(assetPath);
+                for (String asset : assets) {
+                    if (asset.contains(assetName)) {
+                        return assetPath + "/" + asset;
+                    }
+                }
+            } catch (Exception ignore) {
+            }
+        }
+        return null;
+    }
 }

example/android/app/build.gradle

@@ -99,7 +99,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "16.0.0"
+        versionName "16.1.0"
         multiDexEnabled true
     }
     splits {

example/android/app/src/main/assets/fonts/Lexend-Bold.ttf

@@ -0,0 +1,21 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "src/assets/fonts/HKGrotesk-Regular.otf",
+      "sha1": "d16193c24d1d33bfed581fbf575ecbbb47645690"
+    },
+    {
+      "path": "src/assets/fonts/HKGrotesk-SemiBold.otf",
+      "sha1": "b2a30d652829a803c3c225382e37ac63f99f5f49"
+    },
+    {
+      "path": "src/assets/fonts/Lexend-Bold.ttf",
+      "sha1": "06ab06cd31d372d135c243097fb29c940efb6d6e"
+    },
+    {
+      "path": "src/assets/fonts/Lexend-Regular.ttf",
+      "sha1": "6c2aa93d8e5b5f5d831452a101c87bae0a0f913d"
+    }
+  ]
+}

example/android/app/src/main/assets/fonts/Lexend-Regular.ttf

@@ -20,5 +20,6 @@ Shake.setConsoleLogsEnabled(true);
 Shake.setAutoVideoRecording(true);
 Shake.setShowIntroMessage(true);
 Shake.setSensitiveDataRedactionEnabled(true);
+Shake.setHomeSubtitle('React Native Shake Example');
 
 Shake.start(CLIENT_ID, CLIENT_SECRET);