diff --git a/App.tsx b/App.tsx index b3245a3..22eff52 100644 --- a/App.tsx +++ b/App.tsx @@ -1,11 +1,23 @@ -import React from 'react'; +import React, {useEffect} from 'react'; import './gesture-handler'; import RootProvider from './src/context'; import AppNavigator from './src/navigation'; - +import SplashScreen from 'react-native-splash-screen'; function App(): React.JSX.Element { // const isDarkMode = useColorScheme() === 'dark'; - + useEffect(() => { + const initializeApp = async () => { + try { + // TODO: 권한 요청 로직 호출 + } catch (error) { + console.error('splash screen error:', error); + } finally { + SplashScreen.hide(); + console.log('splash screen hide'); + } + }; + initializeApp(); + }, []); return ( diff --git a/android/app/src/main/java/com/clientapp/MainActivity.kt b/android/app/src/main/java/com/clientapp/MainActivity.kt index dc77238..3c7788e 100644 --- a/android/app/src/main/java/com/clientapp/MainActivity.kt +++ b/android/app/src/main/java/com/clientapp/MainActivity.kt @@ -8,6 +8,7 @@ import com.facebook.react.ReactActivity import com.facebook.react.ReactActivityDelegate import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled import com.facebook.react.defaults.DefaultReactActivityDelegate +import org.devio.rn.splashscreen.SplashScreen; class MainActivity : ReactActivity() { @@ -18,6 +19,7 @@ class MainActivity : ReactActivity() { override fun getMainComponentName(): String = "ClientApp" override fun onCreate(savedInstanceState: Bundle?) { + SplashScreen.show(this) super.onCreate(null) // 알림 채널 생성 diff --git a/android/app/src/main/res/drawable-hdpi/logo.png b/android/app/src/main/res/drawable-hdpi/logo.png new file mode 100644 index 0000000..60193a3 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-hdpi/momchanpick.png b/android/app/src/main/res/drawable-hdpi/momchanpick.png new file mode 100644 index 0000000..1f5d503 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/momchanpick.png differ diff --git a/android/app/src/main/res/drawable-mdpi/logo.png b/android/app/src/main/res/drawable-mdpi/logo.png new file mode 100644 index 0000000..7400c40 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-mdpi/momchanpick.png b/android/app/src/main/res/drawable-mdpi/momchanpick.png new file mode 100644 index 0000000..f6ff0fa Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/momchanpick.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/logo.png b/android/app/src/main/res/drawable-xhdpi/logo.png new file mode 100644 index 0000000..60fbf69 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/momchanpick.png b/android/app/src/main/res/drawable-xhdpi/momchanpick.png new file mode 100644 index 0000000..f186cdb Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/momchanpick.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/logo.png b/android/app/src/main/res/drawable-xxhdpi/logo.png new file mode 100644 index 0000000..00615ba Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/momchanpick.png b/android/app/src/main/res/drawable-xxhdpi/momchanpick.png new file mode 100644 index 0000000..17c8872 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/momchanpick.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/logo.png b/android/app/src/main/res/drawable-xxxhdpi/logo.png new file mode 100644 index 0000000..217e352 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/momchanpick.png b/android/app/src/main/res/drawable-xxxhdpi/momchanpick.png new file mode 100644 index 0000000..b87f269 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/momchanpick.png differ diff --git a/android/app/src/main/res/drawable/logo.png b/android/app/src/main/res/drawable/logo.png new file mode 100644 index 0000000..60193a3 Binary files /dev/null and b/android/app/src/main/res/drawable/logo.png differ diff --git a/android/app/src/main/res/drawable/momchanpick.png b/android/app/src/main/res/drawable/momchanpick.png new file mode 100644 index 0000000..1f5d503 Binary files /dev/null and b/android/app/src/main/res/drawable/momchanpick.png differ diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml new file mode 100644 index 0000000..242b81f --- /dev/null +++ b/android/app/src/main/res/layout/launch_screen.xml @@ -0,0 +1,24 @@ + + + + + + + + + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 16e9572..8f6f5f5 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - ClientApp + 맘찬픽 @string/KAKAO_KEY diff --git a/ios/Assets.xcassets/Background.colorset/Contents.json b/ios/Assets.xcassets/Background.colorset/Contents.json new file mode 100644 index 0000000..b5600bc --- /dev/null +++ b/ios/Assets.xcassets/Background.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xB6", + "green" : "0xF7", + "red" : "0xF9" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xB6", + "green" : "0xF7", + "red" : "0xF9" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Assets.xcassets/Contents.json b/ios/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/ios/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ClientApp.xcodeproj/project.pbxproj b/ios/ClientApp.xcodeproj/project.pbxproj index 08e8892..7a22a9b 100644 --- a/ios/ClientApp.xcodeproj/project.pbxproj +++ b/ios/ClientApp.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 74AFF5D31DFF20E6F30A566F /* Pods_ClientApp_ClientAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53CA576FFB7FAD6091DF23D6 /* Pods_ClientApp_ClientAppTests.framework */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; 94CEB96F1A265B79C82B089E /* Pods_ClientApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D3FFA28E7504B9A37D2855D /* Pods_ClientApp.framework */; }; + FA0061112CF6A7F2009C6C6E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA0061102CF6A7F2009C6C6E /* Assets.xcassets */; }; FA2F185C2C9BC72C007629B4 /* SwiftBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2F185B2C9BC72C007629B4 /* SwiftBridge.swift */; }; FA69802C2CF48CE3004798B8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FA69802B2CF48CE3004798B8 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ @@ -49,6 +50,7 @@ 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ClientApp/LaunchScreen.storyboard; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-ClientApp-ClientAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ClientApp-ClientAppTests.release.xcconfig"; path = "Target Support Files/Pods-ClientApp-ClientAppTests/Pods-ClientApp-ClientAppTests.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; + FA0061102CF6A7F2009C6C6E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; FA2F185A2C9BC72C007629B4 /* ClientApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ClientApp-Bridging-Header.h"; sourceTree = ""; }; FA2F185B2C9BC72C007629B4 /* SwiftBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftBridge.swift; sourceTree = ""; }; FA69802B2CF48CE3004798B8 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "ClientApp/GoogleService-Info.plist"; sourceTree = ""; }; @@ -107,6 +109,7 @@ 199B7DE5E9B98157B267CB91 /* PrivacyInfo.xcprivacy */, FA2F185B2C9BC72C007629B4 /* SwiftBridge.swift */, FA2F185A2C9BC72C007629B4 /* ClientApp-Bridging-Header.h */, + FA0061102CF6A7F2009C6C6E /* Assets.xcassets */, ); name = ClientApp; sourceTree = ""; @@ -263,6 +266,7 @@ FA69802C2CF48CE3004798B8 /* GoogleService-Info.plist in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 1AEF1DDAEA082183D637D172 /* PrivacyInfo.xcprivacy in Resources */, + FA0061112CF6A7F2009C6C6E /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -508,7 +512,7 @@ DEVELOPMENT_TEAM = 3P5SZ6DAC9; ENABLE_BITCODE = NO; INFOPLIST_FILE = ClientApp/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = ClientApp; + INFOPLIST_KEY_CFBundleDisplayName = "맘찬픽"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -538,7 +542,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 3P5SZ6DAC9; INFOPLIST_FILE = ClientApp/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = ClientApp; + INFOPLIST_KEY_CFBundleDisplayName = "맘찬픽"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -642,7 +646,10 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -727,7 +734,10 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = "$(inherited) "; + OTHER_LDFLAGS = ( + "$(inherited)", + " ", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; diff --git a/ios/ClientApp/AppDelegate.mm b/ios/ClientApp/AppDelegate.mm index 024608f..1f4729c 100644 --- a/ios/ClientApp/AppDelegate.mm +++ b/ios/ClientApp/AppDelegate.mm @@ -4,6 +4,7 @@ #import "RNCConfig.h" #import // Naver SDK 헤더 추가 #import // FirebaseCore 추가 +#import "RNSplashScreen.h" @implementation AppDelegate diff --git a/ios/ClientApp/Images.xcassets/Contents.json b/ios/ClientApp/Images.xcassets/Contents.json index 2d92bd5..73c0059 100644 --- a/ios/ClientApp/Images.xcassets/Contents.json +++ b/ios/ClientApp/Images.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/ClientApp/Images.xcassets/logo.imageset/Contents.json b/ios/ClientApp/Images.xcassets/logo.imageset/Contents.json new file mode 100644 index 0000000..ed6801e --- /dev/null +++ b/ios/ClientApp/Images.xcassets/logo.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 60376 (1).png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 60376 (1)@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 60376 (1)@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1).png b/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1).png new file mode 100644 index 0000000..7400c40 Binary files /dev/null and b/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1).png differ diff --git a/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1)@2x.png b/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1)@2x.png new file mode 100644 index 0000000..60fbf69 Binary files /dev/null and b/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1)@2x.png differ diff --git a/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1)@3x.png b/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1)@3x.png new file mode 100644 index 0000000..00615ba Binary files /dev/null and b/ios/ClientApp/Images.xcassets/logo.imageset/Group 60376 (1)@3x.png differ diff --git a/ios/ClientApp/Images.xcassets/momchanpick.imageset/Contents.json b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Contents.json new file mode 100644 index 0000000..875e8e8 --- /dev/null +++ b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 556.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 556@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 556@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556.png b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556.png new file mode 100644 index 0000000..f6ff0fa Binary files /dev/null and b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556.png differ diff --git a/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556@2x.png b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556@2x.png new file mode 100644 index 0000000..f186cdb Binary files /dev/null and b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556@2x.png differ diff --git a/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556@3x.png b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556@3x.png new file mode 100644 index 0000000..17c8872 Binary files /dev/null and b/ios/ClientApp/Images.xcassets/momchanpick.imageset/Group 556@3x.png differ diff --git a/ios/ClientApp/Info.plist b/ios/ClientApp/Info.plist index e276609..da678bb 100644 --- a/ios/ClientApp/Info.plist +++ b/ios/ClientApp/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - ClientApp + 맘찬픽 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -115,21 +115,7 @@ remote-notification - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - NMFClientId - $(NAVER_MAP_CLIENT_ID) + NMFClientId + $(NAVER_MAP_CLIENT_ID) diff --git a/ios/ClientApp/LaunchScreen.storyboard b/ios/ClientApp/LaunchScreen.storyboard index 6a96967..77aa92b 100644 --- a/ios/ClientApp/LaunchScreen.storyboard +++ b/ios/ClientApp/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -16,32 +16,26 @@ - - + + + + + + + + - - - - - - - - - + - + + + + + diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dff3c57..26d1ac8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1356,6 +1356,8 @@ PODS: - React - react-native-safe-area-context (4.11.0): - React-Core + - react-native-splash-screen (3.3.0): + - React-Core - React-nativeconfig (0.75.2) - React-NativeModulesApple (0.75.2): - glog @@ -1811,6 +1813,7 @@ DEPENDENCIES: - react-native-geolocation-service (from `../node_modules/react-native-geolocation-service`) - react-native-nmap (from `../node_modules/react-native-naver-map`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) - React-nativeconfig (from `../node_modules/react-native/ReactCommon`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) @@ -1961,6 +1964,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-naver-map" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" + react-native-splash-screen: + :path: "../node_modules/react-native-splash-screen" React-nativeconfig: :path: "../node_modules/react-native/ReactCommon" React-NativeModulesApple: @@ -2100,6 +2105,7 @@ SPEC CHECKSUMS: react-native-geolocation-service: 608e1da71a1ac31b4de64d9ef2815f697978c55b react-native-nmap: 057c4e7b1b765b234ab4b0a6c5ccd9baaf3bc9c7 react-native-safe-area-context: 851c62c48dce80ccaa5637b6aa5991a1bc36eca9 + react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 React-nativeconfig: 5fc2b05a590eb704128f5a4fc8ea6fa7b847e6e8 React-NativeModulesApple: 88313414ddffd1758f76042733e8f0297acfd502 React-perflogger: 8a360ccf603de6ddbe9ff8f54383146d26e6c936 diff --git a/package.json b/package.json index b84fc75..acaf5f0 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "react-native-permissions": "^5.1.0", "react-native-safe-area-context": "^4.10.9", "react-native-screens": "^3.34.0", + "react-native-splash-screen": "^3.3.0", "react-native-svg": "^15.8.0", "react-native-vector-icons": "^10.1.0", "tosspayments-react-native-webview": "^1.0.0" diff --git a/src/assets/MomChanPickPng.png b/src/assets/MomChanPickPng.png new file mode 100644 index 0000000..3827dd5 Binary files /dev/null and b/src/assets/MomChanPickPng.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 31b9b72..9054901 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/logo.svg b/src/assets/logo.svg index e51a338..33ed3c7 100644 --- a/src/assets/logo.svg +++ b/src/assets/logo.svg @@ -1,9 +1,16 @@ - - + + + + + + + + + + - - - - + + + diff --git a/src/screens/SubscribeScreen/index.tsx b/src/screens/SubscribeScreen/index.tsx index a540a3a..523c0ae 100644 --- a/src/screens/SubscribeScreen/index.tsx +++ b/src/screens/SubscribeScreen/index.tsx @@ -22,7 +22,8 @@ const SubscribeScreen = ({navigation}: Props) => { return; } setMarkets(res.markets); - }, []); + console.log('Fetch data success', markets); + }, [markets]); const {refreshing, onRefresh} = usePullDownRefresh(fetchData); diff --git a/yarn.lock b/yarn.lock index 0b918bb..22cef19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4381,6 +4381,7 @@ __metadata: react-native-permissions: ^5.1.0 react-native-safe-area-context: ^4.10.9 react-native-screens: ^3.34.0 + react-native-splash-screen: ^3.3.0 react-native-svg: ^15.8.0 react-native-svg-transformer: ^1.5.0 react-native-vector-icons: ^10.1.0 @@ -10219,6 +10220,15 @@ __metadata: languageName: node linkType: hard +"react-native-splash-screen@npm:^3.3.0": + version: 3.3.0 + resolution: "react-native-splash-screen@npm:3.3.0" + peerDependencies: + react-native: ">=0.57.0" + checksum: 14c565d5d4214f55586dcf6f7abd12d99d3e0667f67de3bda7aa24988971567b283a4187fbc0c6269c83b3c21d59d1950335c61bb0780ec2d065e20b3b9199d0 + languageName: node + linkType: hard + "react-native-svg-transformer@npm:^1.5.0": version: 1.5.0 resolution: "react-native-svg-transformer@npm:1.5.0"