Merge branch 'refs/heads/dev'

Clon1998 · Dec 8, 2024 · 1c39151 · 1c39151
2 parents f0b1705 + aaa4cfe
commit 1c39151
Show file tree

Hide file tree

Showing 147 changed files with 3,219 additions and 1,068 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -22,49 +22,33 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
 android {
-    compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = 'com.mobileraker'
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = '17'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.mobileraker.android"
-//        minSdkVersion flutter.minSdkVersion
-        minSdkVersion 25
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "com.mobileraker.android"
+        minSdk = 25
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     signingConfigs {
@@ -78,16 +62,16 @@ android {
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
 
 dependencies {
-    implementation platform('com.google.firebase:firebase-bom:33.0.0')
+    implementation platform('com.google.firebase:firebase-bom:33.6.0')
     implementation('com.google.firebase:firebase-analytics')
 }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mobileraker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,23 +1,29 @@
 <!--
-  ~ Copyright (c) 2023. Patrick Schmidt.
+  ~ Copyright (c) 2023-2024. Patrick Schmidt.
   ~ All rights reserved.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mobileraker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
      calls FlutterMain.startInitialization(this); in its onCreate method.
      In most cases you can leave this as-is, but you if you want to provide
      additional functionality it is fine to subclass or reimplement
      FlutterApplication and put your custom class here. -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.BILLING"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
+    <!-- Required by AwesomeNotifications -->
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
@@ -43,6 +49,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mobileraker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/build.gradle b/android/build.gradle
@@ -34,6 +34,19 @@ subprojects {
                 }
             }
         }
+        if (project.hasProperty('android')) {
+            project.android {
+                if (namespace == null) {
+                    project.logger.warn(
+                            "Warning: No namespace defined for project: "
+                                    + project.name
+                                    + ". Automatically setting namespace to project group: "
+                                    + project.group
+                    )
+                    namespace project.group
+                }
+            }
+        }
     }
 
     project.evaluationDependsOn(':app')

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,8 @@
-org.gradle.jvmargs=-Xmx1536M
+#
+# Copyright (c) 2024. Patrick Schmidt.
+# All rights reserved.
+#
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+kotlin.jvm.target.validation.mode=IGNORE
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,11 @@
+#
+# Copyright (c) 2024. Patrick Schmidt.
+# All rights reserved.
+#
+
 #Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -10,10 +10,9 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
@@ -24,12 +23,12 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.1.4" apply false
     // START: FlutterFire Configuration
-    id "com.google.gms.google-services" version "4.3.15" apply false
+    id "com.google.gms.google-services" version "4.4.2" apply false
     // END: FlutterFire Configuration
     id "org.jetbrains.kotlin.android" version "2.0.20" apply false
-    id "com.google.firebase.crashlytics" version "2.9.9" apply false
+    id "com.google.firebase.crashlytics" version "3.0.2" apply false
 }
 
-include ":app"
+include ":app"
diff --git a/assets/translations/de.yaml b/assets/translations/de.yaml
@@ -252,6 +252,7 @@ pages:
       last_modified: Zuletzt bearbeitet
       last_printed: Zuletzt gedruckt
       file_size: Dateigröße
+      estimated_time: Geschätzte Druckzeit
     file_actions:
       download: Herunterladen
       delete: Löschen
@@ -284,6 +285,10 @@ pages:
       upload_failed:
         title: Upload fehlgeschlagen
         body: Beim Hochladen der Datei ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.
+        reasons:
+          type_mismatch:
+            title: Dateityp nicht unterstützt
+            body: Nur '{}' Dateien sind erlaubt.
       zipping_success:
         title: Archiv erstellt
         body: Das Archiv wurde erfolgreich erstellt.
@@ -899,33 +904,32 @@ components:
     error:
       config:
         title: Fehler beim Abrufen der Druckerkonfiguration!
-        body: Beim Abrufen der Druckerkonfiguration ist ein Fehler aufgetreten. Stellen Sie sicher,
-          dass die Maschine erreichbar ist und Mobileraker verbunden ist.
+        body: Beim Abrufen der Druckerkonfiguration ist ein Fehler aufgetreten. Stellen Sie sicher, dass die Maschine erreichbar ist und Mobileraker verbunden ist.
   gcode_preview_settings_sheet:
-    title: 'Anzeige-Einstellungen'
+    title: Anzeige-Einstellungen
     show_grid:
-      title: 'Gitter anzeigen'
-      subtitle: 'Zeigt ein Referenzgitter'
+      title: Gitter anzeigen
+      subtitle: Zeigt ein Referenzgitter
     show_axes:
-      title: 'Achsen anzeigen'
-      subtitle: 'Zeigt die X-, Y-Achsen an'
+      title: Achsen anzeigen
+      subtitle: Zeigt die X-, Y-Achsen an
     show_next_layer:
