Skip to content

Commit

Permalink
refactor: Update vector icon imports to use Expo icons
Browse files Browse the repository at this point in the history
  • Loading branch information
himanshu8443 committed May 29, 2024
1 parent abfbf1d commit 37217d6
Show file tree
Hide file tree
Showing 12 changed files with 4,046 additions and 1,205 deletions.
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"
apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")
// apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")


/**
Expand Down Expand Up @@ -86,8 +86,8 @@ android {
applicationId "com.vega"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 15
versionName "1.3.3"
versionCode 17
versionName "1.3.5"
}
signingConfigs {
release {
Expand Down
16 changes: 3 additions & 13 deletions metro.config.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');

const {getDefaultConfig} = require('expo/metro-config');
const {mergeConfig} = require('@react-native/metro-config');
/**
* Metro configuration
* https://reactnative.dev/docs/metro
*
* @type {import('metro-config').MetroConfig}
*/
const config = {
transformer: {
assetPlugins: ['expo-asset/tools/hashAssetFiles'],
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: false,
},
}),
},
};
const config = {};

module.exports = mergeConfig(getDefaultConfig(__dirname), config);
3,974 changes: 3,595 additions & 379 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vega",
"version": "1.3.3",
"version": "1.3.5",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand All @@ -22,21 +22,20 @@
"moti": "^0.28.1",
"nativewind": "^2.0.11",
"react": "18.2.0",
"react-native": "0.74.0",
"react-native": "0.74.1",
"react-native-element-dropdown": "^2.12.0",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.16.0",
"react-native-gesture-handler": "~2.16.1",
"react-native-haptic-feedback": "^2.2.0",
"react-native-linear-gradient": "^2.8.3",
"react-native-media-console": "^2.2.0",
"react-native-mmkv-storage": "^0.9.1",
"react-native-orientation-locker": "^1.7.0",
"react-native-permissions": "^4.1.5",
"react-native-reanimated": "^3.9.0",
"react-native-reanimated": "~3.10.1",
"react-native-safe-area-context": "^4.10.1",
"react-native-screens": "^3.31.1",
"react-native-svg": "14.1.0",
"react-native-vector-icons": "^10.0.3",
"react-native-svg": "15.2.0",
"react-native-video": "^6.0.0-alpha.11",
"zustand": "^4.5.2"
},
Expand All @@ -57,7 +56,7 @@
"prettier": "2.8.8",
"react-test-renderer": "18.2.0",
"tailwindcss": "^3.3.2",
"typescript": "5.0.4"
"typescript": "~5.3.3"
},
"engines": {
"node": ">=18"
Expand Down
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import ScrollList from './screens/ScrollList';
import {NavigationContainer} from '@react-navigation/native';
import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
import {createNativeStackNavigator} from '@react-navigation/native-stack';
import Ionicons from 'react-native-vector-icons/Ionicons';
import Entypo from 'react-native-vector-icons/Entypo';
import Ionicons from '@expo/vector-icons/Ionicons';
import Entypo from '@expo/vector-icons/Entypo';
import 'react-native-reanimated';
import 'react-native-gesture-handler';

Expand Down
4 changes: 2 additions & 2 deletions src/components/Downloader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
completeHandler,
checkForExistingDownloads,
} from '@kesha-antonov/react-native-background-downloader';
import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
import Octicons from 'react-native-vector-icons/Octicons';
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
import Octicons from '@expo/vector-icons/Octicons';
import {getStream, Stream} from '../lib/getStream';
import {MotiView} from 'moti';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React, {useEffect, useState} from 'react';
import {Text} from 'react-native';
import {TouchableOpacity} from 'react-native';
import LinearGradient from 'react-native-linear-gradient';
import FontAwesome6 from 'react-native-vector-icons/FontAwesome6';
import FontAwesome6 from '@expo/vector-icons/FontAwesome';
import {useNavigation} from '@react-navigation/native';
import {NativeStackNavigationProp} from '@react-navigation/native-stack';
import {HomeStackParamList} from '../App';
Expand Down
4 changes: 2 additions & 2 deletions src/components/SeasonList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {useEffect, useState} from 'react';
import {Link} from '../lib/getInfo';
import {NativeStackNavigationProp} from '@react-navigation/native-stack';
import {useNavigation} from '@react-navigation/native';
import Ionicons from 'react-native-vector-icons/Ionicons';
import Ionicons from '@expo/vector-icons/Ionicons';
import {EpisodeLink, getEpisodeLinks} from '../lib/getEpisodesLink';
import {MotiView} from 'moti';
import {Skeleton} from 'moti/skeleton';
Expand All @@ -12,7 +12,7 @@ import Downloader from './Downloader';
import {MMKV, MmmkvCache} from '../lib/Mmkv';
import {Linking} from 'react-native';
import {getStream} from '../lib/getStream';
import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
import MaterialCommunityIcons from '@expo/vector-icons/MaterialCommunityIcons';
import {ifExists} from '../lib/file/ifExists';
import {Dropdown} from 'react-native-element-dropdown';
import * as IntentLauncher from 'expo-intent-launcher';
Expand Down
2 changes: 1 addition & 1 deletion src/screens/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import {useNavigation} from '@react-navigation/native';
import {NativeStackNavigationProp} from '@react-navigation/native-stack';
import {SearchStackParamList} from '../App';
import Ionicons from 'react-native-vector-icons/Ionicons';
import Ionicons from '@expo/vector-icons/Ionicons';
import {TextInput} from 'react-native';
import {genresList} from '../lib/constants';
import {TouchableOpacity} from 'react-native';
Expand Down
2 changes: 1 addition & 1 deletion src/screens/home/Info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import SeasonList from '../../components/SeasonList';
import {OrientationLocker, PORTRAIT} from 'react-native-orientation-locker';
import {Skeleton} from 'moti/skeleton';
import {MotiSafeAreaView} from 'moti';
import Ionicons from 'react-native-vector-icons/Ionicons';
import Ionicons from '@expo/vector-icons/Ionicons';
import {MMKV, MmmkvCache} from '../../lib/Mmkv';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
import useContentStore from '../../lib/zustand/contentStore';
Expand Down
2 changes: 1 addition & 1 deletion src/screens/home/Player.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {getStream, Stream} from '../../lib/getStream';
import VideoPlayer from 'react-native-media-console';
import {useNavigation} from '@react-navigation/native';
import {ifExists} from '../../lib/file/ifExists';
import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
import {
VideoRef,
AudioTrack,
Expand Down
Loading

0 comments on commit 37217d6

Please sign in to comment.