Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Color fix oa route line appearance hud view controller #3543

Merged
merged 2 commits into from
Mar 31, 2024
Merged

Color fix oa route line appearance hud view controller #3543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c20d2
Dark app theme fix
DmitrySvetlichny Mar 28, 2024
6c0a70d
NavBar width fix
DmitrySvetlichny Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Sources/Controllers/RouteInfoMenu/OARouteLineAppearanceHudViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,8 +1048,8 @@ - (void)onSwitch:(BOOL)toggle tableData:(OAGPXBaseTableData *)tableData
_selectedType = [self getRouteAppearanceType:OAColoringType.DEFAULT];
self.applyButton.userInteractionEnabled = YES;
self.applyNavBarButton.userInteractionEnabled = YES;
[self.applyButton setTitleColor:UIColorFromRGB(color_primary_purple) forState:UIControlStateNormal];
[self.applyNavBarButton setTitleColor:UIColorFromRGB(color_primary_purple) forState:UIControlStateNormal];
[self.applyButton setTitleColor:[UIColor colorNamed:ACColorNameIconColorActive] forState:UIControlStateNormal];
[self.applyNavBarButton setTitleColor:[UIColor colorNamed:ACColorNameIconColorActive] forState:UIControlStateNormal];
}
else if (_selectedType.coloringType == OAColoringType.DEFAULT)
{
Expand Down Expand Up @@ -1315,8 +1315,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
{
NSArray *nib = [[NSBundle mainBundle] loadNibNamed:[OADividerCell getCellIdentifier] owner:self options:nil];
cell = (OADividerCell *) nib[0];
cell.backgroundColor = UIColor.whiteColor;
cell.dividerColor = UIColor.whiteColor;
cell.backgroundColor = [UIColor colorNamed:ACColorNameGroupBg];
cell.dividerColor = [UIColor colorNamed:ACColorNameCustomSeparator];
cell.dividerInsets = UIEdgeInsetsZero;
cell.separatorInset = UIEdgeInsetsMake(0., self.tableView.frame.size.width, 0., 0.);
cell.dividerHight = 0.;
Expand Down Expand Up @@ -1381,8 +1381,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
_colorValuesCell.selectionStyle = UITableViewCellSelectionStyleNone;
_colorValuesCell.separatorInset = UIEdgeInsetsMake(0., DeviceScreenWidth, 0., 0.);
_colorValuesCell.collectionView.contentInset = UIEdgeInsetsMake(0., 8. , 0., 20.);
_colorValuesCell.backgroundColor = UIColor.whiteColor;
_colorValuesCell.collectionView.backgroundColor = UIColor.whiteColor;
_colorValuesCell.backgroundColor = [UIColor colorNamed:ACColorNameGroupBg];
_colorValuesCell.collectionView.backgroundColor = [UIColor colorNamed:ACColorNameGroupBg];
_colorValuesCell.collectionView.cellIndex = indexPath;
_colorValuesCell.collectionView.state = _scrollCellsState;
_colorValuesCell.collectionView.foldersDelegate = self;
Expand Down
6 changes: 3 additions & 3 deletions Sources/Controllers/RouteInfoMenu/OARouteLineAppearanceHudViewController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down Expand Up @@ -155,7 +155,7 @@
</view>
<view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" id="Y3O-U6-e8m" userLabel="Navigation View">
<rect key="frame" x="0.0" y="0.0" width="414" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gJn-N4-lwR">
<rect key="frame" x="12" y="60" width="97.5" height="28"/>
Expand Down