Merged PR 2364: Updated android library version

Updated android library version

Related work items: #7216

Author: sp0x

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.0.1'
+    classpath 'com.android.tools.build:gradle:4.1.1'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -129,7 +129,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   //App dependencies
-  implementation 'com.queue_it.androidsdk:library:2.0.23'
+  implementation 'com.queue_it.androidsdk:library:2.0.27'
   implementation 'com.android.support:appcompat-v7:28.0.0'
   implementation 'com.android.support:design:28.0.0'
 }

android/src/main/java/com/reactnativequeueit/QueueItModule.kt

@@ -27,29 +27,29 @@ class QueueItModule(reactContext: ReactApplicationContext)
 
   @ReactMethod
   fun runAsync(customerId: String, eventAlias: String, layoutName: String?, language: String?, promise: Promise) {
-    val qListener = object : QueueListener {
+    val qListener = object : QueueListener() {
       override fun onUserExited() {
         val params = Arguments.createMap()
         sendEvent(context, "userExited", params)
       }
 
       override fun onQueuePassed(queuePassedInfo: QueuePassedInfo?) {
-        handler.post(Runnable {
+        handler.post {
           val params = Arguments.createMap()
           val token = if (queuePassedInfo?.queueItToken!=null) queuePassedInfo.queueItToken else ""
           params.putString("queueittoken", token)
           params.putString("state", EnqueueResultState.Passed.name)
           promise.resolve(params)
-        })
+        }
       }
 
       override fun onQueueItUnavailable() {
-        handler.post(Runnable {
+        handler.post {
           val params = Arguments.createMap()
           params.putNull("queueittoken")
           params.putString("state", EnqueueResultState.Unavailable.name)
           promise.resolve(params)
-        })
+        }
       }
 
       override fun onQueueViewWillOpen() {
@@ -58,25 +58,25 @@ class QueueItModule(reactContext: ReactApplicationContext)
       }
 
       override fun onQueueDisabled() {
-        handler.post(Runnable {
+        handler.post {
           val params = Arguments.createMap()
           params.putNull("queueittoken")
           params.putString("state", EnqueueResultState.Disabled.name)
           promise.resolve(params)
-        })
+        }
       }
 
       override fun onError(error: Error?, errorMessage: String?) {
-        handler.post(Runnable {
+        handler.post {
           promise.reject("error", errorMessage)
-        })
+        }
       }
     }
 
-    handler.post(Runnable {
+    handler.post {
       val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, qListener)
       queueEngine.run(context.currentActivity)
-    })
+    }
   }
 
   private fun sendEvent(reactContext: ReactContext,

example/android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:4.0.1')
+        classpath('com.android.tools.build:gradle:4.1.1')
     }
 }
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jul 17 09:38:54 CEST 2020
+#Tue Nov 24 09:49:38 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

example/ios/QueueItExample/Info.plist

@@ -20,6 +20,17 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>myapp</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

example/src/App.tsx

@@ -43,7 +43,8 @@ class App extends Component<{}, AppState> {
       });
       const enqueueResult = await QueueIt.run(
         this.state.clientId,
-        this.state.eventOrAlias
+        this.state.eventOrAlias,
+        'mobile'
       );
       switch (enqueueResult.State) {
         case EnqueueResultState.Disabled:

ios/Podfile

@@ -8,5 +8,5 @@ target 'QueueIt' do
   # Pods for QueueIt
 
   # Our pods
-  pod 'QueueITLibrary', '~>3.0.1'
+  pod 'QueueITLibrary', '~>3.0.4'
 end

ios/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - QueueITLibrary (3.0.1)
+  - QueueITLibrary (3.0.4)
 
 DEPENDENCIES:
-  - QueueITLibrary (~> 3.0.1)
+  - QueueITLibrary (~> 3.0.4)
 
 SPEC REPOS:
   trunk:
     - QueueITLibrary
 
 SPEC CHECKSUMS:
-  QueueITLibrary: 0a0936ef1994fe09a84a45052ce726839cf185c1
+  QueueITLibrary: 658775740dcc672953ecf20da7002eb465ac5a98
 
-PODFILE CHECKSUM: a07820c47fa81c641a335914ce81685dbef02059
+PODFILE CHECKSUM: 071e1a5db24d5c38e420d6247163daae893f568f
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0

ios/QueueIt.h

@@ -14,6 +14,6 @@ typedef enum {
 
 extern NSString * const EnqueueResultState_toString[];
 
-@interface QueueIt : RCTEventEmitter <RCTBridgeModule, QueuePassedDelegate, QueueViewWillOpenDelegate, QueueDisabledDelegate, QueueITUnavailableDelegate, QueueUserExitedDelegate>
+@interface QueueIt : RCTEventEmitter <RCTBridgeModule, QueuePassedDelegate, QueueViewWillOpenDelegate, QueueDisabledDelegate, QueueITUnavailableDelegate, QueueUserExitedDelegate, QueueNavigationActionDelegate, QueueViewClosedDelegate>
 
 @end

ios/QueueIt.m

@@ -43,6 +43,8 @@ - (dispatch_queue_t)methodQueue
     self.engine.queueDisabledDelegate = self; // Invoked to notify that queue is disabled
     self.engine.queueITUnavailableDelegate = self; // Invoked in case QueueIT is unavailable (500 errors)
     self.engine.queueUserExitedDelegate = self; // Invoked when user chooses to leave the queue
+    self.engine.queueNavigationActionDelegate = self;
+    self.engine.queueViewClosedDelegate = self;
     self.resolve = resolve;
     self.reject = reject;
 
@@ -99,4 +101,13 @@ - (void)notifyUserExited {
     [self sendEventWithName: @"userExited" body:@{}];
 }
 
+
+- (BOOL)notifyNavigation:(NSURL *)url {
+    return NO;
+}
+
+- (void)notifyViewClosed {
+    NSLog(@"View was closed..");
+}
+
 @end