diff --git a/components/ProfileSetting/ProfileSettingComponent.tsx b/components/ProfileSetting/ProfileSettingComponent.tsx index 4adcbe1..e252c95 100644 --- a/components/ProfileSetting/ProfileSettingComponent.tsx +++ b/components/ProfileSetting/ProfileSettingComponent.tsx @@ -9,13 +9,7 @@ function ProfileSettingComponent() { - name: 최봉수 - - - - - 고객센터 Linking.openURL('http://pf.kakao.com/_Numxeb')} diff --git a/components/ProfileSetting/styles.ts b/components/ProfileSetting/styles.ts index 00de6c2..c00571f 100644 --- a/components/ProfileSetting/styles.ts +++ b/components/ProfileSetting/styles.ts @@ -1,8 +1,10 @@ -import { StyleSheet } from 'react-native'; +import { Dimensions, StyleSheet } from 'react-native'; import { mainBlue, mainLightBlue, mainOrange } from '../../color'; +const windowHeight = Dimensions.get('window').height; + const styles = StyleSheet.create({ - profileSettingOuterWrapper: { backgroundColor: 'white', flex: 1 }, + profileSettingOuterWrapper: { backgroundColor: 'white', flex: 1, height: windowHeight }, profileSettingName: { color: mainBlue, @@ -14,7 +16,6 @@ const styles = StyleSheet.create({ profileSettingInnerWrapper: { backgroundColor: mainLightBlue, margin: 17, - flex: 1, borderRadius: 16, }, profileSettingTitle: { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6a0ccda..beb8d8e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -11,7 +11,7 @@ PODS: - React-Core (= 0.67.2) - React-jsi (= 0.67.2) - ReactCommon/turbomodule/core (= 0.67.2) - - Flipper (0.92.0): + - Flipper (0.99.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) - Flipper-Boost-iOSX (1.76.0.1.11) @@ -28,47 +28,47 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.4.3): - Flipper-Folly (~> 2.6) - - FlipperKit (0.92.0): - - FlipperKit/Core (= 0.92.0) - - FlipperKit/Core (0.92.0): - - Flipper (~> 0.92.0) + - FlipperKit (0.99.0): + - FlipperKit/Core (= 0.99.0) + - FlipperKit/Core (0.99.0): + - Flipper (~> 0.99.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.92.0): - - Flipper (~> 0.92.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.92.0): + - FlipperKit/CppBridge (0.99.0): + - Flipper (~> 0.99.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.99.0): - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.92.0) - - FlipperKit/FKPortForwarding (0.92.0): + - FlipperKit/FBDefines (0.99.0) + - FlipperKit/FKPortForwarding (0.99.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.92.0) - - FlipperKit/FlipperKitLayoutHelpers (0.92.0): + - FlipperKit/FlipperKitHighlightOverlay (0.99.0) + - FlipperKit/FlipperKitLayoutHelpers (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.92.0): + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.92.0): + - FlipperKit/FlipperKitLayoutPlugin (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.92.0) - - FlipperKit/FlipperKitNetworkPlugin (0.92.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.99.0) + - FlipperKit/FlipperKitNetworkPlugin (0.99.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.92.0): + - FlipperKit/FlipperKitReactPlugin (0.99.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.92.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.99.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.92.0): + - FlipperKit/SKIOSNetworkPlugin (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) @@ -480,7 +480,7 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (= 0.92.0) + - Flipper (= 0.99.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-DoubleConversion (= 3.1.7) - Flipper-Fmt (= 7.1.7) @@ -488,19 +488,19 @@ DEPENDENCIES: - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (= 0.0.4) - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.92.0) - - FlipperKit/Core (= 0.92.0) - - FlipperKit/CppBridge (= 0.92.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.92.0) - - FlipperKit/FBDefines (= 0.92.0) - - FlipperKit/FKPortForwarding (= 0.92.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.92.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.92.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.92.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.92.0) - - FlipperKit/FlipperKitReactPlugin (= 0.92.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.92.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.92.0) + - FlipperKit (= 0.99.0) + - FlipperKit/Core (= 0.99.0) + - FlipperKit/CppBridge (= 0.99.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.99.0) + - FlipperKit/FBDefines (= 0.99.0) + - FlipperKit/FKPortForwarding (= 0.99.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.99.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.99.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.99.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.99.0) + - FlipperKit/FlipperKitReactPlugin (= 0.99.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - "kakao-login (from `../node_modules/@react-native-seoul/kakao-login`)" - OpenSSL-Universal (= 1.1.180) @@ -678,7 +678,7 @@ SPEC CHECKSUMS: DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: 244195e30d63d7f564c55da4410b9a24e8fbceaa FBReactNativeSpec: c94002c1d93da3658f4d5119c6994d19961e3d52 - Flipper: bc940dd278ca91f9b2d36b6fac5c098a8906ffa2 + Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b @@ -686,7 +686,7 @@ SPEC CHECKSUMS: Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: b2c08dc00bd104315cf3d0fe2f4939b0b20b407a + FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 Google-Maps-iOS-Utils: 95d5ca4d2004314eff88c1819b969db6cac37ab6 @@ -746,6 +746,6 @@ SPEC CHECKSUMS: Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: d029bce6f42b50de8718bf24d7685ba0cdf0cafc +PODFILE CHECKSUM: 4d8c02a502ba230519bdc76caaed1177ed2d3a33 COCOAPODS: 1.11.2 diff --git a/ios/amattang.xcodeproj/project.pbxproj b/ios/amattang.xcodeproj/project.pbxproj index d1a1b4e..507ff2c 100644 --- a/ios/amattang.xcodeproj/project.pbxproj +++ b/ios/amattang.xcodeproj/project.pbxproj @@ -471,7 +471,17 @@ baseConfigurationReference = EF69AFFC09A3127FB3EBDA9A /* Pods-amattang-amattangTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_ROOT}/Flipper-DoubleConversion/Frameworks\"", + "\"${PODS_ROOT}/GoogleMaps/Base/Frameworks\"", + "\"${PODS_ROOT}/GoogleMaps/Maps/Frameworks\"", + "\"${PODS_ROOT}/OpenSSL-Universal/Frameworks\"", + "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion\"", + "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal\"", + ); GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -499,8 +509,14 @@ baseConfigurationReference = 350968AEFD941C314C4A290C /* Pods-amattang-amattangTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_ROOT}/GoogleMaps/Base/Frameworks\"", + "\"${PODS_ROOT}/GoogleMaps/Maps/Frameworks\"", + ); INFOPLIST_FILE = amattangTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -624,7 +640,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.1; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -682,7 +698,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.1; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)",