From 1aeff3fafeefa95ceff883dadb9e2a0ee24fe535 Mon Sep 17 00:00:00 2001
From: vishnuraghavb <design@vishnuraghav.com>
Date: Sat, 24 Apr 2021 01:20:32 +0530
Subject: [PATCH] system default theme implemented

---
 app/components/EnRecipes.vue          |  2 +-
 app/components/Settings/Interface.vue | 13 ++++++++++---
 app/resources/Android/app.gradle      |  4 ++--
 app/store.ts                          | 16 +++++++++++++---
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue
index 70f8323a..3df6dcda 100644
--- a/app/components/EnRecipes.vue
+++ b/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();
diff --git a/app/components/Settings/Interface.vue b/app/components/Settings/Interface.vue
index 3462f629..df2b6498 100644
--- a/app/components/Settings/Interface.vue
+++ b/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();
         }
diff --git a/app/resources/Android/app.gradle b/app/resources/Android/app.gradle
index c03312cf..f44686c4 100644
--- a/app/resources/Android/app.gradle
+++ b/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
diff --git a/app/store.ts b/app/store.ts
index 15d534a1..f3d37e36 100644
--- a/app/store.ts
+++ b/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) {