Ios changes 3

.gitignore

@@ -46,3 +46,5 @@ google-services.json
 GoogleService-Info.plist
 #sonarcloud
 .scannerwork
+
+sunbird-ios.properties

README.md

@@ -64,4 +64,4 @@ Node JS Version - above 8
     Build setting Project, targets
     update Swift language version to 4 
     Inside Tagets -> Build phases -> Copy Bundle Resources -> remove duplicate GoogleService-Info.plist if present
-    and close Xcode then rerun the **cordova emulate ios**
+    and close Xcode then rerun the **cordova emulate ios**

angular.json

@@ -192,8 +192,13 @@
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         },
         "ionic-cordova-build": {
@@ -249,14 +254,17 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": ["**/node_modules/**"]
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         }
       }
     }
   },
   "cli": {
-    "defaultCollection": "@ionic/angular-toolkit"
+    "defaultCollection": "@ionic/angular-toolkit",
+    "analytics": false
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

build-ios.sh

@@ -58,11 +58,12 @@ npm install @ionic-native/[email protected]
 npm install [email protected]
 npm install [email protected]
 
-ionic cordova plugin rm com.jjdltc.cordova.plugin.zip
 ionic cordova plugin rm cordova-plugin-sunbirdsplash
 ionic cordova plugin add cordova-plugin-splashscreen
+ionic cordova plugin rm cordova-plugin-fcm-with-dependecy-updated
+ionic cordova plugin rm cordova-plugin-file-support
 
 #Temporary Workaround to generate build as webpack was complaining of Heap Space
 #need to inspect on webpack dependdencies at the earliest
 NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add ios
-NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build ios
+NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build ios

build_config

@@ -8,7 +8,7 @@ cordova-plugin=cordova-plugin-x-socialsharing
 cordova-plugin=cordova-plugin-androidx-adapter
 cordova-plugin=cordova-plugin-device
 cordova-plugin=cordova-plugin-file
-cordova-plugin=cordova-plugin-file-transfer
+cordova-plugin=https://github.com/apache/cordova-plugin-file-transfer.git
 cordova-plugin=cordova-plugin-inappbrowser
 cordova-plugin=cordova-plugin-network-information
 cordova-plugin=cordova-plugin-statusbar
@@ -28,20 +28,21 @@ cordova-plugin=cordova-plugin-document-viewer
 cordova-plugin=com-sarriaroman-photoviewer
 cordova-plugin=cordova-plugin-filepath
 cordova-plugin=https://github.com/greybax/cordova-plugin-proguard.git
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#release-4.1.0
+cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git
+cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git --variable USESWIFTLANGUAGEVERSION=4
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git --variable URL_SCHEME=@string/custom_scheme_url --variable URL_HOST=mobile
 cordova-plugin=cordova-sqlite-storage
-cordova plugin=cordova-plugin-googleplus
+cordova plugin=cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=$REVERSED_CLIENT_ID
 cordova-pligin=cordova-plugin-camera
 cordova-plugin=cordova-plugin-telerik-imagepicker
-cordova-plugin=cordova-plugin-photo-library
 cordova-plugin=cordova-plugin-filechooser
 cordova-plugin=cordova-plugin-media
 cordova-plugin=cordova.plugins.diagnostic
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-openrap.git
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git
+sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-file-support.git
 sunbird-cordova-plugin=https://github.com/project-sunbird/sb-cordova-plugin-sync.git
 sunbird-cordova-plugin=https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0
+[email protected]

config.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="1" id="org.sunbird.app" version="staging-2.4.0.01" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android">
-    <name>@string/_app_name</name>
+<widget android-versionCode="1" id="staging.sunbird.app" ios-CFBundleVersion="1" version="staging-2.4.0.01" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android">
+    <name>Sunbird</name>
     <description>Sunbird mobile app</description>
     <author email="" href="">EkStep Team</author>
     <access origin="*" />
@@ -16,15 +16,15 @@
     <preference name="AndroidLaunchMode" value="singleInstance" />
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />
     <hook src="scripts/copyContentPlayer.js" type="before_build" />
-    <hook src="scripts/deleteUnUsableIosIcon.js" type="before_build" />
-    <hook src="scripts/copyGradleFiles.js" type="before_build" />
-    <hook src="scripts/copyBundledData.js" type="before_build" />
-    <hook src="scripts/application/add_application.js" type="before_run" />
-    <hook src="scripts/copyGradleFiles.js" type="before_run" />
-    <hook src="scripts/copyBundledData.js" type="before_run" />
     <hook src="scripts/copyContentPlayer.js" type="before_run" />
-    <hook src="scripts/deleteUnUsableIosIcon.js" type="before_run" />
     <platform name="android">
+        <hook src="scripts/deleteUnUsableIosIcon.js" type="before_build" />
+        <hook src="scripts/deleteUnUsableIosIcon.js" type="before_run" />
+        <hook src="scripts/copyGradleFiles.js" type="before_build" />
+        <hook src="scripts/copyBundledData.js" type="before_build" />
+        <hook src="scripts/copyGradleFiles.js" type="before_run" />
+        <hook src="scripts/copyBundledData.js" type="before_run" />
+        <hook src="scripts/application/add_application.js" type="before_run" />
         <resource-file src="MainActivity.java" target="app/src/main/java/org/sunbird/app/MainActivity.java" />
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data android:name="io.fabric.ApiKey" android:value="${fabricKey}" />
@@ -74,6 +74,12 @@
         <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
     </platform>
     <platform name="ios">
+        <hook src="scripts/ios/ios.js" type="after_prepare" />
+        <preference name="WKWebViewOnly" value="true" />
+        <feature name="CDVWKWebViewEngine">
+            <param name="ios-package" value="CDVWKWebViewEngine" />
+        </feature>
+        <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
         <icon height="57" src="resources/ios/icon/icon.png" width="57" />
@@ -95,74 +101,90 @@
         <icon height="58" src="resources/ios/icon/[email protected]" width="58" />
         <icon height="87" src="resources/ios/icon/[email protected]" width="87" />
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
+        <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
+        <icon height="40" src="resources/ios/icon/[email protected]" width="40" />
+        <icon height="60" src="resources/ios/icon/[email protected]" width="60" />
+        <icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
+        <icon height="58" src="resources/ios/icon/[email protected]" width="58" />
+        <icon height="87" src="resources/ios/icon/[email protected]" width="87" />
+        <icon height="48" src="resources/ios/icon/[email protected]" width="48" />
+        <icon height="55" src="resources/ios/icon/[email protected]" width="55" />
+        <icon height="88" src="resources/ios/icon/[email protected]" width="88" />
+        <icon height="172" src="resources/ios/icon/[email protected]" width="172" />
+        <icon height="196" src="resources/ios/icon/[email protected]" width="196" />
+        <icon height="216" src="resources/ios/icon/[email protected]" width="216" />
+        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
+        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
         <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
         <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
         <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
         <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
-        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
-        <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
-        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
-        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+        <preference name="UseSwiftLanguageVersion" value="4" />
+        <resource-file src="GoogleService-Info.plist" />
+        <splash height="2688" src="resources/ios/splash/Default-2688h~iphone.png" width="1242" />
+        <splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
+        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
         <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
-        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
-        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
-        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+        <allow-navigation href="*" />
     </platform>
     <content src="index.html" />
     <plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
     <plugin name="cordova-plugin-zip" spec="^3.1.0" />
     <plugin name="cordova-plugin-code-push" spec="^1.11.18" />
     <plugin name="cordova-plugin-file-opener2" spec="^2.2.0" />
-    <plugin name="cordova-plugin-printer" spec="^0.8.0" />
-    <plugin name="com.jjdltc.cordova.plugin.zip" spec="https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git" />
-    <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
-    <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
-    <plugin name="cordova-plugin-ionic-webview" spec="^4.2.1" />
-    <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
-    <plugin name="cordova-plugin-x-socialsharing" spec="^6.0.2" />
-    <plugin name="cordova-plugin-androidx-adapter" spec="^1.1.3" />
-    <plugin name="cordova-plugin-device" spec="^2.0.3" />
-    <plugin name="cordova-plugin-file" spec="^6.0.2" />
-    <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
-    <plugin name="cordova-plugin-inappbrowser" spec="^3.2.0" />
-    <plugin name="cordova-plugin-network-information" spec="^2.0.2" />
-    <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
-    <plugin name="cordova-plugin-webview-checker" spec="^1.0.1" />
-    <plugin name="cordova-plugin-awesome-shared-preferences" spec="https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git" />
+    <plugin name="cordova-plugin-media" spec="^5.0.3" />
+    <plugin name="cordova-plugin-android-downloadmanager" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git" />
+    <plugin name="cordova-plugin-openrap" spec="https://github.com/project-sunbird/cordova-plugin-openrap.git" />
+    <plugin name="cordova-plugin-qr-scanner" spec="https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0" />
+    <plugin name="cordova-plugin-file-support" spec="https://github.com/project-sunbird/cordova-plugin-file-support.git" />
+    <plugin name="sb-cordova-plugin-sync" spec="https://github.com/project-sunbird/sb-cordova-plugin-sync.git#release-3.2.0" />
+    <plugin name="cordova-plugin-inappupdatemanager" spec="https://github.com/subranil/cordova-plugin-inappupdatemanager.git" />
     <plugin name="cordova-plugin-local-notification" spec="https://github.com/katzer/cordova-plugin-local-notifications.git">
         <variable name="ANDROID_SUPPORT_V4_VERSION" value="26.+" />
     </plugin>
-    <plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0">
-        <variable name="FCM_CORE_VERSION" value="16.0.9" />
-        <variable name="FCM_VERSION" value="18.0.0" />
-        <variable name="GRADLE_TOOLS_VERSION" value="3.5.0" />
-        <variable name="GOOGLE_SERVICES_VERSION" value="4.2.0" />
-        <variable name="ANDROID_DEFAULT_NOTIFICATION_ICON" value="@mipmap/ic_launcher" />
-    </plugin>
     <plugin name="cordova-plugin-advanced-http" spec="^2.5.1" />
     <plugin name="cordova-plugin-android-permissions" spec="^1.1.2" />
-    <plugin name="cordova-plugin-media" spec="^5.0.3" />
     <plugin name="cordova.plugins.diagnostic" spec="^5.0.2">
         <variable name="ANDROID_SUPPORT_VERSION" value="28.+" />
     </plugin>
-    <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
+    <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.7.0" />
+    <plugin name="cordova-plugin-secure-storage-echo" spec="^5.1.1" />
+    <plugin name="cordova-plugin-appavailability" spec="^0.4.2" />
+    <plugin name="cordova-plugin-filepicker" spec="^1.1.6" />
+    <plugin name="com-sarriaroman-photoviewer" spec="^1.2.5" />
+    <plugin name="cordova-plugin-filepath" spec="^1.6.0" />
     <plugin name="cordova-plugin-proguard" spec="https://github.com/greybax/cordova-plugin-proguard.git" />
-    <plugin name="sb-cordova-plugin-utility" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#release-3.1.0" />
-    <plugin name="cordova-plugin-android-downloadmanager" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git" />
-    <plugin name="sb-cordova-plugin-db" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#release-3.1.0" />
+    <plugin name="sb-cordova-plugin-utility" spec="https://github.com/shikshalokam/sb-cordova-plugin-utility.git#release-3.9.0-ios" />
+    <plugin name="sb-cordova-plugin-db" spec="https://github.com/shikshalokam/sb-cordova-plugin-db.git">
+        <variable name="USESWIFTLANGUAGEVERSION" value="4" />
+    </plugin>
     <plugin name="sb-cordova-plugin-customtabs" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git">
         <variable name="URL_SCHEME" value="@string/custom_scheme_url" />
         <variable name="URL_HOST" value="mobile" />
     </plugin>
-    <plugin name="cordova-plugin-openrap" spec="https://github.com/project-sunbird/cordova-plugin-openrap.git" />
-    <plugin name="cordova-plugin-qr-scanner" spec="https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0" />
-    <plugin name="cordova-plugin-sunbirdsplash" spec="https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-3.4.0" />
-    <plugin name="cordova-plugin-file-support" spec="https://github.com/project-sunbird/cordova-plugin-file-support.git" />
-    <plugin name="sb-cordova-plugin-sync" spec="https://github.com/project-sunbird/sb-cordova-plugin-sync.git#release-3.2.0" />
-    <plugin name="cordova-plugin-inappupdatemanager" spec="https://github.com/subranil/cordova-plugin-inappupdatemanager.git" />
-    <plugin name="cordova-sqlite-storage" spec="^6.0.0" />
-    <plugin name="cordova-plugin-googleplus" spec="^8.5.2">
-        <variable name="PLAY_SERVICES_VERSION" value="15.0.1" />
+    <plugin name="cordova-sqlite-storage" spec="^5.1.0" />
+    <plugin name="cordova-plugin-googleplus" spec="^5.2.1">
+        <variable name="REVERSED_CLIENT_ID" value="com.googleusercontent.apps.282927060960-1ls3h8ad2oj4sontnnp8t6kg4573m92u" />
     </plugin>
+    <plugin name="cordova-plugin-camera" spec="^5.0.2" />
+    <plugin name="cordova-plugin-telerik-imagepicker" spec="^2.3.3" />
+    <plugin name="cordova-plugin-filechooser" spec="^1.2.0" />
+    <plugin name="cordova-plugin-printer" spec="^0.8.0" />
+    <plugin name="cordova-plugin-whitelist" spec="^1.3.5" />
+    <plugin name="cordova-plugin-ionic-webview" spec="^4.2.1" />
+    <plugin name="cordova-plugin-app-version" spec="^0.1.12" />
+    <plugin name="cordova-plugin-x-socialsharing" spec="^6.0.3" />
+    <plugin name="cordova-plugin-androidx-adapter" spec="^1.1.3" />
+    <plugin name="cordova-plugin-device" spec="^2.0.3" />
+    <plugin name="cordova-plugin-file" spec="^6.0.2" />
+    <plugin name="cordova-plugin-inappbrowser" spec="^5.0.0" />
+    <plugin name="cordova-plugin-network-information" spec="^2.0.2" />
+    <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
+    <plugin name="cordova-plugin-webview-checker" spec="^1.0.1" />
+    <plugin name="cordova-plugin-awesome-shared-preferences" spec="https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git" />
 </widget>