Allow the detailed feedback style change. (#3954)

Author: ShanMa1991

CHANGELOG.md

@@ -50,6 +50,8 @@
 * Fixed an issue when alternative route lines overlapped the main route line during navigation. ([#3947](https://github.com/mapbox/mapbox-navigation-ios/pull/3947))
 * Fixed an issue when rerouting to the route which does not originate on current user location, route line and camera jumped to route origin. ([#3943](https://github.com/mapbox/mapbox-navigation-ios/pull/3943))
 * All logs that Navigation SDK produces are now sent to the `MapboxCommon` framework. You can intercept these logs in your own code using `LogConfiguration.registerLogWriterBackend(forLogWriter:)` method from `MapboxCommon` framework. ([#3944](https://github.com/mapbox/mapbox-navigation-ios/pull/3944))
+* Fixed an issue where popped window doesn't get updated in appearance when style changes on phone. ([#3954](https://github.com/mapbox/mapbox-navigation-ios/pull/3954))
+* Fixed an issue where detailed feedback items don't change color in different style. ([#3954](https://github.com/mapbox/mapbox-navigation-ios/pull/3954))
 
 ## v2.5.1
 

Sources/MapboxNavigation/DayStyle.swift

@@ -245,6 +245,9 @@ open class DayStyle: Style {
         FeedbackStyleView.appearance(whenContainedInInstancesOf: [FeedbackViewController.self]).backgroundColor = .white
         FeedbackCollectionView.appearance().backgroundColor = .white
         FeedbackCollectionView.appearance().cellColor = .black
+        FeedbackSubtypeCollectionViewCell.appearance().normalCircleColor = .white
+        FeedbackSubtypeCollectionViewCell.appearance().normalCircleOutlineColor = .darkText
+        FeedbackSubtypeCollectionViewCell.appearance().selectedCircleColor = .systemBlue
         InstructionLabel.appearance().roadShieldBlackColor = .roadShieldBlackColor
         InstructionLabel.appearance().roadShieldBlueColor = .roadShieldBlueColor
         InstructionLabel.appearance().roadShieldGreenColor = .roadShieldGreenColor

Sources/MapboxNavigation/Feedback/FeedbackSubtypeCollectionViewCell.swift

@@ -20,7 +20,44 @@ class FeedbackSubtypeCollectionViewCell: UICollectionViewCell {
         title.font = Constants.titleFont
         return title
     }()
+    
+    @objc dynamic var showSelectedColor: Bool = false {
+        didSet {
+            if showSelectedColor {
+                circleColor = selectedCircleColor
+                circleOutlineColor = selectedCircleColor
+            } else {
+                circleColor = normalCircleColor
+                circleOutlineColor = normalCircleOutlineColor
+            }
+        }
+    }
+
+    @objc dynamic var selectedCircleColor: UIColor = .lightGray {
+        didSet {
+            if showSelectedColor {
+                circleColor = selectedCircleColor
+                circleOutlineColor = selectedCircleColor
+            }
+        }
+    }
+    
+    @objc dynamic var normalCircleColor: UIColor = .black {
+        didSet {
+            if !showSelectedColor {
+                circleColor = normalCircleColor
+            }
+        }
+    }
 
+    @objc dynamic var normalCircleOutlineColor: UIColor = .black {
+        didSet {
+            if !showSelectedColor {
+                circleOutlineColor = normalCircleOutlineColor
+            }
+        }
+    }
+    
     public var circleColor: UIColor = .black {
         didSet {
             circleView.backgroundColor = circleColor
@@ -110,7 +147,7 @@ class FeedbackSubtypeCollectionViewCell: UICollectionViewCell {
 
         if #available(iOS 12.0, *),
            previousTraitCollection?.userInterfaceStyle != traitCollection.userInterfaceStyle {
-            circleView.layer.borderColor = circleOutlineColor.cgColor
+            circleOutlineColor = showSelectedColor ? normalCircleColor : selectedCircleColor
         }
     }
 }

Sources/MapboxNavigation/Feedback/FeedbackSubtypeViewController.swift

@@ -5,11 +5,12 @@ class FeedbackSubtypeViewController: FeedbackViewController {
 
     var currentFeedbackType: FeedbackItemType?
 
-    private let reportButtonContainer = UIView()
+    private let reportButtonContainer = FeedbackStyleView()
     private let reportButtonSeparator = UIView()
     private let reportButton = UIButton()
 
     private var selectedItems = [FeedbackItem]()
+    private var selectedPath = Set<IndexPath>()
 
     /**
      Initialize a new FeedbackSubtypeViewController from a `NavigationEventsManager`.
@@ -77,40 +78,33 @@ class FeedbackSubtypeViewController: FeedbackViewController {
             }
         }
 
+        cell.showSelectedColor = selectedPath.contains(indexPath)
         return cell
     }
 
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-
-        let cell = collectionView.cellForItem(at: indexPath) as! FeedbackSubtypeCollectionViewCell
-        if #available(iOS 13.0, *) {
-            cell.circleColor = .systemBlue
-        } else {
-            cell.circleColor = .lightGray
-        }
-        cell.circleOutlineColor = cell.circleColor
-
-        let item = sections[indexPath.row]
-        selectedItems.append(item)
-
-        updateButtonTitle()
+        guard let cell = collectionView.cellForItem(at: indexPath) as? FeedbackSubtypeCollectionViewCell else { return }
+        toggleSelected(cell: cell, at: indexPath)
     }
 
     func collectionView(_ collectionView: UICollectionView, didDeselectItemAt indexPath: IndexPath) {
-        let cell = collectionView.cellForItem(at: indexPath) as! FeedbackSubtypeCollectionViewCell
-        if #available(iOS 13.0, *) {
-            cell.circleColor = .systemBackground
-            cell.circleOutlineColor = .label
+        guard let cell = collectionView.cellForItem(at: indexPath) as? FeedbackSubtypeCollectionViewCell else { return }
+        toggleSelected(cell: cell, at: indexPath)
+    }
+    
+    private func toggleSelected(cell: FeedbackSubtypeCollectionViewCell, at indexPath: IndexPath) {
+        guard let item = sections[safe: indexPath.row] else { return }
+        if selectedPath.contains(indexPath) {
+            selectedItems.removeAll { existingItem -> Bool in
+                return existingItem.type == item.type
+            }
+            selectedPath.remove(indexPath)
+            cell.showSelectedColor = false
         } else {
-            cell.circleColor = .white
-            cell.circleOutlineColor = .darkText
+            selectedItems.append(item)
+            selectedPath.insert(indexPath)
+            cell.showSelectedColor = true
         }
-
-        let item = sections[indexPath.row]
-        selectedItems.removeAll { existingItem -> Bool in
-            return existingItem.type == item.type
-        }
-
         updateButtonTitle()
     }
 
@@ -169,7 +163,7 @@ class FeedbackSubtypeViewController: FeedbackViewController {
 
         let reportButtonContainerLeading = reportButtonContainer.leadingAnchor.constraint(equalTo: view.leadingAnchor)
         let reportButtonContainerTrailing = reportButtonContainer.trailingAnchor.constraint(equalTo: view.trailingAnchor)
-        let reportButtonContainerBottom = reportButtonContainer.bottomAnchor.constraint(equalTo: view.safeBottomAnchor)
+        let reportButtonContainerBottom = reportButtonContainer.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         let reportButtonContainerHeight = reportButtonContainer.heightAnchor.constraint(equalToConstant: 96)
 
         let reportButtonSeparatorLeading = reportButtonSeparator.leadingAnchor.constraint(equalTo: reportButtonContainer.leadingAnchor)

Sources/MapboxNavigation/NightStyle.swift

@@ -113,6 +113,8 @@ open class NightStyle: DayStyle {
         FeedbackStyleView.appearance(whenContainedInInstancesOf: [FeedbackViewController.self]).backgroundColor = .black
         FeedbackCollectionView.appearance().backgroundColor = .black
         FeedbackCollectionView.appearance().cellColor = .white
+        FeedbackSubtypeCollectionViewCell.appearance().normalCircleColor = .black
+        FeedbackSubtypeCollectionViewCell.appearance().normalCircleOutlineColor = .lightText
 
         WayNameView.appearance().borderColor = #colorLiteral(red: 0.2802129388, green: 0.3988235593, blue: 0.5260632038, alpha: 1)
         WayNameLabel.appearance().roadShieldBlackColor = #colorLiteral(red: 0.08, green: 0.09, blue: 0.12, alpha: 1)

Sources/MapboxNavigation/StyleManager.swift

@@ -215,7 +215,7 @@ open class StyleManager {
         if #available(iOS 13.0, *) {
             UIApplication.shared.connectedScenes.forEach {
                 if let windowScene = $0 as? UIWindowScene,
-                   traitCollection?.userInterfaceIdiom == .phone {
+                   windowScene.traitCollection.userInterfaceIdiom == .phone {
                     refreshAppearance(for: windowScene.windows)
                 } else if let templateApplicationScene = $0 as? CPTemplateApplicationScene,
                           traitCollection?.userInterfaceIdiom == .carPlay {