pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] fix style related errors

Browse source
This commit is contained in:
Aleksey Belousov 2020-01-27 18:22:13 +03:00 • committed by Daria Volvenkova
parent 90dba18407
commit ab5e0990fe
9 changed files with 11 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Core/Theme/Extensions/UINavigationItem+styleName.swift
View file

@ -4,12 +4,6 @@ fileprivate struct AssociatedKeys {
}
@objc extension UINavigationItem {
@objc func sw_didMoveToWindow() {
applyTheme()
isStyleApplied = true
sw_didMoveToWindow();
}
@objc var styleName: String {
get {
isStyleApplied = false

4
iphone/Maps/Core/Theme/Extensions/UIView+styleName.swift
View file

@ -5,6 +5,10 @@ fileprivate struct AssociatedKeys {
@objc extension UIView {
@objc func sw_didMoveToWindow() {
guard UIApplication.shared.keyWindow === window else {
sw_didMoveToWindow();
return
}
applyTheme()
isStyleApplied = true
sw_didMoveToWindow();

4
iphone/Maps/Core/Theme/Renderers/UITextFieldRenderer.swift
View file

@ -6,6 +6,10 @@ extension UITextField {
}
@objc override func sw_didMoveToWindow() {
guard UIApplication.shared.keyWindow === window else {
sw_didMoveToWindow();
return
}
applyTheme()
isStyleApplied = true
sw_didMoveToWindow();

9
iphone/Maps/Core/Theme/Swizzle/UINavigationItem+swizzle.h
View file

@ -1,9 +0,0 @@
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UINavigationItem (swizzle)
@end
NS_ASSUME_NONNULL_END

8
iphone/Maps/Core/Theme/Swizzle/UINavigationItem+swizzle.m
View file

@ -1,8 +0,0 @@
#import "UINavigationItem+swizzle.h"
#import "SwizzleStyle.h"
@implementation UINavigationItem (swizzle)
+(void)load {
[SwizzleStyle swizzle:[self class] methodName:@"didMoveToWindow"];
}
@end

9
iphone/Maps/Core/Theme/Swizzle/UIWindow+swizzle.h
View file

@ -1,9 +0,0 @@
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UIWindow (swizzle)
@end
NS_ASSUME_NONNULL_END

8
iphone/Maps/Core/Theme/Swizzle/UIWindow+swizzle.m
View file

@ -1,8 +0,0 @@
#import "UIWindow+swizzle.h"
#import "SwizzleStyle.h"
@implementation UIWindow (swizzle)
+(void)load {
[SwizzleStyle swizzle:[self class] methodName:@"becomeKeyWindow"];
}
@end

12
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -572,8 +572,6 @@
991FCA2823B12201009AD684 /* CheckmarkRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991FCA2723B12201009AD684 /* CheckmarkRenderer.swift */; };
9929693B23D89B7100B0D5D9 /* UIView+swizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 9929693A23D89B7100B0D5D9 /* UIView+swizzle.m */; };
9929693E23D89C1400B0D5D9 /* UITextField+swizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 9929693D23D89C1400B0D5D9 /* UITextField+swizzle.m */; };
9929694323D89D8A00B0D5D9 /* UIWindow+swizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 9929694223D89D8A00B0D5D9 /* UIWindow+swizzle.m */; };
9929694623D8A32200B0D5D9 /* UINavigationItem+swizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 9929694523D8A32200B0D5D9 /* UINavigationItem+swizzle.m */; };
9929694823D8A3CB00B0D5D9 /* UINavigationItem+styleName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9929694723D8A3CB00B0D5D9 /* UINavigationItem+styleName.swift */; };
993F5507237C622700545511 /* DeepLinkSearchStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993F54F8237C622700545511 /* DeepLinkSearchStrategy.swift */; };
993F5508237C622700545511 /* DeepLinkRouteStrategyAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 993F54F9237C622700545511 /* DeepLinkRouteStrategyAdapter.mm */; };
@ -1623,10 +1621,6 @@
9929693A23D89B7100B0D5D9 /* UIView+swizzle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+swizzle.m"; sourceTree = "<group>"; };
9929693C23D89C1400B0D5D9 /* UITextField+swizzle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITextField+swizzle.h"; sourceTree = "<group>"; };
9929693D23D89C1400B0D5D9 /* UITextField+swizzle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITextField+swizzle.m"; sourceTree = "<group>"; };
9929694123D89D8A00B0D5D9 /* UIWindow+swizzle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIWindow+swizzle.h"; sourceTree = "<group>"; };
9929694223D89D8A00B0D5D9 /* UIWindow+swizzle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIWindow+swizzle.m"; sourceTree = "<group>"; };
9929694423D8A32200B0D5D9 /* UINavigationItem+swizzle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationItem+swizzle.h"; sourceTree = "<group>"; };
9929694523D8A32200B0D5D9 /* UINavigationItem+swizzle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationItem+swizzle.m"; sourceTree = "<group>"; };
9929694723D8A3CB00B0D5D9 /* UINavigationItem+styleName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationItem+styleName.swift"; sourceTree = "<group>"; };
993F54F8237C622700545511 /* DeepLinkSearchStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeepLinkSearchStrategy.swift; sourceTree = "<group>"; };
993F54F9237C622700545511 /* DeepLinkRouteStrategyAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkRouteStrategyAdapter.mm; sourceTree = "<group>"; };
@ -3610,10 +3604,6 @@
9929693A23D89B7100B0D5D9 /* UIView+swizzle.m */,
9929693C23D89C1400B0D5D9 /* UITextField+swizzle.h */,
9929693D23D89C1400B0D5D9 /* UITextField+swizzle.m */,
9929694123D89D8A00B0D5D9 /* UIWindow+swizzle.h */,
9929694223D89D8A00B0D5D9 /* UIWindow+swizzle.m */,
9929694423D8A32200B0D5D9 /* UINavigationItem+swizzle.h */,
9929694523D8A32200B0D5D9 /* UINavigationItem+swizzle.m */,
);
path = Swizzle;
sourceTree = "<group>";
@ -5344,7 +5334,6 @@
47A04171238DE8AE00D84E95 /* HotelFacilitiesViewController.swift in Sources */,
479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */,
F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */,
9929694623D8A32200B0D5D9 /* UINavigationItem+swizzle.m in Sources */,
F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */,
34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */,
CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */,
@ -5387,7 +5376,6 @@
47B9065421C7FA400079C85E /* UIImageView+WebImage.m in Sources */,
F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
994AEC2D23AB763C0079B81F /* StyleManager.swift in Sources */,
9929694323D89D8A00B0D5D9 /* UIWindow+swizzle.m in Sources */,
34BBD6581F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */,
33F7668F21A57CDF00A88B16 /* EditOnWebViewController.swift in Sources */,
34AB664A1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */,

6
iphone/Maps/UI/Search/MWMSearchView.xib
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -92,7 +92,7 @@
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleNane" value="SearchBar"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBar"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="236" y="-242"/>
</view>