Procházet zdrojové kódy

인정보 취급 방침 수정

자유해결사 před 5 roky
rodič
revize
c593488562

+ 3 - 1
src/navigation/SwitchNavigator.js

@@ -33,6 +33,9 @@ const SwitchNavigator = createStackNavigator(
   {
     Login,
     AcceptTerms,
+    TermsPopup,
+    
+
     Guide1,
     Guide2,
     Root: {
@@ -42,7 +45,6 @@ const SwitchNavigator = createStackNavigator(
       })
     },
     Setting,
-
     AccountInfo,
     Notice,
     FAQ,

+ 3 - 2
src/pages/_2_AcceptTerms.js

@@ -56,13 +56,14 @@ export default (props)=>{
                                 
                                 <C.EL.Divider cls="ma1"/> 
 
-                                <C.EL.Button  title={title} ccls="w100%"
+                                <C.EL.Button  title={title} ccls="w100%"   
+                                onPress = {()=>{ props.navigation.navigate("TermsPopup",{title:title, contentsIdx : idx })}}
                                     tcls="flx0.9"
                                     iconRight icon={
                                         <C.EL.Icon
                                         ccls="ml3"
                                         name="popup"
-                                        type="entypo"
+                                        type="entypo" 
                                         color="white"
                                         
                                         />

+ 10 - 40
src/popup/_1_TermsPopup.js

@@ -12,56 +12,26 @@ C.addColor("#c87320" , "color-not_agreeBtn");
 
 export default (props)=>{
     // 다국어 처리 영역 
-    let {termsTitle, termsContents, agree , not_agree}  = i18n.t("AcceptTerms");
+    // const { navigation } = props;
+    const {title  : termsTitle, contentsIdx } = props.navigation.state.params;
+
+    let { termsContents, agree , not_agree}  = i18n.t("AcceptTerms");
     let {close}  = i18n.t("TermsPopup");
-    
 
     return (
         <C.SafeAreaView cls="po-full jc-c ai-c"> 
-            <C.View cls="flx0.8 w80% ai-c sdof_0_5 sdo2 bc-color-gray-light-v3 el2 pa2"> 
-                <C.Text cls="f4 fw-b">{termsTitle[0]}</C.Text> 
+            <C.View cls="flx0.8 w90% ai-c sdof_0_5 sdo2 bc-color-gray-light-v3 el2 pa2"> 
+                <C.Text cls="f4 fw-b">{termsTitle}</C.Text> 
                 <C.EL.Divider cls="ma1 w100%"/> 
                 <C.View cls="flx1 jc-sa">
-                    <C.ScrollView>
+                    <C.ScrollView cccls="pa1">
                         <C.Text>
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}{termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}{termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
-                        {termsContents}
+                        {termsContents[contentsIdx]}
+                      
                         </C.Text>
                     </C.ScrollView>
 
-                    <C.EL.Button ccls="mt1"  btncls="bgc-color-agreeBtn" title={close}/>
+                    <C.EL.Button ccls="mt1"  btncls="bgc-color-agreeBtn" title={close} onPress={()=>props.navigation.goBack()} />
                 </C.View>
 
             </C.View>

+ 2 - 5
src/provider/Auth.js

@@ -22,12 +22,8 @@ class Lm  {
     logout = async ()=>{
         let result = await  LoginManager.logOut();
         try {
-            console.log("=====")  
-            // await GoogleSignin.revokeAccess();
-            console.log("222222")  
+            await GoogleSignin.revokeAccess();
             await GoogleSignin.signOut();
-
-            console.log("111")  
         } catch (error) {
             console.log(error)  
         }
@@ -37,6 +33,7 @@ class Lm  {
         result = await NaverLogin.logout();
         
         AsyncStorage.removeItem("@naverToken");
+        AsyncStorage.removeItem("@terms" );
         return true;
     }
 }