Issue #SB-000 merge: Merge branch 'release-5.1.1' into release-5.1.2

build-ios.sh

@@ -80,6 +80,7 @@ ionic cordova plugin add https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip
 ionic cordova plugin add cordova-plugin-sign-in-with-apple
 ionic cordova plugin rm cordova-plugin-inappupdatemanager   
 ionic cordova plugin add https://github.com/subranil/cordova-plugin-inappupdatemanager.git
+ionic cordova plugin add https://github.com/521dimensions/cordova-plugin-screen-orientation
 ionic cordova plugin add ionic-plugin-deeplinks --variable URL_SCHEME="${URL_SCHEME}" --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST="${DEEPLINK_HOST}"
 #Temporary Workaround to generate build as webpack was complaining of Heap Space
 #need to inspect on webpack dependdencies at the earliest

build_config

@@ -13,7 +13,7 @@ cordova-plugin=cordova-plugin-network-information
 cordova-plugin=cordova-plugin-statusbar
 cordova-plugin=cordova-plugin-webview-checker
 cordova-plugin=https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git
-cordova-plugin=https://github.com/katzer/cordova-plugin-local-notifications.git
+cordova-plugin=https://github.com/fquirin/cordova-plugin-local-notifications.git
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.0.2
 cordova-plugin=cordova-plugin-advanced-http
 cordova-plugin=cordova-plugin-android-permissions
@@ -40,7 +40,7 @@ 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#release-5.0.2
-sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-5.0.2
+sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-5.1.1
 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
 cordova-plugin=uk.co.workingedge.phonegap.plugin.istablet

config.xml

@@ -18,12 +18,14 @@
     <hook src="scripts/copyContentPlayer.js" type="before_build" />
     <hook src="scripts/copyContentPlayer.js" type="before_run" />
     <platform name="android">
+        <preference name="android-targetSdkVersion" value="31" />
         <hook src="scripts/deleteUnUsableIosIcon.js" type="before_run" />
         <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/copyGradleFiles.js" type="before_run" />
         <hook src="scripts/copyBundledData.js" type="before_run" />
+        <hook src="scripts/android/android-10-migration-fix.js" type="before_build" />
         <hook src="scripts/application/add_application.js" type="before_run" />
         <hook src="scripts/android/android-10-migration-fix.js" type="before_build" />
         <resource-file src="MainActivity.java" target="app/src/main/java/org/sunbird/app/MainActivity.java" />
@@ -176,7 +178,7 @@
     </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-4.10.1" />
+    <plugin name="cordova-plugin-sunbirdsplash" spec="https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-5.1.1" />
     <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" />

package.json

@@ -63,8 +63,8 @@
     "@ionic/storage": "2.2.0",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
-    "@project-sunbird/client-services": "5.0.0",
-    "@project-sunbird/common-consumption-v9": "5.0.0",
+    "@project-sunbird/client-services": "5.1.1",
+    "@project-sunbird/common-consumption-v9": "5.1.0",
     "@project-sunbird/common-form-elements-v9": "5.0.3",
     "@project-sunbird/content-player": "5.1.0",
     "@project-sunbird/discussions-ui-v8": "2.6.0-beta.2",
@@ -74,8 +74,8 @@
     "@project-sunbird/sunbird-epub-player-v9": "4.8.1",
     "@project-sunbird/sunbird-pdf-player-v9": "4.8.1",
     "@project-sunbird/sunbird-quml-player-v9": "5.0.2",
-    "@project-sunbird/sunbird-sdk": "5.0.0",
-    "@project-sunbird/sunbird-video-player-v9": "5.0.4",
+    "@project-sunbird/sunbird-sdk": "5.1.1",
+    "@project-sunbird/sunbird-video-player-v9": "5.1.3",
     "chart.js": "^2.9.4",
     "chartjs-plugin-datalabels": "^0.7.0",
     "chartjs-plugin-stacked100": "^0.7.1",
@@ -95,8 +95,9 @@
     "cordova-plugin-device": "^2.0.3",
     "cordova-plugin-dialogs": "^2.0.2",
     "cordova-plugin-document-viewer": "^0.9.13",
-    "cordova-plugin-file-opener2": "^2.2.1",
     "cordova-plugin-file-transfer": "git+https://github.com/apache/cordova-plugin-file-transfer.git",
