Merge branch '363-prepare-for-multiple-slider' into 'master'

talipatpace · talipatpace · commit 670d971995fc · 2024-07-11T15:33:29.000Z
Resolve "Prepare for multiple slider"

Closes #363

See merge request pace/mobile/ios/pace-cloud-sdk!416
diff --git a/ExampleApp/PACECloudSDKExample.xcodeproj/project.pbxproj b/ExampleApp/PACECloudSDKExample.xcodeproj/project.pbxproj
@@ -195,6 +195,9 @@
 		3BEF1E312864922400852A18 /* PaymentMethodVendorsRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodVendorsRow.swift; sourceTree = "<group>"; };
 		6ACBC02F26FB758800E6AC05 /* ExampleLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleLogger.swift; sourceTree = "<group>"; };
 		6ACBC03526FDC17D00E6AC05 /* ShareObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareObject.swift; sourceTree = "<group>"; };
+		9A2B25BC2C3679CA000E7233 /* SameBrand.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SameBrand.gpx; sourceTree = "<group>"; };
+		9A2B25BD2C3679CA000E7233 /* DifferentBrands.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = DifferentBrands.gpx; sourceTree = "<group>"; };
+		9A2B25BE2C3679CA000E7233 /* TestStationLinkenheimHochstetten.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = TestStationLinkenheimHochstetten.gpx; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -285,6 +288,9 @@
 		3B784C5026B3E84B00B1D859 /* GPX */ = {
 			isa = PBXGroup;
 			children = (
+				9A2B25BD2C3679CA000E7233 /* DifferentBrands.gpx */,
+				9A2B25BC2C3679CA000E7233 /* SameBrand.gpx */,
+				9A2B25BE2C3679CA000E7233 /* TestStationLinkenheimHochstetten.gpx */,
 				3B784C5126B3E85700B1D859 /* HEM(Baden).gpx */,
 				3B784C5326B3E86000B1D859 /* Kirche-Jet.gpx */,
 				3B784C4C26B3E83F00B1D859 /* PACE.gpx */,
diff --git a/ExampleApp/PACECloudSDKExample/Utils/GPX/DifferentBrands.gpx b/ExampleApp/PACECloudSDKExample/Utils/GPX/DifferentBrands.gpx
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx>
+    <wpt lat="48.990567" lon="8.375001">
+        <name>WP001</name>
+        <time>2017-11-03T15:42:26Z</time>
+    </wpt>
+</gpx>
diff --git a/ExampleApp/PACECloudSDKExample/Utils/GPX/SameBrand.gpx b/ExampleApp/PACECloudSDKExample/Utils/GPX/SameBrand.gpx
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx>
+    <wpt lat="49.311269" lon="12.106522">
+        <name>WP001</name>
+        <time>2017-11-03T15:42:26Z</time>
+    </wpt>
+</gpx>
diff --git a/ExampleApp/PACECloudSDKExample/Utils/GPX/TestStationLinkenheimHochstetten.gpx b/ExampleApp/PACECloudSDKExample/Utils/GPX/TestStationLinkenheimHochstetten.gpx
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx>
+    <wpt lat="49.00843678628607" lon="8.387542515993118">
+        <name>WP001</name>
+        <time>2017-11-03T15:42:26Z</time>
+    </wpt>
+</gpx>
diff --git a/PACECloudSDK/AppKit/AppModels/AppData.swift b/PACECloudSDK/AppKit/AppModels/AppData.swift
@@ -36,7 +36,7 @@ public extension AppKit {
 
         internal var shouldShowDistance: Bool = false
 
-        init(appID: String?, title: String?, subtitle: String?, appUrl: String?, metadata: [AppKit.AppMetadata: AnyHashable]) {
+        public init(appID: String?, title: String?, subtitle: String?, appUrl: String?, metadata: [AppKit.AppMetadata: AnyHashable]) {
             self.appID = appID
             self.title = title
             self.subtitle = subtitle
diff --git a/PACECloudSDK/AppKit/Assets/Images/Images.xcassets/default_notification_logo.imageset/Contents.json b/PACECloudSDK/AppKit/Assets/Images/Images.xcassets/default_notification_logo.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "default_notification_logo.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/PACECloudSDK/AppKit/Assets/Images/Images.xcassets/default_notification_logo.imageset/default_notification_logo.pdf b/PACECloudSDK/AppKit/Assets/Images/Images.xcassets/default_notification_logo.imageset/default_notification_logo.pdf
diff --git a/PACECloudSDK/AppKit/Drawer/AppDrawer.swift b/PACECloudSDK/AppKit/Drawer/AppDrawer.swift
@@ -34,7 +34,7 @@ extension AppKit {
         let labelsPadding = AppDrawer.drawerSize + 8
         var lastSlideDirection: SlideDirection = .left
 
-        var appDrawerBackgroundColor: UIColor = AppStyle.lightColor
+        var appDrawerBackgroundColor: UIColor = AppStyle.blueColor
         let appIconBackgroundColor: UIColor
         var distanceViewLeadingConstraint: NSLayoutConstraint?
         var subtitleTrailingConstraint: NSLayoutConstraint?
@@ -60,7 +60,7 @@ extension AppKit {
             return label
         }()
 
-        lazy var distanceView: UIView = {
+        public lazy var distanceView: UIView = {
             let view = UIView()
             view.layer.cornerRadius = 4
             return view
@@ -114,7 +114,7 @@ extension AppKit {
             self.appData = appData
 
             let appColorString = appData.appManifest?.iconBackgroundColor ?? ""
-            appIconBackgroundColor = UIColor(hex: appColorString) ?? AppStyle.lightColor
+            appIconBackgroundColor = UIColor(hex: appColorString) ?? AppStyle.darkColor
 
             super.init(frame: CGRect())
 
@@ -218,8 +218,8 @@ extension AppKit {
                 appDrawerBackgroundColor = themeColor
                 appDrawerTextColor = textColor
             } else {
-                appDrawerBackgroundColor = theme == .light ? AppStyle.lightColor : AppStyle.darkColor
-                appDrawerTextColor = UIColor.contrastColor(hex: appDrawerBackgroundColor.hexString)
+                appDrawerBackgroundColor = AppStyle.blueColor
+                appDrawerTextColor = AppStyle.darkColor
             }
 
             self.appDrawerBackgroundColor = appDrawerBackgroundColor
@@ -368,7 +368,11 @@ extension AppKit.AppDrawer {
                                                                requestedSize: (Int(Self.drawerSize), Int(Self.drawerSize))),
               let iconSource = icon.source,
               let iconUrlString = URLBuilder.buildAppIconUrl(baseUrl: appData.appBaseUrl, iconSrc: iconSource)
-        else { return }
+        else {
+            AppKitLogger.d("[AppDrawer] Set default app drawer image")
+            appImageView.image = AppStyle.iconDefaultAppDrawer
+            return
+        }
 
         appImageView.load(urlString: iconUrlString.absoluteString)
     }
diff --git a/PACECloudSDK/AppKit/Extensions/UIImageView+Extension.swift b/PACECloudSDK/AppKit/Extensions/UIImageView+Extension.swift
@@ -11,7 +11,7 @@ extension UIImageView {
     func load(urlString: String) {
         URLDataRequest.requestData(with: urlString, headers: nil) { [weak self] result in
             guard case let .success(data) = result, let image = UIImage(data: data) else { return }
-
+            AppKitLogger.d("Successfully loaded app drawer image")
             DispatchQueue.main.async {
                 self?.image = image
             }
diff --git a/PACECloudSDK/AppKit/Styles/AppStyle+Images.swift b/PACECloudSDK/AppKit/Styles/AppStyle+Images.swift
@@ -40,6 +40,10 @@ extension AppStyle {
         return imageNamed("icon_distance").withRenderingMode(.alwaysTemplate)
     }
 
+    static var iconDefaultAppDrawer: UIImage {
+        return imageNamed("default_notification_logo")
+    }
+
     private static func imageNamed(_ imageName: String) -> UIImage {
         return UIImage(named: imageName, in: Bundle.paceCloudSDK, compatibleWith: nil) ?? UIImage()
     }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ extension UIImageView {`
`11`	`11`	`func load(urlString: String) {`
`12`	`12`	`URLDataRequest.requestData(with: urlString, headers: nil) { [weak self] result in`
`13`	`13`	`guard case let .success(data) = result, let image = UIImage(data: data) else { return }`
`14`		`-`
	`14`	`+ AppKitLogger.d("Successfully loaded app drawer image")`
`15`	`15`	`DispatchQueue.main.async {`
`16`	`16`	`self?.image = image`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ extension AppStyle {`
`40`	`40`	`return imageNamed("icon_distance").withRenderingMode(.alwaysTemplate)`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ static var iconDefaultAppDrawer: UIImage {`
	`44`	`+ return imageNamed("default_notification_logo")`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`private static func imageNamed(_ imageName: String) -> UIImage {`
`44`	`48`	`return UIImage(named: imageName, in: Bundle.paceCloudSDK, compatibleWith: nil) ?? UIImage()`
`45`	`49`	`}`