Merge branch 'release-3.1.0' of https://github.com/Sunbird-Ed/Sunbird…

…Ed-mobile-app into release-3.1.0
Sunbird-Ed · Jun 29, 2020 · fbe8204 · fbe8204
2 parents 13c7fb1 + 5eebeb5
commit fbe8204
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/src/app.scss b/src/app.scss
@@ -1337,3 +1337,25 @@ ion-modal.sb-progress-loader {
   color: #0ec254;
   font-weight: bold;
 }
+
+.group-option-popover {
+  padding: 16px;
+  ion-item {
+    font-size: 14px;
+    font-family: "Noto Sans";
+  }
+
+  ion-item:nth-child(1) {
+    color: #333333;
+  }
+  ion-item:nth-child(2) {
+    color: #FF4558;
+  }
+}
+
+.group-option-popover .popover-content {
+  top: 82px !important;
+  left: 173px !important;
+  width: 196px;
+  height: 80px;
+}
diff --git a/src/app/app.constant.ts b/src/app/app.constant.ts
@@ -242,6 +242,7 @@ export class PreferenceKey {
     public static readonly COACH_MARK_SEEN = 'coach_mark_seen';
     public static readonly PAGE_ASSEMBLE_ORGANISATION_ID = 'page_assemble_organisation_id';
     public static readonly CAMPAIGN_PARAMETERS = 'campaign_parameters';
+    public static readonly CREATE_GROUP_INFO_POPUP = 'create_group_info_popup';
 }
 
 export class GenericAppConfig {

diff --git a/src/app/my-groups/group-details/group-details.page.ts b/src/app/my-groups/group-details/group-details.page.ts
@@ -164,7 +164,7 @@ export class GroupDetailsPage {
       componentProps: {
         list: menuList
       },
-      cssClass: 'download-popover'
+      cssClass: 'group-option-popover'
     });
     await groupOptions.present();
 

diff --git a/src/app/my-groups/my-groups.page.ts b/src/app/my-groups/my-groups.page.ts
@@ -2,8 +2,8 @@ import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
 import { Router, NavigationExtras } from '@angular/router';
 
 import { AppHeaderService } from '@app/services/app-header.service';
-import { RouterLinks } from '../app.constant';
-import { AuthService, ClassRoomService, ClassRoom } from '@project-sunbird/sunbird-sdk';
+import { RouterLinks, PreferenceKey } from '../app.constant';
+import { AuthService, ClassRoomService, ClassRoom, SharedPreferences } from '@project-sunbird/sunbird-sdk';
 import { LoginHandlerService } from '@app/services/login-handler.service';
 import { CommonUtilService } from '@app/services';
 import { PopoverController } from '@ionic/angular';
@@ -23,12 +23,13 @@ export class MyGroupsPage implements OnInit, OnDestroy {
   constructor(
     @Inject('AUTH_SERVICE') public authService: AuthService,
     @Inject('CLASS_ROOM_SERVICE') public classRoomService: ClassRoomService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     private headerService: AppHeaderService,
     private router: Router,
     private loginHandlerService: LoginHandlerService,
     private commonUtilService: CommonUtilService,
     private popoverCtrl: PopoverController
-  ) {  }
+  ) { }
 
   ngOnInit() {
     this.checkUserLoggedIn();
@@ -47,6 +48,14 @@ export class MyGroupsPage implements OnInit, OnDestroy {
     this.fetchGroupList();
   }
 
+  async ionViewDidEnter() {
+    const groupInfoScreen = await this.preferences.getBoolean(PreferenceKey.CREATE_GROUP_INFO_POPUP).toPromise();
+    if (!groupInfoScreen) {
+      this.openinfopopup();
+      this.preferences.putBoolean(PreferenceKey.CREATE_GROUP_INFO_POPUP, true).toPromise().then();
+    }
+  }
+
   ngOnDestroy() {
     if (this.headerObservable) {
       this.headerObservable.unsubscribe();
@@ -66,7 +75,7 @@ export class MyGroupsPage implements OnInit, OnDestroy {
   }
 
   login() {
-    this.loginHandlerService.signIn({skipRootNavigation: true});
+    this.loginHandlerService.signIn({ skipRootNavigation: true });
   }
 
   async fetchGroupList() {