+    "cordova-plugin-file": "^7.0.0",
+    "cordova-plugin-file-opener2": "^2.2.1",
     "cordova-plugin-filechooser": "^1.2.0",
     "cordova-plugin-filepath": "^1.5.8",
     "cordova-plugin-filepicker": "^1.1.6",
@@ -120,7 +121,7 @@
     "datatables.net-fixedcolumns": "^3.3.3",
     "dayjs": "1.9.8",
     "dom-to-image": "^2.6.0",
-    "epubjs": "0.3.88",
+    "epubjs": "^0.3.89",
     "es6-promise-plugin": "^4.2.2",
     "grapheme-splitter": "^1.0.4",
     "hammerjs": "^2.0.8",
@@ -131,7 +132,7 @@
     "katex": "^0.12.0",
     "lodash-es": "^4.17.20",
     "material-design-icons": "^3.0.1",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
     "ng-recaptcha": "^5.0.0",
     "ng2-charts": "^2.4.2",
     "ng2-material-dropdown": "0.11.0",
@@ -180,7 +181,7 @@
     "@babel/preset-typescript": "^7.9.0",
     "@ionic/angular-toolkit": "^2.3.1",
     "@ionic/v4-migration-tslint": "^1.7.1",
-    "@project-sunbird/sb-themes": "0.0.82",
+    "@project-sunbird/sb-themes": "0.0.86",
     "@project-sunbird/telemetry-sdk": "0.0.29",
     "@types/jest": "^25.2.1",
     "@types/node": "12.11.5",
@@ -194,11 +195,11 @@
     "cordova-plugin-fcm-with-dependecy-updated": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.0.2",
     "cordova-plugin-file": "^7.0.0",
     "cordova-plugin-inappupdatemanager": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0",
-    "cordova-plugin-local-notification": "git+https://github.com/katzer/cordova-plugin-local-notifications.git",
+    "cordova-plugin-local-notification": "git+https://github.com/fquirin/cordova-plugin-local-notifications.git",
     "cordova-plugin-openrap": "git+https://github.com/project-sunbird/cordova-plugin-openrap.git",
     "cordova-plugin-proguard": "git+https://github.com/greybax/cordova-plugin-proguard.git",
     "cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-5.0.2",
-    "cordova-plugin-sunbirdsplash": "git+https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-5.0.2",
+    "cordova-plugin-sunbirdsplash": "git+https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-5.1.1",
     "cordova-plugin-telerik-imagepicker": "^2.3.3",
     "cordova-zip-plugin": "git+https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git",
     "fs-extra": "^8.1.0",
@@ -291,7 +292,8 @@
       "cordova-plugin-sunbirdsplash": {}
     },
     "platforms": [
-      "android"
+      "android",
+      "ios"
     ]
   },
   "jest": {
@@ -358,4 +360,4 @@
       "<rootDir>/src/app/manage-learn/"
     ]
   }
-}
+}

scripts/android/android-10-migration-fix.js

@@ -8,9 +8,14 @@ var pathList = [
     "platforms/android/cordova-plugin-local-notification/app-localnotification.gradle",
 ]
 for (let i = 0; i < pathList.length; i++) {
-    if(process.platform == "darwin") {
-        shell(`sed -i "" "s!compile!implementation!g" ${pathList[i]}`)
-    } else {
-        shell(`sed -i "s!compile!implementation!g" ${pathList[i]}`)
+    try {
+        if(process.platform == "darwin") {
+            shell(`sed -i "" "s!compile!implementation!g" ${pathList[i]}`)
+        } else {
+            shell(`sed -i "s!compile!implementation!g" ${pathList[i]}`)
+        }
+    }
+    catch(err) {
+        console.log('error on script plugins ', pathList[i] + ' - ' + err);
     }
   }

scripts/deleteUnUsableIosIcon.js

@@ -133,7 +133,8 @@ function deleteUnUsableIosIcon(ionicIconFilePath) {
                 "sync-circle.svg",
                 "arrow-up-circle-outline.svg",
                 "arrow-down-circle-outline.svg",
-                "caret-forward-circle.svg"
+                "caret-forward-circle.svg",
+                "ribbon.svg"
             ].includes(file))) {
                 fs.unlinkSync(ionicIconFilePath + '/' + file);
             }

