Browse Source

[Android] Change the type of the color scheme

j8
Bettenbuk Zoltan 6 years ago
parent
commit
d56d01cebb

+ 3
- 4
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java View File

@@ -27,7 +27,6 @@ import android.support.v7.app.AppCompatActivity;
27 27
 import android.view.KeyEvent;
28 28
 
29 29
 import com.facebook.react.ReactInstanceManager;
30
-import com.facebook.react.bridge.WritableMap;
31 30
 import com.facebook.react.modules.core.PermissionListener;
32 31
 
33 32
 import java.net.URL;
@@ -56,7 +55,7 @@ public class JitsiMeetActivity
56 55
     /**
57 56
      * A color scheme object to override the default color is the SDK.
58 57
      */
59
-    private WritableMap colorScheme;
58
+    private Bundle colorScheme;
60 59
 
61 60
     /**
62 61
      * The default base {@code URL} used to join a conference when a partial URL
@@ -294,9 +293,9 @@ public class JitsiMeetActivity
294 293
     }
295 294
 
296 295
     /**
297
-     * @see JitsiMeetView#setColorScheme(WritableMap)
296
+     * @see JitsiMeetView#setColorScheme(Bundle)
298 297
      */
299
-    public void setColorScheme(WritableMap colorScheme) {
298
+    public void setColorScheme(Bundle colorScheme) {
300 299
         if (view == null) {
301 300
             this.colorScheme = colorScheme;
302 301
         } else {

+ 4
- 6
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java View File

@@ -22,9 +22,7 @@ import android.support.annotation.NonNull;
22 22
 import android.support.annotation.Nullable;
23 23
 import android.util.Log;
24 24
 
25
-import com.facebook.react.bridge.Arguments;
26 25
 import com.facebook.react.bridge.ReadableMap;
27
-import com.facebook.react.bridge.WritableMap;
28 26
 
29 27
 import java.lang.reflect.Method;
30 28
 import java.net.URL;
@@ -74,7 +72,7 @@ public class JitsiMeetView
74 72
     /**
75 73
      * A color scheme object to override the default color is the SDK.
76 74
      */
77
-    private WritableMap colorScheme;
75
+    private Bundle colorScheme;
78 76
 
79 77
     /**
80 78
      * The default base {@code URL} used to join a conference when a partial URL
@@ -142,7 +140,7 @@ public class JitsiMeetView
142 140
      *
143 141
      * @return The color scheme map.
144 142
      */
145
-    public WritableMap getColorScheme() {
143
+    public Bundle getColorScheme() {
146 144
         return colorScheme;
147 145
     }
148 146
 
@@ -226,7 +224,7 @@ public class JitsiMeetView
226 224
 
227 225
         // color scheme
228 226
         if (colorScheme != null) {
229
-            props.putBundle("colorScheme", Arguments.toBundle(colorScheme));
227
+            props.putBundle("colorScheme", colorScheme);
230 228
         }
231 229
 
232 230
         // defaultURL
@@ -331,7 +329,7 @@ public class JitsiMeetView
331 329
      *
332 330
      * @param colorScheme The color scheme map.
333 331
      */
334
-    public void setColorScheme(WritableMap colorScheme) {
332
+    public void setColorScheme(Bundle colorScheme) {
335 333
         this.colorScheme = colorScheme;
336 334
     }
337 335
 

Loading…
Cancel
Save