diff --git a/.gitignore b/.gitignore index 8463840..9e50718 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,15 @@ # Xcode - User files xcuserdata/ -*.xcworkspace + +**/*.xcodeproj/project.xcworkspace/* +!**/*.xcodeproj/project.xcworkspace/xcshareddata + +**/*.xcodeproj/project.xcworkspace/xcshareddata/* +!**/*.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings + +**/*.playground/playground.xcworkspace/* +!**/*.playground/playground.xcworkspace/xcshareddata + +**/*.playground/playground.xcworkspace/xcshareddata/* +!**/*.playground/playground.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/LICENSE/LICENSE.txt b/LICENSE/LICENSE.txt index f6a0587..94e3d54 100644 --- a/LICENSE/LICENSE.txt +++ b/LICENSE/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright © 2018 Apple Inc. +Copyright © 2019 Apple Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 46a073f..9fd9f11 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# UIKitCatalog: Creating and Customizing Views and Controls +# UIKit Catalog: Creating and Customizing Views and Controls Customize your app's user interface by using views and controls in UIKit. @@ -96,8 +96,12 @@ func configureCustomSlider() { let rightTrackImage = UIImage(named: "slider_green_track") customSlider.setMaximumTrackImage(rightTrackImage, for: .normal) - let thumbImage = UIImage(named: "slider_thumb") + // Set the sliding thumb image (normal and highlighted). + let thumbImageConfig = UIImage.SymbolConfiguration(scale: .large) + let thumbImage = UIImage(systemName: "circle.fill", withConfiguration: thumbImageConfig) customSlider.setThumbImage(thumbImage, for: .normal) + let thumbImageHighlighted = UIImage(systemName: "circle", withConfiguration: thumbImageConfig) + customSlider.setThumbImage(thumbImageHighlighted, for: .highlighted) customSlider.minimumValue = 0 customSlider.maximumValue = 100 @@ -125,16 +129,16 @@ func configureSearchBar() { searchBar.showsCancelButton = true searchBar.showsBookmarkButton = true - searchBar.tintColor = UIColor(named: "Tint_Purple_Color") + searchBar.tintColor = UIColor.systemPurple searchBar.backgroundImage = UIImage(named: "search_bar_background") // Set the bookmark image for both normal and highlighted states. - let bookmarkImage = #imageLiteral(resourceName: "bookmark_icon") - searchBar.setImage(bookmarkImage, for: .bookmark, state: .normal) + let bookImage = UIImage(systemName: "bookmark") + searchBar.setImage(bookImage, for: .bookmark, state: .normal) - let bookmarkHighlightedImage = #imageLiteral(resourceName: "bookmark_icon_highlighted") - searchBar.setImage(bookmarkHighlightedImage, for: .bookmark, state: .highlighted) + let bookFillImage = UIImage(systemName: "bookmark.fill") + searchBar.setImage(bookFillImage, for: .bookmark, state: .highlighted) } ``` @@ -150,10 +154,10 @@ override func viewDidLoad() { // See the `UIBarStyle` enum for more styles, including `.Default`. toolbar.barStyle = .black - toolbar.isTranslucent = true + toolbar.isTranslucent = false - toolbar.tintColor = UIColor(named: "Tint_Green_Color") - toolbar.backgroundColor = UIColor(named: "Tint_Blue_Color") + toolbar.tintColor = UIColor.systemGreen + toolbar.backgroundColor = UIColor.systemBlue let toolbarButtonItems = [ refreshBarButtonItem, @@ -194,8 +198,8 @@ func configurePageControl() { pageControl.numberOfPages = colors.count pageControl.currentPage = 2 - pageControl.pageIndicatorTintColor = UIColor(named: "Tint_Green_Color") - pageControl.currentPageIndicatorTintColor = UIColor(named: "Tint_Purple_Color") + pageControl.pageIndicatorTintColor = UIColor.systemGreen + pageControl.currentPageIndicatorTintColor = UIColor.systemPurple pageControl.addTarget(self, action: #selector(PageControlViewController.pageControlValueDidChange), for: .valueChanged) } diff --git a/UIKitCatalog.xcodeproj/project.pbxproj b/UIKitCatalog.xcodeproj/project.pbxproj index 0794631..0f0d942 100644 --- a/UIKitCatalog.xcodeproj/project.pbxproj +++ b/UIKitCatalog.xcodeproj/project.pbxproj @@ -30,12 +30,14 @@ 2200544A18BC54F5002A6E8B /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543B18BC54F5002A6E8B /* WebViewController.swift */; }; 228DBA0818BC53F1002BA12A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 228DBA0718BC53F1002BA12A /* Assets.xcassets */; }; 3E5C084E1974991E00969DD7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3E5C08501974991E00969DD7 /* Main.storyboard */; }; + 5312D0F222848B0200048DE2 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5312D0F022848B0200048DE2 /* Credits.rtf */; }; 533BD78D1F8BE1A6007D5C3B /* DetailViewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD78C1F8BE1A6007D5C3B /* DetailViewManager.swift */; }; 533BD7951F8BF6A4007D5C3B /* UIViewController+SizeChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7941F8BF6A4007D5C3B /* UIViewController+SizeChange.swift */; }; 533BD7971F8BF8B0007D5C3B /* BaseTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7961F8BF8B0007D5C3B /* BaseTableViewController.swift */; }; 533BD7BC1F8D2B08007D5C3B /* SearchBarsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7BA1F8D2B07007D5C3B /* SearchBarsTableViewController.swift */; }; 533BD7BD1F8D2B08007D5C3B /* ToolbarsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7BB1F8D2B07007D5C3B /* ToolbarsTableViewController.swift */; }; 5341627C1F291F310007BCCA /* ToolbarViewControllers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5341627A1F291F310007BCCA /* ToolbarViewControllers.storyboard */; }; + 53654E232298881200B999C7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53654E222298881200B999C7 /* WebKit.framework */; }; 537357141F291E6700FAB742 /* SearchViewControllers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 537357121F291E6700FAB742 /* SearchViewControllers.storyboard */; }; 538B36F41F2A8E06002AE100 /* DatePickerController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 538B36F21F2A8D97002AE100 /* DatePickerController.storyboard */; }; 538B36F71F2A8E8A002AE100 /* TextViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 538B36F51F2A8E66002AE100 /* TextViewController.storyboard */; }; @@ -86,7 +88,10 @@ 228DB9F318BC53F1002BA12A /* UIKitCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UIKitCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; }; 228DB9F718BC53F1002BA12A /* UIKitCatalog-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UIKitCatalog-Info.plist"; sourceTree = ""; }; 228DBA0718BC53F1002BA12A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 2CCCDF102CCCDC9000000001 /* LICENSE.txt */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE.txt; sourceTree = ""; }; + 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */ = {isa = PBXFileReference; name = SampleCode.xcconfig; path = Configuration/SampleCode.xcconfig; sourceTree = ""; }; 3E5C084F1974991E00969DD7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 5312D0F122848B0200048DE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Credits.rtf; sourceTree = ""; }; 533BD78C1F8BE1A6007D5C3B /* DetailViewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewManager.swift; sourceTree = ""; }; 533BD7941F8BF6A4007D5C3B /* UIViewController+SizeChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+SizeChange.swift"; sourceTree = ""; }; 533BD7961F8BF8B0007D5C3B /* BaseTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTableViewController.swift; sourceTree = ""; }; @@ -94,6 +99,7 @@ 533BD7BB1F8D2B07007D5C3B /* ToolbarsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarsTableViewController.swift; sourceTree = ""; }; 5341627B1F291F310007BCCA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ToolbarViewControllers.storyboard; sourceTree = ""; }; 5359C3081F194CF0007F0EC7 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 53654E222298881200B999C7 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 537357131F291E6700FAB742 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SearchViewControllers.storyboard; sourceTree = ""; }; 538B36F31F2A8D97002AE100 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/DatePickerController.storyboard; sourceTree = ""; }; 538B36F61F2A8E66002AE100 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/TextViewController.storyboard; sourceTree = ""; }; @@ -116,9 +122,8 @@ 53CE5AF41F2A8BB000D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/StepperViewController.storyboard; sourceTree = ""; }; 53CE5AF71F2A8BD000D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SwitchViewController.storyboard; sourceTree = ""; }; 53CE5AFA1F2A8BEB00D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/TextFieldViewController.storyboard; sourceTree = ""; }; + 53DDE73C22776382000006CF /* UIKitCatalog.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = UIKitCatalog.entitlements; sourceTree = ""; }; B50F41071B1D284700E5147D /* StackViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackViewController.swift; sourceTree = ""; }; - E05970B0E05971D000000001 /* SampleCode.xcconfig */ = {isa = PBXFileReference; name = SampleCode.xcconfig; path = Configuration/SampleCode.xcconfig; sourceTree = ""; }; - E2DECA10E2DE8B8000000001 /* LICENSE.txt */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE.txt; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -126,6 +131,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 53654E232298881200B999C7 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -138,8 +144,9 @@ 5359C3081F194CF0007F0EC7 /* README.md */, 228DB9F518BC53F1002BA12A /* UIKitCatalog */, 228DB9F418BC53F1002BA12A /* Products */, - E05975F0E0597BF000000001 /* Configuration */, - E2DE9120E2DEC9A000000001 /* LICENSE */, + 53654E212298881100B999C7 /* Frameworks */, + 2CDDD4C02CDDD48000000001 /* Configuration */, + 2CCCD8802CCCCF2000000001 /* LICENSE */, ); sourceTree = ""; }; @@ -154,6 +161,7 @@ 228DB9F518BC53F1002BA12A /* UIKitCatalog */ = { isa = PBXGroup; children = ( + 53DDE73C22776382000006CF /* UIKitCatalog.entitlements */, 3E2459D41931CCB5002D3369 /* Application */, 3E1DA7601931CC99000114A9 /* View Controllers */, 228DBA0718BC53F1002BA12A /* Assets.xcassets */, @@ -171,6 +179,7 @@ 53B791D41F854B4700AB2FA6 /* content.html */, 53B791D61F854B4700AB2FA6 /* InfoPlist.strings */, 53B791D81F854B4800AB2FA6 /* Localizable.strings */, + 5312D0F022848B0200048DE2 /* Credits.rtf */, ); name = "Supporting Files"; sourceTree = ""; @@ -197,6 +206,23 @@ name = Toolbar; sourceTree = ""; }; + 2CCCD8802CCCCF2000000001 /* LICENSE */ = { + isa = PBXGroup; + children = ( + 2CCCDF102CCCDC9000000001 /* LICENSE.txt */, + ); + name = LICENSE; + path = LICENSE; + sourceTree = ""; + }; + 2CDDD4C02CDDD48000000001 /* Configuration */ = { + isa = PBXGroup; + children = ( + 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */, + ); + name = Configuration; + sourceTree = ""; + }; 3E1DA7601931CC99000114A9 /* View Controllers */ = { isa = PBXGroup; children = ( @@ -259,21 +285,12 @@ name = "Search Bar"; sourceTree = ""; }; - E05975F0E0597BF000000001 /* Configuration */ = { + 53654E212298881100B999C7 /* Frameworks */ = { isa = PBXGroup; children = ( - E05970B0E05971D000000001 /* SampleCode.xcconfig */, + 53654E222298881200B999C7 /* WebKit.framework */, ); - name = Configuration; - sourceTree = ""; - }; - E2DE9120E2DEC9A000000001 /* LICENSE */ = { - isa = PBXGroup; - children = ( - E2DECA10E2DE8B8000000001 /* LICENSE.txt */, - ); - name = LICENSE; - path = LICENSE; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -286,7 +303,7 @@ 228DB9EF18BC53F1002BA12A /* Sources */, 228DB9F018BC53F1002BA12A /* Frameworks */, 228DB9F118BC53F1002BA12A /* Resources */, - 5399BE86211B482A005809B6, + FB440340FB430B8000000001, ); buildRules = ( ); @@ -304,17 +321,17 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1100; ORGANIZATIONNAME = Apple; TargetAttributes = { 228DB9F218BC53F1002BA12A = { - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; }; }; buildConfigurationList = 228DB9EE18BC53F1002BA12A /* Build configuration list for PBXProject "UIKitCatalog" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -355,6 +372,7 @@ 53CE5AF21F2A8B8300D8A656 /* StackViewController.storyboard in Resources */, 538B36F71F2A8E8A002AE100 /* TextViewController.storyboard in Resources */, 539C6BAF1F27F4980006C5A9 /* LaunchScreen.storyboard in Resources */, + 5312D0F222848B0200048DE2 /* Credits.rtf in Resources */, 539029FF1F2A53AD009775E3 /* AlertControllerViewController.storyboard in Resources */, 53CE5AF51F2A8BB000D8A656 /* StepperViewController.storyboard in Resources */, 53CE5AF81F2A8BD000D8A656 /* SwitchViewController.storyboard in Resources */, @@ -411,6 +429,14 @@ name = Main.storyboard; sourceTree = ""; }; + 5312D0F022848B0200048DE2 /* Credits.rtf */ = { + isa = PBXVariantGroup; + children = ( + 5312D0F122848B0200048DE2 /* Base */, + ); + name = Credits.rtf; + sourceTree = ""; + }; 5341627A1F291F310007BCCA /* ToolbarViewControllers.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -592,9 +618,10 @@ /* Begin XCBuildConfiguration section */ 228DBA0918BC53F1002BA12A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E05970B0E05971D000000001 /* SampleCode.xcconfig */; + baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -637,7 +664,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.1; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_VERSION = ""; @@ -647,9 +674,10 @@ }; 228DBA0A18BC53F1002BA12A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E05970B0E05971D000000001 /* SampleCode.xcconfig */; + baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -685,7 +713,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.1; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; SDKROOT = iphoneos; SWIFT_VERSION = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -695,37 +723,43 @@ }; 228DBA0C18BC53F1002BA12A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E05970B0E05971D000000001 /* SampleCode.xcconfig */; + baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = UIKitCatalog/UIKitCatalog.entitlements; + DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/UIKitCatalog/UIKitCatalog-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}${SAMPLE_CODE_DISAMBIGUATOR}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SUPPORTS_UIKITFORMAC = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 228DBA0D18BC53F1002BA12A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E05970B0E05971D000000001 /* SampleCode.xcconfig */; + baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = UIKitCatalog/UIKitCatalog.entitlements; + DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/UIKitCatalog/UIKitCatalog-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}${SAMPLE_CODE_DISAMBIGUATOR}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SUPPORTS_UIKITFORMAC = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/UIKitCatalog.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/UIKitCatalog.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..3ddf867 --- /dev/null +++ b/UIKitCatalog.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Latest + + diff --git a/UIKitCatalog/ActivityIndicatorViewController.swift b/UIKitCatalog/ActivityIndicatorViewController.swift index d681b63..b51065f 100644 --- a/UIKitCatalog/ActivityIndicatorViewController.swift +++ b/UIKitCatalog/ActivityIndicatorViewController.swift @@ -10,16 +10,18 @@ import UIKit class ActivityIndicatorViewController: UITableViewController { // MARK: - Properties - @IBOutlet weak var grayStyleActivityIndicatorView: UIActivityIndicatorView! + @IBOutlet weak var defaultSmallActivityIndicatorView: UIActivityIndicatorView! + @IBOutlet weak var defaultLargeActivityIndicatorView: UIActivityIndicatorView! - @IBOutlet weak var tintedActivityIndicatorView: UIActivityIndicatorView! + @IBOutlet weak var tintedSmallActivityIndicatorView: UIActivityIndicatorView! + @IBOutlet weak var tintedLargeActivityIndicatorView: UIActivityIndicatorView! // MARK: - View Life Cycle override func viewDidLoad() { super.viewDidLoad() - configureGrayActivityIndicatorView() + configureDefaultActivityIndicatorView() configureTintedActivityIndicatorView() // When the activity is done, be sure to use UIActivityIndicatorView.stopAnimating(). @@ -27,19 +29,25 @@ class ActivityIndicatorViewController: UITableViewController { // MARK: - Configuration - func configureGrayActivityIndicatorView() { - grayStyleActivityIndicatorView.activityIndicatorViewStyle = .gray + func configureDefaultActivityIndicatorView() { + defaultSmallActivityIndicatorView.style = UIActivityIndicatorView.Style.medium + defaultLargeActivityIndicatorView.style = UIActivityIndicatorView.Style.large - grayStyleActivityIndicatorView.startAnimating() + defaultSmallActivityIndicatorView.startAnimating() + defaultLargeActivityIndicatorView.startAnimating() - grayStyleActivityIndicatorView.hidesWhenStopped = true + defaultSmallActivityIndicatorView.hidesWhenStopped = true + defaultLargeActivityIndicatorView.hidesWhenStopped = true } func configureTintedActivityIndicatorView() { - tintedActivityIndicatorView.activityIndicatorViewStyle = .gray + tintedSmallActivityIndicatorView.style = UIActivityIndicatorView.Style.medium + tintedLargeActivityIndicatorView.style = UIActivityIndicatorView.Style.large - tintedActivityIndicatorView.color = UIColor(named: "Tint_Purple_Color") + tintedSmallActivityIndicatorView.color = UIColor.systemPurple + tintedLargeActivityIndicatorView.color = UIColor.systemPurple - tintedActivityIndicatorView.startAnimating() + tintedSmallActivityIndicatorView.startAnimating() + tintedLargeActivityIndicatorView.startAnimating() } } diff --git a/UIKitCatalog/AlertControllerViewController.swift b/UIKitCatalog/AlertControllerViewController.swift index 4b86c4d..b88dbc2 100644 --- a/UIKitCatalog/AlertControllerViewController.swift +++ b/UIKitCatalog/AlertControllerViewController.swift @@ -157,7 +157,7 @@ class AlertControllerViewController: UITableViewController { secure entry. */ self.textDidChangeObserver = NotificationCenter.default.addObserver( - forName: NSNotification.Name.UITextFieldTextDidChange, + forName: UITextField.textDidChangeNotification, object: textField, queue: OperationQueue.main) { (notification) in if let textField = notification.object as? UITextField { diff --git a/UIKitCatalog/AppDelegate.swift b/UIKitCatalog/AppDelegate.swift index eb8830d..6ca2aab 100644 --- a/UIKitCatalog/AppDelegate.swift +++ b/UIKitCatalog/AppDelegate.swift @@ -20,12 +20,16 @@ class AppDelegate: NSObject, UIApplicationDelegate, UISplitViewControllerDelegat // MARK: - UIApplicationDelegate - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { if let splitViewController = window!.rootViewController as? UISplitViewController { splitViewController.preferredDisplayMode = .allVisible splitViewController.delegate = detailViewManager detailViewManager.splitViewController = splitViewController + + // Set the master view controller table view with translucent background. + splitViewController.primaryBackgroundStyle = .sidebar } + return true } diff --git a/UIKitCatalog/Assets.xcassets/Flowers_1.imageset/Flowers_1.png b/UIKitCatalog/Assets.xcassets/Flowers_1.imageset/Flowers_1.png index a0b2e65..b4b3b38 100644 Binary files a/UIKitCatalog/Assets.xcassets/Flowers_1.imageset/Flowers_1.png and b/UIKitCatalog/Assets.xcassets/Flowers_1.imageset/Flowers_1.png differ diff --git a/UIKitCatalog/Assets.xcassets/Flowers_2.imageset/Flowers_2.png b/UIKitCatalog/Assets.xcassets/Flowers_2.imageset/Flowers_2.png index 3646d88..149520f 100644 Binary files a/UIKitCatalog/Assets.xcassets/Flowers_2.imageset/Flowers_2.png and b/UIKitCatalog/Assets.xcassets/Flowers_2.imageset/Flowers_2.png differ diff --git a/UIKitCatalog/Assets.xcassets/Flowers_3.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/Flowers_3.imageset/Contents.json deleted file mode 100644 index 9b45f82..0000000 --- a/UIKitCatalog/Assets.xcassets/Flowers_3.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "Flowers_3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/Flowers_3.imageset/Flowers_3.png b/UIKitCatalog/Assets.xcassets/Flowers_3.imageset/Flowers_3.png deleted file mode 100644 index f2f6e2a..0000000 Binary files a/UIKitCatalog/Assets.xcassets/Flowers_3.imageset/Flowers_3.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/Flowers_4.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/Flowers_4.imageset/Contents.json deleted file mode 100644 index 188ca0b..0000000 --- a/UIKitCatalog/Assets.xcassets/Flowers_4.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "Flowers_4.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/Flowers_4.imageset/Flowers_4.png b/UIKitCatalog/Assets.xcassets/Flowers_4.imageset/Flowers_4.png deleted file mode 100644 index 96b6527..0000000 Binary files a/UIKitCatalog/Assets.xcassets/Flowers_4.imageset/Flowers_4.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/Flowers_5.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/Flowers_5.imageset/Contents.json deleted file mode 100644 index b0a8ebc..0000000 --- a/UIKitCatalog/Assets.xcassets/Flowers_5.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "Flowers_5.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/Flowers_5.imageset/Flowers_5.png b/UIKitCatalog/Assets.xcassets/Flowers_5.imageset/Flowers_5.png deleted file mode 100644 index 0a67cd1..0000000 Binary files a/UIKitCatalog/Assets.xcassets/Flowers_5.imageset/Flowers_5.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/Tint_Blue_Color.colorset/Contents.json b/UIKitCatalog/Assets.xcassets/Tint_Blue_Color.colorset/Contents.json deleted file mode 100644 index ed6501d..0000000 --- a/UIKitCatalog/Assets.xcassets/Tint_Blue_Color.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0.333", - "alpha" : "1.000", - "blue" : "1.000", - "green" : "0.784" - } - } - } - ] -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/Tint_Green_Color.colorset/Contents.json b/UIKitCatalog/Assets.xcassets/Tint_Green_Color.colorset/Contents.json deleted file mode 100644 index 80c4ff8..0000000 --- a/UIKitCatalog/Assets.xcassets/Tint_Green_Color.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0.255", - "alpha" : "1.000", - "blue" : "0.470", - "green" : "0.804" - } - } - } - ] -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/Tint_Purple_Color.colorset/Contents.json b/UIKitCatalog/Assets.xcassets/Tint_Purple_Color.colorset/Contents.json deleted file mode 100644 index 1bec8fc..0000000 --- a/UIKitCatalog/Assets.xcassets/Tint_Purple_Color.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "0.659", - "alpha" : "1.000", - "blue" : "0.988", - "green" : "0.271" - } - } - } - ] -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/Contents.json deleted file mode 100644 index 86fc624..0000000 --- a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "bookmark_icon_1x.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "bookmark_icon_2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "bookmark_icon_3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_1x.png b/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_1x.png deleted file mode 100644 index 7fdb820..0000000 Binary files a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_1x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_2x.png b/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_2x.png deleted file mode 100644 index ee2b6c7..0000000 Binary files a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_2x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_3x.png b/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_3x.png deleted file mode 100644 index 36f7dc5..0000000 Binary files a/UIKitCatalog/Assets.xcassets/bookmark_icon.imageset/bookmark_icon_3x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/Contents.json deleted file mode 100644 index 2944503..0000000 --- a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "bookmark_icon_highlighted_1x.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "bookmark_icon_highlighted_2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "bookmark_icon_highlighted_3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_1x.png b/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_1x.png deleted file mode 100644 index 9763726..0000000 Binary files a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_1x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_2x.png b/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_2x.png deleted file mode 100644 index f6cb262..0000000 Binary files a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_2x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_3x.png b/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_3x.png deleted file mode 100644 index e654f0e..0000000 Binary files a/UIKitCatalog/Assets.xcassets/bookmark_icon_highlighted.imageset/bookmark_icon_highlighted_3x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/Contents.json deleted file mode 100644 index 6f98023..0000000 --- a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "checkmark_icon_1x.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "checkmark_icon_2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "checkmark_icon_3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_1x.png b/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_1x.png deleted file mode 100644 index 8905a21..0000000 Binary files a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_1x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_2x.png b/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_2x.png deleted file mode 100644 index 4392cb2..0000000 Binary files a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_2x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_3x.png b/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_3x.png deleted file mode 100644 index ecafedb..0000000 Binary files a/UIKitCatalog/Assets.xcassets/checkmark_icon.imageset/checkmark_icon_3x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/search_icon.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/search_icon.imageset/Contents.json deleted file mode 100644 index 4c0295e..0000000 --- a/UIKitCatalog/Assets.xcassets/search_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "search_icon_1x.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "search_icon_2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "search_icon_3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_1x.png b/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_1x.png deleted file mode 100644 index 74f9e9a..0000000 Binary files a/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_1x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_2x.png b/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_2x.png deleted file mode 100644 index 5c7df70..0000000 Binary files a/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_2x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_3x.png b/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_3x.png deleted file mode 100644 index c3cc433..0000000 Binary files a/UIKitCatalog/Assets.xcassets/search_icon.imageset/search_icon_3x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/Contents.json deleted file mode 100644 index ff7f945..0000000 --- a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "slider_thumb_1x.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "slider_thumb_2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "slider_thumb_3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_1x.png b/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_1x.png deleted file mode 100644 index 44a2b0a..0000000 Binary files a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_1x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_2x.png b/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_2x.png deleted file mode 100644 index 6f84378..0000000 Binary files a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_2x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_3x.png b/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_3x.png deleted file mode 100644 index 9a46590..0000000 Binary files a/UIKitCatalog/Assets.xcassets/slider_thumb.imageset/slider_thumb_3x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/text_view_background.colorset/Contents.json b/UIKitCatalog/Assets.xcassets/text_view_background.colorset/Contents.json new file mode 100644 index 0000000..e36b88e --- /dev/null +++ b/UIKitCatalog/Assets.xcassets/text_view_background.colorset/Contents.json @@ -0,0 +1,68 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "1.000", + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "1.000", + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.000", + "alpha" : "0.000", + "blue" : "0.000", + "green" : "0.000" + } + } + }, + { + "idiom" : "ipad", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "1.000", + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000" + } + } + } + ] +} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/tinted_segmented_control.colorset/Contents.json b/UIKitCatalog/Assets.xcassets/tinted_segmented_control.colorset/Contents.json new file mode 100644 index 0000000..479569c --- /dev/null +++ b/UIKitCatalog/Assets.xcassets/tinted_segmented_control.colorset/Contents.json @@ -0,0 +1,68 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.031", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.702" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.031", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.702" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.209", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.938" + } + } + }, + { + "idiom" : "ipad", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.031", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.702" + } + } + } + ] +} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/tinted_stepper_control.colorset/Contents.json b/UIKitCatalog/Assets.xcassets/tinted_stepper_control.colorset/Contents.json new file mode 100644 index 0000000..479569c --- /dev/null +++ b/UIKitCatalog/Assets.xcassets/tinted_stepper_control.colorset/Contents.json @@ -0,0 +1,68 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.031", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.702" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "light" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.031", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.702" + } + } + }, + { + "idiom" : "universal", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.209", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.938" + } + } + }, + { + "idiom" : "ipad", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0.031", + "alpha" : "1.000", + "blue" : "0.500", + "green" : "0.702" + } + } + } + ] +} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/Contents.json b/UIKitCatalog/Assets.xcassets/tools_icon.imageset/Contents.json deleted file mode 100644 index 6e728cd..0000000 --- a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tools_icon_1x.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tools_icon_2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tools_icon_3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_1x.png b/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_1x.png deleted file mode 100644 index 31491b1..0000000 Binary files a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_1x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_2x.png b/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_2x.png deleted file mode 100644 index e6eadf8..0000000 Binary files a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_2x.png and /dev/null differ diff --git a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_3x.png b/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_3x.png deleted file mode 100644 index 9e41751..0000000 Binary files a/UIKitCatalog/Assets.xcassets/tools_icon.imageset/tools_icon_3x.png and /dev/null differ diff --git a/UIKitCatalog/Base.lproj/ActivityIndicatorViewController.storyboard b/UIKitCatalog/Base.lproj/ActivityIndicatorViewController.storyboard index 580560c..ec8a11b 100644 --- a/UIKitCatalog/Base.lproj/ActivityIndicatorViewController.storyboard +++ b/UIKitCatalog/Base.lproj/ActivityIndicatorViewController.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -16,24 +13,42 @@ - + - + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + - - + + + @@ -41,20 +56,37 @@ - - + + - + - - - + + + + + + + + + + + + + + + + + + + - - + + + @@ -68,13 +100,15 @@ - - + + + + - + diff --git a/UIKitCatalog/Base.lproj/AlertControllerViewController.storyboard b/UIKitCatalog/Base.lproj/AlertControllerViewController.storyboard index 02c5c2c..75e090f 100644 --- a/UIKitCatalog/Base.lproj/AlertControllerViewController.storyboard +++ b/UIKitCatalog/Base.lproj/AlertControllerViewController.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -15,7 +13,7 @@ - + @@ -23,14 +21,14 @@ - + @@ -40,14 +38,14 @@ - + @@ -57,14 +55,14 @@ - + @@ -74,14 +72,14 @@ - + @@ -91,14 +89,14 @@ - + @@ -112,14 +110,14 @@ - + @@ -129,14 +127,14 @@ - + diff --git a/UIKitCatalog/Base.lproj/ButtonViewController.storyboard b/UIKitCatalog/Base.lproj/ButtonViewController.storyboard index 9ece674..2c316fa 100644 --- a/UIKitCatalog/Base.lproj/ButtonViewController.storyboard +++ b/UIKitCatalog/Base.lproj/ButtonViewController.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -15,7 +13,7 @@ - + @@ -23,14 +21,12 @@ - + @@ -47,14 +43,11 @@ - + @@ -71,14 +64,11 @@ - + @@ -95,7 +85,7 @@ - + @@ -123,14 +111,12 @@ - + @@ -141,6 +127,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -152,6 +181,8 @@ + + diff --git a/UIKitCatalog/Base.lproj/Credits.rtf b/UIKitCatalog/Base.lproj/Credits.rtf new file mode 100755 index 0000000..b0ce7b8 --- /dev/null +++ b/UIKitCatalog/Base.lproj/Credits.rtf @@ -0,0 +1,9 @@ +{\rtf1\ansi\ansicpg1252\cocoartf2467 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} +\vieww9000\viewh8400\viewkind0 +\pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\qc\partightenfactor0 + +\f0\fs20 \cf2 Demonstrates how to use UIKit's views and controls.\ +} \ No newline at end of file diff --git a/UIKitCatalog/Base.lproj/DatePickerController.storyboard b/UIKitCatalog/Base.lproj/DatePickerController.storyboard index 350b473..ea030c7 100644 --- a/UIKitCatalog/Base.lproj/DatePickerController.storyboard +++ b/UIKitCatalog/Base.lproj/DatePickerController.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -20,9 +17,6 @@ - - - - + diff --git a/UIKitCatalog/Base.lproj/ImageViewController.storyboard b/UIKitCatalog/Base.lproj/ImageViewController.storyboard index 796004d..4a3f018 100644 --- a/UIKitCatalog/Base.lproj/ImageViewController.storyboard +++ b/UIKitCatalog/Base.lproj/ImageViewController.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -15,6 +13,7 @@ + diff --git a/UIKitCatalog/Base.lproj/InfoPlist.strings b/UIKitCatalog/Base.lproj/InfoPlist.strings index 73c4a6e..8b1af5f 100644 --- a/UIKitCatalog/Base.lproj/InfoPlist.strings +++ b/UIKitCatalog/Base.lproj/InfoPlist.strings @@ -2,5 +2,8 @@ See LICENSE folder for this sample’s licensing information. Abstract: -Localized versions of Info.plist keys +Localized versions of Info.plist keys. */ + +CFBundleGetInfoString = "v15.0, Copyright 2008-2019, Apple Inc."; +NSHumanReadableCopyright = "Copyright © 2008-2019, Apple Inc."; diff --git a/UIKitCatalog/Base.lproj/LaunchScreen.storyboard b/UIKitCatalog/Base.lproj/LaunchScreen.storyboard index 5e76aa0..9186575 100644 --- a/UIKitCatalog/Base.lproj/LaunchScreen.storyboard +++ b/UIKitCatalog/Base.lproj/LaunchScreen.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -15,7 +12,7 @@ - + @@ -33,7 +30,6 @@ - diff --git a/UIKitCatalog/Base.lproj/Localizable.strings b/UIKitCatalog/Base.lproj/Localizable.strings index 1da2680..09fdffd 100644 --- a/UIKitCatalog/Base.lproj/Localizable.strings +++ b/UIKitCatalog/Base.lproj/Localizable.strings @@ -23,12 +23,15 @@ Strings used across the application via the NSLocalizedString API. "underlined" = "underlined"; "tinted" = "tinted"; "Placeholder text" = "Placeholder text"; +"Enter search text" = "Enter search text"; "Red color component value" = "Red color component value"; "Green color component value" = "Green color component value"; "Blue color component value" = "Blue color component value"; "Animated images" = "Animated images"; -"Done" = "Done"; -"Search" = "Search"; -"Settings" = "Settings"; + +"Airplane" = "Airplane"; +"Gift" = "Gift"; +"Burst" = "Burst"; + "UIKitCatalog" = "UIKitCatalog"; "An error occurred:" = "An error occurred:"; diff --git a/UIKitCatalog/Base.lproj/Main.storyboard b/UIKitCatalog/Base.lproj/Main.storyboard index 1e3ca33..700b5c9 100755 --- a/UIKitCatalog/Base.lproj/Main.storyboard +++ b/UIKitCatalog/Base.lproj/Main.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -21,23 +19,23 @@ - - + @@ -60,7 +58,7 @@ - + @@ -90,7 +88,7 @@ - + @@ -108,13 +106,13 @@ - + - + - + - + diff --git a/UIKitCatalog/Base.lproj/PageControlViewController.storyboard b/UIKitCatalog/Base.lproj/PageControlViewController.storyboard index 89785fd..901a0b0 100644 --- a/UIKitCatalog/Base.lproj/PageControlViewController.storyboard +++ b/UIKitCatalog/Base.lproj/PageControlViewController.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -24,11 +21,10 @@ - - + - + diff --git a/UIKitCatalog/Base.lproj/PickerViewController.storyboard b/UIKitCatalog/Base.lproj/PickerViewController.storyboard index 2123c2a..f32f93d 100644 --- a/UIKitCatalog/Base.lproj/PickerViewController.storyboard +++ b/UIKitCatalog/Base.lproj/PickerViewController.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -18,26 +16,27 @@ - + + + + - - + - + - - - - - - - + + + + + + diff --git a/UIKitCatalog/Base.lproj/ProgressViewController.storyboard b/UIKitCatalog/Base.lproj/ProgressViewController.storyboard index d111f1f..61a47fb 100644 --- a/UIKitCatalog/Base.lproj/ProgressViewController.storyboard +++ b/UIKitCatalog/Base.lproj/ProgressViewController.storyboard @@ -1,10 +1,8 @@ - - - - + + - + @@ -15,7 +13,7 @@ - + @@ -23,7 +21,7 @@ - + @@ -46,11 +44,11 @@ - + - + @@ -70,7 +68,7 @@ - + diff --git a/UIKitCatalog/Base.lproj/SearchViewControllers.storyboard b/UIKitCatalog/Base.lproj/SearchViewControllers.storyboard index e42c5af..9ce2687 100644 --- a/UIKitCatalog/Base.lproj/SearchViewControllers.storyboard +++ b/UIKitCatalog/Base.lproj/SearchViewControllers.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -17,53 +14,53 @@ - + - + - + - + - + @@ -93,14 +90,18 @@ - + + + Title + Title + - + @@ -126,14 +127,14 @@ - + - + @@ -157,17 +158,17 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,6 +118,7 @@ + diff --git a/UIKitCatalog/Base.lproj/StackViewController.storyboard b/UIKitCatalog/Base.lproj/StackViewController.storyboard index af759f9..b42b729 100644 --- a/UIKitCatalog/Base.lproj/StackViewController.storyboard +++ b/UIKitCatalog/Base.lproj/StackViewController.storyboard @@ -1,11 +1,8 @@ - - - - + + - - + @@ -19,30 +16,30 @@ - + - + - - + +