Merge pull request #38 from fassko/develop

fassko · Jun 6, 2020 · 2ca92e5 · 2ca92e5
2 parents d66da4d + 67ef27b
commit 2ca92e5
Show file tree

Hide file tree

Showing 25 changed files with 454 additions and 122 deletions.
diff --git a/Assets.sketch b/Assets.sketch
diff --git a/MeteoLV.xcodeproj/project.pbxproj b/MeteoLV.xcodeproj/project.pbxproj
@@ -30,6 +30,12 @@
 		636EC0FF244B37FF004E42A9 /* MeteoLVProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 636EC0FE244B37FF004E42A9 /* MeteoLVProvider */; };
 		636EC101244B3EB3004E42A9 /* MeteoLVProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 636EC100244B3EB3004E42A9 /* MeteoLVProvider */; };
 		6375AB5C236D740400B1D8F4 /* MeteoLV.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 6375AB5B236D740400B1D8F4 /* MeteoLV.xctestplan */; };
+		63761DAF244C38260013E993 /* ListingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63761DAE244C38260013E993 /* ListingTableViewController.swift */; };
+		63761DB7244C3D060013E993 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63761DB6244C3D060013E993 /* ShareViewController.swift */; };
+		63761DBA244C3D060013E993 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63761DB8244C3D060013E993 /* MainInterface.storyboard */; };
+		63761DBE244C3D060013E993 /* MeteoLVShare.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 63761DB4244C3D060013E993 /* MeteoLVShare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		63761DC2244C41DC0013E993 /* Localized.strings in Resources */ = {isa = PBXBuildFile; fileRef = 639F3EA1243A696100DF33E5 /* Localized.strings */; };
+		63761DC3244C41EC0013E993 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 639F3EA3243A698900DF33E5 /* Extensions.swift */; };
 		638E119821860AFC00F20159 /* Coordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638E119721860AFC00F20159 /* Coordinator.swift */; };
 		638E119A21860B2700F20159 /* Storyboarded.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638E119921860B2700F20159 /* Storyboarded.swift */; };
 		638E119C21860B5E00F20159 /* MapViewCooordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638E119B21860B5E00F20159 /* MapViewCooordinator.swift */; };
@@ -53,6 +59,13 @@
 			remoteGlobalIDString = 63059D41244B1AE2003BF03A;
 			remoteInfo = MeteoLVTodayNotification;
 		};
+		63761DBC244C3D060013E993 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6300DC7D2039ED7D007C268C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 63761DB3244C3D060013E993;
+			remoteInfo = MeteoLVShare;
+		};
 		63E0991D203A0C3A00959498 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6300DC7D2039ED7D007C268C /* Project object */;
@@ -70,6 +83,7 @@
 			dstSubfolderSpec = 13;
 			files = (
 				63059D4F244B1AE2003BF03A /* Weather Latvia.appex in Embed App Extensions */,
+				63761DBE244C3D060013E993 /* MeteoLVShare.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -102,6 +116,11 @@
 		635524F3205E5E6700EC0E23 /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = "<group>"; };
 		636EC0F7244B3218004E42A9 /* Weather Latvia.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Weather Latvia.entitlements"; sourceTree = "<group>"; };
 		6375AB5B236D740400B1D8F4 /* MeteoLV.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MeteoLV.xctestplan; sourceTree = "<group>"; };
+		63761DAE244C38260013E993 /* ListingTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListingTableViewController.swift; sourceTree = "<group>"; };
+		63761DB4244C3D060013E993 /* MeteoLVShare.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = MeteoLVShare.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		63761DB6244C3D060013E993 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
+		63761DB9244C3D060013E993 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
+		63761DBB244C3D060013E993 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		638E119721860AFC00F20159 /* Coordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coordinator.swift; sourceTree = "<group>"; };
 		638E119921860B2700F20159 /* Storyboarded.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storyboarded.swift; sourceTree = "<group>"; };
 		638E119B21860B5E00F20159 /* MapViewCooordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewCooordinator.swift; sourceTree = "<group>"; };
@@ -138,6 +157,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		63761DB1244C3D060013E993 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		63E09915203A0C3900959498 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -154,6 +180,7 @@
 				6300DC872039ED7D007C268C /* MeteoLV */,
 				63E09919203A0C3A00959498 /* MeteoLVUITests */,
 				63059D46244B1AE2003BF03A /* MeteoLVTodayNotification */,
+				63761DB5244C3D060013E993 /* MeteoLVShare */,
 				63059D43244B1AE2003BF03A /* Frameworks */,
 				6300DC862039ED7D007C268C /* Products */,
 			);
