Skip to content

Update swift 4.2 and XCode 10 #19

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

Open
socquique wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Update swift 4.2 and XCode 10 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
baa7897
Update swift 4.2 and XCode 10
Jan 8, 2019
ec322f6
* Fix minor obj issues
Jan 8, 2019
f3b64f4
Update travis config
Jan 8, 2019
117f44d
Update travis config
Jan 8, 2019
66d74db
Update travis conf
Jan 8, 2019
c9a041a
Restore travis config file
Jan 8, 2019
846a7f0
Testing new travis config
Jan 8, 2019
1ec16a0
Testing travis conf file
Jan 8, 2019
bbd0ccc
Testing travis yml config
Jan 8, 2019
489b3ef
Testing travis config
Jan 8, 2019
e3ba06a
Fix travis config file
Jan 8, 2019
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
10 changes: 4 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ language: objective-c
#xcode_scheme: GlyuckDataGrid-Example
cache: cocoapods
podfile: Example/Podfile
osx_image: xcode8
osx_image: xcode10.1
before_install:
- |
BUNDLE_GEMFILE=Example/Gemfile bundle install
BUNDLE_GEMFILE=Example/Gemfile bundle exec pod repo update
BUNDLE_GEMFILE=Example/Gemfile bundle exec pod install --project-directory=Example
- gem install cocoapods
- pod update --project-directory=Example
install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild test -workspace Example/GlyuckDataGrid.xcworkspace -scheme GlyuckDataGrid-Example -sdk iphonesimulator10.0 -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' | xcpretty
- xcodebuild test -workspace Example/GlyuckDataGrid.xcworkspace -scheme GlyuckDataGrid-Example -sdk iphonesimulator12.1 -destination 'platform=iOS Simulator,name=iPhone 8,OS=12.1' | xcpretty
Empty file modified CHANGELOG.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/Gemfile
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/Gemfile.lock
100644 → 100755
View file
Open in desktop
Empty file.
70 changes: 29 additions & 41 deletions Example/GlyuckDataGrid.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

/* Begin PBXFileReference section */
04AA3CDDD7A3895ECFDD48B6 /* Pods-GlyuckDataGrid_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlyuckDataGrid_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GlyuckDataGrid_Tests/Pods-GlyuckDataGrid_Tests.debug.xcconfig"; sourceTree = "<group>"; };
0E41F53698DC87B16E459BA3 /* GlyuckDataGrid.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GlyuckDataGrid.podspec; path = ../GlyuckDataGrid.podspec; sourceTree = "<group>"; };
0E41F53698DC87B16E459BA3 /* GlyuckDataGrid.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GlyuckDataGrid.podspec; path = ../GlyuckDataGrid.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
390C05C71B6FBA730040E5D7 /* CollectionViewDataSourceSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewDataSourceSpec.swift; sourceTree = "<group>"; };
3941988C1B81FABC008BC0E7 /* CollectionViewDelegateSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewDelegateSpec.swift; sourceTree = "<group>"; };
394EA4341B6BDFB100328166 /* DataGridViewSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataGridViewSpec.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -292,7 +292,6 @@
607FACCD1AFB9204008FA782 /* Frameworks */,
607FACCE1AFB9204008FA782 /* Resources */,
F475821A0549D1A0BF818838 /* [CP] Embed Pods Frameworks */,
093B26BBDC98DD67073F13D7 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -312,7 +311,6 @@
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
3B023957F5AEF07B18EA2212 /* [CP] Embed Pods Frameworks */,
1107411C237B189882701FEC /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -336,11 +334,11 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1010;
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 1010;
TestTargetID = 607FACCF1AFB9204008FA782;
};
};
Expand Down Expand Up @@ -386,45 +384,22 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
093B26BBDC98DD67073F13D7 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GlyuckDataGrid_Example/Pods-GlyuckDataGrid_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
1107411C237B189882701FEC /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GlyuckDataGrid_Tests/Pods-GlyuckDataGrid_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
3B023957F5AEF07B18EA2212 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-GlyuckDataGrid_Tests/Pods-GlyuckDataGrid_Tests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/GlyuckDataGrid/GlyuckDataGrid.framework",
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GlyuckDataGrid.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -437,13 +412,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-GlyuckDataGrid_Tests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
F018D6774197F0D5B96E0D96 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -452,13 +430,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-GlyuckDataGrid_Example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
F475821A0549D1A0BF818838 /* [CP] Embed Pods Frameworks */ = {
Expand All @@ -467,9 +448,12 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-GlyuckDataGrid_Example/Pods-GlyuckDataGrid_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/GlyuckDataGrid/GlyuckDataGrid.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GlyuckDataGrid.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -643,7 +627,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "GlyuckDataGrid/Examples/ObjectiveC/GlyuckDataGrid_Example-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -660,7 +645,8 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "GlyuckDataGrid/Examples/ObjectiveC/GlyuckDataGrid_Example-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -682,7 +668,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GlyuckDataGrid_Example.app/GlyuckDataGrid_Example";
};
name = Debug;
Expand All @@ -701,7 +688,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GlyuckDataGrid_Example.app/GlyuckDataGrid_Example";
};
name = Release;
Expand Down
Empty file modified Example/GlyuckDataGrid.xcodeproj/project.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid.xcodeproj/xcshareddata/xcschemes/GlyuckDataGrid-Example.xcscheme
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions Example/GlyuckDataGrid.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
5 changes: 5 additions & 0 deletions Example/GlyuckDataGrid.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
Empty file modified Example/GlyuckDataGrid/AppDelegate.swift
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Base.lproj/LaunchScreen.xib
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Base.lproj/Main.storyboard
100644 → 100755
View file
Open in desktop
Empty file.
34 changes: 18 additions & 16 deletions Example/GlyuckDataGrid/Examples/MultiplicationTable/MultiplicationTableViewController.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,44 @@ import GlyuckDataGrid

