Merge branch 'develop' into feat/api

DevKor-github · Oct 3, 2024 · 38539d1 · 38539d1
2 parents 8c38480 + 428e8a1
commit 38539d1
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 69 deletions.
diff --git a/android/app/src/main/assets/fonts/PretendardVariable.ttf b/android/app/src/main/assets/fonts/PretendardVariable.ttf
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
@@ -0,0 +1,9 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "src/assets/fonts/PretendardVariable.ttf",
+      "sha1": "89b05a2f18c76f8deb577505d48237127ccfc908"
+    }
+  ]
+}
diff --git a/babel.config.js b/babel.config.js
@@ -5,19 +5,20 @@ module.exports = {
     [
       'module-resolver',
       {
+        root: ['./src'],
         alias: {
           '@/navigation': './src/navigation',
           '@/pages': './src/pages',
-          '@/components': './src/pages',
-          '@/features': './src/pages',
-          '@/services': './src/pages',
-          '@/utils': './src/pages',
-          '@/hooks': './src/pages',
-          '@/store': './src/pages',
-          '@/types': './src/pages',
-          '@/constants': './src/pages',
-          '@/styles': './src/pages',
-          '@/public': './src/pages',
+          '@/components': './src/components',
+          '@/features': './src/features',
+          '@/services': './src/services',
+          '@/utils': './src/utils',
+          '@/hooks': './src/hooks',
+          '@/store': './src/store',
+          '@/types': './src/types',
+          '@/constants': './src/constants',
+          '@/styles': './src/styles',
+          '@/assets': './assets',
         },
       },
     ],

diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json
@@ -0,0 +1,9 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "src/assets/fonts/PretendardVariable.ttf",
+      "sha1": "89b05a2f18c76f8deb577505d48237127ccfc908"
+    }
+  ]
+}
diff --git a/ios/matchoom.xcodeproj/project.pbxproj b/ios/matchoom.xcodeproj/project.pbxproj
diff --git a/ios/matchoom/Info.plist b/ios/matchoom/Info.plist
@@ -26,14 +26,13 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-	  <!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
 		<key>NSAllowsArbitraryLoads</key>
 		<false/>
 		<key>NSAllowsLocalNetworking</key>
 		<true/>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -48,5 +47,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>PretendardVariable.ttf</string>
+	</array>
 </dict>
 </plist>
diff --git a/react-native.config.js b/react-native.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  assets: ['./src/assets/fonts/'],
+};
diff --git a/src/assets/fonts/PretendardVariable.ttf b/src/assets/fonts/PretendardVariable.ttf
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -8,6 +8,17 @@ module.exports = {
     './src/features/**/*.{js,ts,jsx,tsx}',
     './src/hooks/**/*.{js,ts,jsx,tsx}',
   ],
-  theme: {},
+  theme: {
+    extend: {
+      fontFamily: {
+        sans: ['Pretendard', 'Arial'],
+      },
+      colors: {
+        green: '#74EFC2',
+        blue: '#4174F7',
+        background: '#121212',
+      },
+    },
+  },
   plugins: [],
 };