Merge pull request #4519 from crazyserver/MOBILE-4796

MOBILE-4796 screen: Watch full screen to hide statusbars

Author: albertgasset

package-lock.json

@@ -83,7 +83,7 @@
         "@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.5",
         "@moodlehq/cordova-plugin-media-capture": "5.0.0-moodle.1",
         "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.5",
-        "@moodlehq/cordova-plugin-statusbar": "4.0.0-moodle.4",
+        "@moodlehq/cordova-plugin-statusbar": "4.0.0-moodle.5",
         "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
         "@moodlehq/phonegap-plugin-push": "4.0.0-moodle.12",
         "@ngx-translate/core": "^16.0.4",

package.json

@@ -3,7 +3,7 @@
     "allincludinghidden": "All (including removed from view)",
     "aria:card": "Switch to card view",
     "aria:list": "Switch to list view",
-    "browseallcourses": "Browse available courses",
+    "browseallcourses": "Browse all courses",
     "favourites": "Starred",
     "future": "Future",
     "hiddencourses": "Removed from view",

src/addons/block/myoverview/lang.json

@@ -1,3 +1,3 @@
 {
-    "pluginname": "Main menu"
+    "pluginname": "Additional activities"
 }

src/addons/block/sitemainmenu/lang.json

@@ -1,5 +1,5 @@
 @addon_block_site_main_menu @app @block @block_site_main_menu @javascript @lms_from5.0
-Feature: Basic tests of Main menu block
+Feature: Basic tests of Additional activities block
 
   Background:
     Given the Moodle site is compatible with this feature
@@ -10,18 +10,18 @@ Feature: Basic tests of Main menu block
       | blockname      | contextlevel | reference | pagetypepattern | defaultregion |
       | site_main_menu | System       | 1         | site-index      | side-pre      |
 
-  Scenario: View the Main menu block in site home
+  Scenario: View the Additional activities block in site home
     Given the following "activities" exist:
       | activity | course               | section | name          |
       | forum    | Acceptance test site | 0       | My forum name |
     And I entered the app as "student1"
     When I press "Site home" in the app
     And I press "Open block drawer" in the app
-    Then I should find "My forum name" within "Main menu" "ion-card" in the app
+    Then I should find "My forum name" within "Additional activities" "ion-card" in the app
     When I press "My forum name" in the app
     Then the header should be "My forum name" in the app
 
-  Scenario: Activities in main menu block can be made available but not visible on a course page
+  Scenario: Activities in additional activities block can be made available but not visible on a course page
     Given the following config values are set as admin:
       | allowstealth | 1 |
     And the following "activities" exist:
@@ -36,8 +36,8 @@ Feature: Basic tests of Main menu block
     And I entered the app as "student1"
     When I press "Site home" in the app
     And I press "Open block drawer" in the app
-    Then I should find "Visible forum" within "Main menu" "ion-card" in the app
-    Then I should not find "My forum name" within "Main menu" "ion-card" in the app
+    Then I should find "Visible forum" within "Additional activities" "ion-card" in the app
+    Then I should not find "My forum name" within "Additional activities" "ion-card" in the app
     When I press "Visible forum" in the app
     Then the header should be "Visible forum" in the app
 
@@ -51,4 +51,4 @@ Feature: Basic tests of Main menu block
     And I entered the app as "student1"
     When I press "Site home" in the app
     And I press "Open block drawer" in the app
-    Then I should not find "Main menu" in the app
+    Then I should not find "Additional activities" in the app

src/addons/block/sitemainmenu/tests/behat/block_sitemainmenu.feature

@@ -38,7 +38,7 @@
     "loginfail": "Login failed, please try again...",
     "lowscore": "Low score",
     "lowtime": "Low time",
-    "maximumnumberofattemptsreached": "Maximum number of attempts reached - Moving to next page",
+    "maximumnumberofattemptsreached": "You have reached the maximum number of tries for this question. The lesson will now move to the next page.",
     "modattemptsnoteacher": "Student review only works for students.",
     "modulenameplural": "Lessons",
     "noanswer": "One or more questions have no answer given.  Please go back and submit an answer.",

src/addons/mod/lesson/lang.json

@@ -22,4 +22,6 @@ export default function(): void {
     CoreScreen.watchViewport();
 
     CoreScreen.watchOrientation();
+
+    CoreScreen.watchFullscreen();
 }

src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_27.png

@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
-import { makeSingleton } from '@singletons';
+import { makeSingleton, StatusBar } from '@singletons';
 import { CoreEvents } from '@singletons/events';
 import { CorePlatform } from '@services/platform';
 
@@ -128,6 +128,27 @@ export class CoreScreenService {
         });
     }
 
+    /**
+     * Watch fullscreen changes.
+     */
+    async watchFullscreen(): Promise<void> {
+        await CorePlatform.ready();
+
+        // During video playback, Android 11 and previous versions show the status bar on the first click.
+        // We're not hiding the status bar in this case to avoid this issue.
+        if (CorePlatform.isAndroid() && CorePlatform.getPlatformMajorVersion() < 12) {
+            return;
+        }
+
+        document.addEventListener('fullscreenchange', () => {
+            if (document.fullscreenElement) {
+                StatusBar.hide();
+            } else {
+                StatusBar.show();
+            }
+        });
+    }
+
     /**
      * Watch viewport changes.
      */