Merge pull request #3361 from osmandapp/fix_night_theme_point_menu_in…

…_plan_route fix night theme for OAPointOptionsBottomSheetViewController
osmandapp · Jan 4, 2024 · a5ad710 · a5ad710
2 parents 3202dc9 + f34c017
commit a5ad710
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...ntrollers/BottomSheet/RoutePlanningBottomSheet/OAPointOptionsBottomSheetViewController.mm b/...ntrollers/BottomSheet/RoutePlanningBottomSheet/OAPointOptionsBottomSheetViewController.mm
@@ -17,6 +17,7 @@
 #import "OARoadSegmentData.h"
 #import "OAMapUtils.h"
 #import "OAOsmAndFormatter.h"
+#import "OsmAnd_Maps-Swift.h"
 
 @interface OAPointOptionsBottomSheetViewController () <UITableViewDelegate, UITableViewDataSource>
 
@@ -340,8 +341,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             else
             {
                 BOOL isActiveCell =  [self isActiveCell:indexPath];
-                cell.iconColorNormal = isActiveCell ? UIColorFromRGB(color_chart_orange) : UIColorFromRGB(color_tint_gray);
-                cell.textColorNormal = isActiveCell ? [UIColor blackColor] : [UIColor lightGrayColor];
+                cell.iconColorNormal = isActiveCell ? UIColor.iconColorActive : UIColor.iconColorDisabled;
+                cell.textColorNormal = isActiveCell ? UIColor.textColorPrimary : UIColor.textColorSecondary;
                 cell.iconView.image = [UIImage templateImageNamed:item[@"img"]];
                 cell.separatorView.hidden = indexPath.row == (NSInteger) _data[indexPath.section].count - 1;
             }
@@ -374,8 +375,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             else
             {
                 BOOL isActiveCell =  [self isActiveCell:indexPath];
-                cell.iconColorNormal = isActiveCell ? UIColorFromRGB(color_chart_orange) : UIColorFromRGB(color_tint_gray);
-                cell.textColorNormal = isActiveCell ? [UIColor blackColor] : [UIColor lightGrayColor];
+                cell.iconColorNormal = isActiveCell ? UIColor.iconColorActive : UIColor.iconColorDisabled;
+                cell.textColorNormal = isActiveCell ? UIColor.textColorPrimary : UIColor.textColorSecondary;
                 cell.iconView.image = [UIImage templateImageNamed:item[@"img"]];
                 cell.separatorView.hidden = indexPath.row == (NSInteger) _data[indexPath.section].count - 1;
             }