Merge branch 'ej/background-maps-settings-flag' of github.com:digidem…

…/mapeo-desktop into ej/background-maps-settings-flag
digidem · Jul 14, 2023 · 6774eab · 6774eab
2 parents 2492b40 + cf6ad29
commit 6774eab
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 16 deletions.
diff --git a/src/renderer/components/SettingsView/ExperimentsMenu.js b/src/renderer/components/SettingsView/ExperimentsMenu.js
@@ -4,7 +4,7 @@ import { Map as MapIcon } from '@material-ui/icons'
 import { SettingsList } from './SettingsList'
 
 const m = defineMessages({
-  backgroundMaps: 'Background Maps',
+  backgroundMaps: 'Background Maps'
 })
 
 export const ExperiementsMenu = ({ backgroundMaps, setBackgroundMaps }) => {
@@ -21,8 +21,8 @@ export const ExperiementsMenu = ({ backgroundMaps, setBackgroundMaps }) => {
       label: m.backgroundMaps,
       checked: backgroundMaps,
       onClick: toggleBackgroundMaps,
-      type: 'toggle',
-    },
+      type: 'toggle'
+    }
   ]
 
   return <SettingsList options={options} />

diff --git a/src/renderer/components/SettingsView/SettingsMenu.js b/src/renderer/components/SettingsView/SettingsMenu.js
@@ -26,10 +26,14 @@ export const SettingsMenu = ({ tabs, currentTab, onTabChange }) => {
         height: '100vh',
         borderRadius: 0,
         zIndex: 1,
-        position: 'relative',
+        position: 'relative'
       }}
     >
-      <StyledTabs orientation='vertical' value={currentTab} onChange={(e, newValue) => onTabChange(newValue)}>
+      <StyledTabs
+        orientation='vertical'
+        value={currentTab}
+        onChange={(e, newValue) => onTabChange(newValue)}
+      >
         {tabs.map(tab => (
           <Tab
             disableRipple
@@ -47,9 +51,17 @@ export const SettingsMenu = ({ tabs, currentTab, onTabChange }) => {
   )
 }
 
-export const RenderTab = React.forwardRef(({ tab: { icon, label, subtitle, type }, ...rest }, ref) => (
-  <SettingsItem icon={icon} label={label} subtitle={subtitle} type={type || 'menuItem'} {...rest} />
-))
+export const RenderTab = React.forwardRef(
+  ({ tab: { icon, label, subtitle, type }, ...rest }, ref) => (
+    <SettingsItem
+      icon={icon}
+      label={label}
+      subtitle={subtitle}
+      type={type || 'menuItem'}
+      {...rest}
+    />
+  )
+)
 
 const StyledTabs = styled(Tabs)`
   height: 100vh;

diff --git a/src/renderer/components/SettingsView/index.js b/src/renderer/components/SettingsView/index.js
@@ -14,7 +14,7 @@ const m = defineMessages({
   aboutMapeoSubtitle: 'Version and build number',
   experiments: 'Experiments',
   experimentsSubtitle: 'Turn on experimental new features',
-  backgroundMaps: 'Background maps',
+  backgroundMaps: 'Background maps'
 })
 
 const useExperimentsFlagsState = createPersistedState('experimentsFlags')
@@ -26,34 +26,41 @@ export const SettingsView = () => {
       tabId: 'AboutMapeo',
       icon: InfoIcon,
       label: m.aboutMapeo,
-      subtitle: m.aboutMapeoSubtitle,
+      subtitle: m.aboutMapeoSubtitle
     },
     {
       tabId: 'Experiments',
       icon: FlagIcon,
       label: m.experiments,
-      subtitle: m.experimentsSubtitle,
+      subtitle: m.experimentsSubtitle
     },
     ...(backgroundMaps
       ? [
           {
             tabId: 'BackgroundMaps',
             icon: MapIcon,
-            label: m.backgroundMaps,
-          },
+            label: m.backgroundMaps
+          }
         ]
-      : []),
+      : [])
   ]
   const initialMenuState = /** {null | number} */ null
   const [menuItem, setMenuItem] = useState(initialMenuState)
 
   return (
     <Container>
-      <SettingsMenu tabs={tabs} currentTab={menuItem} onTabChange={setMenuItem} />
+      <SettingsMenu
+        tabs={tabs}
+        currentTab={menuItem}
+        onTabChange={setMenuItem}
+      />
 
       {menuItem === 'AboutMapeo' && <AboutMapeoMenu />}
       {menuItem === 'Experiments' && (
-        <ExperiementsMenu backgroundMaps={backgroundMaps} setBackgroundMaps={setBackgroundMaps} />
+        <ExperiementsMenu
+          backgroundMaps={backgroundMaps}
+          setBackgroundMaps={setBackgroundMaps}
+        />
       )}
       {menuItem === 'BackgroundMaps' && <Boc />}
     </Container>