Skip to content

Commit

Permalink
Merge pull request #162 from 4Ailen/fix/#158_build-error
Browse files Browse the repository at this point in the history
Fix/#161 사진 권한 팝업 문구
  • Loading branch information
urlotus authored Sep 22, 2023
2 parents 7ff635c + 9cbfed9 commit 2496817
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 5 deletions.
22 changes: 22 additions & 0 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
022A3EC42A4D9ABC004DECC8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 022A3EC32A4D9ABC004DECC8 /* GoogleService-Info.plist */; };
02ED9B542ABD5AF10058F20D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 02ED9B562ABD5AF10058F20D /* InfoPlist.strings */; };
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
Expand All @@ -34,6 +35,10 @@
/* Begin PBXFileReference section */
020909242AAA177B000C9FE8 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
022A3EC32A4D9ABC004DECC8 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
02ED9B552ABD5AF10058F20D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
02ED9B5A2ABD5E710058F20D /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Main.strings; sourceTree = "<group>"; };
02ED9B5B2ABD5E710058F20D /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
02ED9B5C2ABD5E8D0058F20D /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
068731F663255F76D1FE167D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -124,6 +129,7 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */,
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
97C147021CF9000F007C117D /* Info.plist */,
02ED9B562ABD5AF10058F20D /* InfoPlist.strings */,
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
Expand Down Expand Up @@ -179,6 +185,7 @@
knownRegions = (
en,
Base,
ko,
);
mainGroup = 97C146E51CF9000F007C117D;
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
Expand All @@ -196,6 +203,7 @@
buildActionMask = 2147483647;
files = (
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
02ED9B542ABD5AF10058F20D /* InfoPlist.strings in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
022A3EC42A4D9ABC004DECC8 /* GoogleService-Info.plist in Resources */,
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
Expand Down Expand Up @@ -291,10 +299,20 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
02ED9B562ABD5AF10058F20D /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
02ED9B552ABD5AF10058F20D /* en */,
02ED9B5C2ABD5E8D0058F20D /* ko */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
97C146FA1CF9000F007C117D /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
97C146FB1CF9000F007C117D /* Base */,
02ED9B5A2ABD5E710058F20D /* ko */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -303,6 +321,7 @@
isa = PBXVariantGroup;
children = (
97C147001CF9000F007C117D /* Base */,
02ED9B5B2ABD5E710058F20D /* ko */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
Expand All @@ -314,6 +333,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -397,6 +417,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -452,6 +473,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down
10 changes: 5 additions & 5 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>NSBonjourServices</key>
<array>
<string>_dartobservatory._tcp</string>
</array>
<array>
<string>_dartobservatory._tcp</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
Expand Down Expand Up @@ -44,11 +44,11 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>Used to demonstrate image picker plugin</string>
<string>NSCameraUsageDescription</string>
<key>NSMicrophoneUsageDescription</key>
<string>Used to capture audio for image picker plugin</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Used to demonstrate image picker plugin</string>
<string>NSPhotoLibraryUsageDescription</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
Expand Down
11 changes: 11 additions & 0 deletions ios/Runner/en.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
InfoPlist.strings
Runner

Created by 윤정하 on 2023/09/22.

*/

NSPhotoLibraryUsageDescription = "Allow \"FriendShip\" to access your photos to set as my profile image and to share photos.";

NSCameraUsageDescription = "Allow \"FriendShip\" to access your camera to take a photo to set as my profile image.";
10 changes: 10 additions & 0 deletions ios/Runner/ko.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
InfoPlist.strings
Runner

Created by 윤정하 on 2023/09/22.

*/
NSPhotoLibraryUsageDescription = "\"FriendShip\"이 프로필 사진 첨부 및 수정, 게시글 사진 첨부 및 수정을 위해 사진 라이브러리에 접근하도록 허용합니다. ";

NSCameraUsageDescription = "\"FriendShip\"이 프로필 사진 첨부 및 수정을 위해 카메라에 접근하도록 허용합니다. ";
1 change: 1 addition & 0 deletions ios/Runner/ko.lproj/LaunchScreen.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions ios/Runner/ko.lproj/Main.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

0 comments on commit 2496817

Please sign in to comment.