Merge pull request #110 from dsc-sookmyung/feature/translate

[#11] Translate Screen: implement feature and fix issue
dsc-sookmyung · Aug 14, 2022 · 0ea7b83 · 0ea7b83
2 parents 92cb166 + 1df1350
commit 0ea7b83
Show file tree

Hide file tree

Showing 11 changed files with 195 additions and 155 deletions.
diff --git a/react-native/components/BottomDrawer.tsx b/react-native/components/BottomDrawer.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import { StyleSheet, Dimensions, View, TouchableOpacity, TouchableHighlight, ScrollView, Alert, Linking } from 'react-native';
+import { StyleSheet, Dimensions, View, TouchableOpacity, TouchableHighlight, ScrollView, Alert, Linking, TouchableWithoutFeedback } from 'react-native';
 import { MaterialIcons } from '@expo/vector-icons';
-import { Popover, Button, Text, Modal, FormControl, Input, VStack, CheckIcon, AlertDialog } from 'native-base';
+import { Popover, Button, Text, Modal, FormControl, Input, VStack, HStack, AlertDialog } from 'native-base';
 import { theme } from '../core/theme';
 import type { BottomDrawerProps, EventForm, ResultsForm, UserData } from '../types';
 import { useAuth } from '../contexts/Auth';
@@ -152,15 +152,20 @@ function BottomDrawer(props: BottomDrawerProps) {
             <View style={{ flex: 1 }}>
                 <View style={styles.horizontalLine} />
                 <View style={[styles.spaceBetween, { paddingBottom: 24 }]}>
-                <Text fontFamily="heading" fontWeight={700} fontStyle="normal" fontSize='2xl' color="primary.500">{props.showKorean ? i18n.t('korean') : i18n.t('translation')}</Text>
-                    <View style={styles.alignRow}>
+                    <Text fontFamily="heading" fontWeight={700} fontStyle="normal" fontSize='2xl' color="primary.500">{props.showKorean ? i18n.t('korean') : i18n.t('translation')}</Text>
+                    <HStack space={2}>
                         <TouchableOpacity onPress={props.handleKorean}>
                             <MaterialIcons name="translate" size={32} color="#000"/>
                         </TouchableOpacity>
-                    </View>
+                        <TouchableOpacity onPress={props.copyToClipboard}>
+                            <MaterialIcons name="content-copy" size={32} color="black" />
+                        </TouchableOpacity>
+                    </HStack>
                 </View>
 
-                <ScrollView style={{ flex: 1 }}>
+                {/* <View style={{paddingBottom: 10, marginBottom: 10, flex: 1}}> */}
+                <ScrollView  style={{ flex: 1 }}>
+                    <TouchableWithoutFeedback>
                     <Text fontFamily="body" fontWeight={500} fontStyle="normal" fontSize='md' lineHeight='xl'>
                     {!props.showKorean ? (
                         props.results?.fullText?.map((item, index) => 
@@ -296,15 +301,17 @@ function BottomDrawer(props: BottomDrawerProps) {
                                 </Popover>
                             ) : (
                                 <Text key={item.content}>
-                                    {item.content.slice(72)}
+                                    {item.content}
                                 </Text>
                             )
                         )
                     ) : (
                         <Text>{props.results?.korean}</Text>
                     )}
                     </Text>
+                    </TouchableWithoutFeedback>
                 </ScrollView>
+                {/* </View> */}
             </View>
             {props.isTranslateScreen && 
                 <View style={[styles.spaceBetween, props.isFullDrawer && styles.full ]}>

diff --git a/react-native/locales/en.js b/react-native/locales/en.js
@@ -41,6 +41,7 @@ export default {
     translateMessage_1: "You can add a schedule to the calendar by clicking the highlighted text.",
     translateMessage_2: "You must enter at least one character for the title.",
     saveAlarm: 'Results have been saved',
+    copiedToClipboard: "Copied to Clipboard",
     /* BottomDrawer */
     sessionExpired: "The session has expired. Please log in again.",
     helpertext: "Give your results a title.",

diff --git a/react-native/locales/ja.js b/react-native/locales/ja.js
@@ -70,5 +70,6 @@ export default {
     saveFirst: "保存ボタンを押して結果を保存してください！",
     eventNotFound: "イベントが見つかりませんでした",
     noResults: "まだ結果はありません。",
-    translateFirst: "結果を翻訳して保存する。"
+    translateFirst: "結果を翻訳して保存する。",
+    copiedToClipboard: "クリップボードにコピーしました",
 }
diff --git a/react-native/locales/km.js b/react-native/locales/km.js
@@ -70,5 +70,6 @@ export default {
     saveFirst: "ចុចប៊ូតុង Save ដើម្បីរក្សាទុកលទ្ធផលជាមុន!",
     eventNotFound: "រកមិនឃើញព្រឹត្តិការណ៍ទេ។",
     noResults: "មិនទាន់មានលទ្ធផលនៅឡើយទេ។",
-    translateFirst: "បកប្រែ និងរក្សាទុកលទ្ធផល។"
+    translateFirst: "បកប្រែ និងរក្សាទុកលទ្ធផល។",
+    copiedToClipboard: "បានចម្លងទៅក្ដារតម្បៀតខ្ទាស់",
 }
diff --git a/react-native/locales/ko.js b/react-native/locales/ko.js
@@ -69,5 +69,6 @@ export default {
     saveFirst: "저장 버튼을 눌러서 결과 저장을 먼저 해주세요!",
     eventNotFound: "이벤트를 찾지 못했어요",
     noResults: "아직 결과가 없습니다.",
-    translateFirst: "번역을 한 후에 결과를 저장해주세요."
+    translateFirst: "번역을 한 후에 결과를 저장해주세요.",
+    copiedToClipboard: "클립보드에 복사되었습니다",
 }
diff --git a/react-native/locales/th.js b/react-native/locales/th.js
@@ -70,5 +70,6 @@ export default {
     saveFirst: "คลิกปุ่มบันทึกเพื่อบันทึกผลลัพธ์ก่อน!",
     eventNotFound: "ไม่พบกิจกรรม",
     noResults: "ยังไม่มีผลลัพธ",
-    translateFirst: "แปลและบันทึกผลลัพธ์"
+    translateFirst: "แปลและบันทึกผลลัพธ์",
+    copiedToClipboard: "คัดลอกไปยังคลิปบอร์ดแล้ว",
 }
diff --git a/react-native/locales/vn.js b/react-native/locales/vn.js
@@ -69,5 +69,6 @@ export default {
     saveFirst: "Nhấp vào nút Lưu để lưu kết quả trước!",
     eventNotFound: "Không tìm thấy sự kiện nào",
     noResults: "Chưa có kết quả.",
-    translateFirst: "Dịch và lưu kết quả."
+    translateFirst: "Dịch và lưu kết quả.",
+    copiedToClipboard: "Sao chép vào clipboard",
 }
diff --git a/react-native/locales/zh.js b/react-native/locales/zh.js
@@ -69,5 +69,6 @@ export default {
     saveFirst: "单击保存按钮首先保存结果！",
     eventNotFound: "未找到任何事件",
     noResults: "目前还没有结果。",
-    translateFirst: "翻译并保存结果。"
+    translateFirst: "翻译并保存结果。",
+    copiedToClipboard: "已复制到剪贴板",
 }