Skip to content

Commit

Permalink
✨fix/qa (#39)
Browse files Browse the repository at this point in the history
* ✨ 설정된 국가 코드 가져오기 로직 구현

* ✨ 공유하기 로직 구현

* ✨ 이메일 문의 추가
  • Loading branch information
O-O-wl authored Jan 16, 2021
1 parent c297e2f commit c167aca
Show file tree
Hide file tree
Showing 18 changed files with 569 additions and 93 deletions.
4 changes: 4 additions & 0 deletions Dear-World/Dear-World.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
39965E8825ABE32400069860 /* BottomSheetItemHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */; };
39965E8D25ACA87A00069860 /* BottomSheetItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E8C25ACA87A00069860 /* BottomSheetItem.swift */; };
39965F2525B2E20A00069860 /* heart_fill.json in Resources */ = {isa = PBXBuildFile; fileRef = 39965F2425B2E20900069860 /* heart_fill.json */; };
39965F3325B308B000069860 /* UIApplication+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965F3225B308B000069860 /* UIApplication+.swift */; };
39C832282597651F00236DDF /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 39C832272597651F00236DDF /* RxRelay */; };
39C8322A2597651F00236DDF /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 39C832292597651F00236DDF /* RxSwift */; };
39C8322C2597651F00236DDF /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 39C8322B2597651F00236DDF /* RxCocoa */; };
Expand Down Expand Up @@ -178,6 +179,7 @@
39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItemHeaderView.swift; sourceTree = "<group>"; };
39965E8C25ACA87A00069860 /* BottomSheetItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItem.swift; sourceTree = "<group>"; };
39965F2425B2E20900069860 /* heart_fill.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = heart_fill.json; sourceTree = "<group>"; };
39965F3225B308B000069860 /* UIApplication+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+.swift"; sourceTree = "<group>"; };
39E9F7CF25A1738F00BC2CC2 /* AboutReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutReactor.swift; sourceTree = "<group>"; };
39E9F7DA25A1BBED00BC2CC2 /* PixelWorldMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelWorldMapView.swift; sourceTree = "<group>"; };
39E9F7DF25A1BC3C00BC2CC2 /* NoticeBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeBadge.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -307,6 +309,7 @@
39F0C1622597B34F00A7001F /* UIView+.swift */,
39F0C16A2597C7DF00A7001F /* UIImage+.swift */,
39F0C175259860D700A7001F /* UIControl+Rx.swift */,
39965F3225B308B000069860 /* UIApplication+.swift */,
);
path = Extension;
sourceTree = "<group>";
Expand Down Expand Up @@ -894,6 +897,7 @@
39658FAF259AE4E40050D180 /* World.swift in Sources */,
3971EB24259A7C420084E6DC /* Emoji.Model.Random.swift in Sources */,
39F0C1632597B34F00A7001F /* UIView+.swift in Sources */,
39965F3325B308B000069860 /* UIApplication+.swift in Sources */,
3971EB1F259A7C0E0084E6DC /* Emoji.API.Random.swift in Sources */,
393E0D4025A23A12000DB3B9 /* World.Model.Map.swift in Sources */,
3902F1052596F26D00A3DF8C /* CheeringMapViewController.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
{
"object": {
"pins": [
{
"package": "abseil",
"repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git",
"state": {
"branch": null,
"revision": "05d8107f2971a37e6c77245b7c4c6b0a7e97bc99",
"version": "0.20200225.0"
}
},
{
"package": "Alamofire",
"repositoryURL": "https://github.com/Alamofire/Alamofire",
"state": {
"branch": null,
"revision": "eaf6e622dd41b07b251d8f01752eab31bc811493",
"version": "5.4.1"
}
},
{
"package": "BoringSSL-GRPC",
"repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git",
"state": {
"branch": null,
"revision": "7bcafa2660bc58715c39637494550d1ed7cd7229",
"version": "0.0.7"
}
},
{
"package": "Firebase",
"repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git",
"state": {
"branch": null,
"revision": "c67d97dc802aafe5474042156dce828e1c4145ca",
"version": "7.3.1"
}
},
{
"package": "gRPC",
"repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git",
"state": {
"branch": null,
"revision": "91b62619e6c83bc5f1b99d9d60fe46b2862d3a5a",
"version": "1.28.2"
}
},
{
"package": "GTMSessionFetcher",
"repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
"state": {
"branch": null,
"revision": "91ed3d188eb95705fef3c249453b81f32dc557d1",
"version": "1.5.0"
}
},
{
"package": "Kingfisher",
"repositoryURL": "https://github.com/onevcat/Kingfisher",
"state": {
"branch": null,
"revision": "0be276f6a7fd54af4c3eb03f2d12e12d8c8a1a1d",
"version": "6.0.1"
}
},
{
"package": "leveldb",
"repositoryURL": "https://github.com/firebase/leveldb.git",
"state": {
"branch": null,
"revision": "fa1f25f296a766e5a789c4dacd4798dea798b2c2",
"version": "1.22.1"
}
},
{
"package": "Logger",
"repositoryURL": "https://github.com/f-meloni/Logger",
"state": {
"branch": null,
"revision": "53c3ecca5abe8cf46697e33901ee774236d94cce",
"version": "0.2.3"
}
},
{
"package": "Lottie",
"repositoryURL": "https://github.com/airbnb/lottie-ios",
"state": {
"branch": null,
"revision": "e02e82c7c1b472e85e641a7624e99c855e21add1",
"version": "3.1.9"
}
},
{
"package": "nanopb",
"repositoryURL": "https://github.com/firebase/nanopb.git",
"state": {
"branch": null,
"revision": "8119dfe5631f2616d11e50ead95448d12e816062",
"version": "2.30906.0"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "7a46a5fc86cb917f69e3daf79fcb045283d8f008",
"version": "8.1.2"
}
},
{
"package": "PackageConfig",
"repositoryURL": "https://github.com/shibapm/PackageConfig.git",
"state": {
"branch": null,
"revision": "bf90dc69fa0792894b08a0b74cf34029694ae486",
"version": "0.13.0"
}
},
{
"package": "Promises",
"repositoryURL": "https://github.com/google/promises.git",
"state": {
"branch": null,
"revision": "afa9a1ace74e116848d4f743599ab83e584ff8cb",
"version": "1.2.12"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
"version": "2.2.1"
}
},
{
"package": "ReactorKit",
"repositoryURL": "https://github.com/ReactorKit/ReactorKit",
"state": {
"branch": null,
"revision": "fc392a1dc4c98a496089b8bd091cd92f608fd299",
"version": "2.1.1"
}
},
{
"package": "Rocket",
"repositoryURL": "https://github.com/shibapm/Rocket",
"state": {
"branch": null,
"revision": "f75c9736733b489a3456b4f3a47cf13adb99f197",
"version": "0.9.2"
}
},
{
"package": "RxExpect",
"repositoryURL": "https://github.com/devxoul/RxExpect.git",
"state": {
"branch": null,
"revision": "c3a3bb3d46ee831582c6619ecc48cda1cdbff890",
"version": "2.0.0"
}
},
{
"package": "RxGesture",
"repositoryURL": "https://github.com/RxSwiftCommunity/RxGesture",
"state": {
"branch": null,
"revision": "867f176b6695829e350fafc00b5a849bb46a1857",
"version": "3.0.3"
}
},
{
"package": "RxKeyboard",
"repositoryURL": "https://github.com/RxSwiftCommunity/RxKeyboard",
"state": {
"branch": null,
"revision": "ed5940a7e29c3a4b4925b2d76260f793d311d58e",
"version": "1.0.0"
}
},
{
"package": "RxOptional",
"repositoryURL": "https://github.com/RxSwiftCommunity/RxOptional",
"state": {
"branch": null,
"revision": "98a1895918e9ba9735a15207dd9c7120e9f51843",
"version": "4.1.0"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift",
"state": {
"branch": null,
"revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
"version": "5.1.1"
}
},
{
"package": "SnapKit",
"repositoryURL": "https://github.com/SnapKit/SnapKit",
"state": {
"branch": null,
"revision": "d458564516e5676af9c70b4f4b2a9178294f1bc6",
"version": "5.0.1"
}
},
{
"package": "SwiftRichString",
"repositoryURL": "https://github.com/malcommac/SwiftRichString",
"state": {
"branch": null,
"revision": "9bf4b5af6bb4386865636fc504d6c588c2b65040",
"version": "3.7.2"
}
},
{
"package": "SwiftShell",
"repositoryURL": "https://github.com/kareman/SwiftShell",
"state": {
"branch": null,
"revision": "beebe43c986d89ea5359ac3adcb42dac94e5e08a",
"version": "4.1.2"
}
},
{
"package": "Then",
"repositoryURL": "https://github.com/devxoul/Then",
"state": {
"branch": null,
"revision": "e421a7b3440a271834337694e6050133a3958bc7",
"version": "2.7.0"
}
},
{
"package": "UITextView+Placeholder",
"repositoryURL": "https://github.com/devxoul/UITextView-Placeholder",
"state": {
"branch": null,
"revision": "5a133b7efc4e8dd9de91c9eada48270d90c83ef0",
"version": "1.4.0"
}
},
{
"package": "WeakMapTable",
"repositoryURL": "https://github.com/ReactorKit/WeakMapTable.git",
"state": {
"branch": null,
"revision": "9580560169b4b48ba2affe7badba6a7f360495f4",
"version": "1.2.0"
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams",
"state": {
"branch": null,
"revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f",
"version": "2.0.0"
}
}
]
},
"version": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "left_arrow.pdf",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "location.png",
"filename" : "location.pdf",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "ufo.pdf",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
17 changes: 17 additions & 0 deletions Dear-World/Dear-World/Source/Common/Extension/UIApplication+.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// UIApplication+.swift
// Dear-World
//
// Created by dongyoung.lee on 2021/01/16.
//

import UIKit

extension UIApplication {
var version: String? {
guard let dictionary = Bundle.main.infoDictionary,
let version = dictionary["CFBundleShortVersionString"] as? String,
let build = dictionary["CFBundleVersion"] as? String else { return nil }
return "\(version).\(build)"
}
}
Loading

0 comments on commit c167aca

Please sign in to comment.