From eec7a1b628f21b79819cf2ceed902aff5488f0f6 Mon Sep 17 00:00:00 2001
From: Bettenbuk Zoltan <zoltan.bettenbuk@gmail.com>
Date: Tue, 22 Jan 2019 11:31:04 +0100
Subject: [PATCH] [RN] Add color scheme support - native

---
 .../org/jitsi/meet/sdk/JitsiMeetActivity.java | 18 +++++++++++
 .../org/jitsi/meet/sdk/JitsiMeetView.java     | 30 +++++++++++++++++++
 ios/sdk/src/JitsiMeetView.h                   |  2 ++
 ios/sdk/src/JitsiMeetView.m                   |  1 +
 4 files changed, 51 insertions(+)

diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
index ddf9555c3..8cfccc210 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -27,6 +27,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.PermissionListener;
 
 import java.net.URL;
@@ -52,6 +53,11 @@ public class JitsiMeetActivity
     private static final int OVERLAY_PERMISSION_REQUEST_CODE
         = (int) (Math.random() * Short.MAX_VALUE);
 
+    /**
+     * A color scheme object to override the default color is the SDK.
+     */
+    private WritableMap colorScheme;
+
     /**
      * The default base {@code URL} used to join a conference when a partial URL
      * (e.g. a room name only) is specified. The value is used only while
@@ -120,6 +126,7 @@ public class JitsiMeetActivity
 
         // XXX Before calling JitsiMeetView#loadURL, make sure to call whatever
         // is documented to need such an order in order to take effect:
+        view.setColorScheme(colorScheme);
         view.setDefaultURL(defaultURL);
         if (pictureInPictureEnabled != null) {
             view.setPictureInPictureEnabled(
@@ -286,6 +293,17 @@ public class JitsiMeetActivity
         ReactActivityLifecycleCallbacks.requestPermissions(this, permissions, requestCode, listener);
     }
 
+    /**
+     * @see JitsiMeetView#setColorScheme(WritableMap)
+     */
+    public void setColorScheme(WritableMap colorScheme) {
+        if (view == null) {
+            this.colorScheme = colorScheme;
+        } else {
+            view.setColorScheme(colorScheme);
+        }
+    }
+
     /**
      *
      * @see JitsiMeetView#setDefaultURL(URL)
diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
index 82222d85f..5541102fa 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
@@ -22,7 +22,9 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -69,6 +71,11 @@ public class JitsiMeetView
         return loaded;
     }
 
+    /**
+     * A color scheme object to override the default color is the SDK.
+     */
+    private WritableMap colorScheme;
+
     /**
      * The default base {@code URL} used to join a conference when a partial URL
      * (e.g. a room name only) is specified to {@link #loadURLString(String)} or
@@ -130,6 +137,15 @@ public class JitsiMeetView
         }
     }
 
+    /**
+     * Gets the color scheme used in the SDK.
+     *
+     * @return The color scheme map.
+     */
+    public WritableMap getColorScheme() {
+        return colorScheme;
+    }
+
     /**
      * Gets the default base {@code URL} used to join a conference when a
      * partial URL (e.g. a room name only) is specified to
@@ -208,6 +224,11 @@ public class JitsiMeetView
     public void loadURLObject(@Nullable Bundle urlObject) {
         Bundle props = new Bundle();
 
+        // color scheme
+        if (colorScheme != null) {
+            props.putBundle("colorScheme", Arguments.toBundle(colorScheme));
+        }
+
         // defaultURL
         if (defaultURL != null) {
             props.putString("defaultURL", defaultURL.toString());
@@ -305,6 +326,15 @@ public class JitsiMeetView
         onExternalAPIEvent(LISTENER_METHODS, name, data);
     }
 
+    /**
+     * Sets the color scheme to override the default colors of the SDK.
+     *
+     * @param colorScheme The color scheme map.
+     */
+    public void setColorScheme(WritableMap colorScheme) {
+        this.colorScheme = colorScheme;
+    }
+
     /**
      * Sets the default base {@code URL} used to join a conference when a
      * partial URL (e.g. a room name only) is specified to
diff --git a/ios/sdk/src/JitsiMeetView.h b/ios/sdk/src/JitsiMeetView.h
index dbb217f00..be1b2e89c 100644
--- a/ios/sdk/src/JitsiMeetView.h
+++ b/ios/sdk/src/JitsiMeetView.h
@@ -23,6 +23,8 @@
 
 @property (class, copy, nonatomic, nullable) NSString *conferenceActivityType;
 
+@property (nonatomic) NSDictionary *colorScheme;
+
 @property (copy, nonatomic, nullable) NSURL *defaultURL;
 
 @property (nonatomic, nullable, weak) id<JitsiMeetViewDelegate> delegate;
diff --git a/ios/sdk/src/JitsiMeetView.m b/ios/sdk/src/JitsiMeetView.m
index 9f4ed9e67..7379a0bb1 100644
--- a/ios/sdk/src/JitsiMeetView.m
+++ b/ios/sdk/src/JitsiMeetView.m
@@ -231,6 +231,7 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
         props[@"defaultURL"] = [self.defaultURL absoluteString];
     }
 
+    props[@"colorScheme"] = self.colorScheme;
     props[@"externalAPIScope"] = externalAPIScope;
     props[@"pictureInPictureEnabled"] = @(self.pictureInPictureEnabled);
     props[@"welcomePageEnabled"] = @(self.welcomePageEnabled);