Prechádzať zdrojové kódy

설정 페이지 들 추가.

자유해결사 6 rokov pred
rodič
commit
4383ebbde9

+ 2 - 2
App.js

@@ -24,7 +24,7 @@ import KeepAwake from 'react-native-keep-awake';
 import i18n from  "i18n-js";
 import KO from "./src/i18n/ko"
 i18n.translations["ko"] = KO;
-i18n.locale = "ko";
+i18n.locale = "ko"; 
 
 //모듈 임포트
 import * as RN from 'react-native'
@@ -38,11 +38,11 @@ C.addComp(RN);
 C.addComp(EL, "EL");
 C.addComp({Header : H}, "Comp" );
 C.addComp({SafeAreaView:SafeAreaView}, "Comp");
+C.addComp(RN.Picker.Item, "PickerItem")
 
 const App = () => {
  
   useEffect(() => {
-        console.log(">>>>>>>>>>>>>>>>>>:")
         __DEV__ && KeepAwake.activate();
    }, []);
 

+ 8 - 0
src/i18n/ko.js

@@ -31,6 +31,14 @@ export default {
     },
     AccountInfo : {
         "UpdateyourAccountDetails" : "상세계정정보를 업데이트 하실수 있습니다."
+    },
+    ServiceAlarm : {
+        NewContentsUpload : "신규콘텐츠 등록",
+        "TodaysWords" : "오늘의 명언",
+        TimeSchedule : "타임스케줄",
+    },
+    ChangeLanguage : {
+        ko : "대한민국"
     }
 
 

+ 1 - 1
src/navigation/SwitchNavigator.js

@@ -44,7 +44,7 @@ const SwitchNavigator = createStackNavigator(
     
   },
   {
-    initialRouteName: "ServiceAlarm", 
+    initialRouteName: "Login", 
 
     mode: 'modal',
     headerMode: 'none',

+ 2 - 2
src/pages/_10_Setting.js

@@ -27,13 +27,13 @@ export default (props)=>{
                 centerComponent={<C.Text cls="f3 fw-b ">{i18n.t(`Setting.title`)}</C.Text>}
                 rightComponent={
                     <C.View cls="flx-row jc-sa w20 ">
-                        <C.EL.Icon  name="ios-arrow-back" type="ionicon"/> 
+                        <C.EL.Icon  name="ios-arrow-back" type="ionicon" onPress={()=>props.navigation.goBack()}/> 
                         {/* title="P" ccls="w10" btncls="br19.9"/> */}
                     </C.View>
                 }
             >
             </C.EL.Header>
-            <C.View cls="w100% ai-c flx0.9 ">       
+            <C.View cls="w100% ai-c flx0.9">       
                 <C.ScrollView cccls="ai-c h100 w100" flx="flx1  bgc-test">  
                     {
                         Object.keys(items).map((key , idx )=>{

+ 1 - 1
src/pages/_2_AcceptTerms.js

@@ -20,7 +20,7 @@ export default (props)=>{
 
     return (
         <C.View cls="flx1 bgc-color-white"> 
-            <C.Comp.Header />
+             <C.Comp.Header  {...props}/>
             {/* body */}
 
             <C.View cls="w100% ai-c flx1"> 

+ 1 - 1
src/pages/_3_Guide1.js

@@ -18,7 +18,7 @@ export default (props)=>{
 
     return (
         <C.View cls="flx1 bgc-color-white"> 
-            <C.Comp.Header />
+             <C.Comp.Header  {...props}/>
             <C.View cls="w100% ai-c flx1 jc-sa"> 
                 <C.Text cls="f9 fw-b">BODY(身)</C.Text>
 

+ 2 - 2
src/pages/_4_Guide2.js

@@ -13,12 +13,12 @@ export default (props)=>{
     ]
     
     const pressConfirm = () => {
-        props.navigation.navigate('Main');
+        props.navigation.navigate('Root');   
     }
 
     return (
         <C.View cls="flx1 bgc-color-white"> 
-            <C.Comp.Header />
+             <C.Comp.Header  {...props}/>
             <C.View cls="w100% ai-c flx1 jc-sa"> 
                 <C.Text cls="f9 fw-b">MIND(心)</C.Text>
 

+ 34 - 3
src/popup/_10_4_ChangeLanguage.js

@@ -1,10 +1,41 @@
-import React from 'react';
- 
-import C from 'rn-class'
+import React  , {useState}from 'react';
+import i18n from 'i18n-js' 
+import C from 'rn-class' 
+let langs = ["ko"];
 
 export default (props)=>{
+    let [lan , setLan] = useState("ko");
     return (
         <C.View cls="flx1 bgc-color-white"> 
+             <C.EL.Header 
+                    ccls="bgc-color-transparent" 
+                    leftComponent={<C.EL.Icon type="antdesign" name="close" onPress={()=>props.navigation.goBack()}/>}  
+                >
+                </C.EL.Header>
+                <C.View cls="flx1 jc-sa ai-c">
+                    <C.View  cls="flx0.1 jc-sa ai-c">
+                        <C.Text cls="f3 fw-b"> 
+                        언어 변경
+                        </C.Text>
+                        <C.Text cls="f2"> 
+                        Change Language 
+                        </C.Text>
+                    </C.View>
+
+                    <C.Picker 
+                        selectedValue={lan}
+                        cls="w50%"
+                        // onValueChange={langChange}
+                        > 
+                        {
+                        langs.map((v, idx)=>{
+                            return (
+                                <C.PickerItem cls="f2" key={`lang${idx}`} label={i18n.t(`ChangeLanguage.${v}`)} value={v}/>
+                            )
+                        })
+                        }
+                    </C.Picker>
+                </C.View>
         </C.View>
     )  
 

+ 30 - 0
src/popup/_10_5_Support.js

@@ -5,6 +5,36 @@ import C from 'rn-class'
 export default (props)=>{
     return (
         <C.View cls="flx1 bgc-color-white"> 
+            <C.EL.Header 
+                    ccls="bgc-color-transparent" 
+                    leftComponent={<C.EL.Icon type="antdesign" name="close" onPress={()=>props.navigation.goBack()}/>}  
+                >
+                </C.EL.Header>
+                <C.View cls="flx1 jc-sa ai-c">
+                    <C.View  cls="flx0.3 jc-sa ai-c">
+                        <C.Text cls="f3 fw-b"> 
+                        고객 센터
+                        </C.Text>
+                        <C.Text cls="f2"> 
+                        Help & Support
+                        </C.Text>
+                        <C.Text cls="f2"> 
+                        상담시간 :  평일 AM 09:30 ~ PM 05:30 / 주말·휴일 제외
+                        </C.Text>
+                        <C.Text cls="f2"> 
+                        Consultation time : weekday AM 09:30 ~ PM 05:30 / Weekend·Holiday
+                        </C.Text>
+
+                    </C.View>
+                    <C.View cls="flx0.5 jc-sa">
+                        <C.EL.Button
+                        title="서비스정책"/>
+                        <C.EL.Button 
+                        title="개인정보보호정책"/>
+                        <C.EL.Button 
+                        title="광고·마케팅 정책"/>
+                    </C.View>
+                </C.View>
         </C.View>
     )  
 

+ 30 - 5
src/popup/_10_6_ServiceAlarm.js

@@ -1,8 +1,17 @@
-import React from 'react';
+import React , {useState}from 'react';
  
 import C from 'rn-class'
+import i18n from  "i18n-js";
+import _ from 'lodash'
 
 export default (props)=>{
+    const initData  = [
+        { title : i18n.t("ServiceAlarm.NewContentsUpload") , subtitle : "New Contents Upload" , switch : {value :  true , } , icon : {type:"antdesign" , name:"user" } },
+        { title : i18n.t("ServiceAlarm.TodaysWords") , subtitle : "Today’s Words" , switch : {value : false,  } , icon : {type:"antdesign" , name:"user" }},
+        { title : i18n.t("ServiceAlarm.TimeSchedule") , subtitle : "Time Schedule" , switch : {value : false,  } , icon : {type:"antdesign" , name:"user" }},
+    ] 
+    let [datas , setDatas]= useState(initData);
+    
     return (
         <C.View cls="flx1 bgc-color-white"> 
             <C.EL.Header 
@@ -19,10 +28,26 @@ export default (props)=>{
                         Contents Alarm
                         </C.Text>
                     </C.View>
-                    <C.View cls="mt10"> 
-                        <C.Text>신규콘텐츠 등록</C.Text>
-                        <C.Text>오늘의 명언</C.Text>
-                        <C.Text>타임스케줄</C.Text>  
+                    <C.View cls="mb10"> 
+                        {
+                            datas.map((obj, idx) =>{
+                                
+                                let onoffEvent = (o)=>{
+                                    obj.switch.value = !obj.switch.value ;
+                                    setDatas(_.map(datas , (o)=>{return o ;})); 
+                                }
+                                return (
+                                    <C.EL.ListItem
+                                        key={`item_${idx}`}
+                                        ccls="w100"
+                                        leftIcon={obj.icon}
+                                        title={obj.title} 
+                                        subtitle={obj.subtitle}  
+                                        rightElement={<C.Switch {...obj.switch}   onValueChange ={onoffEvent} />}
+                                        />
+                                )
+                            })
+                        }
                         
                         {/* <C.EL.Button ccls="w90%"  btncls="br10" title="다붓컨설팅 홈페이지"></C.EL.Button> */}
                     </C.View>