From 0a3fb925e02fbb0b0f6179bc781c61c44eca98ba Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Sun, 6 Oct 2024 14:44:33 +0200
Subject: [PATCH] Revert "Change the default navbar style for non-desktop to
 simple navbar" (#2799)

Reverts openhab/openhab-webui#2791
---
 bundles/org.openhab.ui/web/src/components/app.vue          | 2 +-
 .../org.openhab.ui/web/src/components/theme-switcher.vue   | 4 ++--
 bundles/org.openhab.ui/web/src/pages/home.vue              | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/components/app.vue b/bundles/org.openhab.ui/web/src/components/app.vue
index 7233042bb..10c4eecee 100644
--- a/bundles/org.openhab.ui/web/src/components/app.vue
+++ b/bundles/org.openhab.ui/web/src/components/app.vue
@@ -539,7 +539,7 @@ export default {
     updateThemeOptions () {
       this.themeOptions.dark = localStorage.getItem('openhab.ui:theme.dark') || ((window.OHApp && window.OHApp.preferDarkMode) ? window.OHApp.preferDarkMode().toString() : (this.$f7.darkTheme ? 'dark' : 'light'))
       this.themeOptions.bars = localStorage.getItem('openhab.ui:theme.bars') || 'light'
-      this.themeOptions.homeNavbar = localStorage.getItem('openhab.ui:theme.home.navbar') || (this.$f7.device.desktop ? 'large' : 'simple')
+      this.themeOptions.homeNavbar = localStorage.getItem('openhab.ui:theme.home.navbar') || 'default'
       this.themeOptions.homeBackground = localStorage.getItem('openhab.ui:theme.home.background') || 'default'
       this.themeOptions.expandableCardAnimation = localStorage.getItem('openhab.ui:theme.home.cardanimation') || 'default'
       if (this.themeOptions.dark === 'dark') {
diff --git a/bundles/org.openhab.ui/web/src/components/theme-switcher.vue b/bundles/org.openhab.ui/web/src/components/theme-switcher.vue
index b5d1ea810..7ebb8f8b4 100644
--- a/bundles/org.openhab.ui/web/src/components/theme-switcher.vue
+++ b/bundles/org.openhab.ui/web/src/components/theme-switcher.vue
@@ -111,7 +111,7 @@ export default {
       location.reload()
     },
     setHomePageNavbarStyle (value) {
-      localStorage.setItem('openhab.ui:theme.home.navbar', (value) ? 'simple' : 'large')
+      localStorage.setItem('openhab.ui:theme.home.navbar', (value) ? 'simple' : 'default')
       location.reload()
     },
     setHomePageBackground (value) {
@@ -150,7 +150,7 @@ export default {
       return localStorage.getItem('openhab.ui:theme.bars') || 'light'
     },
     homePageNavbarStyle () {
-      return localStorage.getItem('openhab.ui:theme.home.navbar') || (this.$f7.device.desktop ? 'large' : 'simple')
+      return localStorage.getItem('openhab.ui:theme.home.navbar') || 'default'
     },
     homePageBackground () {
       return localStorage.getItem('openhab.ui:theme.home.background') || 'default'
diff --git a/bundles/org.openhab.ui/web/src/pages/home.vue b/bundles/org.openhab.ui/web/src/pages/home.vue
index 57e58f56e..bb1a4ef03 100644
--- a/bundles/org.openhab.ui/web/src/pages/home.vue
+++ b/bundles/org.openhab.ui/web/src/pages/home.vue
@@ -1,10 +1,10 @@
 <template>
   <f7-page stacked name="HomePage" class="page-home" :class="{ 'standard-background': $f7.data.themeOptions.homeBackground === 'standard' }" @page:init="onPageInit" @page:beforein="onPageBeforeIn" @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
-    <f7-navbar :large="navbarLarge" :large-transparent="navbarLarge" class="home-nav disable-user-select">
+    <f7-navbar :large="$f7.data.themeOptions.homeNavbar !== 'simple'" :large-transparent="$f7.data.themeOptions.homeNavbar !== 'simple'" class="home-nav disable-user-select">
       <f7-nav-left>
         <f7-link icon-ios="f7:menu" icon-aurora="f7:menu" icon-md="material:menu" panel-open="left" />
       </f7-nav-left>
-      <f7-nav-title-large v-if="navbarLarge" class="home-title-large">
+      <f7-nav-title-large v-if="$f7.data.themeOptions.homeNavbar !== 'simple'" class="home-title-large">
         <span class="today">{{ new Date().toLocaleString($store.getters.locale, { weekday: 'long', day: 'numeric', month: 'long' }) }}</span>
         {{ title }}
       </f7-nav-title-large>
@@ -108,9 +108,6 @@ export default {
     ready () {
       return this.$store.state.apiVersion > 0
     },
-    navbarLarge () {
-      return this.$f7.data.themeOptions.homeNavbar === 'large'
-    },
     context () {
       return {
         store: this.$store.getters.trackedItems