Merge remote-tracking branch 'origin/main' into main

app/components/EnRecipes.vue

@@ -1088,7 +1088,7 @@ export default {
     },
   },
   created() {
-    this.setTheme(ApplicationSettings.getString("appTheme", "Light"));
+    this.setTheme(ApplicationSettings.getString("appTheme", "sysDef"));
     this.setLayout(ApplicationSettings.getString("layout", "detailed"));
     if (!this.recipes.length) this.initRecipes();
     this.initListItems();

app/components/Settings/Interface.vue

@@ -67,7 +67,9 @@ export default {
         {
           icon: "theme",
           title: "Theme",
-          subTitle: localize(this.appTheme),
+          subTitle: localize(
+            ApplicationSettings.getString("appTheme", "sysDef")
+          ),
           action: this.selectThemes,
         },
         {
@@ -124,10 +126,15 @@ export default {
       this.$showModal(ActionDialog, {
         props: {
           title: "Theme",
-          list: ["Light", "Dark", "Black"],
+          list: ["Light", "Dark", "Black", "sysDef", "sysDefB"],
         },
       }).then((action) => {
-        if (action && action !== "Cancel" && this.appTheme !== action) {
+        if (
+          action &&
+          (ApplicationSettings.getString("appTheme") != this.appTheme
+            ? true
+            : this.appTheme != action)
+        ) {
           this.setTheme(action);
           Frame.reloadPage();
         }

app/resources/Android/app.gradle

@@ -15,8 +15,8 @@
 
 android {
   defaultConfig {
-    versionCode 7
-    versionName '1.3.2'
+    versionCode 8
+    versionName '1.3.3'
     applicationId 'com.vishnuraghav.enrecipes'
     minSdkVersion 23
     targetSdkVersion 30

app/store.ts

@@ -2,7 +2,7 @@ import Vue from 'nativescript-vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
 import { CouchBase } from '@triniwiz/nativescript-couchbase'
-import { getFileAccess, File, ApplicationSettings, Device } from '@nativescript/core'
+import { getFileAccess, File, ApplicationSettings, Application } from '@nativescript/core'
 const EnRecipesDB = new CouchBase('EnRecipes')
 const userCuisinesDB = new CouchBase('userCuisines')
 const userCategoriesDB = new CouchBase('userCategories')
@@ -300,7 +300,7 @@ export default new Vuex.Store({
     selectedCuisine: null,
     selectedCategory: null,
     selectedTag: null,
-    appTheme: 'Light',
+    appTheme: 'sysDef',
     mondayFirst: false,
   },
   mutations: {
@@ -312,7 +312,17 @@ export default new Vuex.Store({
       ApplicationSettings.setBoolean('mondayFirst', bool)
     },
     setTheme(state, theme) {
-      state.appTheme = theme
+      switch (theme) {
+        case 'sysDef':
+          state.appTheme = Application.systemAppearance() == 'dark' ? "Dark" : "Light"
+          break;
+        case 'sysDefB':
+          state.appTheme = Application.systemAppearance() == 'dark' ? "Black" : "Light"
+          break;
+        default:
+          state.appTheme = theme
+          break;
+      }
       ApplicationSettings.setString('appTheme', theme)
     },
     clearFilter(state) {

fastlane/metadata/android/en-GB/changelogs/2.txt

@@ -0,0 +1,2 @@
+- Recipe notes now support inline URLs
+- Ability to set recipe preparation and cooking time

fastlane/metadata/android/en-GB/changelogs/3.txt

@@ -0,0 +1,5 @@
+- Fixed several bugs causing app crashes
+- Minor UI improvements
+- Application language support
+    - Added Tamil
+    - More languages coming soon!

fastlane/metadata/android/en-GB/changelogs/4.txt

@@ -0,0 +1,2 @@
+- Fixed: Ingredients unit getting reset on save
+- Added app language: German

fastlane/metadata/android/en-GB/changelogs/5.txt

@@ -0,0 +1,10 @@
+- New: Add cuisine and tags to your recipes along with category
+- New: Rate and set difficulty level to your recipes
+- New: Shake device to view random recipe
+- Improvement: Search your recipes by name, ingredient or tag
+- Improvement: Add or delete cuisines, categories, yield units, units
+- Improvement: More sorting options
+- Added app languages: Danish, Dutch, Portuguese, Russian and Spanish
+- Removed: Categories rename feature
+- Updated translations
+- Several UI improvements and bug fixes

fastlane/metadata/android/en-GB/changelogs/6.txt

@@ -0,0 +1,10 @@
+- Improvement: Recipe list loads quicker than before
+- Improvement: Long press to select multiple recipes
+- Improvement: Better search & filtering
+- Improvement: Tap to strike off completed instructions
+- Deprecated: Swipe to delete recipe
+- Deprecated: Search recipe with tag
+- Refreshed: Meal Planner calendar, Dialog boxes and UI icons
+- Added app languages: French, Italian, Norwegian Bokmål
+- Updated translations
+- Several UI improvements and bug fixes

fastlane/metadata/android/en-GB/changelogs/7.txt

@@ -0,0 +1,14 @@
+- [New] App icon and Redesigned user interface
+- [New] Recipe list view modes
+- [New] Black theme
+- [New] Dedicated filter panel
+- [New] Set Backup folder location
+- [New] Set Meal Planner's first day of the week to Monday
+- [Fixed] Crash on app start with blocked sensors #30
+- [Fixed] No app name in launcher #29
+- [Improvement] Change theme without restarting the app
+- [Removed] Storage permission
+- [Added App Languages] Hindi, Indonesian, Italian, Malayalam, Portuguese (BR), Spanish and Telugu
+- [Updated] Translations
+- Dropped support for Android Lollipop
+- Several bug fixes and improvements including #33

fastlane/metadata/android/en-GB/changelogs/8.txt

@@ -0,0 +1 @@
+- [Added] System default theme

fastlane/metadata/android/en-GB/full_description.txt

@@ -0,0 +1,27 @@
+EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes.
+
+<b>Features:</b>
+
+* Create recipes quickly
+* Add photo, combinations and notes to your recipes
+* Organise your recipes by cuisine, category and tags
+* Add recipes to your Try Later list and mark them as favourites
+* Quickly search for recipes by title or ingredient
+* Scale your recipe ingredients to serve more or less people
+* Get notified of the last time you tried a recipe
+* Share your recipe to anyone by any means as a nicely formatted message. You can share the recipe photo too.
+* Shake device to view random recipe
+* Create meal plans
+* Import/Export recipes
+* Light, Dark and Black themes
+
+<b>Highlights:</b>
+
+* 100% free and open-source
+* Private by Design
+* No permissions required
+* No annoying ads or pop-ups
+
+<b>Credits:</b>
+
+This app was written in my free time using NativeScript-Vue. I would like to thank all those people who helped me understand the concepts during the process and my special thanks to the NativeScript team and the community. I also would like to thank the members of the Telegram EnRecipes group for contributing their ideas for this project.

fastlane/metadata/android/en-GB/short_description.txt

@@ -0,0 +1 @@
+A Simple, Offline Recipe Manager

fastlane/metadata/android/en-GB/title.txt

@@ -0,0 +1 @@
+EnRecipes

fastlane/metadata/android/en-US/changelogs/8.txt

@@ -0,0 +1 @@
+- [Added] System default theme

fastlane/metadata/android/en-US/full_description.txt

@@ -4,8 +4,8 @@ EnRecipes is an open source, privacy-friendly digital cookbook that lets you cre
 
 * Create recipes quickly
 * Add photo, combinations and notes to your recipes
-* Organise your recipes by cuisine, category and tags
-* Add recipes to your Try Later list and mark them as favourites
+* Organize your recipes by cuisine, category and tags
+* Add recipes to your Try Later list and mark them as favorites
 * Quickly search for recipes by title or ingredient
 * Scale your recipe ingredients to serve more or less people
 * Get notified of the last time you tried a recipe