From f8ef1d649741fe5de4e7ada956e1a0cc6282b503 Mon Sep 17 00:00:00 2001 From: flauschtrud Date: Thu, 7 Sep 2023 12:10:00 +0200 Subject: [PATCH 1/6] Prepared pre-release 1.2.6 --- app/build.gradle | 4 ++-- fastlane/metadata/android/de-DE/changelogs/1020600.txt | 1 + fastlane/metadata/android/en-US/changelogs/1020600.txt | 1 + fastlane/metadata/android/es-ES/changelogs/1020600.txt | 1 + fastlane/metadata/android/fr-FR/changelogs/1020600.txt | 1 + fastlane/metadata/android/it-IT/changelogs/1020600.txt | 1 + fastlane/metadata/android/pl-PL/changelogs/1020600.txt | 1 + fastlane/metadata/android/zh-CN/changelogs/1020600.txt | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/de-DE/changelogs/1020600.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/1020600.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/1020600.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/1020600.txt create mode 100644 fastlane/metadata/android/it-IT/changelogs/1020600.txt create mode 100644 fastlane/metadata/android/pl-PL/changelogs/1020600.txt create mode 100644 fastlane/metadata/android/zh-CN/changelogs/1020600.txt diff --git a/app/build.gradle b/app/build.gradle index fe1e7a83..d90f2df3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.flauschcode.broccoli" minSdkVersion 26 targetSdk 34 - versionCode 1020500 - versionName "1.2.5" + versionCode 1020600 + versionName "1.2.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { annotationProcessorOptions { diff --git a/fastlane/metadata/android/de-DE/changelogs/1020600.txt b/fastlane/metadata/android/de-DE/changelogs/1020600.txt new file mode 100644 index 00000000..91b04938 --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/1020600.txt @@ -0,0 +1 @@ +Broccoli wurde ins Chinesische und Italienische übersetzt! \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/1020600.txt b/fastlane/metadata/android/en-US/changelogs/1020600.txt new file mode 100644 index 00000000..2125bd50 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1020600.txt @@ -0,0 +1 @@ +Broccoli has been translated to Chinese and Italian! \ No newline at end of file diff --git a/fastlane/metadata/android/es-ES/changelogs/1020600.txt b/fastlane/metadata/android/es-ES/changelogs/1020600.txt new file mode 100644 index 00000000..e98d7f02 --- /dev/null +++ b/fastlane/metadata/android/es-ES/changelogs/1020600.txt @@ -0,0 +1 @@ +¡Broccoli se ha traducido al chino y al italiano! \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/1020600.txt b/fastlane/metadata/android/fr-FR/changelogs/1020600.txt new file mode 100644 index 00000000..1ac9a297 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/1020600.txt @@ -0,0 +1 @@ +Broccoli a été traduit en chinois et en italien ! \ No newline at end of file diff --git a/fastlane/metadata/android/it-IT/changelogs/1020600.txt b/fastlane/metadata/android/it-IT/changelogs/1020600.txt new file mode 100644 index 00000000..050764a5 --- /dev/null +++ b/fastlane/metadata/android/it-IT/changelogs/1020600.txt @@ -0,0 +1 @@ +Broccoli è stato tradotto in cinese e in italiano! \ No newline at end of file diff --git a/fastlane/metadata/android/pl-PL/changelogs/1020600.txt b/fastlane/metadata/android/pl-PL/changelogs/1020600.txt new file mode 100644 index 00000000..dc9ede07 --- /dev/null +++ b/fastlane/metadata/android/pl-PL/changelogs/1020600.txt @@ -0,0 +1 @@ +Broccoli zostały przetłumaczone na język chiński i włoski! \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/changelogs/1020600.txt b/fastlane/metadata/android/zh-CN/changelogs/1020600.txt new file mode 100644 index 00000000..4c4f22f6 --- /dev/null +++ b/fastlane/metadata/android/zh-CN/changelogs/1020600.txt @@ -0,0 +1 @@ +Broccoli 已被翻译成中文和意大利文！ \ No newline at end of file From a333126551572a9820fd692f91f054eb8f9141e4 Mon Sep 17 00:00:00 2001 From: flauschtrud <9655818+flauschtrud@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:50:15 +0200 Subject: [PATCH 2/6] Update README.md Added translation contributors to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 12982417..a33e5497 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,8 @@ Available languages so far: - French (done by non-native, feel free to report any issues) - German - Polish (thanks a lot to [r-tw0](https://github.com/r-tw0) for your help!) +- Italian (thanks a lot to [bruce965](https://github.com/bruce965) for your help!) +- Chinese (thanks a lot to [leongjs98](https://github.com/leongjs98) for your help!) ### Seasonal Calendars If you want to contribute by researching data for additional seasonal calendars please contact me. From a5589b64807ef71993db56182e8568fa85afce0d Mon Sep 17 00:00:00 2001 From: flauschtrud Date: Fri, 26 Jan 2024 13:31:20 +0100 Subject: [PATCH 3/6] Improved build performance --- gradle.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab46291b..54e94c6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,7 @@ org.gradle.jvmargs=-Xmx1536m # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true android.experimental.testOptions.managedDevices.allowOldApiLevelDevices=true +org.gradle.configuration-cache=true From 203af1d6a0c53dcf456014ebfe2268bfa59d9459 Mon Sep 17 00:00:00 2001 From: flauschtrud Date: Fri, 26 Jan 2024 13:31:38 +0100 Subject: [PATCH 4/6] Fixed outdated test --- .../java/com/flauschcode/broccoli/ImportingIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/androidTest/java/com/flauschcode/broccoli/ImportingIntegrationTest.java b/app/src/androidTest/java/com/flauschcode/broccoli/ImportingIntegrationTest.java index ab62c415..d50e7f39 100644 --- a/app/src/androidTest/java/com/flauschcode/broccoli/ImportingIntegrationTest.java +++ b/app/src/androidTest/java/com/flauschcode/broccoli/ImportingIntegrationTest.java @@ -104,7 +104,7 @@ public void import_new_recipe_with_arrified_json() { onView(withId(R.id.new_preparation_time)).check(matches(withText("25m"))); onView(withId(R.id.new_description)).check(matches(withSubstring("Dieses Grundrezept für Fladenbrot ohne Hefe passt zu vielen Gerichten. Das einfache und schnelle Rezept ist sehr variabel."))); onView(withId(R.id.new_ingredients)).check(matches(withText("200 g Mehl, Type 550\n3 EL Olivenöl (oder Pflanzenöl)\n3 EL Olivenöl (oder Pflanzenöl)\n1 Prise Salz\n100 ml Wasser"))); - onView(withId(R.id.new_directions)).check(matches(withText("Zuerst das Mehl in eine Schüssel geben, Salz, Wasser und Olivenöl dazugeben und alle Zutaten zu einem Teig verkneten - am besten mit der Hand.\nDann den Teig für 10 Minuten quellen lassen und erneut für 5 Minuten kneten, so dass ein glatter Teig entsteht.\nSpäter aus dem Teig 4 dünne Fladen formen, eine gusseiserne Pfanne (=unbeschichtet) ohne Fett erhitzen und die Teigfladen darin nacheinander backen bis sich die ersten braunen Flecken zeigen.\nIm Anschluss die Fladen wenden und auch auf der anderen Seite backen. Video zum Rezept"))); + onView(withId(R.id.new_directions)).check(matches(withText("Zuerst das Mehl in eine Schüssel geben, Salz, Wasser und Olivenöl dazugeben und alle Zutaten zu einem Teig verkneten - am besten mit der Hand.\nDann den Teig für 10 Minuten quellen lassen und erneut für 5 Minuten kneten, so dass ein glatter Teig entsteht.\nSpäter aus dem Teig 4 dünne Fladen formen, eine gusseiserne Pfanne (=unbeschichtet) ohne Fett erhitzen und die Teigfladen darin nacheinander backen bis sich die ersten braunen Flecken zeigen.\nIm Anschluss die Fladen wenden und auch auf der anderen Seite backen."))); } @Test From 4c504661bf5aa06064bbcdf04268d63f629fd1c6 Mon Sep 17 00:00:00 2001 From: flauschtrud Date: Fri, 26 Jan 2024 13:32:19 +0100 Subject: [PATCH 5/6] Updated dependencies --- app/build.gradle | 14 +++++++------- build.gradle | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d90f2df3..8fa96ea7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,12 +94,12 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' - runtimeOnly group: 'com.google.android.material', name: 'material', version: '1.9.0' + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0' + runtimeOnly group: 'com.google.android.material', name: 'material', version: '1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - def nav_version = "2.7.1" + def nav_version = "2.7.6" implementation "androidx.navigation:navigation-fragment:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version" @@ -107,12 +107,12 @@ dependencies { implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'id.zelory:compressor:2.1.1' // 3.0.0 does not work with Java - def room_version = "2.5.2" + def room_version = "2.6.1" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" testImplementation "androidx.room:room-testing:$room_version" - def fragment_version = "1.6.1" + def fragment_version = "1.6.2" implementation "androidx.fragment:fragment:$fragment_version" debugImplementation ("androidx.fragment:fragment-testing:$fragment_version"){ exclude group: 'androidx.test', module : 'core' @@ -121,7 +121,7 @@ dependencies { def preference_version = "1.2.1" implementation "androidx.preference:preference:$preference_version" - def billing_version = "6.0.1" + def billing_version = "6.1.0" playImplementation "com.android.billingclient:billing:$billing_version" playImplementation 'com.google.android.play:core:1.10.3' diff --git a/build.gradle b/build.gradle index 998ea08e..c7da836a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From 05f3b13bc616dbcdb55081f3185f70b5400ade98 Mon Sep 17 00:00:00 2001 From: flauschtrud Date: Tue, 26 Mar 2024 13:22:08 +0100 Subject: [PATCH 6/6] As a user I can change the app's language in the system settings #209 --- app/build.gradle | 3 +++ app/src/main/res/resources.properties | 1 + 2 files changed, 4 insertions(+) create mode 100644 app/src/main/res/resources.properties diff --git a/app/build.gradle b/app/build.gradle index 8fa96ea7..d29cd318 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,6 +44,9 @@ android { dimension "appstore" } } + androidResources { + generateLocaleConfig = true + } buildFeatures { dataBinding = true buildConfig = true diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties new file mode 100644 index 00000000..63b46f93 --- /dev/null +++ b/app/src/main/res/resources.properties @@ -0,0 +1 @@ +unqualifiedResLocale=en \ No newline at end of file