chore: modify option

MentorMate · Apr 2, 2024 · 8f2b75b · 8f2b75b
1 parent 4999f08
commit 8f2b75b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ In case you want to add react-navigation example code in the project:
 - `With set-up and example screens` option - when selected the App will automatically include an example BottomTabNavigator
   (`src/common/navigation/bottomTab/BottomTabNavigator.tsx`)
 
-#### `Icons`
+#### `Icon Toolkit`
 
 - `Lucide Icons` (Optional) Provides rich set of well styled icons.
 

diff --git a/src/commands/start-project.ts b/src/commands/start-project.ts
@@ -1,5 +1,5 @@
 import {
-  IconChoice,
+  IconToolkitChoice,
   SelectionPrompts,
   StorybookChoice,
   StyleLibraryChoice,
@@ -144,12 +144,6 @@ const startProject = async (toolbox: RnBootstrapToolbox) => {
     }
   }
 
-  if (selectedOptions.icons === IconChoice.withIcons && 
-    (selectedOptions.styleLibrary === StyleLibraryChoice.StyleSheet || selectedOptions.styleLibrary === StyleLibraryChoice.StyledComponents)) {
-    print.highlight('Installing additional dependencies...');
-    await spawnProgress('yarn add react-native-svg@14.0.0');
-  }
-
   IS_MAC && (await yarn.run('pod-install'));
 
   print.success(print.checkmark + ' Setup is done.');

diff --git a/src/tools/dependency-versions.ts b/src/tools/dependency-versions.ts
@@ -15,20 +15,21 @@ export const styleDevDeps = ['@types/styled-components-react-native@^5.2.5'];
 export const gluestackUIDeps = [
   '@gluestack-ui/themed',
   '@gluestack-style/react',
-  'react-native-svg@14.0.0',
+  'react-native-svg@^15.1.0',
   '@gluestack-ui/config@latest'
 ];
 
 export const glueStackUICoreDeps = [
   '@gluestack-ui/themed',
   '@gluestack-style/react',
-  'react-native-svg@14.0.0'
+  'react-native-svg@^15.1.0'
 ];
 
 export const storybookDevDeps = ['cross-env'];
 
-export const iconsDevDeps = [
-  'lucide-react-native'
+export const lucideIconDeps = [
+  'lucide-react-native',
+  'react-native-svg@^15.1.0'
 ]
 
 export const reactotronDevDeps = [

diff --git a/src/tools/options.ts b/src/tools/options.ts
@@ -10,7 +10,7 @@ import {
   glueStackUICoreDeps,
   storybookDevDeps,
   reactotronDevDeps,
-  iconsDevDeps
+  lucideIconDeps
 } from './dependency-versions';
 
 export enum StyleLibraryChoice {
@@ -27,10 +27,9 @@ export enum StorybookChoice {
   NoStorybook = 'No Storybook' 
 }
 
-export enum IconChoice {
-  withIcons = 'Yes',
-  withoutIcons = 'No',
-
+export enum IconToolkitChoice {
+  LucideIcons = 'Lucide Icons',
+  noIconToolkit = 'No Icon Toolkit',
 }
 
 export enum StateLibraryChoice {
@@ -58,15 +57,15 @@ export const SelectionToDependencyNameMap = {
   [StateLibraryChoice.ReduxToolkit]: reduxDeps,
   [StateLibraryChoice.ReduxToolkitWithQuery]: reduxDeps,
   [ReactNavigationExampleChoice.WithReactNavigationExample]: navigationDeps,
-  [ReactNavigationExampleChoice.WithoutReactNavigationExample]: navigationDeps
+  [ReactNavigationExampleChoice.WithoutReactNavigationExample]: navigationDeps,
+  [IconToolkitChoice.LucideIcons]: lucideIconDeps
 };
 
 export const SelectionToDevDependencyNameMap = {
   [StyleLibraryChoice.StyledComponents]: styleDevDeps,
   [StorybookChoice.Storybook]: storybookDevDeps,
   [StorybookChoice.StorybookWithStories]: storybookDevDeps,
-  [ReactotronChoice.withReactotron]: reactotronDevDeps,
-  [IconChoice.withIcons]: iconsDevDeps,
+  [ReactotronChoice.withReactotron]: reactotronDevDeps
 };
 
 // Maps selection to handlebars-friendly object for easier conditionals within templates.
@@ -76,7 +75,7 @@ export const SelectionToTemplateParamsMap: Partial<Record<
   | StateLibraryChoice
   | ReactotronChoice
   | ReactNavigationExampleChoice
-  | IconChoice,
+  | IconToolkitChoice,
   Partial<TemplateParams>
 >> = {
   [StyleLibraryChoice.GluestackUICore]: {
@@ -119,8 +118,8 @@ export const SelectionToTemplateParamsMap: Partial<Record<
   [ReactNavigationExampleChoice.WithReactNavigationExample]: {
     hasReactNavigationExample: true
   },
-  [IconChoice.withIcons]: {
-    hasIcons: true,
+  [IconToolkitChoice.LucideIcons]: {
+    hasIconToolkit: true,
   },
 
 };
@@ -180,7 +179,7 @@ export const DefaultTemplateParams: TemplateParams = {
   hasRTKQuery: false,
   hasReactotron: false,
   hasReactNavigationExample: false,
-  hasIcons: false
+  hasIconToolkit: false
 };
 
 const PromptSelectionOptions = {
@@ -204,9 +203,9 @@ const PromptSelectionOptions = {
     choices: Object.values(ReactNavigationExampleChoice),
     message: 'React Navigation:'
   },
-  icons: {
-    choices: Object.values(IconChoice),
-    message: 'Lucide icons:'
+  iconToolkit: {
+    choices: Object.values(IconToolkitChoice),
+    message: 'Icon Toolkit:'
   }
 };
 

diff --git a/src/types/BaseProjectTemplateParams.ts b/src/types/BaseProjectTemplateParams.ts
@@ -4,7 +4,7 @@ export interface TemplateParams {
   hasGluestackUIDefaultTheme: boolean;
   hasGluestackUIEjected: boolean;
   hasAnyGluestackUIOption: boolean;
-  hasIcons: boolean;
+  hasIconToolkit: boolean;
   hasStorybook: boolean;
   hasStorybookExample: boolean;
   hasReduxToolkit: boolean;

diff --git a/src/types/StartProjectOptionSelectionResult.ts b/src/types/StartProjectOptionSelectionResult.ts
@@ -1,5 +1,5 @@
 import {
-  IconChoice,
+  IconToolkitChoice,
   ReactNavigationExampleChoice,
   StateLibraryChoice,
   StorybookChoice,
@@ -11,5 +11,5 @@ export interface StartProjectOptionSelectionResult {
   storybook: StorybookChoice;
   stateManagementLibrary: StateLibraryChoice;
   reactNavigationExample: ReactNavigationExampleChoice;
-  icons: IconChoice;
+  iconToolkit: IconToolkitChoice;
 }