Merge pull request #22 from Macro-Deck-App/disable-screen-orientation…

…-lock-android-oreo

Disable screen lock in Android 8

android/app/capacitor.build.gradle

@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-keep-awake')
     implementation project(':capacitor-app')
+    implementation project(':capacitor-device')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capawesome-capacitor-screen-orientation')

android/app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
             android:name=".MainActivity"
             android:label="@string/title_activity_main"
-            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:theme="@style/AppTheme"
             android:launchMode="singleTask"
             android:exported="true">
 

android/app/src/main/res/values/styles.xml

@@ -2,20 +2,14 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:background">@null</item>
-    </style>
-
-    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
-      <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
 </resources>

android/capacitor.settings.gradle

@@ -8,6 +8,9 @@ project(':capacitor-community-keep-awake').projectDir = new File('../node_module
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 
+include ':capacitor-device'
+project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android')
+
 include ':capacitor-haptics'
 project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
 

package.json

@@ -29,6 +29,7 @@
     "@capacitor/android": "5.7.5",
     "@capacitor/app": "5.0.7",
     "@capacitor/core": "5.7.5",
+    "@capacitor/device": "^6.0.0",
     "@capacitor/haptics": "5.0.7",
     "@capacitor/ios": "5.7.5",
     "@capacitor/keyboard": "5.0.8",

src/app/pages/shared/modals/settings-modal/settings-modal.component.html

@@ -49,12 +49,17 @@
     @if (isiOSorAndroid()) {
       <ion-item>
         <ion-icon slot="start" class="mdi mdi-screen-rotation d-flex align-items-center"></ion-icon>
-        <ion-select [(ngModel)]="screenOrientation" label="Screen orientation">
-          <ion-select-option value="0">Auto</ion-select-option>
-          <ion-select-option value="1">Landscape</ion-select-option>
-          <ion-select-option value="2">Landscape alternative</ion-select-option>
-          <ion-select-option value="3">Portrait</ion-select-option>
-        </ion-select>
+        @if (!isAndroidOreo) {
+          <ion-select [(ngModel)]="screenOrientation" label="Screen orientation">
+            <ion-select-option value="0">Auto</ion-select-option>
+            <ion-select-option value="1">Landscape</ion-select-option>
+            <ion-select-option value="2">Landscape alternative</ion-select-option>
+            <ion-select-option value="3">Portrait</ion-select-option>
+          </ion-select>
+        } @else {
+          <ion-label>Screen orientation</ion-label>
+          <ion-label slot="end">Not available</ion-label>
+        }
       </ion-item>
     }
 

src/app/pages/shared/modals/settings-modal/settings-modal.component.ts

@@ -18,6 +18,7 @@ export class SettingsModalComponent  implements OnInit {
 
   public static settingsApplied: EventEmitter<any> = new EventEmitter();
 
+  isAndroidOreo: boolean = false;
   preventScreenTimeout: boolean = false;
   showMenuButton: boolean = false;
   skipSslValidation: boolean = false;
@@ -39,6 +40,7 @@ export class SettingsModalComponent  implements OnInit {
 
   async ngOnInit() {
     await this.loadCurrentSettings();
+    this.isAndroidOreo = await this.diagnosticService.isAndroidOreo();
   }
 
   async confirm() {

src/app/services/diagnostic/diagnostic.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import {App} from "@capacitor/app";
 import {Platform} from "@ionic/angular";
-import {Capacitor} from "@capacitor/core";
+import {Device} from "@capacitor/device";
 
 @Injectable({
   providedIn: 'root'
@@ -19,6 +19,20 @@ export class DiagnosticService {
     return "Web Client";
   }
 
+  async isAndroidOreo() {
+    if (!this.isAndroid()) {
+      return false;
+    }
+
+    let androidSdk = await this.getAndroidSdkVersion();
+    return androidSdk == 26 || androidSdk == 27;
+  }
+
+  async getAndroidSdkVersion() {
+    const info = await Device.getInfo();
+    return info.androidSDKVersion;
+  }
+
   public isAndroid() {
     return this.platform.is("android");
   }
@@ -34,7 +48,7 @@ export class DiagnosticService {
       return "i";
     }
 
-    return "";
+    return "pwa";
   }
 
   public isiOSorAndroid() {

src/app/services/screen-orientation/screen-orientation.service.ts

@@ -18,6 +18,10 @@ export class ScreenOrientationService {
       return;
     }
 
+    if (await this.diagnosticService.isAndroidOreo()) {
+      return;
+    }
+
     let screenOrientation = await this.settingsService.getScreenOrientation();
     try {
       switch (screenOrientation) {