src/app.scss

@@ -805,6 +805,42 @@ ion-toast.red-toast{
   --background: #{map-get($colors, vivid_red)};
 }
 
+html[data-theme="JOYFUL"][data-mode="DARKMODE"].ios {
+  .loading-wrapper,
+  ion-toast {
+    --background: #{map-get($colors, granite_gray)};
+  }
+}
+
+html[data-theme="JOYFUL"][data-mode="DARKMODE"] {
+  sb-library-card sb-library-card-v4 .sb--card.sb--card--theme2 {
+    .sb--card__info{
+      .subject-info,
+      .sb--card__meta{
+        color: white !important;
+      }
+    }
+  }
+
+  sb-course-curiculum-card .sb--card.sb--card--course--curiculum .sb--card__main-area{
+    .sb--card__info .sb--card__title {
+      background: transparent !important;
+    }
+  }
+
+  lib-lib-entry {
+    &.main_discuss_lib {
+      .ng2-tag-input__text-input {
+        width: 100%;
+        color: white !important;
+      }
+      .discussion-start-modal .discussion-start-modal-content .discussion-start-form .start-form-content .start-form-label {
+        color: white !important;
+      }
+    }
+  }
+}
+
 .btn-block {
   margin: 0 !important;
   position: relative;
@@ -2099,7 +2135,7 @@ html[data-theme="JOYFUL"][data-mode="DARKMODE"] {
   }
   .background-theme-color{
     background-color: var(--app-secondary-background) !important;
-}
+  }
   .message,.projects-labels, .clr-primary {
     color: $white;
   }
@@ -2120,13 +2156,13 @@ html[data-theme="JOYFUL"][data-mode="DARKMODE"] {
   }
   .button-clr{
   color: map-get($colors, black) !important;
-}
-.clr-downloaded-btn{
-  color:green !important;
-}
-ion-icon.mg-popup-btn-icon.md.hydrated{
-  filter: invert(0) !important;
-}
+  }
+  .clr-downloaded-btn{
+    color:green !important;
+  }
+  ion-icon.mg-popup-btn-icon.md.hydrated{
+    filter: invert(0) !important;
+  }
   .loading-spinner.sc-ion-loading-md,
   .loading-wrapper.ion-overlay-wrapper.sc-ion-loading-md{
     filter: invert(0) !important;
@@ -2146,16 +2182,19 @@ ion-icon.mg-popup-btn-icon.md.hydrated{
     .action-btn{
       color: #000 !important;
       --background: #FFD954  !important;
-  }
+    }
 
   }
   .attachments-list{
     .card-text{
       color: #000 !important;
     }
   }
-  .segment-button-has-label-only.segment-button-layout-icon-top.ion-activatable.ion-activatable-instant.ion-focusable.hydrated.segment-button-checked ion-label {
-    color: white !important;
+  .segment-button-has-label-only.segment-button-layout-icon-top.ion-activatable.ion-activatable-instant.ion-focusable.hydrated.segment-button-checked {
+    ion-label {
+    color: balck !important;
+    }
+    --ion-background-color: transparent
   }
 }
 

src/app/app.component.ts

@@ -785,7 +785,9 @@ export class AppComponent implements OnInit, AfterViewInit {
       .then(result => {
         if (result) {
           setTimeout(() => {
-            this.events.publish('force_optional_upgrade', result);
+            if(!this.platform.is('ios')) {
+              this.events.publish('force_optional_upgrade', result);
+            }
           }, 5000);
         }
       })

src/app/category-list/category-list-page.html

@@ -83,7 +83,8 @@
                                         [viewMoreButtonText]="'VIEW_MORE' | translate" [maxCardCount]="3"
                                         [layoutConfig]="layoutConfiguration"
                                         (viewMoreClick)="navigateToViewMorePage(section?.contents, section.name, section?.totalCount)"
-                                        (cardClick)="navigateToDetailPage($event, section.name)">
+                                        (cardClick)="navigateToDetailPage($event, section.name)"
+                                        [defaultImage]="defaultImage">
                 </sb-library-cards-stack>
             </div>
         </div>