indigitall-capacitor-plugin 2.7.0 → 2.9.0

package/IndigitallCapacitorPlugin.podspec

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '12.0'
   s.dependency 'Capacitor'
-  s.dependency 'indigitall-ios', '~> 6.7.0'
+  s.dependency 'indigitall-ios', '~> 6.9.0'
   s.swift_version = '5.1'
 end

package/android/build.gradle

@@ -57,7 +57,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation('com.indigitall:android:5.10.+'){
+    implementation('com.indigitall:android:5.12.+'){
          exclude group: "com.indigitall", module: "android-hms"
     }
 

package/android/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         </intent-filter>
     </receiver>
         <activity
-            android:name=".models.CpIndigitallHiddenActivity"
+            android:name="com.indigitall.capacitor.models.CpIndigitallHiddenActivity"
             android:label="@string/app_name_sdk"
             android:screenOrientation="portrait"
             android:configChanges="orientation|keyboardHidden"
@@ -31,7 +31,7 @@
             android:excludeFromRecents="true">
         </activity>
 
-        <service android:name=".services.IndigitallFirebaseMessagingService"
+        <service android:name="com.indigitall.capacitor.services.IndigitallFirebaseMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />

package/android/src/main/java/com/indigitall/capacitor/implementations/InboxCp.java

@@ -49,7 +49,7 @@ public class InboxCp implements InboxAuthListener {
 
         String status = null;
         JSONArray jsonArraySendingIdList = null;
-        ArrayList<Integer> sendingIdList = new ArrayList<Integer>();
+        ArrayList<Integer> sendingIdList = null;
         try {
             if (params.length() > 0) {
                 if (params.has(JSON_SENDING_ID_LIST)) jsonArraySendingIdList = params.getJSONArray(JSON_SENDING_ID_LIST);
@@ -58,6 +58,7 @@ public class InboxCp implements InboxAuthListener {
 
             JSONArray jArray = (JSONArray)jsonArraySendingIdList;
             if (jArray != null) {
+                sendingIdList = new ArrayList<>();
                 for (int i=0;i<jArray.length();i++){
                     sendingIdList.add(jArray.getInt(i));
                 }

package/android/src/main/java/com/indigitall/capacitor/implementations/IndigitallCp.java

@@ -90,6 +90,7 @@ public class IndigitallCp {
         final String JSON_SET_ALWAYS_LAUNCH_ON_INIT = "alwaysLaunchOnInit";
         final String JSON_SET_AUTO_REQUEST_PUSH_PERMISSION = "autoRequestPushPermission";
         final String JSON_AVOID_CYPHER = "avoidCypher";
+        final String JSON_PUSH_DISABLED_SERVICE = "disabledPushService";
 
         String appKey = null,
                 senderId = null,
@@ -101,6 +102,7 @@ public class IndigitallCp {
                 alwaysLaunchOnInit = false,
                 autoRequestPushPermission = true,
                 wifiFilterEnabled = false,
+                disabledPushService = false,
                 avoidCypher = false;
         try {
             if (params.length() > 0) {
@@ -115,6 +117,7 @@ public class IndigitallCp {
                 if (params.has(JSON_SET_ALWAYS_LAUNCH_ON_INIT)) alwaysLaunchOnInit = params.getBoolean(JSON_SET_ALWAYS_LAUNCH_ON_INIT);
                 if (params.has(JSON_SET_AUTO_REQUEST_PUSH_PERMISSION)) autoRequestPushPermission = params.getBoolean(JSON_SET_AUTO_REQUEST_PUSH_PERMISSION);
                 if (params.has(JSON_AVOID_CYPHER)) avoidCypher = params.getBoolean(JSON_AVOID_CYPHER);
+                if (params.has(JSON_PUSH_DISABLED_SERVICE)) disabledPushService = params.getBoolean(JSON_PUSH_DISABLED_SERVICE);
             }
         } catch(JSONException ex) {
             ex.printStackTrace();
@@ -146,6 +149,7 @@ public class IndigitallCp {
                     .setUrlInboxApi(urlInboxApi)
                     .setAlwaysLaunchOnInit(alwaysLaunchOnInit)
                     .setAutoRequestPushPermission(autoRequestPushPermission)
+                    .setPushServiceDisabled(disabledPushService)
                     .setAvoidCypher(avoidCypher)
                     .build();
             Indigitall.INSTANCE.init(context,config, callback);

package/android/src/main/java/com/indigitall/capacitor/inapp/CpInAppIndigitall.java

@@ -191,9 +191,9 @@ public class CpInAppIndigitall {
                     hole.addJavascriptInterface(new WebCpInAppInterface(context, inApp, popupWindow, show), INDIGITALL_INTERFACE);
                     hole.loadDataWithBaseURL(
                             null,
-                            htmlFinal + InAppConstants.INSTANCE.getSCRIPT(),
-                            InAppConstants.MIME_TYPE_INFO,
-                            InAppConstants.UTF8,
+                            htmlFinal + InAppConstants.Companion.getSCRIPT(),
+                            InAppConstants.Companion.getMIME_TYPE_INFO(),
+                            InAppConstants.Companion.getUTF8(),
                             null
                     );
                 }catch (Exception ex) {

package/dist/esm/InApp.js

@@ -340,9 +340,17 @@ async function drawInApp(inApp, viewId, onShowTimeFinished, didClicked, didFormS
 }
 function editingFormHtml(html, viewId) {
     const htmlWithoutOnClick = html.replace('InAppIndigitall.onClick', `inAppIndigitallOnClick_${viewId}`);
-    const htmlWithoutOnSubmit = htmlWithoutOnClick.replace('InAppIndigitall.submit', 'inAppIndigitallSubmit');
+    const htmlWithoutOnSubmit = htmlWithoutOnClick.replace('InAppIndigitall.submit', `inAppIndigitallSubmit_${viewId}`);
     const htmlEditMethodNames = htmlWithoutOnSubmit
         .replace('plusSlides', `plusSlides_${viewId}`)
+        .replace('indCOImages', `indCOImages_${viewId}`)
+        .replace('ind_carouselOverlapLeftView', `ind_carouselOverlapLeftView_${viewId}`)
+        .replace('ind_carouselOverlapLRightView', `ind_carouselOverlapLRightView_${viewId}`)
+        .replace('ind_carouselOverlapLMainView', `ind_carouselOverlapLMainView_${viewId}`)
+        .replace('ind_carouselOverlapContainer', `ind_carouselOverlapContainer_${viewId}`)
+        .replace('setImagesCarouselOverLap', `setImagesCarouselOverLap_${viewId}`)
+        .replace('shiftRight', `shiftRight_${viewId}`)
+        .replace('shiftLeft', `shiftLeft_${viewId}`)
         .replace('currentSlide', `currentSlide_${viewId}`)
         .replace('setNewInterval', `setNewInterval_${viewId}`)
         .replace('newSlide', `newSlide_${viewId}`)
@@ -351,121 +359,206 @@ function editingFormHtml(html, viewId) {
 }
 function getInAppScript(viewId, viewIdEdited, inAppModel) {
     return `
-               var slideIndex_${viewIdEdited} = 1;
-               var delta_${viewIdEdited} = 6;
-               var startMove_${viewIdEdited} = null;
-               var startMoveY_${viewIdEdited} = null;
-               var diffX_${viewIdEdited};
-               var diffY_${viewIdEdited};
-               var timeSlide_${viewIdEdited} = 10000;
-   
-               var slider_${viewIdEdited} = document.getElementById("${viewId}").querySelector('.ind_slider-container-actions');
-               var sliderTotal_${viewIdEdited} = document.getElementById("${viewId}").getElementsByClassName("ind_slideshow-item").length;
-   
-               showSlides_${viewIdEdited}(slideIndex_${viewIdEdited});
-   
-               var interval_${viewIdEdited} = setInterval(() => {
-                   newSlide_${viewIdEdited}();
-               }, timeSlide_${viewIdEdited});
-   
-               if (slider_${viewIdEdited}){
-                 slider_${viewIdEdited}.addEventListener('touchstart', handleStart_${viewIdEdited}, false);
-                 slider_${viewIdEdited}.addEventListener('touchend', handleEnd_${viewIdEdited}, false);
-                 slider_${viewIdEdited}.addEventListener('mousedown', mouseStart_${viewIdEdited});
-                 slider_${viewIdEdited}.addEventListener('mouseup', mouseEnd_${viewIdEdited});
-               }
-   
-   
-               function mouseStart_${viewIdEdited}(evt) {
-                   evt.preventDefault();
-                   startMove_${viewIdEdited} = evt.clientX;
-                   startMoveY_${viewIdEdited} = evt.clientY;
-               }
-   
-               function mouseEnd_${viewIdEdited}(evt) {
-                   evt.preventDefault();
-                   var endMove = evt.clientX;
-                   var endMoveY = evt.clientY;
-                   setEndMove_${viewIdEdited}(endMove, endMoveY);
-               }
-   
-               function handleStart_${viewIdEdited}(evt) {
-                   evt.preventDefault();
-                   startMove_${viewIdEdited} = evt.touches[0].clientX;
-                   startMoveY_${viewIdEdited} = evt.touches[0].clientY;
-               }
-               function handleEnd_${viewIdEdited}(evt) {
-                   evt.preventDefault();
-                   var endMove = evt.changedTouches[0].pageX;
-                   var endMoveY = evt.changedTouches[0].pageY;
-                   setEndMove_${viewIdEdited}(endMove, endMoveY);
-               }
-   
-               function setEndMove_${viewIdEdited}(endMove, endMoveY) {
-                   diffX_${viewIdEdited} = Math.abs(endMove - startMove_${viewIdEdited});
-                   diffY_${viewIdEdited} = Math.abs(endMoveY - startMoveY_${viewIdEdited});
-                   if (startMove_${viewIdEdited} != null) {
-                       if (startMove_${viewIdEdited} > endMove) {
-                           slideIndex_${viewIdEdited}++;
-                           if (slideIndex_${viewIdEdited} > sliderTotal_${viewIdEdited}) {
-                               slideIndex_${viewIdEdited} = 1;
-                           }
-                       } else {
-                           if (slideIndex_${viewIdEdited} == 0) {
-                               slideIndex_${viewIdEdited} = sliderTotal_${viewIdEdited};
-                           } else {
-                               slideIndex_${viewIdEdited}--;
-                           }
-                       }
-                       showSlides_${viewIdEdited}(slideIndex_${viewIdEdited});
-                       setNewInterval_${viewIdEdited}();
-                   }
-               }
-   
-               function plusSlides_${viewIdEdited}(n) {
-                 showSlides_${viewIdEdited}(slideIndex_${viewIdEdited} += n);
-                 setNewInterval_${viewIdEdited}();
-               }
-   
-               function currentSlide_${viewIdEdited}(n) {
-                 showSlides_${viewIdEdited}(slideIndex_${viewIdEdited} = n);
-               }
-   
-               function setNewInterval_${viewIdEdited}() {
-                 clearInterval(interval_${viewIdEdited});
-                 interval_${viewIdEdited} = setInterval(() => {
-                   newSlide_${viewIdEdited}();
-                 }, timeSlide_${viewIdEdited});
-               }
-   
-               function newSlide_${viewIdEdited}(){
-                   slideIndex_${viewIdEdited}++;
-                   if (slideIndex_${viewIdEdited} > sliderTotal_${viewIdEdited}) {
-                       slideIndex_${viewIdEdited} = 1;
-                   }
-                   showSlides_${viewIdEdited}(slideIndex_${viewIdEdited});
-               }
-   
-               function showSlides_${viewIdEdited}(n) {
-                 let view = document.getElementById("${viewId}");
-                 if (view) {
-                   let slides = view.getElementsByClassName("ind_slideshow-item");
-                   let i;
-                   let dots = view.getElementsByClassName("ind_dot");
-                   if (n > slides.length) {slideIndex_${viewIdEdited} = 1;}
-                   if (n < 1) {slideIndex_${viewIdEdited} = slides.length;}
-                   for (i = 0; i < slides.length; i++) {
-                     slides[i].style.display = "none";
-                   }
-                   for (i = 0; i < dots.length; i++) {
-                     dots[i].className = dots[i].className.replace(" active", "");
-                   }
-                   if (slides[slideIndex_${viewIdEdited}-1]) {
-                     slides[slideIndex_${viewIdEdited}-1].style.display = "block";
-                   }
-                   if (dots[slideIndex_${viewIdEdited}-1]) dots[slideIndex_${viewIdEdited}-1].className += " active";
-                 }
-               }
+                var slideIndex_${viewIdEdited} = 1;
+                var delta_${viewIdEdited} = 6;
+                var startMove_${viewIdEdited} = null;
+                var startMoveY_${viewIdEdited} = null;
+                var diffX_${viewIdEdited};
+                var diffY_${viewIdEdited};
+                var timeSlide_${viewIdEdited} = 10000;
+
+                var slider_${viewIdEdited} = document.getElementById("${viewId}").querySelector('.ind_slider-container-actions');
+                var sliderTotal_${viewIdEdited} = document.getElementById("${viewId}").getElementsByClassName("ind_slideshow-item").length ? document.getElementById("${viewId}").getElementsByClassName("ind_slideshow-item").length : document.getElementById("${viewId}").getElementsByClassName("ind_slideshow-carousel-item").length;
+                
+                let ind_carouselOverlap_${viewIdEdited} = document.getElementById("ind_carouselOverlapContainer_${viewIdEdited}");
+
+                var imageList_${viewIdEdited} = document.getElementById("${viewId}").getElementsByClassName("indCOImages_${viewIdEdited}");
+                if (imageList_${viewIdEdited}) {
+                setImagesCarouselOverLap_${viewIdEdited}();
+                let docIframeHeight_${viewIdEdited} = document.getElementById("${viewId}").clientHeight;
+                
+                if (document.getElementById("ind_carouselOverlapLeftView_${viewIdEdited}")) document.getElementById("ind_carouselOverlapLeftView_${viewIdEdited}").style.height = (docIframeHeight_${viewIdEdited}-20)+"px";
+                if (document.getElementById("ind_carouselOverlapLRightView_${viewIdEdited}")) document.getElementById("ind_carouselOverlapLRightView_${viewIdEdited}").style.height = (docIframeHeight_${viewIdEdited}-20)+"px";
+                if (document.getElementById("ind_carouselOverlapLMainView_${viewIdEdited}")) document.getElementById("ind_carouselOverlapLMainView_${viewIdEdited}").style.height = document.getElementById("${viewId}").style.height;
+                if (document.getElementById("ind_carouselOverlapLMainView_${viewIdEdited}")) document.getElementById("ind_carouselOverlapLMainView_${viewIdEdited}").style.width = document.getElementById("${viewId}").style.width;
+                }
+
+                function setImagesCarouselOverLap_${viewIdEdited}() {
+                let slides = document.getElementById("${viewId}").getElementsByClassName("ind_slideshow-carousel-item");
+                for (i = 0; i < slides.length; i++) {
+                    slides[i].style.backgroundImage = "url('"+imageList_${viewIdEdited}[i].src+"')";
+                    slides[i].style.backgroundSize = "cover";
+                }
+
+                if (slides[1]) slides[1].onclick = imageList_${viewIdEdited}[1].onclick;
+                }
+
+                function shiftRight_${viewIdEdited}() {
+                let newArr = new Array(imageList_${viewIdEdited}.length);
+                for (var i = 0; i < imageList_${viewIdEdited}.length; i++) {
+                    if (i == 0) {
+                    newArr[i] = imageList_${viewIdEdited}[imageList_${viewIdEdited}.length-1];
+                    } else {
+                    newArr[i] = imageList_${viewIdEdited}[i-1];
+                    }
+                }
+                imageList_${viewIdEdited} = newArr;
+                }
+
+                function shiftLeft_${viewIdEdited}() {
+                let newArr = new Array(imageList_${viewIdEdited}.length);
+                for (var i = 0; i < imageList_${viewIdEdited}.length; i++) {
+                    if (i+1 == imageList_${viewIdEdited}.length) {
+                    newArr[i] = imageList_${viewIdEdited}[0];   
+                    } else {
+                    newArr[i] = imageList_${viewIdEdited}[i+1];
+                    }
+                }
+                imageList_${viewIdEdited} = newArr;
+                }
+
+                var interval_${viewIdEdited} = setInterval(() => {
+                    newSlide_${viewIdEdited}();
+                }, timeSlide_${viewIdEdited});
+                
+                if (slider_${viewIdEdited} && !ind_carouselOverlap_${viewIdEdited}) {
+                    slider_${viewIdEdited}.addEventListener('touchstart', handleStart_${viewIdEdited}, false);
+                    slider_${viewIdEdited}.addEventListener('touchend', handleEnd_${viewIdEdited}, false);
+                    slider_${viewIdEdited}.addEventListener('mousedown', mouseStart_${viewIdEdited});
+                    slider_${viewIdEdited}.addEventListener('mouseup', mouseEnd_${viewIdEdited}); 
+                } else if (ind_carouselOverlap_${viewIdEdited} && ind_carouselOverlapLMainView_${viewIdEdited}) {
+                    ind_carouselOverlapLMainView_${viewIdEdited}.addEventListener('touchstart', handleStart_${viewIdEdited}, false);
+                    ind_carouselOverlapLMainView_${viewIdEdited}.addEventListener('touchend', handleEnd_${viewIdEdited}, false);
+                    ind_carouselOverlapLMainView_${viewIdEdited}.addEventListener('mousedown', mouseStart_${viewIdEdited});
+                    ind_carouselOverlapLMainView_${viewIdEdited}.addEventListener('mouseup', mouseEnd_${viewIdEdited});
+                }
+
+                showSlides_${viewIdEdited}(slideIndex_${viewIdEdited});
+
+                function mouseStart_${viewIdEdited}(evt) {
+                    evt.preventDefault();
+                    startMove_${viewIdEdited} = evt.clientX;
+                    startMoveY_${viewIdEdited} = evt.clientY;
+                }
+
+                function mouseEnd_${viewIdEdited}(evt) {
+                    evt.preventDefault();
+                    var endMove = evt.clientX;
+                    var endMoveY = evt.clientY;
+                    setEndMove_${viewIdEdited}(endMove, endMoveY);
+                }
+
+                function handleStart_${viewIdEdited}(evt) {
+                    evt.preventDefault();
+                    startMove_${viewIdEdited} = evt.touches[0].clientX;
+                    startMoveY_${viewIdEdited} = evt.touches[0].clientY;
+                }
+                function handleEnd_${viewIdEdited}(evt) {
+                    evt.preventDefault();
+                    var endMove = evt.changedTouches[0].pageX;
+                    var endMoveY = evt.changedTouches[0].pageY;
+                    setEndMove_${viewIdEdited}(endMove, endMoveY);
+                }
+
+                function setEndMove_${viewIdEdited}(endMove, endMoveY) {
+                    let slides = document.getElementById("${viewId}").getElementsByClassName("ind_slideshow-carousel-item");
+                    diffX_${viewIdEdited} = Math.abs(endMove - startMove_${viewIdEdited});
+                    diffY_${viewIdEdited} = Math.abs(endMoveY - startMoveY_${viewIdEdited});
+                    if (!ind_carouselOverlap_${viewIdEdited} && diffX_${viewIdEdited} < delta_${viewIdEdited} && diffY_${viewIdEdited} < delta_${viewIdEdited}) {
+                        slides[slideIndex-1].children[0].click();
+                    } else if (ind_carouselOverlap_${viewIdEdited} && diffX_${viewIdEdited} < delta_${viewIdEdited} && diffY_${viewIdEdited} < delta_${viewIdEdited}) {
+                        if (ind_carouselOverlapLMainView_${viewIdEdited}) ind_carouselOverlapLMainView_${viewIdEdited}.click();
+                    } else {
+                        if (startMove_${viewIdEdited} != null) {
+                            if (startMove_${viewIdEdited} > endMove) {
+                            if (ind_carouselOverlap_${viewIdEdited}) {
+                                slideIndex_${viewIdEdited} = -1;
+                            } else {
+                                slideIndex_${viewIdEdited}++;
+                                if (slideIndex_${viewIdEdited} > sliderTotal_${viewIdEdited}) {
+                                    slideIndex_${viewIdEdited} = 1;
+                                }
+                            }
+                            } else {
+                            if (ind_carouselOverlap_${viewIdEdited}) {
+                                if (startMove_${viewIdEdited} == endMove) {
+                                slideIndex_${viewIdEdited} = 0;
+                                } else {
+                                slideIndex_${viewIdEdited} = 1;
+                                }
+                            } else {
+                                if (slideIndex_${viewIdEdited} == 0) {
+                                    slideIndex_${viewIdEdited} = sliderTotal_${viewIdEdited};
+                                } else {
+                                    slideIndex_${viewIdEdited}--;
+                                }
+                            }
+                            }
+                            showSlides_${viewIdEdited}(slideIndex_${viewIdEdited});
+                            setNewInterval_${viewIdEdited}();
+                        }
+                    }
+                }
+
+                function plusSlides_${viewIdEdited}(n) {
+                if (ind_carouselOverlap_${viewIdEdited}) {
+                    showSlides_${viewIdEdited}(n == 1 ? -1: 1);
+                } else {
+                    showSlides_${viewIdEdited}(slideIndex_${viewIdEdited} += n);
+                }
+                setNewInterval_${viewIdEdited}();
+                }
+
+                function currentSlide_${viewIdEdited}(n) {
+                showSlides_${viewIdEdited}(slideIndex_${viewIdEdited} = n);
+                }
+
+                function setNewInterval_${viewIdEdited}() {
+                clearInterval(interval_${viewIdEdited});
+                interval_${viewIdEdited} = setInterval(() => {
+                    newSlide_${viewIdEdited}();
+                }, timeSlide_${viewIdEdited});
+                }
+
+                function newSlide_${viewIdEdited}(){
+                    slideIndex_${viewIdEdited}++;
+                    if (slideIndex_${viewIdEdited} > sliderTotal_${viewIdEdited}) {
+                        slideIndex_${viewIdEdited} = 1;
+                    }
+                    showSlides_${viewIdEdited}(slideIndex_${viewIdEdited});
+                }
+
+                function showSlides_${viewIdEdited}(n) {
+                let view = document.getElementById("${viewId}") ? document.getElementById("${viewId}") : document;
+                if (view) {
+                    if (ind_carouselOverlap_${viewIdEdited}) {
+                    let slides = document.getElementsByClassName("ind_slideshow-carousel-item");
+                    if (n < 0) {
+                        shiftLeft_${viewIdEdited}();
+                    } else if (n > 0) {
+                        shiftRight_${viewIdEdited}();
+                    }
+                    setImagesCarouselOverLap_${viewIdEdited}();
+                    } else {
+                    let slides = view.getElementsByClassName("ind_slideshow-item");
+                    let i;
+                    let dots = view.getElementsByClassName("ind_dot");
+                    if (n > slides.length) {slideIndex_${viewIdEdited} = 1;}
+                    if (n < 1) {slideIndex_${viewIdEdited} = slides.length;}
+                    for (i = 0; i < slides.length; i++) {
+                        slides[i].style.display = "none";
+                    }
+                    for (i = 0; i < dots.length; i++) {
+                        dots[i].className = dots[i].className.replace(" active", "");
+                    }
+                    if (slides[slideIndex_${viewIdEdited}-1]) {
+                        slides[slideIndex_${viewIdEdited}-1].style.display = "block";
+                    }
+                    if (dots[slideIndex_${viewIdEdited}-1]) dots[slideIndex_${viewIdEdited}-1].className += " active";
+                    }
+                }
+                }
+
    
    
                function inAppIndigitallOnClick_${viewIdEdited}(action) {
@@ -478,7 +571,7 @@ function getInAppScript(viewId, viewIdEdited, inAppModel) {
                  }
                }
    
-               function inAppIndigitallSubmit(formOptions) {
+               function inAppIndigitallSubmit_${viewIdEdited}(formOptions) {
                    const jsonForm = {}
                    const jsonCustomer = {}
                    const form = document.querySelector('[id="'+formOptions.formId+'"]');