Merge pull request #89 from CovidTrackerFr/develop

Merge develop into main
CovidTrackerFr · May 1, 2021 · 520de7b · 520de7b
2 parents af01dc0 + a0905b5
commit 520de7b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 8 deletions.
diff --git a/ViteMaDose.xcodeproj/project.pbxproj b/ViteMaDose.xcodeproj/project.pbxproj
@@ -113,6 +113,7 @@
 /* Begin PBXFileReference section */
 		5702B5D6263595FF00C51F47 /* HomeViewModelDelegateSpy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModelDelegateSpy.swift; sourceTree = "<group>"; };
 		5702B5DA2635965C00C51F47 /* APIServiceMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIServiceMock.swift; sourceTree = "<group>"; };
+		570E4273263893E5004A47F9 /* ViteMaDoseDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ViteMaDoseDebug.entitlements; sourceTree = "<group>"; };
 		57471428262B6BA300535DF1 /* CountyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountyCell.swift; sourceTree = "<group>"; };
 		57471429262B6BA300535DF1 /* CountyCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CountyCell.xib; sourceTree = "<group>"; };
 		575CC223262AECA7008D1869 /* HomeTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTitleCell.swift; sourceTree = "<group>"; };
@@ -263,7 +264,6 @@
 		576738BE261E329C004A700D /* ViteMaDose */ = {
 			isa = PBXGroup;
 			children = (
-				6A28354B262DC06C00FA6456 /* ViteMaDose.entitlements */,
 				57673986261E5AF3004A700D /* Application */,
 				5767392A261E3B99004A700D /* Views */,
 				5767393C261E3BFD004A700D /* ViewModels */,
@@ -400,6 +400,8 @@
 		57673986261E5AF3004A700D /* Application */ = {
 			isa = PBXGroup;
 			children = (
+				570E4273263893E5004A47F9 /* ViteMaDoseDebug.entitlements */,
+				6A28354B262DC06C00FA6456 /* ViteMaDose.entitlements */,
 				579D713126373A030021CB56 /* GoogleService-Info-debug.plist */,
 				577A7F6B262CA3D000B1D03C /* GoogleService-Info-prod.plist */,
 				576738BF261E329C004A700D /* AppDelegate.swift */,
@@ -1020,7 +1022,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = ViteMaDose/ViteMaDose.entitlements;
+				CODE_SIGN_ENTITLEMENTS = ViteMaDose/ViteMaDoseDebug.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 841539;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

diff --git a/ViteMaDose/Helpers/Extensions/Storyboard+Common.swift b/ViteMaDose/Helpers/Extensions/Storyboard+Common.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol Storyboarded: class {
+protocol Storyboarded: AnyObject {
     static var storyboard: UIStoryboard { get }
 }
 

diff --git a/ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift b/ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol ErrorDisplayable: class {
+protocol ErrorDisplayable: AnyObject {
     func presentRetryableAndCancellableError(
         error: Error,
         retryHandler:  @escaping (_: UIAlertAction) -> Void,

diff --git a/ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift b/ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift
@@ -31,7 +31,7 @@ protocol CentresListViewModelProvider {
     func bookingLink(at indexPath: IndexPath) -> URL?
 }
 
-protocol CentresListViewModelDelegate: class {
+protocol CentresListViewModelDelegate: AnyObject {
     func updateLoadingState(isLoading: Bool, isEmpty: Bool)
 
     func presentLoadError(_ error: Error)

diff --git a/ViteMaDose/ViewModels/CountySelection/CountySelectionViewModel.swift b/ViteMaDose/ViewModels/CountySelection/CountySelectionViewModel.swift
@@ -13,7 +13,7 @@ protocol CountySelectionViewModelProvider {
     func didSelectCell(at indexPath: IndexPath)
 }
 
-protocol CountySelectionViewModelDelegate: class {
+protocol CountySelectionViewModelDelegate: AnyObject {
     func reloadTableView(with counties: Counties)
     func dismissViewController(with county: County)
 }

diff --git a/ViteMaDose/ViewModels/Home/HomeViewModel.swift b/ViteMaDose/ViewModels/Home/HomeViewModel.swift
@@ -35,7 +35,7 @@ protocol HomeViewModelProvider {
     var stats: Stats? { get }
 }
 
-protocol HomeViewModelDelegate: class {
+protocol HomeViewModelDelegate: AnyObject {
     func updateLoadingState(isLoading: Bool, isEmpty: Bool)
 
     func presentVaccinationCentres(for county: County)

diff --git a/ViteMaDose/Views/CountySelection/CountySelectionViewController.swift b/ViteMaDose/Views/CountySelection/CountySelectionViewController.swift
@@ -9,7 +9,7 @@ import Foundation
 import UIKit
 import Haptica
 
-protocol CountySelectionViewControllerDelegate: class {
+protocol CountySelectionViewControllerDelegate: AnyObject {
     func didSelect(county: County)
 }
 

diff --git a/ViteMaDose/ViteMaDose.entitlements b/ViteMaDose/ViteMaDose.entitlements
@@ -6,6 +6,7 @@
 	<array>
 		<string>applinks:vitemadose.covidtracker.fr</string>
 		<string>applinks:vitemadose.app</string>
+		<string>applinks:vitemadose.page.link</string>
 	</array>
 </dict>
 </plist>
diff --git a/ViteMaDose/ViteMaDoseDebug.entitlements b/ViteMaDose/ViteMaDoseDebug.entitlements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:vitemadose.covidtracker.fr</string>
+		<string>applinks:vitemadose.app</string>
+		<string>applinks:vitemadosedev.page.link</string>
+	</array>
+</dict>
+</plist>