Nikatlas 5 년 전
부모
커밋
d836983c0d
34개의 변경된 파일124개의 추가작업 그리고 32개의 파일을 삭제
  1. 32 8
      App.js
  2. BIN
      assets/fonts/SFCompactDisplay-Black_0.otf
  3. BIN
      assets/fonts/SFCompactDisplay-Bold_0.otf
  4. BIN
      assets/fonts/SFCompactDisplay-Heavy_0.otf
  5. BIN
      assets/fonts/SFCompactDisplay-Light_0.otf
  6. BIN
      assets/fonts/SFCompactDisplay-Medium_0.otf
  7. BIN
      assets/fonts/SFCompactDisplay-Regular_0.otf
  8. BIN
      assets/fonts/SFCompactDisplay-Semibold_0.otf
  9. BIN
      assets/fonts/SFCompactDisplay-Thin_0.otf
  10. BIN
      assets/fonts/SFCompactDisplay-Ultralight_0.otf
  11. 0 0
      dist/modules/Button/index.js
  12. 1 0
      dist/modules/Button/styles/arial.js
  13. 1 0
      dist/modules/Button/styles/black.js
  14. 1 0
      dist/modules/Button/styles/deepblue.js
  15. 0 1
      dist/modules/Button/styles/defaultStyle.js
  16. 1 0
      dist/modules/Button/styles/gray.js
  17. 1 1
      dist/modules/Button/styles/index.js
  18. 1 0
      dist/modules/Button/styles/lightgreen.js
  19. 1 0
      dist/modules/Button/styles/lightred.js
  20. 1 0
      dist/modules/Button/styles/white.js
  21. 0 0
      dist/modules/Form/index.js
  22. 0 0
      dist/modules/Image/index.js
  23. 8 7
      modules/Button/index.js
  24. 8 0
      modules/Button/styles/arial.js
  25. 8 0
      modules/Button/styles/black.js
  26. 8 0
      modules/Button/styles/deepblue.js
  27. 0 8
      modules/Button/styles/defaultStyle.js
  28. 8 0
      modules/Button/styles/gray.js
  29. 17 3
      modules/Button/styles/index.js
  30. 8 0
      modules/Button/styles/lightgreen.js
  31. 8 0
      modules/Button/styles/lightred.js
  32. 8 0
      modules/Button/styles/white.js
  33. 1 2
      modules/Form/index.js
  34. 2 2
      modules/Image/index.js

+ 32 - 8
App.js

@@ -14,7 +14,7 @@ import RootComp from './modules/RootComp';
 import ImageComp from './modules/Image';
 import ButtonComp from './modules/Button';
 import Environment from './environment';
-
+import * as Font from 'expo-font';
 import Module from './modules';
 console.log("@@@@@@@@@@@@@@")
 console.log(Module)
@@ -150,14 +150,38 @@ CS.import(Environment);
 
 
 const useForceUpdate = (text) => useState(text)[1];