-      title: 'Nächste Schicht anzeigen'
-      subtitle: 'Zeigt die nächste Schicht an'
+      title: Nächste Schicht anzeigen
+      subtitle: Zeigt die nächste Schicht an
     show_previous_layer:
-      title: 'Vorherige Schicht anzeigen'
-      subtitle: 'Zeigt die zuvor gedruckte Schicht an'
+      title: Vorherige Schicht anzeigen
+      subtitle: Zeigt die zuvor gedruckte Schicht an
     extrusion_width_multiplier:
-      prefix: 'Linienbreiten-Multiplikator'
+      prefix: Linienbreiten-Multiplikator
     show_extrusion:
-      title: 'Extrusionen anzeigen'
-      subtitle: 'Zeige Materialbewegungen in der Vorschau an'
+      title: Extrusionen anzeigen
+      subtitle: Zeige Materialbewegungen in der Vorschau an
     show_retraction:
-      title: 'Rückzüge anzeigen'
-      subtitle: 'Zeige Filament-Rückzugsbewegungen in der Vorschau an'
+      title: Rückzüge anzeigen
+      subtitle: Zeige Filament-Rückzugsbewegungen in der Vorschau an
     show_travel:
-      title: 'Verfahrbewegungen anzeigen'
-      subtitle: 'Zeigt nicht-druckende Bewegungen in der Vorschau an'
+      title: Verfahrbewegungen anzeigen
+      subtitle: Zeigt nicht-druckende Bewegungen in der Vorschau an
   select_color_sheet:
     title: Farbe auswählen
 dialogs:
@@ -995,6 +999,7 @@ dialogs:
     active_machine: 'Aktive Maschine: {}'
     hint: Tippen Sie auf eine Maschine, um sie zu aktivieren.
   supporter_perks:
+    learn_more: Erfahren mehr über die Vorteile
     title: Supporter Vorteile
     body: Indem Sie Mobileraker unterstützen, stellen Sie sicher, dass die App für die Community kostenlos bleiben kann. Zusätzlich erhalten Supporter die folgenden Funktionen.
     hint: 'Hinweis: Zurzeit sind die Vergünstigungen geräteabhängig. Dies könnte sich in Zukunft ändern.'
@@ -1050,7 +1055,8 @@ dialogs:
     value: Header-Wert
     value_hint: Der Wert des HTTP-Headers
   macro_settings:
-    show_while_printing: Während des Drucks anzeigen
+    show_for_states: Druck-Zustände
+    show_for_states_hint: Wählen Sie die Druckzustände, in denen das Makro angezeigt werden soll
     visible: Sichtbar
   extruder_feedrate:
     title: Extruder-Geschwindigkeit [mm/s]

diff --git a/assets/translations/en.yaml b/assets/translations/en.yaml
@@ -257,6 +257,7 @@ pages:
       last_modified: Last modified
       last_printed: Last printed
       file_size: Size
+      estimated_time: Estimated print time
     file_actions:
       download: Download
       delete: Delete
@@ -289,6 +290,10 @@ pages:
       upload_failed:
         title: Upload failed
         body: An error occurred while trying to upload the file. Please retry later.
+        reasons:
+          type_mismatch:
+            title: File type mismatch
+            body: Only '{}' files are allowed.
       zipping_success:
         title: Zipping successful
         body: The archive was successfully created.
@@ -700,6 +705,7 @@ pages:
   paywall:
     manage_view:
       title: Thanks for your Support!
+
       list_title: 'Change Supporter Tier:'
       store_btn: Cancel Subscription in {}
       sub_warning: Please take note that purchasing the lifetime supporter tier does
@@ -1073,6 +1079,7 @@ dialogs:
     active_machine: 'Active Machine: {}'
     hint: Tap on a machine to set it as active.
   supporter_perks:
+    learn_more: Learn about Supporter Perks
     title: Supporter Perks
     body: By supporting Mobileraker, you ensure the app can stay free for the community.
       Additionally supporters gain the following list of perks.
@@ -1131,7 +1138,8 @@ dialogs:
     value: Header-Value
     value_hint: The value of the header
   macro_settings:
-    show_while_printing: Show while printing
+    show_for_states: Print States
+    show_for_states_hint: Select the states for which the macro should be displayed
     visible: Visible
   extruder_feedrate:
     title: Extruder Velocity [mm/s]

diff --git a/assets/translations/fr.yaml b/assets/translations/fr.yaml
@@ -647,7 +647,6 @@ dialogs:
     value: Valeur de l'en-tête
     value_hint: La valeur de l'en-tête
   macro_settings:
-    show_while_printing: Afficher lors de l'impression
     visible: Visible
   extruder_feedrate:
     title: Vitesse de l'extrudeur [mm/s]