class MultiplicationTableViewController: UIViewController, DataGridViewDataSource, DataGridViewDelegate {
@IBOutlet weak var dataGridView: DataGridView!

static override func initialize() {
super.initialize()

let dataGridAppearance = DataGridView.glyuck_appearanceWhenContained(in: self)!
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
let dataGridAppearance = DataGridView.glyuck_appearanceWhenContained(in: DataGridView.self)!
dataGridAppearance.row1BackgroundColor = nil
dataGridAppearance.row2BackgroundColor = nil

let cornerHeaderAppearance = DataGridViewCornerHeaderCell.glyuck_appearanceWhenContained(in: self)!
let cornerHeaderAppearance = DataGridViewCornerHeaderCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
cornerHeaderAppearance.backgroundColor = UIColor.white
cornerHeaderAppearance.borderBottomWidth = 1 / UIScreen.main.scale
cornerHeaderAppearance.borderBottomColor = UIColor(white: 0.73, alpha: 1)
cornerHeaderAppearance.borderRightWidth = 1 / UIScreen.main.scale
cornerHeaderAppearance.borderRightColor = UIColor(white: 0.73, alpha: 1)

let rowHeaderAppearance = DataGridViewRowHeaderCell.glyuck_appearanceWhenContained(in: self)!
let rowHeaderAppearance = DataGridViewRowHeaderCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
rowHeaderAppearance.backgroundColor = UIColor(white: 0.95, alpha: 1)
rowHeaderAppearance.borderBottomWidth = 1 / UIScreen.main.scale
rowHeaderAppearance.borderBottomColor = UIColor(white: 0.73, alpha: 1)

let columnHeaderAppearance = DataGridViewColumnHeaderCell.glyuck_appearanceWhenContained(in: self)!
let columnHeaderAppearance = DataGridViewColumnHeaderCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
columnHeaderAppearance.borderRightWidth = 1 / UIScreen.main.scale
columnHeaderAppearance.borderRightColor = UIColor(white: 0.73, alpha: 1)

let cellAppearance = DataGridViewContentCell.glyuck_appearanceWhenContained(in: self)!
let cellAppearance = DataGridViewContentCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
cellAppearance.borderRightWidth = 1 / UIScreen.main.scale
cellAppearance.borderRightColor = UIColor(white: 0.73, alpha: 1)
cellAppearance.borderBottomWidth = 1 / UIScreen.main.scale
cellAppearance.borderBottomColor = UIColor(white: 0.73, alpha: 1)

columnHeaderAppearance.backgroundColor = UIColor(white: 0.95, alpha: 1)
let labelAppearance = UILabel.glyuck_appearanceWhenContained(in: self)!
labelAppearance.appearanceFont = UIFont.systemFont(ofSize: 12, weight: UIFontWeightLight)
let labelAppearance = UILabel.glyuck_appearanceWhenContained(in: DataGridView.self)!
labelAppearance.appearanceFont = UIFont.systemFont(ofSize: 12, weight: UIFont.Weight.light)
labelAppearance.appearanceTextAlignment = .center
}



override func viewDidLoad() {
dataGridView.delegate = self
dataGridView.dataSource = self
Expand Down
Empty file modified Example/GlyuckDataGrid/Examples/ObjectiveC/GlyuckDataGrid_Example-Bridging-Header.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Examples/ObjectiveC/ObjectiveCDataGridViewController.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Examples/ObjectiveC/ObjectiveCDataGridViewController.m
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Examples/SimpleDataGrid/SimpleDataGridViewController.swift
100644 → 100755
View file
Open in desktop
Empty file.
42 changes: 24 additions & 18 deletions Example/GlyuckDataGrid/Examples/SpreadSheet/SpreadSheetViewController.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ class SpreadSheetViewController: UIViewController, DataGridViewDataSource, DataG
var dataArray: [[String]] = [[String]](repeating: [String](repeating: "", count: Constants.numberOfLetters), count: Constants.numberOfRows)

@IBOutlet weak var dataGridView: DataGridView!

static override func initialize() {
super.initialize()

let dataGridAppearance = DataGridView.glyuck_appearanceWhenContained(in: self)!
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
let dataGridAppearance = DataGridView.glyuck_appearanceWhenContained(in: DataGridView.self)!
dataGridAppearance.row1BackgroundColor = nil
dataGridAppearance.row2BackgroundColor = nil

let cornerHeaderAppearance = DataGridViewCornerHeaderCell.glyuck_appearanceWhenContained(in: self)!
let cornerHeaderAppearance = DataGridViewCornerHeaderCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
cornerHeaderAppearance.backgroundColor = Colors.headerBackground
cornerHeaderAppearance.borderLeftWidth = 1 / UIScreen.main.scale
cornerHeaderAppearance.borderTopWidth = 1 / UIScreen.main.scale
Expand All @@ -42,40 +42,46 @@ class SpreadSheetViewController: UIViewController, DataGridViewDataSource, DataG
cornerHeaderAppearance.borderTopColor = Colors.border
cornerHeaderAppearance.borderRightColor = Colors.border
cornerHeaderAppearance.borderBottomColor = Colors.border

let rowHeaderAppearance = DataGridViewRowHeaderCell.glyuck_appearanceWhenContained(in :self)!
let rowHeaderAppearance = DataGridViewRowHeaderCell.glyuck_appearanceWhenContained(in :DataGridView.self)!
rowHeaderAppearance.backgroundColor = Colors.headerBackground
rowHeaderAppearance.borderLeftWidth = 1 / UIScreen.main.scale
rowHeaderAppearance.borderBottomWidth = 1 / UIScreen.main.scale
rowHeaderAppearance.borderRightWidth = 1 / UIScreen.main.scale
rowHeaderAppearance.borderLeftColor = Colors.border
rowHeaderAppearance.borderBottomColor = Colors.border
rowHeaderAppearance.borderRightColor = Colors.border

let rowHeaderLabelAppearane = UILabel.glyuck_appearanceWhenContained(in: self, class2: DataGridViewRowHeaderCell.self)!
let rowHeaderLabelAppearane = UILabel.glyuck_appearanceWhenContained(in: DataGridView.self, class2: DataGridViewRowHeaderCell.self)!
rowHeaderLabelAppearane.appearanceTextAlignment = .right

let columnHeaderAppearance = DataGridViewColumnHeaderCell.glyuck_appearanceWhenContained(in: self)!
let columnHeaderAppearance = DataGridViewColumnHeaderCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
columnHeaderAppearance.backgroundColor = Colors.headerBackground
columnHeaderAppearance.borderTopWidth = 1 / UIScreen.main.scale
columnHeaderAppearance.borderBottomWidth = 1 / UIScreen.main.scale
columnHeaderAppearance.borderRightWidth = 1 / UIScreen.main.scale
columnHeaderAppearance.borderTopColor = Colors.border
columnHeaderAppearance.borderBottomColor = Colors.border
columnHeaderAppearance.borderRightColor = Colors.border

let cellAppearance = DataGridViewContentCell.glyuck_appearanceWhenContained(in: self)!
let cellAppearance = DataGridViewContentCell.glyuck_appearanceWhenContained(in: DataGridView.self)!
cellAppearance.borderRightWidth = 1 / UIScreen.main.scale
cellAppearance.borderRightColor = UIColor(white: 0.73, alpha: 1)
cellAppearance.borderBottomWidth = 1 / UIScreen.main.scale
cellAppearance.borderBottomColor = UIColor(white: 0.73, alpha: 1)

columnHeaderAppearance.backgroundColor = UIColor(white: 0.95, alpha: 1)
let labelAppearance = UILabel.glyuck_appearanceWhenContained(in: self)!
labelAppearance.appearanceFont = UIFont.systemFont(ofSize: 12, weight: UIFontWeightLight)
let labelAppearance = UILabel.glyuck_appearanceWhenContained(in: DataGridView.self)!
labelAppearance.appearanceFont = UIFont.systemFont(ofSize: 12, weight: UIFont.Weight.light)
labelAppearance.appearanceTextAlignment = .center
}

// static override func initialize() {
// super.initialize()
//
//
// }

override func viewDidLoad() {
super.viewDidLoad()

Expand Down
Empty file modified Example/GlyuckDataGrid/Examples/SpreadSheet/Views/SpreadSheetCell.swift
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Examples/SpreadSheet/Views/SpreadSheetCell.xib
100644 → 100755
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions Example/GlyuckDataGrid/F1DataSource.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import UIKit


class F1DataSource: NSObject {
static let stats:[[String:String]] = [
@objc static let stats:[[String:String]] = [
["season": "1950", "driver": "Giuseppe Farina", "age": "44", "team": "Alfa Romeo", "engine": "Alfa Romeo", "poles": "2", "wins": "3", "podiums": "3", "fastest_laps": "3", "points": "30", "clinched": "Race 7 of 7", "point_margin": "3"],
["season": "1951", "driver": "Juan Manuel Fangio", "age": "40", "team": "Alfa Romeo", "engine": "Alfa Romeo", "poles": "4", "wins": "3", "podiums": "5", "fastest_laps": "5", "points": "31", "clinched": "Race 8 of 8", "point_margin": "6"],
["season": "1952", "driver": "Alberto Ascari", "age": "34", "team": "Ferrari", "engine": "Ferrari", "poles": "5", "wins": "6", "podiums": "6", "fastest_laps": "6", "points": "36", "clinched": "Race 6 of 8", "point_margin": "12"],
Expand Down Expand Up @@ -76,7 +76,7 @@ class F1DataSource: NSObject {
["season": "2013", "driver": "Sebastian Vettel", "age": "26", "team": "Red Bull", "engine": "Renault", "poles": "9", "wins": "13", "podiums": "16", "fastest_laps": "7", "points": "397", "clinched": "Race 16 of 19", "point_margin": "155"],
["season": "2014", "driver": "Lewis Hamilton", "age": "29", "team": "Mercedes", "engine": "Mercedes", "poles": "7", "wins": "11", "podiums": "16", "fastest_laps": "7", "points": "384", "clinched": "Race 19 of 19", "point_margin": "67"]
]
static let columnsTitles = ["Year", "Driver", "Age", "Team", "Engine", "Poles", "Wins", "Podiums", "Fastest\nlaps", "Points", "Clinched", "Points\nmargin"]
static let columns = ["season", "driver", "age", "team", "engine", "poles", "wins", "podiums", "fastest_laps", "points", "clinched", "point_margin"]
static let columnsWidths: [CGFloat] = [70, 150, 60, 120, 110, 70, 70, 95, 70, 75, 130, 70]
@objc static let columnsTitles = ["Year", "Driver", "Age", "Team", "Engine", "Poles", "Wins", "Podiums", "Fastest\nlaps", "Points", "Clinched", "Points\nmargin"]
@objc static let columns = ["season", "driver", "age", "team", "engine", "poles", "wins", "podiums", "fastest_laps", "points", "clinched", "point_margin"]
@objc static let columnsWidths: [CGFloat] = [70, 150, 60, 120, 110, 70, 70, 95, 70, 75, 130, 70]
}
Empty file modified Example/GlyuckDataGrid/Images.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/GlyuckDataGrid/Info.plist
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Example/Podfile
100644 → 100755
View file
Open in desktop
Empty file.
Loading