@moamc/rn-cli 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moamc/rn-cli",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Enterprise-grade Code Generation CLI for React Native Applications",
   "main": "index.js",
   "bin": {

package/templates/screenTemplate.js

@@ -53,8 +53,40 @@ const generateEnhancedTemplate = (screenName, featureName, hasForm = false, form
   const { headerImportPath, hasHeadersFolder } = detectProjectStructure();
   const isDistributorStyle = !hasHeadersFolder;
   
+  let bottomSheetCode = '';
+  if (hasDropdown) {
+    bottomSheetCode = `
+\t\t\t<BottomSheet
+\t\t\t\tmodalVisible={!!openBottomNote}
+\t\t\t\tsetIsModalVisible={() => setOpenBottomNote(null)}
+\t\t\t>
+\t\t\t\t<DropDownReview
+\t\t\t\t\tFundBuyType={/* Add options */[]}
+\t\t\t\t\tselectValue={formData[bottomSheetType]}
+\t\t\t\t\tonSelectValue={e => {
+\t\t\t\t\t\thandleChange(e, bottomSheetType);
+\t\t\t\t\t\tsetOpenBottomNote(null);
+\t\t\t\t\t}}
+\t\t\t\t\tlabel={bottomSheetType}
+\t\t\t\t/>
+\t\t\t</BottomSheet>`;
+  }
+
+  let datePickerCode = '';
+  if (hasDate) {
+    datePickerCode = `
+\t\t\t<DatePickerCustom
+\t\t\t\tmodalTransparent={true}
+\t\t\t\tonDateChange={data => {
+\t\t\t\t\thandleChange(moment(data).format('DD MMM YYYY'), 'dateField');
+\t\t\t\t}}
+\t\t\t\tsetModalVisible={() => setOpenCalendar(!openCalendar)}
+\t\t\t\tmodalVisible={openCalendar}
+\t\t\t\tminimumDate={new Date(1920, 0, 1)}
+\t\t\t/>`;
+  }
+  
   if (isDistributorStyle) {
-    // Distributor app style with proper imports and styling
     return `import React, { useState } from 'react';
 import { Text, ScrollView, View, StyleSheet } from 'react-native';
 import { colorConstant, fonts, utilities } from '../../../assets/styles';
@@ -94,30 +126,7 @@ ${generateFormFields(formFields)}
 \t\t\t</Container>
 \t\t\t<Footer isBottom={true}>
 \t\t\t\t<FormButton title="Submit" onPress={handleSubmit} />
-\t\t\t</Footer>${hasDropdown ? \`
-\t\t\t<BottomSheet
-\t\t\t\tmodalVisible={!!openBottomNote}
-\t\t\t\tsetIsModalVisible={() => setOpenBottomNote(null)}
-\t\t\t>
-\t\t\t\t<DropDownReview
-\t\t\t\t\tFundBuyType={/* Add options */[]}
-\t\t\t\t\tselectValue={formData[bottomSheetType]}
-\t\t\t\t\tonSelectValue={e => {
-\t\t\t\t\t\thandleChange(e, bottomSheetType);
-\t\t\t\t\t\tsetOpenBottomNote(null);
-\t\t\t\t\t}}
-\t\t\t\t\tlabel={bottomSheetType}
-\t\t\t\t/>
-\t\t\t</BottomSheet>\` : ''}${hasDate ? \`
-\t\t\t<DatePickerCustom
-\t\t\t\tmodalTransparent={true}
-\t\t\t\tonDateChange={data => {
-\t\t\t\t\thandleChange(moment(data).format('DD MMM YYYY'), 'dateField');
-\t\t\t\t}}
-\t\t\t\tsetModalVisible={() => setOpenCalendar(!openCalendar)}
-\t\t\t\tmodalVisible={openCalendar}
-\t\t\t\tminimumDate={new Date(1920, 0, 1)}
-\t\t\t/>\` : ''}
+\t\t\t</Footer>${bottomSheetCode}${datePickerCode}
 \t\t</>
 \t);
 };
@@ -128,12 +137,30 @@ const styles = StyleSheet.create({
 \t\tcolor: colorConstant.moBlack,
 \t\tmarginVertical: 20,
 \t},
+\theadContainer: {
+\t\tflexDirection: 'row',
+\t\tjustifyContent: 'space-between',
+\t\tmarginTop: 16,
+\t},
+\theadWidth: {
+\t\twidth: '48%',
+\t},
+\tfloatContentStyle: {
+\t\t...fonts.fontWSR16,
+\t\tcolor: colorConstant.amcBlack,
+\t},
+\tfloatStyle: {},
+\tfloatLabelStyle: {
+\t\tcolor: colorConstant?.amcMediumGrey,
+\t\tbackgroundColor: colorConstant?.amcWhite,
+\t\t...fonts.fontWSM12,
+\t\tlineHeight: 16,
+\t},
 });
 
 export default ${componentName};
 `;
   } else {
-    // Investor app style - original template
     return `import React, { useState } from 'react';
 import { Text, ScrollView, View } from 'react-native';
 import { TouchableRipple } from 'react-native-paper';
@@ -173,30 +200,7 @@ ${generateFormFields(formFields)}
 \t\t\t</Container>
 \t\t\t<Footer style={styles.footerDesign}>
 \t\t\t\t<FormButton title="Submit" onPress={handleSubmit} />
-\t\t\t</Footer>${hasDropdown ? \`
-\t\t\t<BottomSheet
-\t\t\t\tmodalVisible={!!openBottomNote}
-\t\t\t\tsetIsModalVisible={() => setOpenBottomNote(null)}
-\t\t\t>
-\t\t\t\t<DropDownReview
-\t\t\t\t\tFundBuyType={/* Add options */[]}
-\t\t\t\t\tselectValue={formData[bottomSheetType]}
-\t\t\t\t\tonSelectValue={e => {
-\t\t\t\t\t\thandleChange(e, bottomSheetType);
-\t\t\t\t\t\tsetOpenBottomNote(null);
-\t\t\t\t\t}}
-\t\t\t\t\tlabel={bottomSheetType}
-\t\t\t\t/>
-\t\t\t</BottomSheet>\` : ''}${hasDate ? \`
-\t\t\t<DatePickerCustom
-\t\t\t\tmodalTransparent={true}
-\t\t\t\tonDateChange={data => {
-\t\t\t\t\thandleChange(moment(data).format('DD MMM YYYY'), 'dateField');
-\t\t\t\t}}
-\t\t\t\tsetModalVisible={() => setOpenCalendar(!openCalendar)}
-\t\t\t\tmodalVisible={openCalendar}
-\t\t\t\tminimumDate={new Date(1920, 0, 1)}
-\t\t\t/>\` : ''}
+\t\t\t</Footer>${bottomSheetCode}${datePickerCode}
 \t\t</>
 \t);
 };
@@ -207,18 +211,15 @@ export default ${componentName};
 };
 
 const generateScreenTemplate = (screenName, featureName, hasForm = false, formFields = []) => {
-  // Use enhanced template for form screens
   if (hasForm) {
     return generateEnhancedTemplate(screenName, featureName, hasForm, formFields);
   }
 
-  // Simple screen template
   const componentName = screenName;
   const { headerImportPath, hasHeadersFolder } = detectProjectStructure();
   const isDistributorStyle = !hasHeadersFolder;
   
   if (isDistributorStyle) {
-    // Distributor app style - with Header, Footer, and FormButton
     return `import React from 'react';
 import { View, Text, ScrollView, StyleSheet } from 'react-native';
 import { colorConstant, fonts, utilities } from '../../../assets/styles';
@@ -270,7 +271,6 @@ const styles = StyleSheet.create({
 export default ${componentName};
 `;
   } else {
-    // Investor app style - original template
     return `import React from 'react';
 import { View, Text, ScrollView } from 'react-native';
 import { Container, Loader } from '../../../components/common';