chore: remove barrel files

.eslintrc.js

@@ -54,7 +54,7 @@ module.exports = {
 		'jsx-a11y/href-no-hash': 0,
 		'jsx-a11y/aria-role': 0,
 		'import/prefer-default-export': 0,
-		'import/no-cycle': 0,
+		'import/no-cycle': 2,
 		'import/order': [
 			'error',
 			{

app/AppContainer.tsx

@@ -17,7 +17,7 @@ import MasterDetailStack from './stacks/MasterDetailStack';
 import ShareExtensionStack from './stacks/ShareExtensionStack';
 import { ThemeContext } from './theme';
 import { setCurrentScreen } from './lib/methods/helpers/log';
-import { themes } from './lib/constants';
+import { themes } from './lib/constants/colors';
 import { emitter } from './lib/methods/helpers';
 
 const createStackNavigator = createNativeStackNavigator;

app/containers/ActionSheet/Handle.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { View } from 'react-native';
 
 import styles from './styles';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 import { useTheme } from '../../theme';
 
 export const Handle = React.memo(() => {

app/containers/Avatar/AvatarContainer.tsx

@@ -5,7 +5,7 @@ import { getUserSelector } from '../../selectors/login';
 import Avatar from './Avatar';
 import { IAvatar } from './interfaces';
 import { useAvatarETag } from './useAvatarETag';
-import { useAppSelector } from '../../lib/hooks';
+import { useAppSelector } from '../../lib/hooks/useAppSelector';
 
 const AvatarContainer = ({
 	style,

app/containers/Avatar/AvatarWithEdit.tsx

@@ -7,7 +7,7 @@ import { IAvatar } from './interfaces';
 import I18n from '../../i18n';
 import { useTheme } from '../../theme';
 import { BUTTON_HIT_SLOP } from '../message/utils';
-import { useAppSelector } from '../../lib/hooks';
+import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import { compareServerVersion } from '../../lib/methods/helpers/compareServerVersion';
 import sharedStyles from '../../views/Styles';
 

app/containers/BackgroundContainer/index.stories.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { ThemeContext, TSupportedThemes } from '../../theme';
 import { longText } from '../../../.rnstorybook/utils';
 import BackgroundContainer, { IBackgroundContainer } from '.';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 
 export default {
 	title: 'BackgroundContainer'

app/containers/BackgroundContainer/index.tsx

@@ -3,7 +3,7 @@ import { ActivityIndicator, ImageBackground, StyleSheet, Text, View } from 'reac
 
 import { useTheme } from '../../theme';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 
 export interface IBackgroundContainer {
 	text?: string;

app/containers/CallHeader.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
-import { useAppSelector } from '../lib/hooks';
+import { useAppSelector } from '../lib/hooks/useAppSelector';
 import { useTheme } from '../theme';
 import sharedStyles from '../views/Styles';
 import { CustomIcon } from './CustomIcon';

app/containers/Check.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { CustomIcon } from './CustomIcon';
-import { themes } from '../lib/constants';
+import { themes } from '../lib/constants/colors';
 import { useTheme } from '../theme';
 
 const Check = React.memo(() => {

app/containers/DirectoryItem/DirectoryItem.stories.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { ScrollView } from 'react-native';
 
 import DirectoryItem from './index';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 
 const _theme = 'light';
 

app/containers/EmojiPicker/CustomEmoji.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Image } from 'expo-image';
 
-import { useAppSelector } from '../../lib/hooks';
+import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import { ICustomEmojiProps } from './interfaces';
 
 const CustomEmoji = React.memo(

app/containers/EmojiPicker/EmojiCategory.tsx

@@ -5,7 +5,7 @@ import { ICustomEmojis, IEmoji } from '../../definitions/IEmoji';
 import scrollPersistTaps from '../../lib/methods/helpers/scrollPersistTaps';
 import { PressableEmoji } from './PressableEmoji';
 import { EMOJI_BUTTON_SIZE } from './styles';
-import { emojisByCategory } from '../../lib/constants';
+import { emojisByCategory } from '../../lib/constants/emojis';
 import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import { useFrequentlyUsedEmoji } from '../../lib/hooks/useFrequentlyUsedEmoji';
 import { IEmojiCategoryProps, TEmojiCategory } from './interfaces';

app/containers/EmojiPicker/interfaces.ts

@@ -1,6 +1,6 @@
 import { ImageStyle, StyleProp, TextInputProps } from 'react-native';
 
-import { emojisByCategory } from '../../lib/constants';
+import { emojisByCategory } from '../../lib/constants/emojis';
 import { ICustomEmoji, IEmoji } from '../../definitions';
 
 export enum EventTypes {

app/containers/Header/index.tsx

@@ -5,7 +5,7 @@ import { NativeStackHeaderProps } from '@react-navigation/native-stack';
 import HeaderTitle from './components/HeaderTitle';
 import HeaderContainer from './components/HeaderContainer';
 import { isAndroid } from '../../lib/methods/helpers';
-import { useAppSelector } from '../../lib/hooks';
+import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import { styles } from './styles';
 import { HeaderBackButton } from './components/HeaderBackButton';
 

app/containers/ImageViewer/ImageViewer.tsx

@@ -5,8 +5,8 @@ import Animated, { withTiming, useSharedValue, useAnimatedStyle, withSpring } fr
 import { Image, ImageStyle } from 'expo-image';
 
 import Touch from '../Touch';
-import { useUserPreferences } from '../../lib/methods';
-import { AUTOPLAY_GIFS_PREFERENCES_KEY } from '../../lib/constants';
+import { useUserPreferences } from '../../lib/methods/userPreferences';
+import { AUTOPLAY_GIFS_PREFERENCES_KEY } from '../../lib/constants/keys';
 import { useTheme } from '../../theme';
 
 interface ImageViewerProps {

app/containers/InAppNotification/IncomingCallNotification/index.tsx

@@ -7,7 +7,7 @@ import { useDispatch } from 'react-redux';
 import { acceptCall, cancelCall } from '../../../actions/videoConf';
 import { ISubscription, SubscriptionType } from '../../../definitions';
 import i18n from '../../../i18n';
-import { useAppSelector } from '../../../lib/hooks';
+import { useAppSelector } from '../../../lib/hooks/useAppSelector';
 import { useEndpointData } from '../../../lib/hooks/useEndpointData';
 import { hideNotification } from '../../../lib/methods/helpers/notifications';
 import { CustomIcon } from '../../CustomIcon';

app/containers/InAppNotification/NotifierComponent.tsx

@@ -7,7 +7,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import Avatar from '../Avatar';
 import { CustomIcon } from '../CustomIcon';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 import { useTheme } from '../../theme';
 import { goRoom } from '../../lib/methods/helpers/goRoom';
 import { IApplicationState, ISubscription, SubscriptionType } from '../../definitions';

app/containers/InAppNotification/index.tsx

@@ -6,7 +6,7 @@
 import EventEmitter from '../../lib/methods/helpers/events';
 import Navigation from '../../lib/navigation/appNavigation';
 import { getActiveRoute } from '../../lib/methods/helpers/navigation';
-import { useAppSelector } from '../../lib/hooks';
+import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import { setInAppFeedback } from '../../actions/inAppFeedback';
 
 export const INAPP_NOTIFICATION_EMITTER = 'NotificationInApp';
@@ -60,7 +60,7 @@
 		return () => {
 			EventEmitter.removeListener(INAPP_NOTIFICATION_EMITTER, listener);
 		};
 	}, [subscribedRoom, appState]);
 
 	return <NotifierRoot />;
 });

app/containers/List/List.stories.tsx

@@ -6,7 +6,7 @@ import SafeAreaView from '../SafeAreaView';
 import { longText } from '../../../.rnstorybook/utils';
 import { ThemeContext, TSupportedThemes } from '../../theme';
 import { DimensionsContext } from '../../dimensions';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 
 export default {
 	title: 'List'

app/containers/LoginServices/LoginServices.stories.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text } from 'react-native';
 
-import { colors } from '../../lib/constants';
+import { colors } from '../../lib/constants/colors';
 import i18n from '../../i18n';
 import sharedStyles from '../../views/Styles';
 import ServicesSeparator from './ServicesSeparator';

app/containers/LoginServices/index.tsx

@@ -3,7 +3,7 @@ import { shallowEqual } from 'react-redux';
 import Animated, { Easing, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
 
 import { IServices } from '../../selectors/login';
-import { useAppSelector } from '../../lib/hooks';
+import { useAppSelector } from '../../lib/hooks/useAppSelector';
 import { IItemService, IServiceList } from './interfaces';
 import { SERVICES_COLLAPSED_HEIGHT, SERVICE_HEIGHT } from './styles';
 import ServicesSeparator from './ServicesSeparator';

app/containers/LoginServices/serviceLogin.ts

@@ -2,10 +2,10 @@ import * as AppleAuthentication from 'expo-apple-authentication';
 import { Linking } from 'react-native';
 import { Base64 } from 'js-base64';
 
-import { Services } from '../../lib/services';
 import Navigation from '../../lib/navigation/appNavigation';
 import { IItemService, IOpenOAuth, IServiceLogin } from './interfaces';
 import { random } from '../../lib/methods/helpers';
+import { loginOAuthOrSso } from '../../lib/services/connect';
 import { events, logEvent } from '../../lib/methods/helpers/log';
 
 type TLoginStyle = 'popup' | 'redirect';
@@ -134,7 +134,7 @@ export const onPressAppleLogin = async () => {
 				AppleAuthentication.AppleAuthenticationScope.EMAIL
 			]
 		});
-		await Services.loginOAuthOrSso({ fullName, email, identityToken });
+		await loginOAuthOrSso({ fullName, email, identityToken });
 	} catch {
 		logEvent(events.ENTER_WITH_APPLE_F);
 	}

app/containers/MessageActions/Header.tsx

@@ -2,11 +2,11 @@ import React from 'react';
 import { FlatList, StyleSheet, Text, View, useWindowDimensions } from 'react-native';
 
 import { TSupportedThemes, useTheme } from '../../theme';
-import { themes } from '../../lib/constants';
+import { themes } from '../../lib/constants/colors';
 import { CustomIcon } from '../CustomIcon';
 import useShortnameToUnicode from '../../lib/hooks/useShortnameToUnicode';
-import { addFrequentlyUsed } from '../../lib/methods';
-import { useFrequentlyUsedEmoji } from '../../lib/hooks';
+import { addFrequentlyUsed } from '../../lib/methods/emojis';
+import { useFrequentlyUsedEmoji } from '../../lib/hooks/useFrequentlyUsedEmoji';
 import CustomEmoji from '../EmojiPicker/CustomEmoji';
 import sharedStyles from '../../views/Styles';
 import { IEmoji, TAnyMessageModel } from '../../definitions';

app/containers/MessageActions/index.tsx

@@ -17,9 +17,18 @@
 import Header, { HEADER_HEIGHT, IHeader } from './Header';
 import events from '../../lib/methods/helpers/log/events';
 import { IApplicationState, IEmoji, ILoggedUser, TAnyMessageModel, TSubscriptionModel } from '../../definitions';
-import { getPermalinkMessage, getQuoteMessageLink } from '../../lib/methods';
+import { getPermalinkMessage } from '../../lib/methods/getPermalinks';
+import { getQuoteMessageLink } from '../../lib/methods/getQuoteMessageLink';
 import { compareServerVersion, getRoomTitle, getUidDirectMessage, hasPermission } from '../../lib/methods/helpers';
-import { Services } from '../../lib/services';
+import {
+	deleteMessage,
+	markAsUnread,
+	toggleStarMessage,
+	togglePinMessage,
+	createDirectMessage,
+	translateMessage,
+	reportMessage
+} from '../../lib/services/restApi';
 
 export interface IMessageActionsProps {
 	room: TSubscriptionModel;
@@ -218,7 +227,7 @@
 				const { rid } = room;
 				try {
 					const db = database.active;
-					const result = await Services.markAsUnread({ messageId });
+					const result = await markAsUnread({ messageId });
 					if (result.success) {
 						const subRecord = await getSubscriptionByRoomId(rid);
 						if (!subRecord) {
@@ -276,7 +285,7 @@
 
 			const handleReplyInDM = async (message: TAnyMessageModel) => {
 				if (message?.u?.username) {
-					const result = await Services.createDirectMessage(message.u.username);
+					const result = await createDirectMessage(message.u.username);
 					if (result.success) {
 						const { room } = result;
 						const params = {
@@ -294,8 +303,7 @@
 			const handleStar = async (messageId: string, starred: boolean) => {
 				logEvent(starred ? events.ROOM_MSG_ACTION_UNSTAR : events.ROOM_MSG_ACTION_STAR);
 				try {
-					await Services.toggleStarMessage(messageId, starred);
-
+					await toggleStarMessage(messageId, starred);
 					EventEmitter.emit(LISTENER, { message: starred ? I18n.t('Message_unstarred') : I18n.t('Message_starred') });
 				} catch (e) {
 					logEvent(events.ROOM_MSG_ACTION_STAR_F);
@@ -306,7 +314,7 @@
 			const handlePin = async (message: TAnyMessageModel) => {
 				logEvent(events.ROOM_MSG_ACTION_PIN);
 				try {
-					await Services.togglePinMessage(message.id, message.pinned as boolean); // TODO: reevaluate `message.pinned` type on IMessage
+					await togglePinMessage(message.id, message.pinned as boolean); // TODO: reevaluate `message.pinned` type on IMessage
 				} catch (e) {
 					logEvent(events.ROOM_MSG_ACTION_PIN_F);
 					log(e);
@@ -345,7 +353,7 @@
 					});
 					const translatedMessage = getMessageTranslation(message, room.autoTranslateLanguage);
 					if (!translatedMessage) {
-						await Services.translateMessage(message.id, room.autoTranslateLanguage);
+						await translateMessage(message.id, room.autoTranslateLanguage);
 					}
 				} catch (e) {
 					log(e);
@@ -355,7 +363,7 @@
 			const handleReport = async (message: TAnyMessageModel) => {
 				logEvent(events.ROOM_MSG_ACTION_REPORT);
 				try {
-					await Services.reportMessage(message.id);
+					await reportMessage(message.id);
 					Alert.alert(I18n.t('Message_Reported'));
 				} catch (e) {
 					logEvent(events.ROOM_MSG_ACTION_REPORT_F);
@@ -370,7 +378,7 @@
 					onPress: async () => {
 						try {
 							logEvent(events.ROOM_MSG_ACTION_DELETE);
-							await Services.deleteMessage(message.id, message.subscription ? message.subscription.id : '');
+							await deleteMessage(message.id, message.subscription ? message.subscription.id : '');
 						} catch (e) {
 							logEvent(events.ROOM_MSG_ACTION_DELETE_F);
 							log(e);
@@ -379,7 +387,7 @@
 				});
 			};
 
 			const getOptions = (message: TAnyMessageModel) => {
 				const options: TActionSheetOptionsItem[] = [];
 				const videoConfBlock = message.t === 'videoconf';
 

app/containers/MessageComposer/components/Buttons/ActionsButton.tsx

@@ -6,7 +6,8 @@ import { TActionSheetOptionsItem, useActionSheet } from '../../../ActionSheet';
 import { MessageInnerContext } from '../../context';
 import I18n from '../../../../i18n';
 import Navigation from '../../../../lib/navigation/appNavigation';
-import { useAppSelector, usePermissions } from '../../../../lib/hooks';
+import { useAppSelector } from '../../../../lib/hooks/useAppSelector';
+import { usePermissions } from '../../../../lib/hooks/usePermissions';
 import { useCanUploadFile, useChooseMedia } from '../../hooks';
 import { useRoomContext } from '../../../../views/RoomView/context';
 

app/containers/MessageComposer/components/Buttons/MicOrSendButton.tsx

@@ -4,7 +4,7 @@ import { Alert } from 'react-native';
 import { PermissionStatus } from 'expo-camera';
 
 import i18n from '../../../../i18n';
-import { useAppSelector } from '../../../../lib/hooks';
+import { useAppSelector } from '../../../../lib/hooks/useAppSelector';
 import { openAppSettings } from '../../../../lib/methods/helpers/openAppSettings';
 import { useTheme } from '../../../../theme';
 import { useRoomContext } from '../../../../views/RoomView/context';

app/containers/MessageComposer/components/ComposerInput.tsx

@@ -4,7 +4,7 @@
 import { useDispatch } from 'react-redux';
 import { RouteProp, useFocusEffect, useRoute } from '@react-navigation/native';
 
-import { textInputDebounceTime } from '../../../lib/constants';
+import { textInputDebounceTime } from '../../../lib/constants/debounceConfig';
 import I18n from '../../../i18n';
 import { IAutocompleteItemProps, IComposerInput, IComposerInputProps, IInputSelection, TSetInput } from '../interfaces';
 import { useAutocompleteParams, useFocused, useMessageComposerApi, useMicOrSend } from '../context';
@@ -31,7 +31,8 @@
 import { generateTriggerId } from '../../../lib/methods/actions';
 import { executeCommandPreview } from '../../../lib/services/restApi';
 import log from '../../../lib/methods/helpers/log';
-import { useAppSelector, usePrevious } from '../../../lib/hooks';
+import { useAppSelector } from '../../../lib/hooks/useAppSelector';
+import { usePrevious } from '../../../lib/hooks/usePrevious';
 import { ChatsStackParamList } from '../../../stacks/types';
 import { loadDraftMessage } from '../../../lib/methods/draftMessage';
 
@@ -84,7 +85,7 @@
 			}
 			if (sharing) return;
 			if (usedCannedResponse) setInput(usedCannedResponse);
 		}, [action, rid, tmid, usedCannedResponse]);
 
 		// Edit/quote
 		useEffect(() => {

app/containers/MessageComposer/components/EmojiSearchbar.tsx

@@ -7,7 +7,7 @@ import { useTheme } from '../../../theme';
 import I18n from '../../../i18n';
 import { CustomIcon } from '../../CustomIcon';
 import { IEmoji } from '../../../definitions';
-import { useFrequentlyUsedEmoji } from '../../../lib/hooks';
+import { useFrequentlyUsedEmoji } from '../../../lib/hooks/useFrequentlyUsedEmoji';
 import { addFrequentlyUsed, searchEmojis } from '../../../lib/methods/emojis';
 import { useDebounce } from '../../../lib/methods/helpers/debounce';
 import sharedStyles from '../../../views/Styles';

app/containers/MessageComposer/components/Quotes/Quote.tsx

@@ -7,7 +7,7 @@ import sharedStyles from '../../../../views/Styles';
 import { useRoomContext } from '../../../../views/RoomView/context';
 import { BaseButton } from '../Buttons';
 import { useMessage } from '../../hooks';
-import { useAppSelector } from '../../../../lib/hooks';
+import { useAppSelector } from '../../../../lib/hooks/useAppSelector';
 import { MarkdownPreview } from '../../../markdown';
 
 export const Quote = ({ messageId }: { messageId: string }) => {

app/containers/MessageComposer/components/SendThreadToChannel.tsx

@@ -10,7 +10,7 @@ import { CustomIcon } from '../../CustomIcon';
 import { useTheme } from '../../../theme';
 import sharedStyles from '../../../views/Styles';
 import I18n from '../../../i18n';
-import { useAppSelector } from '../../../lib/hooks';
+import { useAppSelector } from '../../../lib/hooks/useAppSelector';
 import database from '../../../lib/database';
 import { compareServerVersion } from '../../../lib/methods/helpers';
 import { useEmojiKeyboard } from '../hooks/useEmojiKeyboard';

app/containers/MessageComposer/hooks/useCanUploadFile.ts

@@ -1,6 +1,7 @@
 import { shallowEqual } from 'react-redux';
 
-import { getPermissionsSelector, useAppSelector, usePermissions } from '../../../lib/hooks';
+import { usePermissions, getPermissionsSelector } from '../../../lib/hooks/usePermissions';
+import { useAppSelector } from '../../../lib/hooks/useAppSelector';
 
 export const useCanUploadFile = (rid?: string): boolean => {
 	const [uploadPermissionRedux] = useAppSelector(state => getPermissionsSelector(state, ['mobile-upload-file']), shallowEqual);

app/containers/MessageComposer/hooks/useChooseMedia.ts

@@ -9,7 +9,7 @@ import log from '../../../lib/methods/helpers/log';
 import { getSubscriptionByRoomId } from '../../../lib/database/services/Subscription';
 import { getThreadById } from '../../../lib/database/services/Thread';
 import Navigation from '../../../lib/navigation/appNavigation';
-import { useAppSelector } from '../../../lib/hooks';
+import { useAppSelector } from '../../../lib/hooks/useAppSelector';
 import { useRoomContext } from '../../../views/RoomView/context';
 import ImagePicker, { ImageOrVideo } from '../../../lib/methods/helpers/ImagePicker/ImagePicker';