Feat/150 ga expo

TERMTERM/.gitignore

@@ -10,6 +10,9 @@ npm-debug.*
 *.orig.*
 web-build/
 secret.ts
+environment.js
+ios/
+android/
 
 # macOS
 .DS_Store

TERMTERM/GoogleService-Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyC8f2gCV1a-crdjF_qJMda1RP-boKqcs-I</string>
+	<key>GCM_SENDER_ID</key>
+	<string>25902704158</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>io.omz.termterm</string>
+	<key>PROJECT_ID</key>
+	<string>termterm-f2dd0</string>
+	<key>STORAGE_BUCKET</key>
+	<string>termterm-f2dd0.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<true></true>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:25902704158:ios:9ead1313d399eb97ea300f</string>
+</dict>
+</plist>

TERMTERM/app.json

@@ -14,7 +14,9 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
       "supportsTablet": true,
       "usesAppleSignIn": true,
@@ -28,6 +30,9 @@
     },
     "web": {
       "favicon": "./assets/favicon.png"
-    }
+    },
+    "plugins": [
+      "expo-build-properties"
+    ]
   }
 }

TERMTERM/index.js

@@ -0,0 +1,8 @@
+import { registerRootComponent } from 'expo';
+
+import App from './App';
+
+// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
+// It also ensures that whether you load the app in Expo Go or in a native build,
+// the environment is set up appropriately
+registerRootComponent(App);

TERMTERM/metro.config.js

@@ -0,0 +1,7 @@
+// Learn more https://docs.expo.io/guides/customizing-metro
+const { getDefaultConfig } = require("expo/metro-config");
+
+const defaultConfig = getDefaultConfig(__dirname);
+defaultConfig.resolver.sourceExts.push("cjs");
+
+module.exports = defaultConfig;

TERMTERM/package.json

