Skip to content

M
Material
Commit 7fbf127f by Daniel Dahan
Options

development: udpated TableViewCell to correctly display detail text and updated Motion framework

parent c90a4289
Showing with 43 additions and 18 deletions
Motion @ d2c8755c
Subproject commit 1816943409577cabc9f4711272bc8fca16ac543b Subproject commit d2c8755c1bae996567b6374beb2b26920d073b20
Material.xcodeproj/project.pbxproj
...@@ -350,13 +350,16 @@ ...@@ -350,13 +350,16 @@
name = Grid; name = Grid;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
96090B031D9D709E00709CA6 /* TextField */ = { 96090B031D9D709E00709CA6 /* Text */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
961276621DCD8B1800A7D920 /* CharacterAttribute.swift */,
96BCB79D1CB40DC500C806FE /* TextStorage.swift */,
96BCB79E1CB40DC500C806FE /* TextView.swift */,
96BCB79C1CB40DC500C806FE /* TextField.swift */, 96BCB79C1CB40DC500C806FE /* TextField.swift */,
961F18E71CD93E3E008927C5 /* ErrorTextField.swift */, 961F18E71CD93E3E008927C5 /* ErrorTextField.swift */,
); );
name = TextField; name = Text;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
961E6BDD1DDA2A7E004E6C93 /* Application */ = { 961E6BDD1DDA2A7E004E6C93 /* Application */ = {
...@@ -578,8 +581,7 @@ ...@@ -578,8 +581,7 @@
968C99421D36EC9E000074FF /* Switch */, 968C99421D36EC9E000074FF /* Switch */,
963FBF011D6696AB008F8512 /* Tab */, 963FBF011D6696AB008F8512 /* Tab */,
966ECF2B1CF4C21B00BB0BDF /* Table */, 966ECF2B1CF4C21B00BB0BDF /* Table */,
96090B031D9D709E00709CA6 /* TextField */, 96090B031D9D709E00709CA6 /* Text */,
96BCB80E1CB4110E00C806FE /* TextView */,
963FBF001D66964F008F8512 /* Toolbar */, 963FBF001D66964F008F8512 /* Toolbar */,
96BCB8061CB40FD000C806FE /* Type */, 96BCB8061CB40FD000C806FE /* Type */,
96BCB80C1CB410DD00C806FE /* View */, 96BCB80C1CB410DD00C806FE /* View */,
...@@ -741,16 +743,6 @@ ...@@ -741,16 +743,6 @@
name = Layer; name = Layer;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
96BCB80E1CB4110E00C806FE /* TextView */ = {
isa = PBXGroup;
children = (
961276621DCD8B1800A7D920 /* CharacterAttribute.swift */,
96BCB79D1CB40DC500C806FE /* TextStorage.swift */,
96BCB79E1CB40DC500C806FE /* TextView.swift */,
);
name = TextView;
sourceTree = "<group>";
};
96D88BF41C1328D800B91418 /* Sources */ = { 96D88BF41C1328D800B91418 /* Sources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -841,11 +833,11 @@ ...@@ -841,11 +833,11 @@
96F345161F1960A300EE27C9 /* Preprocessors */ = { 96F345161F1960A300EE27C9 /* Preprocessors */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96F3451B1F1960A300EE27C9 /* MotionPreprocessor.swift */,
96F345171F1960A300EE27C9 /* CascadePreprocessor.swift */, 96F345171F1960A300EE27C9 /* CascadePreprocessor.swift */,
96F345181F1960A300EE27C9 /* DurationPreprocessor.swift */, 96F345181F1960A300EE27C9 /* DurationPreprocessor.swift */,
96F345191F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift */, 96F345191F1960A300EE27C9 /* IgnoreSubviewModifiersPreprocessor.swift */,
96F3451A1F1960A300EE27C9 /* MatchPreprocessor.swift */, 96F3451A1F1960A300EE27C9 /* MatchPreprocessor.swift */,
96F3451B1F1960A300EE27C9 /* MotionPreprocessor.swift */,
96F3451C1F1960A300EE27C9 /* SourcePreprocessor.swift */, 96F3451C1F1960A300EE27C9 /* SourcePreprocessor.swift */,
96F345451F1961ED00EE27C9 /* TransitionPreprocessor.swift */, 96F345451F1961ED00EE27C9 /* TransitionPreprocessor.swift */,
); );
......
Material.xcodeproj/project.xcworkspace/xcshareddata/Material.xcscmblueprint 0 → 100644
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "9CF35BC641478FBD765F7442D4034ED362261E0A",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"9CF35BC641478FBD765F7442D4034ED362261E0A" : 9223372036854775807,
"0F3E254D46E5A5B90D1542854F510B7D145A9F31" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "0F44C283-777E-4E3F-9E10-FC52C3C270CE",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"9CF35BC641478FBD765F7442D4034ED362261E0A" : "Material\/",
"0F3E254D46E5A5B90D1542854F510B7D145A9F31" : "Material\/Frameworks\/Motion\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Material",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Material.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CosmicMind\/Motion.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0F3E254D46E5A5B90D1542854F510B7D145A9F31"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/CosmicMind\/Material.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9CF35BC641478FBD765F7442D4034ED362261E0A"
}
]
}
\ No newline at end of file
Sources/iOS/TableView.swift
...@@ -68,5 +68,7 @@ open class TableView: UITableView { ...@@ -68,5 +68,7 @@ open class TableView: UITableView {
open func prepare() { open func prepare() {
backgroundColor = .white backgroundColor = .white
contentScaleFactor = Screen.scale contentScaleFactor = Screen.scale
separatorStyle = .none
register(TableViewCell.self, forCellReuseIdentifier: "TableViewCell")
} }
} }
Sources/iOS/TableViewCell.swift
...@@ -102,7 +102,7 @@ open class TableViewCell: UITableViewCell, Pulseable, PulseableLayer { ...@@ -102,7 +102,7 @@ open class TableViewCell: UITableViewCell, Pulseable, PulseableLayer {
- Parameter reuseIdentifier: A String identifier. - Parameter reuseIdentifier: A String identifier.
*/ */
public override init(style: UITableViewCellStyle, reuseIdentifier: String!) { public override init(style: UITableViewCellStyle, reuseIdentifier: String!) {
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
prepare() prepare()
} }
...@@ -169,7 +169,7 @@ open class TableViewCell: UITableViewCell, Pulseable, PulseableLayer { ...@@ -169,7 +169,7 @@ open class TableViewCell: UITableViewCell, Pulseable, PulseableLayer {
open func prepare() { open func prepare() {
selectionStyle = .none selectionStyle = .none
separatorInset = .zero separatorInset = .zero
contentScaleFactor = Screen.scale contentScaleFactor = Screen.scale
imageView?.isUserInteractionEnabled = false imageView?.isUserInteractionEnabled = false
textLabel?.isUserInteractionEnabled = false textLabel?.isUserInteractionEnabled = false
detailTextLabel?.isUserInteractionEnabled = false detailTextLabel?.isUserInteractionEnabled = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment