From 729a86113b9e03d0cc22df6c2dfdcfbc17e8ec24 Mon Sep 17 00:00:00 2001
From: Violet Caulfield <42452695+anultravioletaurora@users.noreply.github.com>
Date: Sat, 7 Mar 2026 07:29:54 -0600
Subject: [PATCH] styling fixes

text press animations

settings page fixes
---
 src/components/Album/header.tsx               |  3 +-
 .../Global/components/Track/index.tsx         |  2 +-
 src/components/Global/components/icon.tsx     |  5 +-
 src/components/Settings/component.tsx         | 94 ++++++++-----------
 .../components/settings-list-group.tsx        | 28 +++---
 src/components/Settings/tab-bar.tsx           | 16 ----
 6 files changed, 61 insertions(+), 87 deletions(-)
 delete mode 100644 src/components/Settings/tab-bar.tsx

diff --git a/src/components/Album/header.tsx b/src/components/Album/header.tsx
index 92c2b062..a6e77852 100644
--- a/src/components/Album/header.tsx
+++ b/src/components/Album/header.tsx
@@ -12,7 +12,7 @@ import Button from '../Global/helpers/button'
 import { InstantMixButton } from '../Global/components/instant-mix-button'
 import { useAlbumDiscs } from '../../api/queries/album'
 import { formatArtistName } from '../../utils/formatting/artist-names'
-import { BUTTON_PRESS_STYLES } from '../../configs/style.config'
+import { BUTTON_PRESS_STYLES, ICON_PRESS_STYLES } from '../../configs/style.config'
 
 /**
  * Renders a header for an Album's track list
@@ -75,6 +75,7 @@ export default function AlbumTrackListHeader({ album }: { album: BaseItemDto }):
 						textAlign='center'
 						fontSize={'$6'}
 						paddingBottom={'$2'}
+						{...ICON_PRESS_STYLES}
 					>
 						{formatArtistName(album.AlbumArtists[0].Name)}
 					</Paragraph>
diff --git a/src/components/Global/components/Track/index.tsx b/src/components/Global/components/Track/index.tsx
index b4f00f89..5313f003 100644
--- a/src/components/Global/components/Track/index.tsx
+++ b/src/components/Global/components/Track/index.tsx
@@ -208,7 +208,7 @@ export default function Track({
 
 	return (
 		<SwipeableRow
-			disabled={isNested}
+			disabled={isNested || (isOffline && !isDownloaded)}
 			{...swipeConfig}
 			onLongPress={handleLongPress}
 			onPress={handlePress}
diff --git a/src/components/Global/components/icon.tsx b/src/components/Global/components/icon.tsx
index d0e86a81..7803ca78 100644
--- a/src/components/Global/components/icon.tsx
+++ b/src/components/Global/components/icon.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { getTokenValue, ThemeTokens, useTheme, YStack } from 'tamagui'
+import { getTokenValue, SizeTokens, ThemeTokens, useTheme, YStack } from 'tamagui'
 import MaterialDesignIcon from '@react-native-vector-icons/material-design-icons'
 
 const xxxsmallSize = 12
@@ -19,6 +19,7 @@ const SIZE_ENTRIES = [
 
 export default function Icon({
 	name,
+	margin,
 	onPress,
 	onPressIn,
 	xxxsmall,
@@ -33,6 +34,7 @@ export default function Icon({
 	textOutline,
 }: {
 	name: string
+	margin?: SizeTokens | undefined
 	onPress?: () => void
 	onPressIn?: () => void
 	xxxsmall?: boolean
@@ -79,6 +81,7 @@ export default function Icon({
 				textOutline === 'strong' ? { width: 0.5, height: 0.5 } : { width: 0, height: 0 }
 			}
 			shadowRadius={textOutline === 'strong' ? 1 : 0}
+			margin={margin}
 		>
 			<MaterialDesignIcon
 				color={resolvedColor}
diff --git a/src/components/Settings/component.tsx b/src/components/Settings/component.tsx
index f03535c9..19b44b90 100644
--- a/src/components/Settings/component.tsx
+++ b/src/components/Settings/component.tsx
@@ -3,7 +3,7 @@ import { useColorScheme } from 'react-native'
 import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs'
 import { getTokenValue, useTheme, Spinner, YStack } from 'tamagui'
 import { useColorPresetSetting, useThemeSetting } from '../../stores/settings/app'
-import SettingsTabBar from './tab-bar'
+import { SafeAreaView } from 'react-native-safe-area-context'
 
 // Lazy load tab components to improve initial render
 const PreferencesTab = lazy(() => import('./components/preferences-tab'))
@@ -73,63 +73,49 @@ export default function Settings(): React.JSX.Element {
 	const themeKey = `${colorPreset}_${resolvedMode}`
 
 	return (
-		<SettingsTabsNavigator.Navigator
-			key={themeKey}
-			screenOptions={{
-				tabBarIndicatorStyle: {
-					borderColor: theme.background.val,
-					borderBottomWidth: getTokenValue('$2'),
-				},
-				tabBarActiveTintColor: theme.background.val,
-				tabBarInactiveTintColor: theme.background50.val,
-				tabBarStyle: {
-					backgroundColor: theme.primary.val,
-				},
-				tabBarLabelStyle: {
-					fontFamily: 'Figtree-Bold',
-				},
-				tabBarPressOpacity: 0.5,
-				lazy: true,
-				lazyPreloadDistance: 0, // Only load the active tab
-			}}
-			tabBar={(props) => <SettingsTabBar {...props} />}
-		>
-			<SettingsTabsNavigator.Screen
-				name='Settings'
-				component={LazyPreferencesTab}
-				options={{
-					title: 'App',
+		<SafeAreaView edges={['top']} style={{ flex: 1 }}>
+			<SettingsTabsNavigator.Navigator
+				key={themeKey}
+				screenOptions={{
+					tabBarIndicatorStyle: {
+						borderColor: theme.primary.val,
+						borderBottomWidth: getTokenValue('$2'),
+					},
+					tabBarActiveTintColor: theme.primary.val,
+					tabBarInactiveTintColor: theme.borderColor.val,
+					tabBarStyle: {
+						backgroundColor: theme.background.val,
+					},
+					tabBarLabelStyle: {
+						fontFamily: 'Figtree-Bold',
+					},
+					tabBarPressOpacity: 0.5,
+					lazy: true,
+					lazyPreloadDistance: 0, // Only load the active tab
 				}}
-			/>
-
-			<SettingsTabsNavigator.Screen
-				name='Playback'
-				component={LazyPlaybackTab}
-				options={{
-					title: 'Player',
-				}}
-			/>
-
-			<SettingsTabsNavigator.Screen name='Usage' component={LazyStorageTab} />
-
-			<SettingsTabsNavigator.Screen name='User' component={LazyAccountTab} />
-
-			<SettingsTabsNavigator.Screen name='About' component={LazyInfoTab} />
-			{/*
+			>
 				<SettingsTabsNavigator.Screen
-					name='Labs'
-					component={LabsTab}
+					name='Settings'
+					component={LazyPreferencesTab}
 					options={{
-						tabBarIcon: ({ focused, color }) => (
-							<Icon
-								name='flask'
-								color={focused ? '$primary' : '$borderColor'}
-								small
-							/>
-						),
+						title: 'App',
 					}}
 				/>
-			) */}
-		</SettingsTabsNavigator.Navigator>
+
+				<SettingsTabsNavigator.Screen
+					name='Playback'
+					component={LazyPlaybackTab}
+					options={{
+						title: 'Player',
+					}}
+				/>
+
+				<SettingsTabsNavigator.Screen name='Usage' component={LazyStorageTab} />
+
+				<SettingsTabsNavigator.Screen name='User' component={LazyAccountTab} />
+
+				<SettingsTabsNavigator.Screen name='About' component={LazyInfoTab} />
+			</SettingsTabsNavigator.Navigator>
+		</SafeAreaView>
 	)
 }