@@ -1,18 +1,21 @@
 {
   "name": "termterm",
   "version": "1.0.0",
-  "main": "node_modules/expo/AppEntry.js",
   "scripts": {
-    "start": "expo start",
-    "android": "expo start --android",
-    "ios": "expo start --ios",
-    "web": "expo start --web"
+    "start": "expo start --dev-client",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
+    "web": "expo start --web",
+    "build:preview": "eas build --profile preview --platform ios",
+    "build:production": "eas build --profile production --platform ios"
   },
   "dependencies": {
     "@expo/react-native-action-sheet": "^4.0.1",
     "@gorhom/bottom-sheet": "^4",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/masked-view": "^0.1.11",
+    "@react-native-firebase/analytics": "^18.5.0",
+    "@react-native-firebase/app": "^18.5.0",
     "@react-navigation/bottom-tabs": "^6.5.7",
     "@react-navigation/native": "^6.1.4",
     "@react-navigation/stack": "^6.3.14",
@@ -21,17 +24,20 @@
     "@types/styled-components": "^5.1.26",
     "@types/styled-components-react-native": "^5.2.1",
     "axios": "^1.4.0",
-    "expo": "~47.0.12",
+    "expo": "~47.0.14",
     "expo-apple-authentication": "~5.0.1",
+    "expo-build-properties": "~0.4.1",
+    "expo-dev-client": "~2.0.1",
     "expo-haptics": "~12.0.1",
     "expo-image-picker": "^14.1.1",
     "expo-sharing": "~11.0.1",
-    "expo-splash-screen": "^0.17.5",
+    "expo-splash-screen": "~0.17.5",
     "expo-status-bar": "~1.4.2",
+    "expo-updates": "~0.15.6",
     "lottie-react-native": "5.1.4",
     "react": "18.1.0",
     "react-dom": "18.1.0",
-    "react-native": "0.70.5",
+    "react-native": "0.70.8",
     "react-native-dropdown-picker": "^5.4.4",
     "react-native-gesture-handler": "~2.8.0",
     "react-native-modal": "^13.0.1",

TERMTERM/src/components/OtherThink/Commnet.tsx

@@ -148,15 +148,15 @@ const Content = styled.Text<{ COLOR: colorTheme }>`
   width: 100%;
   ${TYPO_STYLE.Subheading[1].Regular};
   color: ${(props) => props.COLOR.Text.active};
-  text-align: start;
+  text-align: left;
   white-space: pre-line;
 
-  line-height: 20.5%;
+  /* line-height: 20.5%; */
 `;
 
 const Source = styled.Text<{ COLOR: colorTheme }>`
   ${TYPO_STYLE.Caption[2].Medium};
-  text-align: start;
+  text-align: left;
   color: ${(props) => props.COLOR.Text.disabled};
   margin-top: 7px;
 `;
@@ -180,7 +180,7 @@ const DefaultInfoWrapper = styled.View`
 const ProfileImageWrapper = styled.View`
   width: 22px;
   height: 22px;
-  border-radius: 100%;
+  border-radius: 100px;
   overflow: hidden;
   display: flex;
   align-items: center;
@@ -220,7 +220,7 @@ const Likes = styled.Text<{ COLOR: colorTheme }>`
 const LikeButtonWrapper = styled.TouchableOpacity`
   width: 34px;
   height: 34px;
-  border-radius: 100%;
+  border-radius: 100px;
   overflow: hidden;
   margin-right: 7px;
 `;

TERMTERM/src/components/apply/style.tsx

@@ -32,7 +32,7 @@ export const TitleWrapper = styled.View`
 export const Title = styled.Text<{ COLOR: colorTheme }>`
   ${TYPO_STYLE.Body[1].ExtraBold};
   color: ${(props) => props.COLOR.Text.active};
-  text-align: start;
+  text-align: left;
 `;
 
 export const TitleObjet = styled.View`
@@ -46,7 +46,7 @@ export const TitleObjet = styled.View`
 
 export const Content = styled.Text<{ COLOR: colorTheme }>`
   ${TYPO_STYLE.Subheading[1].Regular};
-  text-align: start;
+  text-align: left;
   white-space: pre-line;
   line-height: 20px;
   color: ${(props) => props.COLOR.Text.active};

TERMTERM/src/components/archive/default/index.tsx

@@ -63,7 +63,6 @@ const Title = styled.Text<{ COLOR: colorTheme }>`
   text-align: center;
   white-space: pre-line;
   margin-top: 20px;
-  line-height: 37%;
 `;
 
 const Subtitle = styled.Text<{ COLOR: colorTheme }>`

TERMTERM/src/components/cards/EmptyWordCard.tsx

@@ -90,7 +90,6 @@ const Title = styled.Text<{ COLOR: colorTheme }>`
   ${TYPO_STYLE.Body[1].ExtraBold};
   color: ${(props) => props.COLOR.Text.active};
   text-align: center;
-  line-height: 37%;
 `;
 
 const SubTitle = styled.Text<{ COLOR: colorTheme }>`
@@ -107,7 +106,7 @@ const WordButton = styled.TouchableOpacity<{ COLOR: colorTheme }>`
   height: 45px;
   z-index: 2;
   background-color: ${(props) => props.COLOR.THEME.primary[130]};
-  border-radius: 50%;
+  border-radius: 50px;
   margin-top: 30px;
   display: flex;
   flex-direction: row;

TERMTERM/src/components/cards/WordCard.tsx

@@ -85,7 +85,7 @@ const WordButton = styled.TouchableOpacity`
   height: 44px;
   z-index: 2;
   background-color: #19d24d;
-  border-radius: 50%;
+  border-radius: 50px;
   margin-top: 30px;
 `;
 

TERMTERM/src/components/common/Bookmark.tsx

@@ -9,7 +9,7 @@ export const BookmarkButton = styled.TouchableOpacity`
   right: 10px;
   width: 38px;
   height: 38px;
-  border-radius: 100%;
+  border-radius: 100px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -27,7 +27,7 @@ export const PreviewBookmark = styled.TouchableOpacity`
 export const BookmarkWrapper = styled.TouchableOpacity`
   width: 38px;
   height: 38px;
-  border-radius: 100%;
+  border-radius: 100px;
   display: flex;
   align-items: center;
   justify-content: center;

TERMTERM/src/components/common/CustomEmailInput.tsx

@@ -50,7 +50,7 @@ const Input = styled.TextInput<{ COLOR: colorTheme }>`
   ${TYPO_STYLE.Subheading[1].Regular};
   width: 100%;
   height: 100%;
-  text-align: start;
+  text-align: left;
   color: ${(props) => props.COLOR.Text.active};
   margin-bottom: 2px;
 `;

TERMTERM/src/components/common/CustomTextInput.tsx

@@ -58,7 +58,7 @@ const InputBox = styled.View`
 const Input = styled.TextInput<{ COLOR: colorTheme }>`
   width: 100%;
   height: 100%;
-  text-align: start;
+  text-align: left;
   color: ${(props) => props.COLOR.Text.active};
   margin-bottom: 2px;
 `;

TERMTERM/src/components/common/CustomTextarea.tsx

@@ -46,7 +46,7 @@ const Input = styled.TextInput<{ COLOR: colorTheme }>`
   padding: 15px 20px;
   outline: none;
   border: none;
-  text-align: start;
+  text-align: left;
   ${TYPO_STYLE.Subheading[1].Regular};
 `;
 

TERMTERM/src/components/common/Filter/index.tsx

@@ -52,7 +52,7 @@ const FilterButton = styled.TouchableOpacity`
 const CilrcleWrapper = styled.View<{ COLOR: colorTheme }>`
   width: 11px;
   height: 11px;
-  border-radius: 100%;
+  border-radius: 100px;
   background-color: ${(props) => props.COLOR.THEME.primary[130]};
   display: flex;
   align-items: center;

TERMTERM/src/components/common/Input.tsx

@@ -73,7 +73,7 @@ const InputBox = styled.View`
 const Input = styled.TextInput<{ COLOR: colorTheme }>`
   width: 100%;
   height: 100%;
-  text-align: start;
+  text-align: left;
   color: ${(props) => props.COLOR.Text.active};
   margin-bottom: 2px;
 `;

TERMTERM/src/components/common/TermBox/index.tsx

@@ -98,7 +98,7 @@ const BookmarkButton = styled.TouchableOpacity<{ mode: boolean }>`
   align-items: center;
   justify-content: center;
   background-color: ${(props) => (props.mode ? "#e2e2e261" : "#0000003b")};
-  border-radius: 100%;
+  border-radius: 100px;
 `;
 
 const ResultTitle = styled.Text<{ COLOR: colorTheme }>`

TERMTERM/src/components/home/DailyTermBox.tsx

@@ -92,9 +92,9 @@ const Content = styled.Text<{ COLOR: colorTheme }>`
   ${TYPO_STYLE.Caption[1].Regular};
   //TODO : line-height 수정
   flex: 1;
-  line-height: 17.5%;
+  /* line-height: 17.5%; */
   color: ${(props) => props.COLOR.Text.default};
-  text-align: start;
+  text-align: left;
   white-space: pre-line;
 `;
 

TERMTERM/src/components/my/Point/HistoryWrapper.tsx

@@ -94,7 +94,7 @@ const Container = styled.View`
 
 const TitleBox = styled.Text<{ COLOR: colorTheme }>`
   width: 100%;
-  text-align: start;
+  text-align: left;
   ${TYPO_STYLE.Body[2].Bold};
   color: ${(props) => props.COLOR.Text.active};
 `;

TERMTERM/src/screens/CompleteQuiz.tsx

@@ -240,7 +240,7 @@ const CompleteButton = styled.TouchableOpacity<{
   z-index: 2;
   background-color: ${(props) =>
     props.mode ? props.COLOR.Neutral[100] : props.COLOR.Background.onSurface};
-  border-radius: 50%;
+  border-radius: 50px;
   margin-top: 40px;
 `;
 

TERMTERM/src/screens/MakeFolder.tsx

@@ -9,6 +9,7 @@ import { Keyboard } from "react-native";
 import CompleteButton from "@components/makefolder/CompleteButton";
 import { useHaptics } from "@hooks/useHaptics";
 import { useFolder } from "@hooks/useFolder";
+import { logGAevent } from "@utils/analytics";
 
 export type Props = StackScreenProps<RootStackParamList, "MakeFolder">;
 
@@ -27,7 +28,7 @@ const MakeFolder = ({ navigation }: Props) => {
   const onComplete = () => {
     if (info.name !== "") {
       const res = createFolder({ description: info.desc, title: info.name });
-
+      logGAevent("make_folder");
       getUsersFolderList();
       navigation.pop();
     } else {

TERMTERM/src/screens/QuizResult.tsx

@@ -15,6 +15,7 @@ import {
 import QuizAnswerCard from "@components/terms/QuizAnswerCard";
 import { eachQuizAnswerResult, quizState } from "@recoil/quizState";
 import { useRecoilValue, useSetRecoilState } from "recoil";
+import { logGAevent } from "@utils/analytics";
 
 export type Props = StackScreenProps<RootStackParamList, "QuizResult">;
 
@@ -44,11 +45,18 @@ const QuizResult = ({ navigation, route }: Props) => {
           theme={mode}
           type={mode ? BUTTON_TYPE.primary : BUTTON_TYPE.secondary}
           state={BUTTON_STATE.active}
-          onPress={() =>
-            currIdx === 5
-              ? navigation.navigate("CompleteQuiz", {id: quizResult.statusCode})
-              : navigation.navigate("DailyQuiz")
-          }
+          onPress={() => {
+            if (currIdx === 5) {
+              logGAevent("daily_quiz_complete", {
+                status_code: quizResult.statusCode,
+              });
+              navigation.navigate("CompleteQuiz", {
+                id: quizResult.statusCode,
+              });
+            } else {
+              navigation.navigate("DailyQuiz");
+            }
+          }}
           style={{ width: "90%", alignSelf: "center", marginTop: "7%" }}
         />
       </Container>