Hot fix : Update import

dropy-project · Nov 12, 2022 · 6584df0 · 6584df0
1 parent e533b66
commit 6584df0
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 67 deletions.
diff --git a/src/components/chat/ChatHeader.js b/src/components/chat/ChatHeader.js
@@ -5,9 +5,11 @@ import { useNavigation } from '@react-navigation/native';
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import Styles, { Colors, Fonts } from '../../styles/Styles';
 import { blockUser, reportUser } from '../../utils/profiles';
+
 import useOverlay from '../../hooks/useOverlay';
+
 import ProfileAvatar from '../profile/ProfileAvatar';
-import DisabledNotificationsPopup from './DisabledNotificationsPopup';
+import DisabledNotificationsPopup from '../overlays/DisabledNotificationsPopup';
 
 const ChatHeader = ({ conversation, otherUserConnected, popToTopOnQuit }) => {
   const navigation = useNavigation();

diff --git a/src/components/chat/ConversationItem.js b/src/components/chat/ConversationItem.js
@@ -3,8 +3,9 @@ import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 
 import { useNavigation } from '@react-navigation/native';
 import Styles, { Colors, Fonts } from '../../styles/Styles';
+
 import DebugText from '../other/DebugText';
-import ProfileAvatar from './ProfileAvatar';
+import ProfileAvatar from '../profile/ProfileAvatar';
 
 const ConversationItem = ({
   conversation,

diff --git a/src/components/effect/AnimatedDropyPreviewBox.js b/src/components/effect/AnimatedDropyPreviewBox.js
@@ -12,9 +12,7 @@ import { responsiveWidth } from 'react-native-responsive-dimensions';
 import { Entypo, Ionicons, MaterialCommunityIcons } from '@expo/vector-icons';
 
 import Styles, { Colors } from '../../styles/Styles';
-
-
-import DropyPopup from '../assets/svgs/dropyPopup.svg';
+import DropyPopup from '../../assets/svgs/dropyPopup.svg';
 
 export const OVERLAY_STATE = {
   HIDDEN: 'HIDDEN',

diff --git a/src/components/input/GlassCircleButton.js b/src/components/input/GlassCircleButton.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
-import Svg1 from '../assets/svgs/add_drop_1.svg';
-import Svg2 from '../assets/svgs/add_drop_2.svg';
-import Svg3 from '../assets/svgs/add_drop_3.svg';
+import Svg1 from '../../assets/svgs/add_drop_1.svg';
+import Svg2 from '../../assets/svgs/add_drop_2.svg';
+import Svg3 from '../../assets/svgs/add_drop_3.svg';
 import Styles, { Colors } from '../../styles/Styles';
 
 const GlassCircleButton = ({ style, children, onPress, size = 70, activeOpacity }) => (

diff --git a/src/components/map/DropyMapMarker.js b/src/components/map/DropyMapMarker.js
@@ -3,10 +3,10 @@ import { Platform, StyleSheet, Text, View } from 'react-native';
 import { Marker } from 'react-native-maps';
 import Styles, { Colors, Fonts } from '../../styles/Styles';
 
-import DropyPopup from '../assets/svgs/dropyPopup.svg';
-
+import DropyPopup from '../../assets/svgs/dropyPopup.svg';
 import { createDropTimeString } from '../../utils/time';
 
+
 const DropyMapMarker = ({ dropy, onPress }) => {
   const [dropTimeString, setDropTimeString] = useState('0s');
 

diff --git a/src/components/other/FooterConfirmation.js b/src/components/other/FooterConfirmation.js
@@ -2,8 +2,8 @@ import React, { useEffect, useRef } from 'react';
 import { Animated, Easing, StyleSheet, Text, View } from 'react-native';
 import Styles, { Colors, Fonts } from '../../styles/Styles';
 import { createDropTimeString } from '../../utils/time';
-import GlassButton from './GlassButton';
-import ProfileImage from './ProfileImage';
+import GlassButton from '../input/GlassButton';
+import ProfileImage from '../profile/ProfileImage';
 
 
 const FooterConfirmation = ({ dropy, onPress, textButton }) => {

diff --git a/src/components/other/HomeScreenTabBar.js b/src/components/other/HomeScreenTabBar.js
@@ -19,7 +19,7 @@ import Styles, { Colors, Fonts } from '../../styles/Styles';
 import useOverlay from '../../hooks/useOverlay';
 import useUnreadConversation from '../../hooks/useUnreadConversation';
 import useCurrentUser from '../../hooks/useCurrentUser';
-import GlassCircleButton from './GlassCircleButton';
+import GlassCircleButton from '../input/GlassCircleButton';
 
 const mainButtonSize = responsiveHeight(7.5);
 const iconsSize = 30;

diff --git a/src/components/overlays/ConfirmDropyOverlay.js b/src/components/overlays/ConfirmDropyOverlay.js
@@ -22,10 +22,11 @@ import Haptics from '../../utils/haptics';
 
 import useOverlay from '../../hooks/useOverlay';
 import useCurrentUser from '../../hooks/useCurrentUser';
+
 import GoBackHeader from '../other/GoBackHeader';
 import AnimatedDropyPreviewBox, { OVERLAY_STATE } from '../effect/AnimatedDropyPreviewBox';
-import GlassButton from './GlassButton';
-import ProfileAvatar from './ProfileAvatar';
+import ProfileAvatar from '../profile/ProfileAvatar';
+import GlassButton from '../input/GlassButton';
 
 const ConfirmDropyOverlay = ({ visible = false, onCloseOverlay: closeOverlay = () => {}, dropyCreateParams, createDropy }) => {
   const { sendBottomAlert } = useOverlay();

diff --git a/src/components/profile/ProfileImage.js b/src/components/profile/ProfileImage.js
@@ -2,9 +2,11 @@ import React, { useEffect, useRef, useState } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import FastImage from 'react-native-fast-image';
 
-import useCurrentUser from '../hooks/useCurrentUser';
-import API from '../services/API';
-import Styles, { Colors, Fonts } from '../styles/Styles';
+import useCurrentUser from '../../hooks/useCurrentUser';
+import API from '../../services/API';
+
+import Styles, { Colors, Fonts } from '../../styles/Styles';
+
 
 const ProfileImage = (props) => {
   const { user: localUser } = useCurrentUser();

diff --git a/src/screens/BlockedUsersScreen.js b/src/screens/BlockedUsersScreen.js
@@ -10,10 +10,12 @@ import {
   View
 } from 'react-native';
 import { responsiveHeight, responsiveWidth } from 'react-native-responsive-dimensions';
-import FadeInWrapper from '../components/FadeInWrapper';
-import GoBackHeader from '../components/GoBackHeader';
-import LoadingSpinner from '../components/LoadingSpinner';
-import ProfileAvatar from '../components/ProfileAvatar';
+
+import FadeInWrapper from '../components/effect/FadeInWrapper';
+import LoadingSpinner from '../components/effect/LoadingSpinner';
+import GoBackHeader from '../components/other/GoBackHeader';
+import ProfileAvatar from '../components/profile/ProfileAvatar';
+
 import useOverlay from '../hooks/useOverlay';
 import API from '../services/API';
 import Styles, { Colors, Fonts } from '../styles/Styles';

diff --git a/src/screens/ChatScreen.js b/src/screens/ChatScreen.js
@@ -2,15 +2,15 @@ import React, { useRef } from 'react';
 import { FlatList, Platform, StyleSheet, View } from 'react-native';
 import KeyboardSpacer from 'react-native-keyboard-spacer';
 
-import LoadingSpinner from '../components/LoadingSpinner';
 import useChatSocket from '../hooks/useChatSocket';
 import useCurrentUser from '../hooks/useCurrentUser';
 import useOverlay from '../hooks/useOverlay';
 import useKeyboardVisible from '../hooks/useKeyboardVisible';
+import ChatBubble from '../components/chat/ChatBubble';
+import SendMessageInput from '../components/input/SendMessageInput';
+import LoadingSpinner from '../components/effect/LoadingSpinner';
+import ChatHeader from '../components/chat/ChatHeader';
 
-import SendMessageInput from '../components/SendMessageInput';
-import ChatBubble from '../components/ChatBubble';
-import ChatHeader from '../components/ChatHeader';
 
 const ONE_HOUR = 60 * 60 * 1000;
 

diff --git a/src/screens/ConversationsScreen.js b/src/screens/ConversationsScreen.js
@@ -1,10 +1,12 @@
 import React, { useEffect } from 'react';
 import { FlatList, SafeAreaView, StyleSheet, Text, View } from 'react-native';
 import { responsiveHeight } from 'react-native-responsive-dimensions';
-import ConversationItem from '../components/ConversationItem';
-import FadeInWrapper from '../components/FadeInWrapper';
-import GoBackHeader from '../components/GoBackHeader';
-import LoadingSpinner from '../components/LoadingSpinner';
+
+import ConversationItem from '../components/chat/ConversationItem';
+import FadeInWrapper from '../components/effect/FadeInWrapper';
+import LoadingSpinner from '../components/effect/LoadingSpinner';
+import GoBackHeader from '../components/other/GoBackHeader';
+
 import useConversationsSocket from '../hooks/useConversationsSocket';
 import useOverlay from '../hooks/useOverlay';
 import Styles, { Colors, Fonts } from '../styles/Styles';

diff --git a/src/screens/CreateDropyTextScreen.js b/src/screens/CreateDropyTextScreen.js
@@ -10,10 +10,10 @@ import {
 } from 'react-native';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 import Styles, { Colors, Fonts } from '../styles/Styles';
-import GoBackHeader from '../components/GoBackHeader';
-import GlassButton from '../components/GlassButton';
-import MEDIA_TYPES from '../utils/mediaTypes';
 import useOverlay from '../hooks/useOverlay';
+import MEDIA_TYPES from '../utils/mediaTypes';
+import GoBackHeader from '../components/other/GoBackHeader';
+import GlassButton from '../components/input/GlassButton';
 
 const CreateDropyTextScreen = ({ navigation, route }) => {
   const { sendAlert } = useOverlay();

diff --git a/src/screens/DisplayDropyMediaScreen.js b/src/screens/DisplayDropyMediaScreen.js
@@ -4,14 +4,16 @@ import { useActionSheet } from '@expo/react-native-action-sheet';
 import LinearGradient from 'react-native-linear-gradient';
 import { Colors } from '../styles/Styles';
 
-import FooterConfirmation from '../components/FooterConfirmation';
-import GoBackHeader from '../components/GoBackHeader';
-import DropyMediaViewer from '../components/DropyMediaViewer';
-import useOverlay from '../hooks/useOverlay';
 import { blockUser, reportUser } from '../utils/profiles';
+
+import useOverlay from '../hooks/useOverlay';
 import useCurrentUser from '../hooks/useCurrentUser';
 import useConversationsSocket from '../hooks/useConversationsSocket';
 
+import DropyMediaViewer from '../components/other/DropyMediaViewer';
+import GoBackHeader from '../components/other/GoBackHeader';
+import FooterConfirmation from '../components/other/FooterConfirmation';
+
 const DisplayDropyMediaScreen = ({ navigation, route }) => {
   const { dropy, showBottoModal } = route.params || {};
 

diff --git a/src/screens/GetDropyScreen.js b/src/screens/GetDropyScreen.js
@@ -7,11 +7,13 @@ import {
   Text,
   View
 } from 'react-native';
-import GoBackHeader from '../components/GoBackHeader';
-import DropyLogo from '../assets/svgs/dropy_logo.svg';
+
 import { Colors, Fonts } from '../styles/Styles';
-import FooterConfirmation from '../components/FooterConfirmation';
-import ParticleEmitter from '../components/ParticleEmitter';
+
+import DropyLogo from '../assets/svgs/dropy_logo.svg';
+import ParticleEmitter from '../components/effect/ParticleEmitter';
+import FooterConfirmation from '../components/other/FooterConfirmation';
+import GoBackHeader from '../components/other/GoBackHeader';
 
 const GetDropyScreen = ({ navigation, route }) => {
   const { dropy = null } = route.params || {};

diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js
@@ -12,15 +12,15 @@ import {
 import { FontAwesome5 } from '@expo/vector-icons';
 import Styles, { Colors, Fonts } from '../styles/Styles';
 
-import HomeScreenTabBar from '../components/HomeScreenTabBar';
-import ConfirmDropyOverlay from '../components/ConfirmDropyOverlay';
-import ProfileAvatar from '../components/ProfileAvatar';
-import DropyMap from '../components/DropyMap';
 
 import useDropiesAroundSocket from '../hooks/useDropiesAroundSocket';
 import { BackgroundGeolocationContext } from '../states/BackgroundGolocationContextProvider';
-import MuseumOverlay from '../components/MuseumOverlay';
 import Haptics from '../utils/haptics';
+import DropyMap from '../components/map/DropyMap';
+import ProfileAvatar from '../components/profile/ProfileAvatar';
+import MuseumOverlay from '../components/overlays/MuseumOverlay';
+import HomeScreenTabBar from '../components/other/HomeScreenTabBar';
+import ConfirmDropyOverlay from '../components/overlays/ConfirmDropyOverlay';
 
 const BACKGROUND_GEOLOC_ICON_OPENED_SIZE = 40;
 

diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js
@@ -20,18 +20,20 @@ import { PERMISSIONS, request, requestNotifications, RESULTS } from 'react-nativ
 import BackgroundGeolocation from 'react-native-background-geolocation';
 import DropyLogo from '../assets/svgs/dropy_logo_grey.svg';
 import Styles, { Colors, Fonts } from '../styles/Styles';
-import GoBackHeader from '../components/GoBackHeader';
 import OnboardingLines from '../assets/svgs/onboarding_lines.svg';
-import GlassButton from '../components/GlassButton';
-import FormInput from '../components/FormInput';
-import FormCheckBox from '../components/FormCheckBox';
-import ViewSlider from '../components/ViewSlider';
 import { compressImage } from '../utils/files';
 import API from '../services/API';
 import useOverlay from '../hooks/useOverlay';
 import useCurrentUser from '../hooks/useCurrentUser';
+
 import { BackgroundGeolocationContext } from '../states/BackgroundGolocationContextProvider';
-import LoadingSpinner from '../components/LoadingSpinner';
+
+import GoBackHeader from '../components/other/GoBackHeader';
+import FormInput from '../components/input/FormInput';
+import ViewSlider from '../components/viewSlider/ViewSlider';
+import FormCheckBox from '../components/input/FormCheckBox';
+import GlassButton from '../components/input/GlassButton';
+import LoadingSpinner from '../components/effect/LoadingSpinner';
 
 // eslint-disable-next-line no-undef
 const DEBUG = __DEV__;

diff --git a/src/screens/ProfileEditScreen.js b/src/screens/ProfileEditScreen.js
@@ -15,11 +15,12 @@ import {
 } from 'react-native';
 import { openCamera, openPicker } from 'react-native-image-crop-picker';
 
-import FormInput from '../components/FormInput';
-import FormSelect from '../components/FormSelect';
-import GoBackHeader from '../components/GoBackHeader';
-import LoadingSpinner from '../components/LoadingSpinner';
-import ProfileImage from '../components/ProfileImage';
+import LoadingSpinner from '../components/effect/LoadingSpinner';
+import FormInput from '../components/input/FormInput';
+import FormSelect from '../components/input/FormSelect';
+import GoBackHeader from '../components/other/GoBackHeader';
+import ProfileImage from '../components/profile/ProfileImage';
+
 import useCurrentUser from '../hooks/useCurrentUser';
 import useOverlay from '../hooks/useOverlay';
 import API from '../services/API';

diff --git a/src/screens/ProfileScreen.js b/src/screens/ProfileScreen.js
@@ -1,8 +1,8 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { Animated, StatusBar, StyleSheet, Text, View } from 'react-native';
 import { responsiveHeight } from 'react-native-responsive-dimensions';
-import DebugText from '../components/DebugText';
-import ProfileScreenHeader, { MAX_HEADER_HEIGHT } from '../components/ProfileScreenHeader';
+import DebugText from '../components/other/DebugText';
+import ProfileScreenHeader, { MAX_HEADER_HEIGHT } from '../components/profile/ProfileScreenHeader';
 import useCurrentUser from '../hooks/useCurrentUser';
 import useOverlay from '../hooks/useOverlay';
 import API from '../services/API';

diff --git a/src/screens/SettingScreen.js b/src/screens/SettingScreen.js
@@ -11,15 +11,16 @@ import {
 } from 'react-native';
 import { responsiveWidth } from 'react-native-responsive-dimensions';
 import { AntDesign, Feather, Ionicons } from '@expo/vector-icons';
-import GoBackHeader from '../components/GoBackHeader';
 import AppInfo from '../../app.json';
 import Styles, { Colors, Fonts } from '../styles/Styles';
 import { BackgroundGeolocationContext } from '../states/BackgroundGolocationContextProvider';
 import useCurrentUser from '../hooks/useCurrentUser';
-import DebugText from '../components/DebugText';
-import FormToggle from '../components/FormToggle';
 import API from '../services/API';
 
+import FormToggle from '../components/input/FormToggle';
+import DebugText from '../components/other/DebugText';
+import GoBackHeader from '../components/other/GoBackHeader';
+
 const SettingsScreen = ({ navigation }) => {
   const { setDeveloperMode } = useCurrentUser();
 

diff --git a/src/screens/UserDropiesScreen.js b/src/screens/UserDropiesScreen.js
@@ -11,10 +11,12 @@ import {
 } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 import { responsiveHeight, responsiveWidth } from 'react-native-responsive-dimensions';
-import DropyMediaViewer from '../components/DropyMediaViewer';
-import FadeInWrapper from '../components/FadeInWrapper';
-import GoBackHeader from '../components/GoBackHeader';
-import LoadingSpinner from '../components/LoadingSpinner';
+
+import FadeInWrapper from '../components/effect/FadeInWrapper';
+import LoadingSpinner from '../components/effect/LoadingSpinner';
+import DropyMediaViewer from '../components/other/DropyMediaViewer';
+import GoBackHeader from '../components/other/GoBackHeader';
+
 import useOverlay from '../hooks/useOverlay';
 import API from '../services/API';
 import Styles, { Colors, Fonts } from '../styles/Styles';

diff --git a/src/states/NotificationProvider.js b/src/states/NotificationProvider.js
@@ -8,9 +8,10 @@ import API from '../services/API';
 import useCurrentUser from '../hooks/useCurrentUser';
 import useEffectForegroundOnly from '../hooks/useEffectForegroundOnly';
 
-import Notification from '../components/Notification';
 import useConversationsSocket from '../hooks/useConversationsSocket';
 
+import Notification from '../components/overlays/Notification';
+
 export const extractNotificationPayload = (notification) => {
   if (Platform.OS === 'android') {
     const payload = notification?.payload['gcm.notification.click_action'];