Skip to content

Commit

Permalink
Fix file structures
Browse files Browse the repository at this point in the history
  • Loading branch information
saulamsal committed Oct 30, 2024
1 parent 9ec4533 commit f8cd19f
Show file tree
Hide file tree
Showing 17 changed files with 13 additions and 151 deletions.
4 changes: 2 additions & 2 deletions app/(tabs)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { MaterialIcons, Ionicons } from '@expo/vector-icons';
import ParallaxScrollView from '@/components/ParallaxScrollView';
import { ThemedText } from '@/components/ThemedText';
import { ThemedView } from '@/components/ThemedView';
import { songs } from '@/app/data/songs.json';
import { useAudio } from '@/app/context/AudioContext';
import { songs } from '@/data/songs.json';
import { useAudio } from '@/contexts/AudioContext';
import { MusicVisualizer } from '@/components/MusicVisualizer';
import { useColorScheme } from '@/hooks/useColorScheme';

Expand Down
10 changes: 5 additions & 5 deletions app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { Stack } from 'expo-router';
import * as SplashScreen from 'expo-splash-screen';
import { useEffect } from 'react';
import { StyleSheet, useColorScheme, View } from 'react-native';
import { RootScaleProvider } from '@/app/contexts/RootScaleContext';
import { useRootScale } from '@/app/contexts/RootScaleContext';
import { RootScaleProvider } from '@/contexts/RootScaleContext';
import { useRootScale } from '@/contexts/RootScaleContext';
import Animated, { useAnimatedStyle } from 'react-native-reanimated';
import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { OverlayProvider } from '@/app/components/Overlay/OverlayProvider';
import { AudioProvider } from '@/app/context/AudioContext';
import { OverlayProvider } from '@/components/Overlay/OverlayProvider';
import { AudioProvider } from '@/contexts/AudioContext';
import { MiniPlayer } from '@/components/BottomSheet/MiniPlayer';
import { useRouter } from 'expo-router';
import { useAudio } from '@/app/context/AudioContext';
import { useAudio } from '@/contexts/AudioContext';

function AnimatedStack() {
const { scale } = useRootScale();
Expand Down
4 changes: 2 additions & 2 deletions app/music/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useEffect, useCallback, useRef } from 'react';
import { StatusBar } from 'expo-status-bar';
import { ThemedView } from '@/components/ThemedView';
import { ExpandedPlayer } from '@/components/BottomSheet/ExpandedPlayer';
import { useRootScale } from '@/app/contexts/RootScaleContext';
import { useRootScale } from '@/contexts/RootScaleContext';
import Animated, {
useSharedValue,
useAnimatedStyle,
Expand All @@ -13,7 +13,7 @@ import Animated, {
runOnJS,
} from 'react-native-reanimated';
import { GestureDetector, Gesture } from 'react-native-gesture-handler';
import { songs } from '@/app/data/songs.json';
import { songs } from '@/data/songs.json';
import * as Haptics from 'expo-haptics';

const SCALE_FACTOR = 0.83;
Expand Down
2 changes: 1 addition & 1 deletion components/BottomSheet/ExpandedPlayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { LinearGradient } from 'expo-linear-gradient';
import { Ionicons } from '@expo/vector-icons';
import { Audio } from 'expo-av';
import { useEffect, useState, useCallback } from 'react';
import { useAudio } from '@/app/context/AudioContext';
import { useAudio } from '@/contexts/AudioContext';
const { width } = Dimensions.get('window');
import {
useSafeAreaInsets,
Expand Down
2 changes: 1 addition & 1 deletion components/BottomSheet/MiniPlayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useState, useEffect } from 'react';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { BlurView } from 'expo-blur';
import { useColorScheme } from '@/hooks/useColorScheme';
import { useAudio } from '@/app/context/AudioContext';
import { useAudio } from '@/contexts/AudioContext';

export function MiniPlayer({ onPress, song, isPlaying, onPlayPause }: MiniPlayerProps) {
const insets = useSafeAreaInsets();
Expand Down
41 changes: 0 additions & 41 deletions components/Collapsible.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions components/ExternalLink.tsx

This file was deleted.

37 changes: 0 additions & 37 deletions components/HelloWave.tsx

This file was deleted.

File renamed without changes.
File renamed without changes.
10 changes: 0 additions & 10 deletions components/__tests__/ThemedText-test.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions components/__tests__/__snapshots__/ThemedText-test.tsx.snap

This file was deleted.

2 changes: 0 additions & 2 deletions components/navigation/TabBarIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// You can explore the built-in icon families and icons on the web at https://icons.expo.fyi/

import Ionicons from '@expo/vector-icons/Ionicons';
import { type IconProps } from '@expo/vector-icons/build/createIconSet';
import { type ComponentProps } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion app/context/AudioContext.tsx → contexts/AudioContext.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createContext, useContext, useState, useEffect, useCallback } from 'react';
import { Audio } from 'expo-av';
import { songs } from '@/app/data/songs.json';
import { songs } from '@/data/songs.json';

interface Song {
id: number;
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/hooks/useOverlayView.ts → hooks/useOverlayView.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useRef } from 'react';
import { useOverlay } from '@/app/components/Overlay/OverlayContext';
import { useOverlay } from '@/components/Overlay/OverlayContext';

export const useOverlayView = () => {
const { addOverlay, removeOverlay } = useOverlay();
Expand Down

0 comments on commit f8cd19f

Please sign in to comment.