diff --git a/Podfile b/Podfile index 12d2e5d..dcfaacb 100644 --- a/Podfile +++ b/Podfile @@ -1,15 +1,15 @@ -platform :ios, '12.0' +platform :ios, '13.0' use_frameworks! inhibit_all_warnings! ENV['COCOAPODS_DISABLE_STATS'] = "true" target 'QuickChat' do - pod 'Firebase/Core' - pod 'Firebase/Auth' - pod 'Firebase/Storage' - pod 'Kingfisher' - pod 'Firebase/Firestore' - pod 'ALLoadingView' + pod 'Firebase/Core' + pod 'Firebase/Auth' + pod 'Firebase/Storage' + pod 'Kingfisher' + pod 'Firebase/Firestore' + pod 'ALLoadingView' end diff --git a/Podfile.lock b/Podfile.lock index ab23ab1..5829311 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,4 +1,163 @@ PODS: + - abseil/algorithm (0.20190808): + - abseil/algorithm/algorithm (= 0.20190808) + - abseil/algorithm/container (= 0.20190808) + - abseil/algorithm/algorithm (0.20190808) + - abseil/algorithm/container (0.20190808): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/base (0.20190808): + - abseil/base/atomic_hook (= 0.20190808) + - abseil/base/base (= 0.20190808) + - abseil/base/base_internal (= 0.20190808) + - abseil/base/bits (= 0.20190808) + - abseil/base/config (= 0.20190808) + - abseil/base/core_headers (= 0.20190808) + - abseil/base/dynamic_annotations (= 0.20190808) + - abseil/base/endian (= 0.20190808) + - abseil/base/log_severity (= 0.20190808) + - abseil/base/malloc_internal (= 0.20190808) + - abseil/base/pretty_function (= 0.20190808) + - abseil/base/spinlock_wait (= 0.20190808) + - abseil/base/throw_delegate (= 0.20190808) + - abseil/base/atomic_hook (0.20190808) + - abseil/base/base (0.20190808): + - abseil/base/atomic_hook + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/log_severity + - abseil/base/spinlock_wait + - abseil/meta/type_traits + - abseil/base/base_internal (0.20190808): + - abseil/meta/type_traits + - abseil/base/bits (0.20190808): + - abseil/base/core_headers + - abseil/base/config (0.20190808) + - abseil/base/core_headers (0.20190808): + - abseil/base/config + - abseil/base/dynamic_annotations (0.20190808) + - abseil/base/endian (0.20190808): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/log_severity (0.20190808): + - abseil/base/core_headers + - abseil/base/malloc_internal (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/spinlock_wait + - abseil/base/pretty_function (0.20190808) + - abseil/base/spinlock_wait (0.20190808): + - abseil/base/core_headers + - abseil/base/throw_delegate (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/memory (0.20190808): + - abseil/memory/memory (= 0.20190808) + - abseil/memory/memory (0.20190808): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/meta (0.20190808): + - abseil/meta/type_traits (= 0.20190808) + - abseil/meta/type_traits (0.20190808): + - abseil/base/config + - abseil/numeric/int128 (0.20190808): + - abseil/base/config + - abseil/base/core_headers + - abseil/strings/internal (0.20190808): + - abseil/base/core_headers + - abseil/base/endian + - abseil/meta/type_traits + - abseil/strings/strings (0.20190808): + - abseil/base/base + - abseil/base/bits + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/throw_delegate + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/strings/internal + - abseil/time (0.20190808): + - abseil/time/internal (= 0.20190808) + - abseil/time/time (= 0.20190808) + - abseil/time/internal (0.20190808): + - abseil/time/internal/cctz (= 0.20190808) + - abseil/time/internal/cctz (0.20190808): + - abseil/time/internal/cctz/civil_time (= 0.20190808) + - abseil/time/internal/cctz/includes (= 0.20190808) + - abseil/time/internal/cctz/time_zone (= 0.20190808) + - abseil/time/internal/cctz/civil_time (0.20190808) + - abseil/time/internal/cctz/includes (0.20190808) + - abseil/time/internal/cctz/time_zone (0.20190808): + - abseil/time/internal/cctz/civil_time + - abseil/time/time (0.20190808): + - abseil/base/base + - abseil/base/core_headers + - abseil/numeric/int128 + - abseil/strings/strings + - abseil/time/internal/cctz/civil_time + - abseil/time/internal/cctz/time_zone + - abseil/types (0.20190808): + - abseil/types/any (= 0.20190808) + - abseil/types/bad_any_cast (= 0.20190808) + - abseil/types/bad_any_cast_impl (= 0.20190808) + - abseil/types/bad_optional_access (= 0.20190808) + - abseil/types/bad_variant_access (= 0.20190808) + - abseil/types/compare (= 0.20190808) + - abseil/types/optional (= 0.20190808) + - abseil/types/span (= 0.20190808) + - abseil/types/variant (= 0.20190808) + - abseil/types/any (0.20190808): + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/bad_any_cast + - abseil/utility/utility + - abseil/types/bad_any_cast (0.20190808): + - abseil/base/config + - abseil/types/bad_any_cast_impl + - abseil/types/bad_any_cast_impl (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/types/bad_optional_access (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/types/bad_variant_access (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/types/compare (0.20190808): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/optional (0.20190808): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/types/bad_optional_access + - abseil/utility/utility + - abseil/types/span (0.20190808): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/base/throw_delegate + - abseil/meta/type_traits + - abseil/types/variant (0.20190808): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/bad_variant_access + - abseil/utility/utility + - abseil/utility/utility (0.20190808): + - abseil/base/base_internal + - abseil/base/config + - abseil/meta/type_traits - ALLoadingView (1.1.5) - BoringSSL-GRPC (0.0.3): - BoringSSL-GRPC/Implementation (= 0.0.3) @@ -6,97 +165,96 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.3): - BoringSSL-GRPC/Interface (= 0.0.3) - BoringSSL-GRPC/Interface (0.0.3) - - Firebase/Auth (6.9.0): + - Firebase/Auth (6.13.0): - Firebase/CoreOnly - - FirebaseAuth (~> 6.2.3) - - Firebase/Core (6.9.0): + - FirebaseAuth (~> 6.4.0) + - Firebase/Core (6.13.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.1.2) - - Firebase/CoreOnly (6.9.0): - - FirebaseCore (= 6.3.0) - - Firebase/Firestore (6.9.0): + - FirebaseAnalytics (= 6.1.6) + - Firebase/CoreOnly (6.13.0): + - FirebaseCore (= 6.4.0) + - Firebase/Firestore (6.13.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 1.5.1) - - Firebase/Storage (6.9.0): + - FirebaseFirestore (~> 1.8.0) + - Firebase/Storage (6.13.0): - Firebase/CoreOnly - - FirebaseStorage (~> 3.4.1) - - FirebaseAnalytics (6.1.2): - - FirebaseCore (~> 6.3) + - FirebaseStorage (~> 3.4.2) + - FirebaseAnalytics (6.1.6): + - FirebaseCore (~> 6.4) - FirebaseInstanceID (~> 4.2) - - GoogleAppMeasurement (= 6.1.2) + - GoogleAppMeasurement (= 6.1.6) - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (~> 0.3) - - FirebaseAuth (6.2.3): + - nanopb (= 0.3.9011) + - FirebaseAuth (6.4.0): - FirebaseAuthInterop (~> 1.0) - FirebaseCore (~> 6.2) - GoogleUtilities/AppDelegateSwizzler (~> 6.2) - GoogleUtilities/Environment (~> 6.2) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (6.3.0): + - FirebaseCore (6.4.0): - FirebaseCoreDiagnostics (~> 1.0) - FirebaseCoreDiagnosticsInterop (~> 1.0) - GoogleUtilities/Environment (~> 6.2) - GoogleUtilities/Logger (~> 6.2) - - FirebaseCoreDiagnostics (1.1.0): + - FirebaseCoreDiagnostics (1.1.1): - FirebaseCoreDiagnosticsInterop (~> 1.0) - GoogleDataTransportCCTSupport (~> 1.0) - GoogleUtilities/Environment (~> 6.2) - GoogleUtilities/Logger (~> 6.2) - - FirebaseCoreDiagnosticsInterop (1.0.0) - - FirebaseFirestore (1.5.1): - - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 6.2) - - FirebaseFirestore/abseil-cpp (= 1.5.1) - - "gRPC-C++ (= 0.0.9)" - - leveldb-library (~> 1.22) - nanopb (~> 0.3.901) - - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (1.5.1): + - FirebaseCoreDiagnosticsInterop (1.1.0) + - FirebaseFirestore (1.8.0): + - abseil/algorithm (= 0.20190808) + - abseil/base (= 0.20190808) + - abseil/memory (= 0.20190808) + - abseil/meta (= 0.20190808) + - abseil/strings/strings (= 0.20190808) + - abseil/time (= 0.20190808) + - abseil/types (= 0.20190808) - FirebaseAuthInterop (~> 1.0) - FirebaseCore (~> 6.2) - "gRPC-C++ (= 0.0.9)" - leveldb-library (~> 1.22) - nanopb (~> 0.3.901) - - Protobuf (~> 3.1) - - FirebaseInstanceID (4.2.5): + - FirebaseInstanceID (4.2.7): - FirebaseCore (~> 6.0) - GoogleUtilities/Environment (~> 6.0) - GoogleUtilities/UserDefaults (~> 6.0) - - FirebaseStorage (3.4.1): + - FirebaseStorage (3.4.2): - FirebaseAuthInterop (~> 1.0) - FirebaseCore (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - - GoogleAppMeasurement (6.1.2): + - GoogleAppMeasurement (6.1.6): - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (~> 0.3) - - GoogleDataTransport (2.0.0) - - GoogleDataTransportCCTSupport (1.1.0): - - GoogleDataTransport (~> 2.0) - - nanopb - - GoogleUtilities/AppDelegateSwizzler (6.3.0): + - nanopb (= 0.3.9011) + - GoogleDataTransport (3.1.0) + - GoogleDataTransportCCTSupport (1.2.1): + - GoogleDataTransport (~> 3.0) + - nanopb (~> 0.3.901) + - GoogleUtilities/AppDelegateSwizzler (6.3.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.3.0) - - GoogleUtilities/Logger (6.3.0): + - GoogleUtilities/Environment (6.3.2) + - GoogleUtilities/Logger (6.3.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.3.0): + - GoogleUtilities/MethodSwizzler (6.3.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.3.0): + - GoogleUtilities/Network (6.3.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.3.0)" - - GoogleUtilities/Reachability (6.3.0): + - "GoogleUtilities/NSData+zlib (6.3.2)" + - GoogleUtilities/Reachability (6.3.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.3.0): + - GoogleUtilities/UserDefaults (6.3.2): - GoogleUtilities/Logger - "gRPC-C++ (0.0.9)": - "gRPC-C++/Implementation (= 0.0.9)" @@ -114,17 +272,16 @@ PODS: - gRPC-Core/Interface (= 1.21.0) - nanopb (~> 0.3) - gRPC-Core/Interface (1.21.0) - - GTMSessionFetcher/Core (1.2.2) - - Kingfisher (5.8.1): - - Kingfisher/Core (= 5.8.1) - - Kingfisher/Core (5.8.1) + - GTMSessionFetcher/Core (1.3.0) + - Kingfisher (5.9.0): + - Kingfisher/Core (= 5.9.0) + - Kingfisher/Core (5.9.0) - leveldb-library (1.22) - - nanopb (0.3.901): - - nanopb/decode (= 0.3.901) - - nanopb/encode (= 0.3.901) - - nanopb/decode (0.3.901) - - nanopb/encode (0.3.901) - - Protobuf (3.9.2) + - nanopb (0.3.9011): + - nanopb/decode (= 0.3.9011) + - nanopb/encode (= 0.3.9011) + - nanopb/decode (0.3.9011) + - nanopb/encode (0.3.9011) DEPENDENCIES: - ALLoadingView @@ -136,6 +293,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - abseil - ALLoadingView - BoringSSL-GRPC - Firebase @@ -158,33 +316,32 @@ SPEC REPOS: - Kingfisher - leveldb-library - nanopb - - Protobuf SPEC CHECKSUMS: + abseil: 18063d773f5366ff8736a050fe035a28f635fd27 ALLoadingView: 5f3a5e73402d3ec178dae51ebdb39c1d64c0a87b BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 - Firebase: 2d750c54cda57d5a6ae31212cfe5cc813c6be7e4 - FirebaseAnalytics: 5d9ccbf46ed25d3ec9304d263f85bddf1e93e2d2 - FirebaseAuth: e7f86c2dfc57281cd01f7da5e4b40e01e4510a4a + Firebase: 458d109512200d1aca2e1b9b6cf7d68a869a4a46 + FirebaseAnalytics: 45f36d9c429fc91d206283900ab75390cd05ee8a + FirebaseAuth: 7d0f84873926f6648bbd1391a318dfb1a26b5e4f FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 8b2765c445d40db7137989b7146a3aa3f91b5529 - FirebaseCoreDiagnostics: be4f7a09d02ab305f18de59a470412caddb64c2a - FirebaseCoreDiagnosticsInterop: 6829da2b8d1fc795ff1bd99df751d3788035d2cb - FirebaseFirestore: 5ee8bdb959541f0d55352f2d681efb03b9742a43 - FirebaseInstanceID: 550df9be1f99f751d8fcde3ac342a1e21a0e6c42 - FirebaseStorage: b7c6d00997bc21d4465453bdcc5cc65513110fed - GoogleAppMeasurement: 0ae90be1cc4dad40f4a27fc767ef59fa032ec87b - GoogleDataTransport: c8617c00e4f3eb9418e42ac0e8ac5241a9d555dd - GoogleDataTransportCCTSupport: 9f352523e8785a71f6754f51eeff09f49ec19268 - GoogleUtilities: 9c2c544202301110b29f7974a82e77fdcf12bf51 + FirebaseCore: 307ea2508df730c5865334e41965bd9ea344b0e5 + FirebaseCoreDiagnostics: af29e43048607588c050889d19204f4d7b758c9f + FirebaseCoreDiagnosticsInterop: e9b1b023157e3a2fc6418b5cb601e79b9af7b3a0 + FirebaseFirestore: 7acd8c85ce6b8955cedc0b9be17d456473605a93 + FirebaseInstanceID: ebd2ea79ee38db0cb5f5167b17a0d387e1cc7b6e + FirebaseStorage: 046abe9ac4e2a1a0e47d72f536490ffa50896632 + GoogleAppMeasurement: dfe55efa543e899d906309eaaac6ca26d249862f + GoogleDataTransport: 67cc56f6280d1bc9d470285e851ec49ee9013dba + GoogleDataTransportCCTSupport: f6ab1962e9dc05ab1fb938b795e5b310209edeec + GoogleUtilities: 547a86735c6f0ee30ad17e94df4fc21f616b71cb "gRPC-C++": 9dfe7b44821e7b3e44aacad2af29d2c21f7cde83 gRPC-Core: c9aef9a261a1247e881b18059b84d597293c9947 - GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 - Kingfisher: de969e451c81ca6c07a454bc36fea84b8b08c3c7 + GTMSessionFetcher: 43b8b64263023d4f32caa0b40f4c8bfa3c5f36d8 + Kingfisher: ff98240aebb7302bdc4f1ecd701761030ce18b16 leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 - nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 - Protobuf: 67fb42ba613def994e61854de2b3164f13790cc4 + nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd -PODFILE CHECKSUM: 151ae1bed8a0c460041494ef1128ea57316c4f72 +PODFILE CHECKSUM: 46f720711b0ccf5399a792073f4425cb3ba05f5f -COCOAPODS: 1.8.1 +COCOAPODS: 1.8.4 diff --git a/QuickChat.xcodeproj/project.pbxproj b/QuickChat.xcodeproj/project.pbxproj index 07ef9c5..b57bc03 100644 --- a/QuickChat.xcodeproj/project.pbxproj +++ b/QuickChat.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -408,7 +408,7 @@ attributes = { LastSwiftUpdateCheck = 0800; LastUpgradeCheck = 1020; - ORGANIZATIONNAME = Mexonis; + ORGANIZATIONNAME = "Haik Aslanyan"; TargetAttributes = { 22A92BAC1D59EBD5005D76F7 = { CreatedOnToolsVersion = 8.0; @@ -427,7 +427,7 @@ }; }; buildConfigurationList = 22A92BA81D59EBD5005D76F7 /* Build configuration list for PBXProject "QuickChat" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 11.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -490,31 +490,12 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-QuickChat/Pods-QuickChat-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/ALLoadingView/ALLoadingView.framework", - "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", - "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework", - "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-QuickChat/Pods-QuickChat-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ALLoadingView.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-QuickChat/Pods-QuickChat-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -682,7 +663,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; }; @@ -695,8 +677,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/QuickChat/Application/Resources/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.quick-chat"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -711,8 +696,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/QuickChat/Application/Resources/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.quick-chat"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; diff --git a/QuickChat.xcodeproj/xcuserdata/Haik.xcuserdatad/xcschemes/QuickChat.xcscheme b/QuickChat.xcodeproj/xcuserdata/Haik.xcuserdatad/xcschemes/QuickChat.xcscheme index 6fe1f46..21d9ca2 100644 --- a/QuickChat.xcodeproj/xcuserdata/Haik.xcuserdatad/xcschemes/QuickChat.xcscheme +++ b/QuickChat.xcodeproj/xcuserdata/Haik.xcuserdatad/xcschemes/QuickChat.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - ? = nil) { +extension KeyboardHandler { + func addKeyboardObservers(_ completion: CompletionObject? = nil) { NotificationCenter.default.addObserver(forName: UIResponder.keyboardWillShowNotification, object: nil, queue: nil) {[weak self] (notification) in self?.handleKeyboard(notification: notification) completion?(true) diff --git a/QuickChat/Application/Resources/Assets.xcassets/AuthBackground.colorset/Contents.json b/QuickChat/Application/Resources/Assets.xcassets/AuthBackground.colorset/Contents.json new file mode 100644 index 0000000..a5adc59 --- /dev/null +++ b/QuickChat/Application/Resources/Assets.xcassets/AuthBackground.colorset/Contents.json @@ -0,0 +1,56 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "1.000", + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "1.000", + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.220", + "alpha" : "1.000", + "blue" : "0.220", + "green" : "0.220" + } + } + } + ] +} \ No newline at end of file diff --git a/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/Contents.json b/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/Contents.json index 44fec78..1110a8c 100644 --- a/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/Contents.json +++ b/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/Contents.json @@ -4,14 +4,76 @@ "idiom" : "universal", "scale" : "1x" }, + { + "idiom" : "universal", + "scale" : "1x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ] + }, + { + "idiom" : "universal", + "scale" : "1x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ] + }, { "idiom" : "universal", "filename" : "clouds.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "clouds-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ], + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "clouds-2.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "scale" : "3x" + }, + { + "idiom" : "universal", + "scale" : "3x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ] + }, + { + "idiom" : "universal", + "scale" : "3x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ] } ], "info" : { diff --git a/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/clouds-1.png b/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/clouds-1.png new file mode 100644 index 0000000..056b832 Binary files /dev/null and b/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/clouds-1.png differ diff --git a/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/clouds-2.png b/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/clouds-2.png new file mode 100644 index 0000000..126aed0 Binary files /dev/null and b/QuickChat/Application/Resources/Assets.xcassets/clouds.imageset/clouds-2.png differ diff --git a/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/Contents.json b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/Contents.json index 71fb056..9ec7cc0 100644 --- a/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/Contents.json +++ b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/Contents.json @@ -4,14 +4,76 @@ "idiom" : "universal", "scale" : "1x" }, + { + "idiom" : "universal", + "scale" : "1x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ] + }, + { + "idiom" : "universal", + "scale" : "1x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ] + }, + { + "idiom" : "universal", + "filename" : "empty1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "empty1-1.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "empty.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], "scale" : "2x" }, { "idiom" : "universal", "scale" : "3x" + }, + { + "idiom" : "universal", + "scale" : "3x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ] + }, + { + "idiom" : "universal", + "scale" : "3x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ] } ], "info" : { diff --git a/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty.png b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty.png index dbcf0bf..71eba71 100644 Binary files a/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty.png and b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty.png differ diff --git a/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty1-1.png b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty1-1.png new file mode 100644 index 0000000..b9e3019 Binary files /dev/null and b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty1-1.png differ diff --git a/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty1.png b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty1.png new file mode 100644 index 0000000..b9e3019 Binary files /dev/null and b/QuickChat/Application/Resources/Assets.xcassets/empty.imageset/empty1.png differ diff --git a/QuickChat/Application/Resources/LaunchScreen.storyboard b/QuickChat/Application/Resources/LaunchScreen.storyboard index 1ce5ca3..cd79fa2 100644 --- a/QuickChat/Application/Resources/LaunchScreen.storyboard +++ b/QuickChat/Application/Resources/LaunchScreen.storyboard @@ -1,10 +1,9 @@ - - - - + + - + + diff --git a/QuickChat/Presenter/Auth/Auth.storyboard b/QuickChat/Presenter/Auth/Auth.storyboard index 55d9b0c..45eb57e 100644 --- a/QuickChat/Presenter/Auth/Auth.storyboard +++ b/QuickChat/Presenter/Auth/Auth.storyboard @@ -1,10 +1,9 @@ - - - - + + - + + @@ -94,7 +93,6 @@ - @@ -136,7 +134,6 @@ - @@ -177,7 +174,6 @@ - @@ -206,7 +202,7 @@ - + @@ -249,7 +245,6 @@ - @@ -291,7 +286,6 @@ - @@ -339,7 +333,7 @@ - + @@ -370,7 +364,7 @@ - + @@ -420,5 +414,8 @@ + + + diff --git a/QuickChat/Presenter/Conversations/Conversations.storyboard b/QuickChat/Presenter/Conversations/Conversations.storyboard index 2312393..a901aa6 100644 --- a/QuickChat/Presenter/Conversations/Conversations.storyboard +++ b/QuickChat/Presenter/Conversations/Conversations.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -19,7 +17,7 @@ - + @@ -61,6 +59,7 @@ + @@ -81,7 +80,7 @@ - + @@ -124,6 +123,7 @@ + @@ -137,6 +137,7 @@ + @@ -145,16 +146,17 @@ - + - + + @@ -165,6 +167,7 @@ + @@ -173,7 +176,7 @@ - + @@ -206,7 +209,6 @@ - diff --git a/QuickChat/Presenter/Initial/InitialViewController.swift b/QuickChat/Presenter/Initial/InitialViewController.swift index 1f7fbe8..3cb1609 100644 --- a/QuickChat/Presenter/Initial/InitialViewController.swift +++ b/QuickChat/Presenter/Initial/InitialViewController.swift @@ -30,6 +30,8 @@ class InitialViewController: UIViewController { override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - present(UIStoryboard.initial(storyboard: UserManager().currentUserID().isNone ? .auth : .conversations), animated: true, completion: nil) + let vc = UIStoryboard.initial(storyboard: UserManager().currentUserID().isNone ? .auth : .conversations) + vc.modalPresentationStyle = .fullScreen + present(vc, animated: true) } } diff --git a/QuickChat/Presenter/Messages/Messages.storyboard b/QuickChat/Presenter/Messages/Messages.storyboard index db64d80..fbd22fd 100644 --- a/QuickChat/Presenter/Messages/Messages.storyboard +++ b/QuickChat/Presenter/Messages/Messages.storyboard @@ -1,10 +1,9 @@ - - - - + + - + + @@ -19,7 +18,7 @@ - + @@ -45,6 +44,7 @@ + @@ -56,6 +56,7 @@ + @@ -96,6 +97,7 @@ + @@ -109,6 +111,7 @@ + @@ -146,12 +149,14 @@ + + @@ -202,6 +207,7 @@ + @@ -210,6 +216,7 @@ + @@ -223,14 +230,6 @@ - - - - - - - - @@ -239,7 +238,7 @@ - + @@ -328,9 +327,8 @@ - + - @@ -344,7 +342,7 @@ - + @@ -355,6 +353,7 @@ + @@ -364,19 +363,15 @@ - + - - - - + - @@ -404,6 +399,9 @@ + + + diff --git a/QuickChat/Presenter/Previews/Previews.storyboard b/QuickChat/Presenter/Previews/Previews.storyboard index 45afb64..daf9ce2 100644 --- a/QuickChat/Presenter/Previews/Previews.storyboard +++ b/QuickChat/Presenter/Previews/Previews.storyboard @@ -1,10 +1,8 @@ - - - - + + - + diff --git a/QuickChat/Presenter/Profile/Profile.storyboard b/QuickChat/Presenter/Profile/Profile.storyboard index ef7b0fd..7c5aad5 100644 --- a/QuickChat/Presenter/Profile/Profile.storyboard +++ b/QuickChat/Presenter/Profile/Profile.storyboard @@ -1,10 +1,9 @@ - - - - + + - + + @@ -90,7 +89,7 @@ - + @@ -144,5 +143,8 @@ + + + diff --git a/QuickChat/Services/LocationService.swift b/QuickChat/Services/LocationService.swift index 29d4b95..5e6b89f 100644 --- a/QuickChat/Services/LocationService.swift +++ b/QuickChat/Services/LocationService.swift @@ -59,10 +59,6 @@ class LocationService: NSObject, CLLocationManagerDelegate { completion?(.denied) } } - - deinit { - manager.stopUpdatingLocation() - } } extension LocationService { diff --git a/README.md b/README.md index dcdfadf..561e21e 100755 --- a/README.md +++ b/README.md @@ -29,9 +29,9 @@ To get started and run the app, you need to follow these simple steps: ## Compatibility -This project is written in Swift 5.0 and requires Xcode 10.0 to build and run. +This project is written in Swift 5.0 and requires Xcode 11.0 to build and run. -Quick Chat for iOS is compatible with iOS 12.0+. +Quick Chat for iOS is compatible with iOS 13.0+. ## Author