[ios] [carplay] fix bug when light estimates view appears on dark maps #6424

kirylkaveryn · 2023-10-30T12:15:13Z

kirylkaveryn commented

2023-10-30 12:15:13 +00:00

Fix bug in PR: organicmaps/organicmaps#6408 when light estimates view (at the bottom) appears on dark maps.

There are 3 possible states that the user can choose in CarPlay Settings:

Always dark is Selected, Always Show Dark Map is On: Interface and maps are dark.
Always dark is Selected, Always Show Dark Map is Off: Interface is dark, and maps+instructions can be set light/dark by CarPlay
Automatic is Selected: CarPlay set automatically Interface and maps+instructions theme styles.

Fix bug in PR: https://git.omaps.dev/organicmaps/organicmaps/pulls/6408 when light estimates view (at the bottom) appears on dark maps. There are 3 possible states that the user can choose in CarPlay Settings: <img width="800" alt="image" src="https://github.com/organicmaps/organicmaps/assets/79797627/1dad5949-c367-4a52-b51e-08980a628d9c"> 1. `Always dark` is Selected, `Always Show Dark Map` is `On`: Interface and maps are dark. <img width="800" alt="image" src="https://github.com/organicmaps/organicmaps/assets/79797627/db7c9c5e-c3d8-42f6-b25d-db0bbbc83fd9"> 2. `Always dark` is Selected, `Always Show Dark Map` is `Off`: Interface is dark, and maps+instructions can be set light/dark by CarPlay <img width="795" alt="image" src="https://github.com/organicmaps/organicmaps/assets/79797627/83cded7d-676b-43f9-9823-16ee456f123e"> <img width="803" alt="image" src="https://github.com/organicmaps/organicmaps/assets/79797627/2934470f-6db7-435d-b8be-144166c7a4db"> 3. `Automatic` is Selected: CarPlay set automatically Interface and maps+instructions theme styles. <img width="796" alt="image" src="https://github.com/organicmaps/organicmaps/assets/79797627/b820e747-21b2-4dc5-9e35-0677e9f3f936">

biodranik (Migrated from github.com) approved these changes 2023-10-30 12:26:21 +00:00

iphone/Maps/Classes/CarPlay/CarPlayService.swift

					
				@ -39,2 +39,3 @@

				    self.interfaceController?.delegate = self

				    sessionConfiguration = CPSessionConfiguration(delegate: self)

				    let configuration = CPSessionConfiguration(delegate: self)

				    sessionConfiguration = configuration

biodranik (Migrated from github.com) commented

2023-10-30 12:26:08 +00:00

Is this intermediate variable really necessary?

kirylkaveryn reviewed 2023-10-30 12:51:35 +00:00

iphone/Maps/Classes/CarPlay/CarPlayService.swift

					
				@ -39,2 +39,3 @@

				    self.interfaceController?.delegate = self

				    sessionConfiguration = CPSessionConfiguration(delegate: self)

				    let configuration = CPSessionConfiguration(delegate: self)

				    sessionConfiguration = configuration

kirylkaveryn commented

2023-10-30 12:51:35 +00:00

Nope. But it is clearer to use a switch-case for the enum contentStyle and avoid if-elses...

Probably this will be more clear:

sessionConfiguration = CPSessionConfiguration(delegate: self)
    // Try to use the CarPlay unit's interface style.
    if #available(iOS 13.0, *), let contentStyle = sessionConfiguration?.contentStyle  {
      switch contentStyle {
      case .light:

Nope. But it is clearer to use a switch-case for the enum `contentStyle` and avoid if-elses... Probably this will be more clear: ```swift sessionConfiguration = CPSessionConfiguration(delegate: self) // Try to use the CarPlay unit's interface style. if #available(iOS 13.0, *), let contentStyle = sessionConfiguration?.contentStyle { switch contentStyle { case .light: ```

biodranik (Migrated from github.com) approved these changes 2023-10-30 12:54:29 +00:00

iphone/Maps/Classes/CarPlay/CarPlayService.swift

					
				@ -39,2 +39,3 @@

				    self.interfaceController?.delegate = self

				    sessionConfiguration = CPSessionConfiguration(delegate: self)

				    let configuration = CPSessionConfiguration(delegate: self)

				    sessionConfiguration = configuration