[ios] Fix the route estimates colors when the app appearance was changed #7331

kirylkaveryn · 2024-02-07T10:29:02Z

kirylkaveryn commented

2024-02-07 10:29:02 +00:00

When the app appearance is changed and the route preview screen is active the estimates colors are not changed properly:

Issue:

This happens because estimates is a stored property (of MWMNavigationDashboardEntity class) of the NSAttributedString type that is built during initialization and cannot be changed dynamically to react to the theme changes.

@property(copy, nonatomic, readonly) NSAttributedString *estimate;

 entity.estimate =
      estimate(info.m_totalTimeInSec, @(info.m_totalPedestrianDistanceStr.c_str()),
               @(info.m_totalPedestrianUnitsSuffix.c_str()), self.etaAttributes, self.etaSecondaryAttributes, YES, YES);

NSAttributedString *estimate(NSTimeInterval time, NSString *distance, NSString *distanceUnits,
                             NSDictionary *primaryAttributes, NSDictionary *secondaryAttributes, BOOL isWalk, BOOL showEta) {
  auto result = [[NSMutableAttributedString alloc] initWithString:@""];
  if (showEta) {
    NSString *eta = [NSDateComponentsFormatter etaStringFrom:time];
    [result appendAttributedString:[[NSMutableAttributedString alloc] initWithString:eta attributes:primaryAttributes]];
    [result appendAttributedString:MWMNavigationDashboardEntity.estimateDot];
  }

  if (isWalk) {
    UIFont *font = primaryAttributes[NSFontAttributeName];
    auto textAttachment = [[NSTextAttachment alloc] init];
    auto image = [UIImage imageNamed:@"ic_walk"];
    textAttachment.image = image;
    auto const height = font.lineHeight;
    auto const y = height - image.size.height;
    auto const width = image.size.width * height / image.size.height;
    textAttachment.bounds = CGRectIntegral({{0, y}, {width, height}});

    NSMutableAttributedString *attrStringWithImage =
      [NSAttributedString attributedStringWithAttachment:textAttachment].mutableCopy;
...

Solution

There is no reason to store such complex NSAttributedString in the instance.
The logic was moved into the instance method to get string only if it is needed. And when theme is changing attr strinl will be rebuilt with proper colors and formatting.

Result:

Fix https://git.omaps.dev/organicmaps/organicmaps/pulls/7292 When the app appearance is changed and the route preview screen is active the estimates colors are not changed properly: <img src="https://github.com/organicmaps/organicmaps/assets/79797627/4e48d42d-bc08-4465-b73b-d4ee20956c71" width="200"> <img src="https://github.com/organicmaps/organicmaps/assets/79797627/dfa2bba3-84f9-4f21-a7bb-636bf59b194c" width="200"> <img src="https://github.com/organicmaps/organicmaps/assets/79797627/1c2dd660-3a45-4d03-ba8c-5946285348a8" width="200"> ### Issue: This happens because `estimates` is a stored property (of `MWMNavigationDashboardEntity` class) of the `NSAttributedString` type that is built during initialization and cannot be changed dynamically to react to the theme changes. `@property(copy, nonatomic, readonly) NSAttributedString *estimate;` ```objc entity.estimate = estimate(info.m_totalTimeInSec, @(info.m_totalPedestrianDistanceStr.c_str()), @(info.m_totalPedestrianUnitsSuffix.c_str()), self.etaAttributes, self.etaSecondaryAttributes, YES, YES); NSAttributedString *estimate(NSTimeInterval time, NSString *distance, NSString *distanceUnits, NSDictionary *primaryAttributes, NSDictionary *secondaryAttributes, BOOL isWalk, BOOL showEta) { auto result = [[NSMutableAttributedString alloc] initWithString:@""]; if (showEta) { NSString *eta = [NSDateComponentsFormatter etaStringFrom:time]; [result appendAttributedString:[[NSMutableAttributedString alloc] initWithString:eta attributes:primaryAttributes]]; [result appendAttributedString:MWMNavigationDashboardEntity.estimateDot]; } if (isWalk) { UIFont *font = primaryAttributes[NSFontAttributeName]; auto textAttachment = [[NSTextAttachment alloc] init]; auto image = [UIImage imageNamed:@"ic_walk"]; textAttachment.image = image; auto const height = font.lineHeight; auto const y = height - image.size.height; auto const width = image.size.width * height / image.size.height; textAttachment.bounds = CGRectIntegral({{0, y}, {width, height}}); NSMutableAttributedString *attrStringWithImage = [NSAttributedString attributedStringWithAttachment:textAttachment].mutableCopy; ... ``` ### Solution There is no reason to store such complex NSAttributedString in the instance. The logic was moved into the instance method to get string only if it is needed. And when theme is changing attr strinl will be rebuilt with proper colors and formatting. Result: ![Simulator Screen Recording - iPhone 15 Pro - 2024-02-07 at 14 21 09](https://github.com/organicmaps/organicmaps/assets/79797627/64b51b04-e8ee-416c-b04b-d36679888854)

 @ -53,3 +52,4 @@
 UIImage * image(routing::turns::PedestrianDirection t) {
   if (![MWMLocationManager lastLocation])
     return nil;

				`@ -166,6 +135,39 @@ NSArray<MWMRouterTransitStepInfo > buildRouteTransitSteps(NSArray<MWMRoutePoin`
				`return [[NSAttributedString alloc] initWithString:@" • " attributes:attributes];`

Rows
Columns