-export default function App() {
-  let [text, setText] = useState('');
+export default class App extends React.Component {
+  constructor(){
+      super()
+
+  }
+
+  /*let [text, setText] = useState('');
   let forceUpdate = useForceUpdate(text);
-  // let currentView =  NCS.render();
-  let currentView2 = CS.render();
-  // console.log(currentView2)
-  return <Div>{currentView2}</Div>;
-}
+  */
+  componentDidMount() {
+    Font.loadAsync({
+      'black': require('./assets/fonts/SFCompactDisplay-Black_0.otf'),
+      'bold': require('./assets/fonts/SFCompactDisplay-Bold_0.otf'),
+      'heavy': require('./assets/fonts/SFCompactDisplay-Heavy_0.otf'),
+      'light': require('./assets/fonts/SFCompactDisplay-Light_0.otf'),
+      'medium': require('./assets/fonts/SFCompactDisplay-Medium_0.otf'),
+      'regular': require('./assets/fonts/SFCompactDisplay-Regular_0.otf'),
+      'semibold': require('./assets/fonts/SFCompactDisplay-Semibold_0.otf'),
+      'thin': require('./assets/fonts/SFCompactDisplay-Thin_0.otf'),
+      'ultralight': require('./assets/fonts/SFCompactDisplay-Ultralight_0.otf')
+
+    });
+  }
+  render(){
+  let currentView2 = CS.render();  
+  return (
+    <Div>
+      <Div>{CS.ModuleSystem.createElementCtor(ButtonComp)}</Div>
+      <Div>{currentView2}</Div>
+    </Div>)
+    }
+  }
 
 
 const ImageStyle = StyleSheet.create({

BIN
assets/fonts/SFCompactDisplay-Black_0.otf


BIN
assets/fonts/SFCompactDisplay-Bold_0.otf


BIN
assets/fonts/SFCompactDisplay-Heavy_0.otf


BIN
assets/fonts/SFCompactDisplay-Light_0.otf


BIN
assets/fonts/SFCompactDisplay-Medium_0.otf


BIN
assets/fonts/SFCompactDisplay-Regular_0.otf


BIN
assets/fonts/SFCompactDisplay-Semibold_0.otf


BIN
assets/fonts/SFCompactDisplay-Thin_0.otf


BIN
assets/fonts/SFCompactDisplay-Ultralight_0.otf


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Button/index.js


+ 1 - 0
dist/modules/Button/styles/arial.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(255, 255, 255, 1)',width:'100%',height:'48',borderRadius:0,FontSize:18,backgroundColor:'rgba(73, 156, 219, 1)'};exports["default"]=_default;

+ 1 - 0
dist/modules/Button/styles/black.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(255, 255, 255, 1)',width:'150',height:'48',borderRadius:0,FontSize:18,backgroundColor:'rgba(52, 52, 52, 1)'};exports["default"]=_default;

+ 1 - 0
dist/modules/Button/styles/deepblue.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(255, 255, 255, 1)',width:'150',height:'48',borderRadius:24,FontSize:18,backgroundColor:'rgba(96, 96, 248, 1)'};exports["default"]=_default;

+ 0 - 1
dist/modules/Button/styles/defaultStyle.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'white',width:'100',height:'50',borderRadius:14,FontSize:14,backgroundColor:'red'};exports["default"]=_default;

+ 1 - 0
dist/modules/Button/styles/gray.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(35, 35, 35, 1)',width:'258',height:'48',borderRadius:5,FontSize:18,backgroundColor:'rgba(233, 233, 233, 1)'};exports["default"]=_default;

+ 1 - 1
dist/modules/Button/styles/index.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _defaultStyle=_interopRequireDefault(require("./defaultStyle"));var _fake=_interopRequireDefault(require("./fake"));var _default={defaultStyle:_defaultStyle["default"],fake:_fake["default"]};exports["default"]=_default;
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _black=_interopRequireDefault(require("./black"));var _fake=_interopRequireDefault(require("./fake"));var _arial=_interopRequireDefault(require("./arial"));var _deepblue=_interopRequireDefault(require("./deepblue"));var _lightgreen=_interopRequireDefault(require("./lightgreen"));var _lightred=_interopRequireDefault(require("./lightred"));var _white=_interopRequireDefault(require("./white"));var _gray=_interopRequireDefault(require("./gray"));var _default={blackStyle:_black["default"],fake:_fake["default"],arial:_arial["default"],deepblue:_deepblue["default"],lightgreen:_lightgreen["default"],lightred:_lightred["default"],white:_white["default"],gray:_gray["default"]};exports["default"]=_default;

+ 1 - 0
dist/modules/Button/styles/lightgreen.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(35, 35, 35, 1)',width:'150',height:'48',borderRadius:24,FontSize:18,backgroundColor:'rgba(97, 255, 171, 1)'};exports["default"]=_default;

+ 1 - 0
dist/modules/Button/styles/lightred.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(255, 255, 255, 1)',width:'150',height:'48',borderRadius:0,FontSize:18,backgroundColor:'rgba(255, 119, 119, 1)'};exports["default"]=_default;

+ 1 - 0
dist/modules/Button/styles/white.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _default={textColor:'rgba(255, 119, 119, 1)',width:'258',height:'48',borderRadius:5,FontSize:18,backgroundColor:'rgba(255, 255, 255, 1)'};exports["default"]=_default;

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Form/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/modules/Image/index.js


+ 8 - 7
modules/Button/index.js

@@ -5,8 +5,7 @@ import Types from '../../lib/Types';
 import {Button} from 'react-native-elements'
 import Styles from './styles';
 
-console.log("WHATTTTTTTTTTTTTTTTT")
-console.log(Styles)
+
 
 export default class ButtonComp extends Module {
 	constructor(props) {
@@ -23,6 +22,7 @@ export default class ButtonComp extends Module {
 			height,
 			borderRadius,
 			FontSize,
+			fontFamily,
 			backgroundColor
 		} = this.props;
 		return 	(
@@ -30,7 +30,7 @@ export default class ButtonComp extends Module {
 				  onPress = {this.props.press || this.press}
 				  title={title || "submit"}
 				  accessibilityLabel="Learn more about this purple button"
-				  titleStyle = {{color:textColor,fontSize:FontSize}}
+				  titleStyle = {{color:textColor,fontSize:FontSize,fontFamily:fontFamily}}
 				  buttonStyle = {{backgroundColor:backgroundColor,width:width,height:height,borderRadius:borderRadius}}
 				/>
 			)
@@ -40,10 +40,11 @@ export default class ButtonComp extends Module {
 
 ButtonComp.Inputs = {
 	title: new Types.Text().require().default('Submit'),
-	textColor: new Types.Text().require().color().default('black'),
-	backgroundColor: new Types.Text().require().color().default('rgba(47, 150, 145, 1)'),
-	borderRadius: new Types.Integer().require(),
-	FontSize: new Types.Integer().require(),
+	fontFamily :  new Types.Text().require().default('Light'),
+	textColor: new Types.Text().require().color().default('rgba(255, 255, 255, 1)'),
+	backgroundColor: new Types.Text().require().color().default('rgba(73, 156, 219, 1)'),
+	borderRadius: new Types.Integer().require().default(0),
+	FontSize: new Types.Integer().require().default(18),
 	width: new Types.Integer().require(),
 	height: new Types.Integer().require()
 }

+ 8 - 0
modules/Button/styles/arial.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(255, 255, 255, 1)',
+	width:'100%',
+	height:'48',
+	borderRadius:0,
+	FontSize:18,
+	backgroundColor:'rgba(73, 156, 219, 1)'
+}

+ 8 - 0
modules/Button/styles/black.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(255, 255, 255, 1)',
+	width:'150',
+	height:'48',
+	borderRadius:0,
+	FontSize:18,
+	backgroundColor:'rgba(52, 52, 52, 1)'
+}

+ 8 - 0
modules/Button/styles/deepblue.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(255, 255, 255, 1)',
+	width:'150',
+	height:'48',
+	borderRadius:24,
+	FontSize:18,
+	backgroundColor:'rgba(96, 96, 248, 1)'
+}

+ 0 - 8
modules/Button/styles/defaultStyle.js

@@ -1,8 +0,0 @@
-export default {
-	textColor:'white',
-	width:'100',
-	height:'50',
-	borderRadius:14,
-	FontSize:14,
-	backgroundColor:'red'
-}

+ 8 - 0
modules/Button/styles/gray.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(35, 35, 35, 1)',
+	width:'258',
+	height:'48',
+	borderRadius:5,
+	FontSize:18,
+	backgroundColor:'rgba(233, 233, 233, 1)'
+}

+ 17 - 3
modules/Button/styles/index.js

@@ -1,7 +1,21 @@
-import defaultStyle from './defaultStyle';
+import blackStyle from './black';
 import fake from './fake';
+import arial from './arial';
+import deepblue from './deepblue';
+import lightgreen from './lightgreen';
+import lightred from './lightred';
+import white from './white';
+import gray from './gray'
+
 
 export default {
-defaultStyle,
-fake
+	blackStyle,
+	fake,
+	arial,
+	deepblue,
+	lightgreen,
+	lightred,
+	white,
+	gray
+	
 }

+ 8 - 0
modules/Button/styles/lightgreen.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(35, 35, 35, 1)',
+	width:'150',
+	height:'48',
+	borderRadius:24,
+	FontSize:18,
+	backgroundColor:'rgba(97, 255, 171, 1)'
+}

+ 8 - 0
modules/Button/styles/lightred.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(255, 255, 255, 1)',
+	width:'150',
+	height:'48',
+	borderRadius:0,
+	FontSize:18,
+	backgroundColor:'rgba(255, 119, 119, 1)'
+}

+ 8 - 0
modules/Button/styles/white.js

@@ -0,0 +1,8 @@
+export default {
+	textColor:'rgba(255, 119, 119, 1)',
+	width:'258',
+	height:'48',
+	borderRadius:5,
+	FontSize:18,
+	backgroundColor:'rgba(255, 255, 255, 1)'
+}

+ 1 - 2
modules/Form/index.js

@@ -38,8 +38,7 @@ export default class FormComp extends Module {
 		//Init
 		
 		if(!inputsMargin) inputsMargin = 7
-		console.log("@@@@@")
-		console.log(this.props)
+	
 
 		let Inputs = (inputs || []).map((item,indx) => {
 			let state = {}

+ 2 - 2
modules/Image/index.js

@@ -31,7 +31,7 @@ export default class ImageComp extends Module {
 
 ImageComp.Inputs = {
 	source: new Types.Text(),
-	width: new Types.Integer().require().default(100),
-	height: new Types.Integer().require().default(100),
+	width: new Types.Integer().require().default(70),
+	height: new Types.Integer().require().default(70),
 	resizeMode: new Types.Text().require().default('cover')
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.