Merge branch 'dev'

# Conflicts:
#	docs/faq.md
#	pubspec.yaml
#	test/unit/marshalling/configfile_marshalling_test.dart

Author: Clon1998

.github/workflows/build-Android.yml

@@ -13,8 +13,8 @@ jobs:
         with:
           java-version: '12.x'
       - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: '3.3.10'
+#        with:
+#          flutter-version: '3.3.10'
       - run: echo ${{ secrets.GOOGLE_SERVICES_JSON }} | base64 -d > ./android/app/google-services.json
       - run: echo ${{ secrets.KEY_PROPERTIES }} | base64 -d > ./android/key.properties
       - run: echo ${{ secrets.PLAY_STORE_JKS }} | base64 -d > ./android/app/gps.jks

analysis_options.yaml

@@ -27,3 +27,7 @@ linter:
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+
+analyzer:
+  plugins:
+    - custom_lint

android/app/build.gradle

@@ -34,12 +34,18 @@ if (keystorePropertiesFile.exists()) {
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
@@ -74,7 +80,7 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation platform('com.google.firebase:firebase-bom:30.5.0')
+    implementation platform('com.google.firebase:firebase-bom:31.2.3')
     implementation 'com.google.firebase:firebase-analytics'
 }
 

android/build.gradle

@@ -1,19 +1,18 @@
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.10'
     ext.minSdkVersion   = 25                // or latest
     ext.compileSdkVersion   = 33                // or latest
     ext.targetSdkVersion    = 33                // or latest
-    ext.appCompatVersion    = '1.5.1'           // or latest
 
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.gms:google-services:4.3.15'
     }
 }
 

android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

assets/translations/de.json

@@ -304,6 +304,7 @@
     "connection_watcher": {
       "reconnect": "Neu verbinden",
       "trying_connect": "Versuche zu verbinden ...",
+      "trying_connect_remote": "Versuche zu verbinden, nutze remote Client ...",
       "server_starting": "Der Server startet ..."
     }
   },

assets/translations/en.json

@@ -16,6 +16,7 @@
     "shutdown": "Shutdown",
     "firmware": "Firmware",
     "fetching": "Fetching",
+    "loading": "Loading",
     "unknown": "Unknown",
     "disabled": "Disabled",
     "confirm": "Confirm",
@@ -256,7 +257,13 @@
         "default_addr": "Default Address",
         "flip_vertical": "Flip vertical",
         "flip_horizontal": "Flip horizontal",
-        "cam_mode": "Cam Mode"
+        "cam_mode": "Cam Mode",
+        "cam_mofde": "Cam fasff",
+        "cam_rotate": {
+          "label": "Rotate",
+          "landscape": "Landscape",
+          "portrait": "Portrait"
+        }
       },
       "macros": {
         "new_macro_grp": "New Macro - Group",
@@ -297,6 +304,12 @@
       "fetching_machines": "@:general.fetching machines...",
       "no_entries": "No machines found",
       "add_machine": "Add Machine"
+    },
+    "faq": {
+      "title": "FAQ",
+      "loading": "@:general.loading FAQ...",
+      "error":"An error occurred while trying to fetch FAQ",
+      "open_in_browser": "Open @:pages.faq.title in Browser"
     }
   },
   "components": {
@@ -311,8 +324,10 @@
     },
     "connection_watcher": {
       "reconnect": "Reconnect",
-      "trying_connect": "Trying to connect ...",
-      "server_starting": "Server is starting..."
+      "trying_connect": "Trying to connect...",
+      "trying_connect_remote": "Trying to connect using remote client...",
+      "server_starting": "Server is starting...",
+      "more_details": "More Details"
     }
   },
   "dialogs": {
@@ -369,7 +384,8 @@
     "shutdown": "Shutdown",
     "starting": "Starting",
     "disconnected": "Disconnected",
-    "error": "Error"
+    "error": "Error",
+    "unauthorized": "Unauthorized"
   },
   "notifications": {
     "channel_printer_grp": "Printer {}",

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -293,6 +293,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -346,6 +347,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

ios/Runner/Info.plist

@@ -59,5 +59,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

lib/app_setup.dart

@@ -11,6 +11,7 @@ import 'package:mobileraker/data/model/hive/octoeverywhere.dart';
 import 'package:mobileraker/data/model/hive/progress_notification_mode.dart';
 import 'package:mobileraker/data/model/hive/temperature_preset.dart';
 import 'package:mobileraker/data/model/hive/webcam_mode.dart';
+import 'package:mobileraker/data/model/hive/webcam_rotation.dart';
 import 'package:mobileraker/data/model/hive/webcam_setting.dart';
 import 'package:mobileraker/service/machine_service.dart';
 import 'package:mobileraker/service/moonraker/klippy_service.dart';
@@ -70,6 +71,10 @@ setupBoxes() async {
   if (!Hive.isAdapterRegistered(octoAdapater.typeId)) {
     Hive.registerAdapter(octoAdapater);
   }
+  var webCamRotationAdapter = WebCamRotationAdapter();
+  if (!Hive.isAdapterRegistered(webCamRotationAdapter.typeId)) {
+    Hive.registerAdapter(webCamRotationAdapter);
+  }
   // Hive.deleteBoxFromDisk('printers');
 
   try {