@@ -165,6 +192,7 @@
 				6300DC852039ED7D007C268C /* MeteoLV.app */,
 				63E09918203A0C3900959498 /* MeteoLVUITests.xctest */,
 				63059D42244B1AE2003BF03A /* Weather Latvia.appex */,
+				63761DB4244C3D060013E993 /* MeteoLVShare.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -210,6 +238,7 @@
 		63059D38244B1094003BF03A /* List */ = {
 			isa = PBXGroup;
 			children = (
+				63761DAE244C38260013E993 /* ListingTableViewController.swift */,
 				639F3E9B243A5D2B00DF33E5 /* ListTableViewController.swift */,
 			);
 			path = List;
@@ -276,6 +305,16 @@
 			path = Storyboards;
 			sourceTree = "<group>";
 		};
+		63761DB5244C3D060013E993 /* MeteoLVShare */ = {
+			isa = PBXGroup;
+			children = (
+				63761DB6244C3D060013E993 /* ShareViewController.swift */,
+				63761DB8244C3D060013E993 /* MainInterface.storyboard */,
+				63761DBB244C3D060013E993 /* Info.plist */,
+			);
+			path = MeteoLVShare;
+			sourceTree = "<group>";
+		};
 		63E09919203A0C3A00959498 /* MeteoLVUITests */ = {
 			isa = PBXGroup;
 			children = (
@@ -307,6 +346,7 @@
 			);
 			dependencies = (
 				63059D4E244B1AE2003BF03A /* PBXTargetDependency */,
+				63761DBD244C3D060013E993 /* PBXTargetDependency */,
 			);
 			name = MeteoLV;
 			packageProductDependencies = (
@@ -336,6 +376,23 @@
 			productReference = 63059D42244B1AE2003BF03A /* Weather Latvia.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
+		63761DB3244C3D060013E993 /* MeteoLVShare */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 63761DBF244C3D060013E993 /* Build configuration list for PBXNativeTarget "MeteoLVShare" */;
+			buildPhases = (
+				63761DB0244C3D060013E993 /* Sources */,
+				63761DB1244C3D060013E993 /* Frameworks */,
+				63761DB2244C3D060013E993 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = MeteoLVShare;
+			productName = MeteoLVShare;
+			productReference = 63761DB4244C3D060013E993 /* MeteoLVShare.appex */;
+			productType = "com.apple.product-type.app-extension";
+		};
 		63E09917203A0C3900959498 /* MeteoLVUITests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 63E0991F203A0C3A00959498 /* Build configuration list for PBXNativeTarget "MeteoLVUITests" */;
@@ -371,6 +428,9 @@
 					63059D41244B1AE2003BF03A = {
 						CreatedOnToolsVersion = 11.4.1;
 					};
+					63761DB3244C3D060013E993 = {
+						CreatedOnToolsVersion = 11.4.1;
+					};
 					63E09917203A0C3900959498 = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 1010;
@@ -399,6 +459,7 @@
 				6300DC842039ED7D007C268C /* MeteoLV */,
 				63E09917203A0C3900959498 /* MeteoLVUITests */,
 				63059D41244B1AE2003BF03A /* MeteoLVTodayNotification */,
+				63761DB3244C3D060013E993 /* MeteoLVShare */,
 			);
 		};
 /* End PBXProject section */
@@ -421,11 +482,20 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				63761DC2244C41DC0013E993 /* Localized.strings in Resources */,
 				63059D54244B2AB6003BF03A /* Assets.xcassets in Resources */,
 				63059D4B244B1AE2003BF03A /* MainInterface.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		63761DB2244C3D060013E993 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				63761DBA244C3D060013E993 /* MainInterface.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		63E09916203A0C3900959498 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -466,6 +536,7 @@
 				631E462421BBEFB2000CC546 /* ObservationsViewController+Map.swift in Sources */,
 				6300DC9B2039EF16007C268C /* ObservationsViewController.swift in Sources */,
 				63D4718E243BA7CA00077406 /* FavoritesViewCoordinator.swift in Sources */,
+				63761DAF244C38260013E993 /* ListingTableViewController.swift in Sources */,
 				63D47190243BA83000077406 /* ListCoordinatorProtocol.swift in Sources */,
 				6300DC892039ED7D007C268C /* AppDelegate.swift in Sources */,
 				635524F4205E5E6700EC0E23 /* InfoViewController.swift in Sources */,
@@ -485,6 +556,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				63059D48244B1AE2003BF03A /* TodayViewController.swift in Sources */,
+				63761DC3244C41EC0013E993 /* Extensions.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		63761DB0244C3D060013E993 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				63761DB7244C3D060013E993 /* ShareViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -506,6 +586,11 @@
 			target = 63059D41244B1AE2003BF03A /* MeteoLVTodayNotification */;
 			targetProxy = 63059D4D244B1AE2003BF03A /* PBXContainerItemProxy */;
 		};
