merging changes

Saranshmalik · Jun 30, 2020 · e2c3443 · e2c3443
2 parents 8474a62 + 0197a93
commit e2c3443
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 
-# react-native-zendesk
+# react-native-zendesk [![npm version](https://badge.fury.io/js/react-native-zendesk-v2.svg)](https://badge.fury.io/js/react-native-zendesk-v2)
+[![NPM](https://nodei.co/npm/react-native-zendesk-v2.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/react-native-zendesk-v2/)
+
 React native wrapper for zendesk unified SDK. Supports both iOS and Android platforms.
 
 # NOTICE

diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-architect
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -2,4 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.saranshmalik.rnzendeskchat">
 </manifest>
-
+
diff --git a/android/src/main/java/com/saranshmalik/rnzendeskchat/RNZendeskChat.java b/android/src/main/java/com/saranshmalik/rnzendeskchat/RNZendeskChat.java
@@ -176,4 +176,4 @@ public void startChat(ReadableMap options) {
         }
 
     }
-}
+}
diff --git a/ios/RNZendeskChat.m b/ios/RNZendeskChat.m
@@ -88,10 +88,13 @@ @implementation RNZendeskChat
   [ZDKChat initializeWithAccountKey:key queue:dispatch_get_main_queue()];
 }
 
+<<<<<<< HEAD
 RCT_EXPORT_METHOD(setPrimaryColor:(NSString *)color) {
   [ZDKCommonTheme currentTheme].primaryColor = [self colorFromHexString:color];
 }
 
+=======
+>>>>>>> 0197a93e1397af27dbf285d111f2f286df8d6745
 - (UIColor *)colorFromHexString:(NSString *)hexString {
     unsigned rgbValue = 0;
     NSScanner *scanner = [NSScanner scannerWithString:hexString];
@@ -127,7 +130,6 @@ - (void) showHelpCenterFunction:(NSDictionary *)options {
     //                                                                                   target: self
     //                                                                                   action: @selector(chatClosedClicked)];
 
-
     UIViewController *topController = [UIApplication sharedApplication].keyWindow.rootViewController;
     while (topController.presentedViewController) {
         topController = topController.presentedViewController;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.saranshmalik.rnzendeskchat">
		</manifest>
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,4 +176,4 @@ public void startChat(ReadableMap options) { @@
             }
         }
-    }
+    }