diff --git a/bun.lockb b/bun.lockb index 311511a1..8c8285c2 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/src/app/(screens)/about.tsx b/src/app/(screens)/about.tsx index 48c41e9e..c448da37 100644 --- a/src/app/(screens)/about.tsx +++ b/src/app/(screens)/about.tsx @@ -10,6 +10,7 @@ import { type FormListSections } from '@/types/components' import { trackEvent } from '@aptabase/react-native' import { alert } from 'burnt' import * as Application from 'expo-application' +import Constants from 'expo-constants' import * as Haptics from 'expo-haptics' import { useRouter } from 'expo-router' import React, { useState } from 'react' @@ -42,8 +43,11 @@ export default function About(): JSX.Element { const addUnlockedAppIcon = usePreferencesStore( (state) => state.addUnlockedAppIcon ) - const version = `${Application.nativeApplicationVersion}` - const versionWithCode = `${version} (${Application.nativeBuildVersion})` + const version = + Application.nativeApplicationVersion ?? + Constants.expoConfig?.version ?? + 'unknown' + const versionWithCode = `${version} (${Application.nativeBuildVersion ?? '0'})` const [displayVersion, setDisplayVersion] = useState(version) const toggleVersion = (): void => { diff --git a/src/components/Layout/Tabbar.web.tsx b/src/components/Layout/Tabbar.web.tsx index d821ce9f..6f99f6da 100644 --- a/src/components/Layout/Tabbar.web.tsx +++ b/src/components/Layout/Tabbar.web.tsx @@ -13,6 +13,7 @@ const DefaultTabs = (): JSX.Element => { const { theme: styleTheme } = useStyles() const { t } = useTranslation('navigation') const isMobile = Dimensions.get('window').width < 900 + const isPad = Dimensions.get('window').width < 1300 return ( <> @@ -26,6 +27,12 @@ const DefaultTabs = (): JSX.Element => { tabBarStyle: { backgroundColor: styleTheme.colors.card, }, + tabBarLabelPosition: isMobile + ? undefined + : isPad + ? 'below-icon' + : 'beside-icon', + tabBarVariant: isMobile ? 'uikit' : 'material', }} > , }, - { - key: 'food', - removable: true, - initial: [USER_GUEST], - allowed: [USER_GUEST, USER_STUDENT, USER_EMPLOYEE], - card: () => , - }, { key: 'library', removable: true, @@ -72,7 +65,13 @@ export const AllCards: Card[] = [ allowed: [USER_STUDENT, USER_EMPLOYEE], card: () => , }, - + { + key: 'food', + removable: true, + initial: [USER_GUEST, USER_STUDENT, USER_EMPLOYEE], + allowed: [USER_GUEST, USER_STUDENT, USER_EMPLOYEE], + card: () => , + }, { key: 'login', removable: false,