drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-07 13:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'eb264889e3' into traffic

Browse Source
This commit is contained in:
mvglasow
2025-10-10 18:40:35 +03:00
parent 30b2df89cd eb264889e3
commit bf36c875d5
808 changed files with 31595 additions and 27751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iphone/Maps/Core/Search/SearchResult.h
View File

@@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) NSUInteger index;
@property (nonatomic, readonly) NSString * titleText;
@property (nonatomic, readonly, nullable) NSString * branchText;
@property (nonatomic, readonly) NSString * iconImageName;
@property (nonatomic, readonly) NSString * addressText;
@property (nonatomic, readonly) NSString * infoText;

1
iphone/Maps/Core/Search/SearchResult.mm
View File

@@ -33,6 +33,7 @@
_titleText = result.GetString().empty() ? @(result.GetLocalizedFeatureType().c_str()) : @(result.GetString().c_str());
_addressText = @(result.GetAddress().c_str());
_infoText = @(result.GetFeatureDescription().c_str());
_branchText = result.GetBranch().empty() ? nil : @(result.GetBranch().c_str());
if (result.IsSuggest())
_suggestion = @(result.GetSuggestionString().c_str());

2
iphone/Maps/Core/Theme/Colors.swift
View File

@@ -21,6 +21,7 @@ class DayColors: IColors {
var linkBlueDark = UIColor.accent
var buttonRed = UIColor(244, 67, 67, alpha100)
var buttonRedHighlighted = UIColor(183, 28, 28, alpha100)
var black = UIColor(0, 0, 0, alpha100)
var blackPrimaryText = UIColor(0, 0, 0, alpha87)
var blackSecondaryText = UIColor(0, 0, 0, alpha54)
var blackHintText = UIColor(0, 0, 0, alpha26)
@@ -83,6 +84,7 @@ class NightColors: IColors {
var linkBlueDark = UIColor.accent
var buttonRed = UIColor(244, 67, 67, alpha100)
var buttonRedHighlighted = UIColor(183, 28, 28, alpha100)
var black = UIColor(255, 255, 255, alpha100)
var blackPrimaryText = UIColor(255, 255, 255, alpha90)
var blackSecondaryText = UIColor(255, 255, 255, alpha70)
var blackHintText = UIColor(255, 255, 255, alpha30)

1
iphone/Maps/Core/Theme/Components/IColors.swift
View File

@@ -32,6 +32,7 @@ let alpha100: CGFloat = 1.0
var linkBlueDark: UIColor { get }
var buttonRed: UIColor { get }
var buttonRedHighlighted: UIColor { get }
var black: UIColor { get }
var blackPrimaryText: UIColor { get }
var blackSecondaryText: UIColor { get }
var blackHintText: UIColor { get }

1
iphone/Maps/Core/Theme/Components/IFonts.swift
View File

@@ -56,4 +56,5 @@
var semibold15: UIFont { get }
var semibold16: UIFont { get }
var semibold18: UIFont { get }
var semibold20: UIFont { get }
}

2
iphone/Maps/Core/Theme/FontStyleSheet.swift
View File

@@ -60,6 +60,7 @@ enum FontStyleSheet: String, CaseIterable {
case semibold15
case semibold16
case semibold18
case semibold20
}
extension FontStyleSheet: IStyleSheet {
@@ -127,6 +128,7 @@ extension FontStyleSheet: IStyleSheet {
case .semibold15: return fonts.semibold15
case .semibold16: return fonts.semibold16
case .semibold18: return fonts.semibold18
case .semibold20: return fonts.semibold20
}
}()
return .add { s in s.font = font }

1
iphone/Maps/Core/Theme/Fonts.swift
View File

@@ -55,4 +55,5 @@ class Fonts: IFonts {
var semibold15 = UIFont.systemFont(ofSize: 15, weight:UIFont.Weight.semibold)
var semibold16 = UIFont.systemFont(ofSize: 16, weight:UIFont.Weight.semibold)
var semibold18 = UIFont.systemFont(ofSize: 18, weight:UIFont.Weight.semibold)
var semibold20 = UIFont.systemFont(ofSize: 20, weight:UIFont.Weight.semibold)
}

49
iphone/Maps/Core/Theme/Renderers/UISearchBarRenderer.swift
View File

@@ -1,6 +1,10 @@
import Foundation
extension UISearchBar {
@objc override func applyTheme() {
if #available(iOS 26, *) {
return;
}
if styleName.isEmpty {
setStyle(.searchBar)
}
@@ -25,6 +29,10 @@ class UISearchBarRenderer: UIViewRenderer {
class func render(_ control: UISearchBar, style: Style) {
super.render(control, style: style)
if #available(iOS 26, *) {
return;
}
let searchTextField = control.searchTextField
// Default search bar implementation adds the grey transparent image for background. This code removes it and updates the corner radius. This is not working on iPad designed for mac.
if !ProcessInfo.processInfo.isiOSAppOnMac {
@@ -65,24 +73,6 @@ class UISearchBarRenderer: UIViewRenderer {
}
}
//fix for iOS 12 and below
class func setAppearance() {
for style in StyleManager.shared.getStyle("SearchBar") {
if let backgroundColor = style.backgroundColor {
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).backgroundColor = backgroundColor
}
if let font = style.font {
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).font = font
}
if let fontColor = style.fontColor {
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).defaultTextAttributes = [.foregroundColor: fontColor]
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).textColor = fontColor
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).leftView?.tintColor = fontColor
UITextField.appearance(whenContainedInInstancesOf: [UISearchBar.self]).tintColor = fontColor
}
}
}
@available(iOS, deprecated: 13.0)
private static let kiOS12DefaultSystemTextFieldHeight = 36
@@ -91,27 +81,4 @@ class UISearchBarRenderer: UIViewRenderer {
@available(iOS, deprecated: 13.0)
private static var searchBarBackgroundImage: UIImage?
// Draws the background image for the UITextField using the default system's text field height.
// This approach is used only for iOS 12.
@available(iOS, deprecated: 13.0)
private static func getSearchBarBackgroundImage(color: UIColor) -> UIImage? {
if color != searchBarBackgroundColor {
let size = CGSize(width: kiOS12DefaultSystemTextFieldHeight, height: kiOS12DefaultSystemTextFieldHeight)
UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
guard let context = UIGraphicsGetCurrentContext() else { return nil }
let rect = CGRect(origin: .zero, size: size)
let cornerRadius = CGFloat(8)
let path = UIBezierPath(roundedRect: rect, byRoundingCorners: [.topLeft, .topRight, .bottomLeft, .bottomRight], cornerRadii: CGSize(width: cornerRadius, height: cornerRadius))
context.addPath(path.cgPath)
context.setFillColor(color.cgColor)
context.fillPath()
let image = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext()
searchBarBackgroundImage = image
searchBarBackgroundColor = color
return image
}
return searchBarBackgroundImage
}
}