Skip to content

Commit 1c39151

Browse files
committed
Merge branch 'refs/heads/dev'
2 parents f0b1705 + aaa4cfe commit 1c39151

File tree

147 files changed

+3219
-1068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+3219
-1068
lines changed

android/app/build.gradle

+14-30
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,33 @@ if (localPropertiesFile.exists()) {
2222
}
2323
}
2424

25-
26-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
27-
if (flutterVersionCode == null) {
28-
flutterVersionCode = '1'
29-
}
30-
31-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
32-
if (flutterVersionName == null) {
33-
flutterVersionName = '1.0'
34-
}
35-
36-
3725
def keystoreProperties = new Properties()
3826
def keystorePropertiesFile = rootProject.file('key.properties')
3927
if (keystorePropertiesFile.exists()) {
4028
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
4129
}
4230

4331
android {
44-
compileSdk flutter.compileSdkVersion
45-
ndkVersion flutter.ndkVersion
32+
namespace = 'com.mobileraker'
33+
compileSdk = flutter.compileSdkVersion
34+
ndkVersion = flutter.ndkVersion
4635

4736
compileOptions {
48-
sourceCompatibility JavaVersion.VERSION_1_8
49-
targetCompatibility JavaVersion.VERSION_1_8
37+
sourceCompatibility = JavaVersion.VERSION_17
38+
targetCompatibility = JavaVersion.VERSION_17
5039
}
5140

5241
kotlinOptions {
53-
jvmTarget = '1.8'
54-
}
55-
56-
sourceSets {
57-
main.java.srcDirs += 'src/main/kotlin'
42+
jvmTarget = '17'
5843
}
5944

6045
defaultConfig {
6146
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
62-
applicationId "com.mobileraker.android"
63-
// minSdkVersion flutter.minSdkVersion
64-
minSdkVersion 25
65-
targetSdkVersion flutter.targetSdkVersion
66-
versionCode flutterVersionCode.toInteger()
67-
versionName flutterVersionName
47+
applicationId = "com.mobileraker.android"
48+
minSdk = 25
49+
targetSdk = flutter.targetSdkVersion
50+
versionCode = flutter.versionCode
51+
versionName = flutter.versionName
6852
}
6953

7054
signingConfigs {
@@ -78,16 +62,16 @@ android {
7862

7963
buildTypes {
8064
release {
81-
signingConfig signingConfigs.release
65+
signingConfig = signingConfigs.release
8266
}
8367
}
8468
}
8569

8670
flutter {
87-
source '../..'
71+
source = "../.."
8872
}
8973

9074
dependencies {
91-
implementation platform('com.google.firebase:firebase-bom:33.0.0')
75+
implementation platform('com.google.firebase:firebase-bom:33.6.0')
9276
implementation('com.google.firebase:firebase-analytics')
9377
}

android/app/src/debug/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.mobileraker">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

android/app/src/main/AndroidManifest.xml

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<!--
2-
~ Copyright (c) 2023. Patrick Schmidt.
2+
~ Copyright (c) 2023-2024. Patrick Schmidt.
33
~ All rights reserved.
44
-->
55

6-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
7-
package="com.mobileraker">
6+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
87
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
98
calls FlutterMain.startInitialization(this); in its onCreate method.
109
In most cases you can leave this as-is, but you if you want to provide
1110
additional functionality it is fine to subclass or reimplement
1211
FlutterApplication and put your custom class here. -->
1312
<uses-permission android:name="android.permission.INTERNET"/>
1413
<uses-permission android:name="android.permission.BILLING"/>
15-
<uses-permission android:name="android.permission.VIBRATE"/>
1614
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1715
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
1816
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
1917
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
2018

19+
<!-- Required by AwesomeNotifications -->
20+
<uses-permission android:name="android.permission.VIBRATE"/>
21+
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
22+
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
23+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
24+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
25+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
26+
2127
<queries>
2228
<intent>
2329
<action android:name="android.intent.action.VIEW" />
@@ -43,6 +49,7 @@
4349
android:name=".MainActivity"
4450
android:exported="true"
4551
android:launchMode="singleTop"
52+
android:taskAffinity=""
4653
android:theme="@style/LaunchTheme"
4754
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
4855
android:hardwareAccelerated="true"

android/app/src/profile/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.mobileraker">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

android/build.gradle

+13
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@ subprojects {
3434
}
3535
}
3636
}
37+
if (project.hasProperty('android')) {
38+
project.android {
39+
if (namespace == null) {
40+
project.logger.warn(
41+
"Warning: No namespace defined for project: "
42+
+ project.name
43+
+ ". Automatically setting namespace to project group: "
44+
+ project.group
45+
)
46+
namespace project.group
47+
}
48+
}
49+
}
3750
}
3851

