Merge pull request #107 from Instabug/feature/color-theme-api

[IBGBUGCHAT-10513] Map API: setColorTheme

Author: Ali Abdelfattah

sampleApp/platforms/android/app/src/test/java/com/instabug/cordova/plugin/IBGPluginTests.java

@@ -9,6 +9,7 @@
 import android.webkit.WebChromeClient;
 
 import com.instabug.library.Instabug;
+import com.instabug.library.InstabugColorTheme;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
@@ -253,5 +254,20 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
         Instabug.setPrimaryColor(color);
     }
 
+    @Test
+    public void givenArg$setColorTheme_whenQuery_thenShouldCallNativeApiWithArg() {
+        // given
+        PowerMockito.mockStatic(Instabug.class);
+        String colorTheme = "dark";
+        JSONArray args = new JSONArray();
+        args.put(colorTheme);
+
+        // when
+        cordovaModule.execute("setColorTheme", args, callbackContext);
+
+        // then
+        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        Instabug.setColorTheme(InstabugColorTheme.InstabugColorThemeDark);
+    }
 
 }

sampleApp/platforms/android/platform_www/plugins/instabug-cordova/www/instabug.js

@@ -49,6 +49,13 @@ var getLocales = function () {
     };
 };
 
+var getColorThemes = function () {
+    return {
+        light: 'light',
+        dark: 'dark',
+    };
+};
+
 var Instabug = function () {
 };
 
@@ -79,7 +86,7 @@ Instabug.startWithToken = function (token, events, options, success, error) {
   if (validatedEvents !== undefined || validatedEvents.length != 0) {
     exec(success, error, 'IBGPlugin', 'startWithToken', [token, validatedEvents, options]);
   } else {
-      console.log('Could not activate Instabug - invocation event is not valid.');
+    console.log('Could not activate Instabug - invocation event is not valid.');
   }
 };
 
@@ -222,6 +229,16 @@ Instabug.setLocale = function (locale, success, error) {
     }
 };
 
+Instabug.setColorTheme = function (colorTheme, success, error) {
+    var validatedColorTheme = getColorThemes()[colorTheme];
+
+    if (validatedColorTheme) {
+        exec(success, error, 'IBGPlugin', 'setColorTheme', [validatedColorTheme]);
+    } else {
+        console.log('Could not set color theme - "' + colorTheme + '" is not valid.');
+    }
+};
+
 module.exports = Instabug;
 
 });

src/android/IBGPlugin.java

@@ -16,6 +16,7 @@
 import com.instabug.featuresrequest.FeatureRequests;
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
+import com.instabug.library.InstabugColorTheme;
 import com.instabug.library.OnSdkDismissCallback;
 import com.instabug.library.extendedbugreport.ExtendedBugReport;
 import com.instabug.library.internal.module.InstabugLocale;
@@ -466,6 +467,40 @@ public void run() {
             callbackContext.error("A colorInt must be provided.");
     }
 
+    /**
+     * Convenience method for parsing and setting
+     * whether the desired color theme for the SDK
+     * invocation.
+     *
+     * @param callbackContext Used when calling back into JavaScript
+     * @param args .optString(0)     Theme
+     *
+     */
+    public void setColorTheme(final CallbackContext callbackContext, final JSONArray args) {
+        final String colorTheme = args.optString(0);
+        if (colorTheme != null) {
+            try {
+                new Handler(Looper.getMainLooper()).post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if ("dark".equals(colorTheme)) {
+                            Instabug.setColorTheme(InstabugColorTheme.InstabugColorThemeDark);
+                        } else if ("light".equals(colorTheme)) {
+                            Instabug.setColorTheme(InstabugColorTheme.InstabugColorThemeLight);
+                        } else {
+                            callbackContext.error("Color theme value is not valid.");
+                        }
+                    }
+                });
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+                callbackContext.error(errorMsg);
+            }
+        } else {
+            callbackContext.error("A color theme must be provided.");
+        }
+    }
+
     /**
      * Sets the threshold value of the shake gesture on the device
      *

src/ios/IBGPlugin.m

@@ -1075,7 +1075,7 @@ - (void) setWelcomeMessageMode:(NSString*)welcomeMessageMode
  * @param {NSString*} theme
  *        NSString representation of color theme
  */
-- (void) setColorTheme:(NSString*)theme
+- (void) setColorThemeInOptions:(NSString*)theme
 {
     if ([theme isEqualToString:@"dark"]) {
         [Instabug setColorTheme:IBGColorThemeDark];
@@ -1084,6 +1084,36 @@ - (void) setColorTheme:(NSString*)theme
     }
 }
 
+/**
+ * Sets the SDK color theme
+ *
+ * @param {CDVInvokedUrlCommand*} command
+ *        The command sent from JavaScript
+ */
+- (void) setColorTheme:(CDVInvokedUrlCommand*)command
+{
+    CDVPluginResult* result;
+    NSString* theme = [command argumentAtIndex:0];
+
+    if ([theme length] > 0) {
+        if ([theme isEqualToString:@"dark"]) {
+            [Instabug setColorTheme:IBGColorThemeDark];
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+        } else if ([theme isEqualToString:@"light"]) {
+            [Instabug setColorTheme:IBGColorThemeLight];
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+        } else {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                   messageAsString:@"Color theme value is not valid."];
+        }
+    } else {
+        result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
+                                   messageAsString:@"Color theme must be provided."];
+    }
+
+    [self.commandDelegate sendPluginResult:result callbackId:[command callbackId]];
+}
+
 /**
  * Sets a threshold for numbers of sessions and another for number of days
  * required before a survey, that has been dismissed once, would show again.
@@ -1244,7 +1274,7 @@ - (void) applyOptions:(NSDictionary*)options
     [self setTrackingUserStepsEnabled:[[options objectForKey:@"enableTrackingUserSteps"] stringValue]];
     [self setPushNotificationsEnabled:[[options objectForKey:@"enablePushNotifications"] stringValue]];
     [self setSessionProfilerEnabled:[[options objectForKey:@"enableSessionProfiler"] stringValue]];
-    [self setColorTheme:[options objectForKey:@"colorTheme"]];
+    [self setColorThemeInOptions:[options objectForKey:@"colorTheme"]];
     [self setWelcomeMessageMode:[options objectForKey:@"welcomeMessageMode"]];
 }