diff --git a/src/components/Settings/components/settings-list-group.tsx b/src/components/Settings/components/settings-list-group.tsx
index 024cab6d..2473a083 100644
--- a/src/components/Settings/components/settings-list-group.tsx
+++ b/src/components/Settings/components/settings-list-group.tsx
@@ -1,14 +1,12 @@
 import { ListItem, ScrollView, Separator, YGroup } from 'tamagui'
 import { SettingsTabList } from '../types'
 import Icon from '../../Global/components/icon'
-import { ThemeTokens } from 'tamagui'
 import React from 'react'
 import { Text } from '../../Global/helpers/text'
 
 interface SettingsListGroupProps {
 	settingsList: SettingsTabList
 	footer?: React.JSX.Element
-	borderColor?: ThemeTokens
 }
 
 function SettingsListItem({ setting }: { setting: SettingsTabList[number] }) {
@@ -16,9 +14,9 @@ function SettingsListItem({ setting }: { setting: SettingsTabList[number] }) {
 		<>
 			<YGroup.Item>
 				<ListItem
-					size={'$5'}
+					size={'$4'}
 					title={setting.title}
-					icon={<Icon name={setting.iconName} color={setting.iconColor} />}
+					icon={<Icon name={setting.iconName} color={setting.iconColor} margin={'$2'} />}
 					subTitle={
 						setting.subTitle && <Text color={'$borderColor'}>{setting.subTitle}</Text>
 					}
@@ -38,20 +36,22 @@ function SettingsListItem({ setting }: { setting: SettingsTabList[number] }) {
 
 export default function SettingsListGroup({
 	settingsList,
-	borderColor,
 	footer,
 }: SettingsListGroupProps): React.JSX.Element {
 	return (
 		<ScrollView>
-			<YGroup
-				alignSelf='center'
-				borderWidth={'$1'}
-				borderColor={'$borderColor'}
-				margin={'$3'}
-			>
-				{settingsList.map((setting, index, self) => (
-					<SettingsListItem key={setting.title} setting={setting} />
-				))}
+			<YGroup>
+				{settingsList.map((setting, index, self) => {
+					return (
+						<>
+							<SettingsListItem key={setting.title} setting={setting} />
+
+							{index < self.length - 1 && (
+								<Separator borderColor={'$borderColor'} marginHorizontal={'$4'} />
+							)}
+						</>
+					)
+				})}
 			</YGroup>
 			{footer}
 		</ScrollView>
diff --git a/src/components/Settings/tab-bar.tsx b/src/components/Settings/tab-bar.tsx
deleted file mode 100644
index dd71fcd1..00000000
--- a/src/components/Settings/tab-bar.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { MaterialTopTabBarProps, MaterialTopTabBar } from '@react-navigation/material-top-tabs'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { Square, YStack } from 'tamagui'
-import StatusBar from '../Global/helpers/status-bar'
-
-export default function SettingsTabBar(props: MaterialTopTabBarProps): React.JSX.Element {
-	const { top } = useSafeAreaInsets()
-
-	return (
-		<YStack>
-			<Square height={top} backgroundColor={'$primary'} />
-			<StatusBar invertColors />
-			<MaterialTopTabBar {...props} />
-		</YStack>
-	)
-}