+		63761DBD244C3D060013E993 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 63761DB3244C3D060013E993 /* MeteoLVShare */;
+			targetProxy = 63761DBC244C3D060013E993 /* PBXContainerItemProxy */;
+		};
 		63E0991E203A0C3A00959498 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 6300DC842039ED7D007C268C /* MeteoLV */;
@@ -538,6 +623,14 @@
 			name = MainInterface.storyboard;
 			sourceTree = "<group>";
 		};
+		63761DB8244C3D060013E993 /* MainInterface.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				63761DB9244C3D060013E993 /* Base */,
+			);
+			name = MainInterface.storyboard;
+			sourceTree = "<group>";
+		};
 		639F3EA1243A696100DF33E5 /* Localized.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -584,7 +677,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.8.200418.1842;
+				CURRENT_PROJECT_VERSION = 1.9.200419.1133;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -646,7 +739,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.8.200418.1842;
+				CURRENT_PROJECT_VERSION = 1.9.200419.1133;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -675,7 +768,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = MeteoLV/MeteoLV.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1.8.200418.1842;
+				CURRENT_PROJECT_VERSION = 1.9.200419.1133;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				INFOPLIST_FILE = MeteoLV/Info.plist;
@@ -702,7 +795,7 @@
 				CODE_SIGN_ENTITLEMENTS = MeteoLV/MeteoLV.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1.8.200418.1842;
+				CURRENT_PROJECT_VERSION = 1.9.200419.1133;
 				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				INFOPLIST_FILE = MeteoLV/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -725,7 +818,7 @@
 			buildSettings = {
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = "MeteoLVTodayNotification/Weather Latvia.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = 3SGNZQGS68;
 				INFOPLIST_FILE = MeteoLVTodayNotification/Info.plist;
@@ -740,7 +833,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fassko.MeteoLV.MeteoLVTodayNotification;
 				PRODUCT_NAME = "Weather Latvia";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.fassko.MeteoLV.MeteoLVTodayNotification";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development com.fassko.MeteoLV.MeteoLVTodayNotification";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -773,6 +866,55 @@
 			};
 			name = Release;
 		};
+		63761DC0244C3D060013E993 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 3SGNZQGS68;
+				INFOPLIST_FILE = MeteoLVShare/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.fassko.MeteoLV.MeteoLVShare;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development com.fassko.MeteoLV.MeteoLVShare";
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		63761DC1244C3D060013E993 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				DEVELOPMENT_TEAM = 3SGNZQGS68;
+				INFOPLIST_FILE = MeteoLVShare/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.fassko.MeteoLV.MeteoLVShare;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.fassko.MeteoLV.MeteoLVShare";
+				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
 		63E09920203A0C3A00959498 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -847,6 +989,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		63761DBF244C3D060013E993 /* Build configuration list for PBXNativeTarget "MeteoLVShare" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				63761DC0244C3D060013E993 /* Debug */,
+				63761DC1244C3D060013E993 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		63E0991F203A0C3A00959498 /* Build configuration list for PBXNativeTarget "MeteoLVUITests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

diff --git a/MeteoLV.xcodeproj/xcuserdata/kristaps.xcuserdatad/xcschemes/xcschememanagement.plist b/MeteoLV.xcodeproj/xcuserdata/kristaps.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,6 +9,11 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>MeteoLVShare.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
 		<key>MeteoLVTodayNotification.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>

diff --git a/MeteoLV/Assets.xcassets/home-full.imageset/home-full.pdf b/MeteoLV/Assets.xcassets/home-full.imageset/home-full.pdf
diff --git a/MeteoLV/Assets.xcassets/home.imageset/home.pdf b/MeteoLV/Assets.xcassets/home.imageset/home.pdf
diff --git a/MeteoLV/Core/MapViewCooordinator.swift b/MeteoLV/Core/MapViewCooordinator.swift
@@ -30,7 +30,7 @@ class MapViewCooordinator: Coordinator {
     navigationController.pushViewController(stationViewController, animated: true)
   }
 
-  func showInfo() {
+  func showInfo() { 
     let infoViewController = InfoViewController.instantiate()
     navigationController.pushViewController(infoViewController, animated: true)
   }

diff --git a/MeteoLV/Favorites/FavoritesTableViewController.swift b/MeteoLV/Favorites/FavoritesTableViewController.swift
@@ -26,6 +26,7 @@ class FavoritesTableViewController: ListingTableViewController, Storyboarded {
 
         DispatchQueue.main.async {
           self?.tableView.reloadData()
+          self?.refreshControl?.endRefreshing()
         }
       case let .failure(error):
         os_log("%s", log: OSLog.standard, type: OSLogType.error, error.localizedDescription)