3952
project.evaluationDependsOn(':app')

android/gradle.properties

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
#
2+
# Copyright (c) 2024. Patrick Schmidt.
3+
# All rights reserved.
4+
#
5+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
26
android.useAndroidX=true
37
android.enableJetifier=true
8+
kotlin.jvm.target.validation.mode=IGNORE
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
#
2+
# Copyright (c) 2024. Patrick Schmidt.
3+
# All rights reserved.
4+
#
5+
16
#Fri Jun 23 08:50:38 CEST 2017
27
distributionBase=GRADLE_USER_HOME
38
distributionPath=wrapper/dists
49
zipStoreBase=GRADLE_USER_HOME
510
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
11+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip

android/settings.gradle

+6-7
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ pluginManagement {
1010
def flutterSdkPath = properties.getProperty("flutter.sdk")
1111
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
1212
return flutterSdkPath
13-
}
14-
settings.ext.flutterSdkPath = flutterSdkPath()
13+
}()
1514

16-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
15+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1716

1817
repositories {
1918
google()
@@ -24,12 +23,12 @@ pluginManagement {
2423

2524
plugins {
2625
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
27-
id "com.android.application" version "7.3.0" apply false
26+
id "com.android.application" version "8.1.4" apply false
2827
// START: FlutterFire Configuration
29-
id "com.google.gms.google-services" version "4.3.15" apply false
28+
id "com.google.gms.google-services" version "4.4.2" apply false
3029
// END: FlutterFire Configuration
3130
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
32-
id "com.google.firebase.crashlytics" version "2.9.9" apply false
31+
id "com.google.firebase.crashlytics" version "3.0.2" apply false
3332
}
3433

35-
include ":app"
34+
include ":app"

assets/translations/de.yaml

+25-19
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ pages:
252252
last_modified: Zuletzt bearbeitet
253253
last_printed: Zuletzt gedruckt
254254
file_size: Dateigröße
255+
estimated_time: Geschätzte Druckzeit
255256
file_actions:
256257
download: Herunterladen
257258
delete: Löschen
@@ -284,6 +285,10 @@ pages:
284285
upload_failed:
285286
title: Upload fehlgeschlagen
286287
body: Beim Hochladen der Datei ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.
288+
reasons:
289+
type_mismatch:
290+
title: Dateityp nicht unterstützt
291+
body: Nur '{}' Dateien sind erlaubt.
287292
zipping_success:
288293
title: Archiv erstellt
289294
body: Das Archiv wurde erfolgreich erstellt.
@@ -899,33 +904,32 @@ components:
899904
error:
900905
config:
901906
title: Fehler beim Abrufen der Druckerkonfiguration!
902-
body: Beim Abrufen der Druckerkonfiguration ist ein Fehler aufgetreten. Stellen Sie sicher,
903-
dass die Maschine erreichbar ist und Mobileraker verbunden ist.
907+
body: Beim Abrufen der Druckerkonfiguration ist ein Fehler aufgetreten. Stellen Sie sicher, dass die Maschine erreichbar ist und Mobileraker verbunden ist.
904908
gcode_preview_settings_sheet:
905-
title: 'Anzeige-Einstellungen'
909+
title: Anzeige-Einstellungen
906910
show_grid:
907-
title: 'Gitter anzeigen'
908-
subtitle: 'Zeigt ein Referenzgitter'
911+
title: Gitter anzeigen
912+
subtitle: Zeigt ein Referenzgitter
909913
show_axes:
910-
title: 'Achsen anzeigen'
911-
subtitle: 'Zeigt die X-, Y-Achsen an'
914+
title: Achsen anzeigen
915+
subtitle: Zeigt die X-, Y-Achsen an
912916
show_next_layer:
913-
title: 'Nächste Schicht anzeigen'
914-
subtitle: 'Zeigt die nächste Schicht an'
917+
title: Nächste Schicht anzeigen
918+
subtitle: Zeigt die nächste Schicht an
915919
show_previous_layer:
916-
title: 'Vorherige Schicht anzeigen'
917-
subtitle: 'Zeigt die zuvor gedruckte Schicht an'
920+
title: Vorherige Schicht anzeigen
921+
subtitle: Zeigt die zuvor gedruckte Schicht an
918922
extrusion_width_multiplier:
919-
prefix: 'Linienbreiten-Multiplikator'
923+
prefix: Linienbreiten-Multiplikator
920924
show_extrusion:
921-
title: 'Extrusionen anzeigen'
922-
subtitle: 'Zeige Materialbewegungen in der Vorschau an'
925+
title: Extrusionen anzeigen
926+
subtitle: Zeige Materialbewegungen in der Vorschau an
923927
show_retraction:
924-
title: 'Rückzüge anzeigen'
925-
subtitle: 'Zeige Filament-Rückzugsbewegungen in der Vorschau an'
928+
title: Rückzüge anzeigen
929+
subtitle: Zeige Filament-Rückzugsbewegungen in der Vorschau an
926930
show_travel:
927-
title: 'Verfahrbewegungen anzeigen'
928-
subtitle: 'Zeigt nicht-druckende Bewegungen in der Vorschau an'
931+
title: Verfahrbewegungen anzeigen
932+
subtitle: Zeigt nicht-druckende Bewegungen in der Vorschau an
929933
select_color_sheet:
930934
title: Farbe auswählen
931935
dialogs:
@@ -995,6 +999,7 @@ dialogs:
995999
active_machine: 'Aktive Maschine: {}'
9961000
hint: Tippen Sie auf eine Maschine, um sie zu aktivieren.
9971001
supporter_perks:
1002+
learn_more: Erfahren mehr über die Vorteile
9981003
title: Supporter Vorteile
9991004
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.
10001005
hint: 'Hinweis: Zurzeit sind die Vergünstigungen geräteabhängig. Dies könnte sich in Zukunft ändern.'
@@ -1050,7 +1055,8 @@ dialogs:
10501055
value: Header-Wert
10511056
value_hint: Der Wert des HTTP-Headers
10521057
macro_settings:
1053-
show_while_printing: Während des Drucks anzeigen
1058+
show_for_states: Druck-Zustände
1059+
show_for_states_hint: Wählen Sie die Druckzustände, in denen das Makro angezeigt werden soll
10541060
visible: Sichtbar
10551061
extruder_feedrate:
10561062
title: Extruder-Geschwindigkeit [mm/s]

assets/translations/en.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ pages:
257257
last_modified: Last modified
258258
last_printed: Last printed
259259
file_size: Size
260+
estimated_time: Estimated print time
260261
file_actions:
261262
download: Download
262263
delete: Delete
@@ -289,6 +290,10 @@ pages:
289290
upload_failed:
290291
title: Upload failed
291292
body: An error occurred while trying to upload the file. Please retry later.
293+
reasons:
294+
type_mismatch:
295+
title: File type mismatch
296+
body: Only '{}' files are allowed.
292297
zipping_success:
293298
title: Zipping successful
294299
body: The archive was successfully created.
@@ -700,6 +705,7 @@ pages:
700705
paywall:
701706
manage_view:
702707
title: Thanks for your Support!
708+
703709
list_title: 'Change Supporter Tier:'
704710
store_btn: Cancel Subscription in {}
705711
sub_warning: Please take note that purchasing the lifetime supporter tier does
@@ -1073,6 +1079,7 @@ dialogs:
10731079
active_machine: 'Active Machine: {}'
10741080
hint: Tap on a machine to set it as active.
10751081
supporter_perks:
1082+
learn_more: Learn about Supporter Perks
10761083
title: Supporter Perks
10771084
body: By supporting Mobileraker, you ensure the app can stay free for the community.
10781085
Additionally supporters gain the following list of perks.
@@ -1131,7 +1138,8 @@ dialogs:
11311138
value: Header-Value
11321139
value_hint: The value of the header
11331140
macro_settings:
1134-
show_while_printing: Show while printing
1141+
show_for_states: Print States
1142+
show_for_states_hint: Select the states for which the macro should be displayed
11351143
visible: Visible
11361144
extruder_feedrate:
11371145
title: Extruder Velocity [mm/s]

assets/translations/fr.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,6 @@ dialogs:
647647
value: Valeur de l'en-tête
648648
value_hint: La valeur de l'en-tête
649649
macro_settings:
650-
show_while_printing: Afficher lors de l'impression
651650
visible: Visible
652651
extruder_feedrate:
653652
title: Vitesse de l'extrudeur [mm/s]

0 commit comments

Comments
 (0)