Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Kan 152] ios UI Fix #60

Merged
merged 8 commits into from
Jun 19, 2024
Merged

[Kan 152] ios UI Fix #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
194602f
Fix/headers
sjsjmine129 Jun 16, 2024
50db7c4
Fix/ioName
sjsjmine129 Jun 19, 2024
5d1f358
Fix/iosName
sjsjmine129 Jun 19, 2024
aceab04
Feat/map mlocation focus
sjsjmine129 Jun 19, 2024
916c9c9
Fix/iosUI
sjsjmine129 Jun 19, 2024
ca94424
Fix/data
sjsjmine129 Jun 19, 2024
7ff8967
Fix/release
sjsjmine129 Jun 19, 2024
ebaf1d2
Fix
sjsjmine129 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ios/meokguskku.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,31 @@
00E356EE1AD99517003FC87E /* meokguskkuTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = meokguskkuTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* meokguskkuTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = meokguskkuTests.m; sourceTree = "<group>"; };
05A0D76595064C7D82FC26A9 /* NanumSquareRoundB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundB.otf; path = ../src/assets/fonts/NanumSquareRoundB.otf; sourceTree = "<group>"; };
05A0D76595064C7D82FC26A9 /* NanumSquareRoundB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundB.otf; path = ../src/assets/fonts/NanumSquareRoundB.otf; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* meokguskku.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = meokguskku.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = meokguskku/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = meokguskku/AppDelegate.mm; sourceTree = "<group>"; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = meokguskku/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = meokguskku/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = meokguskku/main.m; sourceTree = "<group>"; };
19F6CBCC0A4E27FBF8BF4A61 /* libPods-meokguskku-meokguskkuTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-meokguskku-meokguskkuTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1C6B42C5E19141E9895D2EC6 /* NanumSquareRoundL.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundL.otf; path = ../src/assets/fonts/NanumSquareRoundL.otf; sourceTree = "<group>"; };
1C6B42C5E19141E9895D2EC6 /* NanumSquareRoundL.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundL.otf; path = ../src/assets/fonts/NanumSquareRoundL.otf; sourceTree = "<group>"; };
1EA088AE07AA4A008F5DECC0 /* NanumSquareRoundB.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundB.ttf; path = ../src/assets/fonts/NanumSquareRoundB.ttf; sourceTree = "<group>"; };
3105D155E65943C28C5F5FDB /* NanumSquareRoundR.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundR.ttf; path = ../src/assets/fonts/NanumSquareRoundR.ttf; sourceTree = "<group>"; };
3B4392A12AC88292D35C810B /* Pods-meokguskku.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku.debug.xcconfig"; path = "Target Support Files/Pods-meokguskku/Pods-meokguskku.debug.xcconfig"; sourceTree = "<group>"; };
5709B34CF0A7D63546082F79 /* Pods-meokguskku.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku.release.xcconfig"; path = "Target Support Files/Pods-meokguskku/Pods-meokguskku.release.xcconfig"; sourceTree = "<group>"; };
5B7EB9410499542E8C5724F5 /* Pods-meokguskku-meokguskkuTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku-meokguskkuTests.debug.xcconfig"; path = "Target Support Files/Pods-meokguskku-meokguskkuTests/Pods-meokguskku-meokguskkuTests.debug.xcconfig"; sourceTree = "<group>"; };
5DCACB8F33CDC322A6C60F78 /* libPods-meokguskku.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-meokguskku.a"; sourceTree = BUILT_PRODUCTS_DIR; };
74704C3B020D4AC293BF0FF9 /* NanumSquareRoundEB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundEB.otf; path = ../src/assets/fonts/NanumSquareRoundEB.otf; sourceTree = "<group>"; };
74704C3B020D4AC293BF0FF9 /* NanumSquareRoundEB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundEB.otf; path = ../src/assets/fonts/NanumSquareRoundEB.otf; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = meokguskku/LaunchScreen.storyboard; sourceTree = "<group>"; };
89C6BE57DB24E9ADA2F236DE /* Pods-meokguskku-meokguskkuTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku-meokguskkuTests.release.xcconfig"; path = "Target Support Files/Pods-meokguskku-meokguskkuTests/Pods-meokguskku-meokguskkuTests.release.xcconfig"; sourceTree = "<group>"; };
AD65022AAA184922BE36CA7C /* NanumSquareRoundEB.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundEB.ttf; path = ../src/assets/fonts/NanumSquareRoundEB.ttf; sourceTree = "<group>"; };
BF3E8CB4790F421288F1C7F9 /* NanumSquareRoundR.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundR.otf; path = ../src/assets/fonts/NanumSquareRoundR.otf; sourceTree = "<group>"; };
BF3E8CB4790F421288F1C7F9 /* NanumSquareRoundR.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundR.otf; path = ../src/assets/fonts/NanumSquareRoundR.otf; sourceTree = "<group>"; };
CA822710062140ACB7F5B758 /* NanumSquareRoundL.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundL.ttf; path = ../src/assets/fonts/NanumSquareRoundL.ttf; sourceTree = "<group>"; };
CE1AB077A2FE48F1BC9E56AE /* NIXGONFONTS L 2.0.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS L 2.0.ttf"; path = "../src/assets/fonts/NIXGONFONTS L 2.0.ttf"; sourceTree = "<group>"; };
E734FDCFB6374063BE1E6506 /* NIXGONFONTS M 2.0.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS M 2.0.ttf"; path = "../src/assets/fonts/NIXGONFONTS M 2.0.ttf"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
EE95F34BC81444CEAE8A7E42 /* NIXGONFONTS M 2.0.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS M 2.0.otf"; path = "../src/assets/fonts/NIXGONFONTS M 2.0.otf"; sourceTree = "<group>"; };
EE95F34BC81444CEAE8A7E42 /* NIXGONFONTS M 2.0.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS M 2.0.otf"; path = "../src/assets/fonts/NIXGONFONTS M 2.0.otf"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -521,6 +521,8 @@
DEVELOPMENT_TEAM = B4BSCLJVA5;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = meokguskku/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "먹구스꾸";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -548,6 +550,8 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = B4BSCLJVA5;
INFOPLIST_FILE = meokguskku/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "먹구스꾸";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
48 changes: 26 additions & 22 deletions ios/meokguskku/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>meokguskku</string>
<string>먹구스꾸</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down Expand Up @@ -38,31 +38,17 @@
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
<string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>리뷰/및 프로필 사진 업로드를 위해 갤러리 접근 권한이 필요합니다.</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSLocationWhenInUseUsageDescription</key>
<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>리뷰/및 프로필 사진 업로드를 위해 갤러리 접근 권한이 필요합니다.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
<key>UIAppFonts</key>
<array>
<string>NanumSquareRoundB.ttf</string>
Expand All @@ -77,5 +63,23 @@
<string>NanumSquareRoundL.otf</string>
<string>NanumSquareRoundR.otf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
</plist>
10 changes: 10 additions & 0 deletions src/assets/svg.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions src/components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
COLOR_BACKGROUND,
COLOR_GRAY,
COLOR_PRIMARY,
COLOR_TEXT_BLACK,
} from '../assets/color';
import AnimatedButton from './AnimationButton';
import {useNavigation} from '@react-navigation/native';
Expand All @@ -22,7 +23,8 @@ import {StatusBarHeight} from './Safe';

export default function Header(props) {
const navigation = useNavigation();
const {title, isBackButton, noSafe} = props;
const {title, isBackButton, noSafe, color} = props;

return (
<View
style={{
Expand All @@ -31,7 +33,7 @@ export default function Header(props) {
? 0
: StatusBarHeight
: 0,
backgroundColor: COLOR_PRIMARY,
backgroundColor: color == 'white' ? COLOR_BACKGROUND : COLOR_PRIMARY,
// height: 56,
justifyContent: 'center',
alignItems: 'center',
Expand All @@ -54,12 +56,18 @@ export default function Header(props) {
onPress={() => {
navigation.goBack();
}}>
<SvgXml xml={svgXml.button.goback} width="24" height="24" />
<SvgXml
xml={
color == 'white' ? svgXml.button.gobackGray : svgXml.button.goback
}
width="24"
height="24"
/>
</AnimatedButton>
) : null}
<Text
style={{
color: COLOR_WHITE,
color: color ? COLOR_TEXT_BLACK : COLOR_WHITE,
fontSize: 16,
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
Expand Down
54 changes: 0 additions & 54 deletions src/components/HeaderWhite.js
View file
Open in desktop

This file was deleted.

Loading
Loading