Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
a045b498
Commit
a045b498
authored
Jun 13, 2018
by
Orkhan Alikhanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added fontSize for UILabel and UIButton
parent
ff98daff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
100 additions
and
0 deletions
+100
-0
Material.xcodeproj/project.pbxproj
+8
-0
Sources/iOS/Material+UIButton.swift
+46
-0
Sources/iOS/Material+UILabel.swift
+46
-0
No files found.
Material.xcodeproj/project.pbxproj
View file @
a045b498
...
...
@@ -174,6 +174,8 @@
96E3C39A1D3A1CC20086A024
/* ErrorTextField.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
961F18E71CD93E3E008927C5
/* ErrorTextField.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96E3C39C1D3A1CC20086A024
/* Offset.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
968C99461D377849000074FF
/* Offset.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96F1A5531F24F17A001D8CAF
/* TabsController.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96E09DC71F2287E50000B121
/* TabsController.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
9D054A6520D175AC00D0528D
/* Material+UIButton.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9D054A6320D175AC00D0528D
/* Material+UIButton.swift */
;
};
9D054A6620D175AC00D0528D
/* Material+UILabel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9D054A6420D175AC00D0528D
/* Material+UILabel.swift */
;
};
9DE84D721FF0252600586C8B
/* RadioButtonGroup.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9DE84D6F1FF0252500586C8B
/* RadioButtonGroup.swift */
;
};
9DE84D731FF0252600586C8B
/* BaseButtonGroup.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9DE84D701FF0252500586C8B
/* BaseButtonGroup.swift */
;
};
9DE84D741FF0252600586C8B
/* CheckButtonGroup.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9DE84D711FF0252500586C8B
/* CheckButtonGroup.swift */
;
};
...
...
@@ -293,6 +295,8 @@
96E09DC71F2287E50000B121
/* TabsController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
TabsController.swift
;
sourceTree
=
"<group>"
;
};
96E3C3931D397AE90086A024
/* Material+UIView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
"Material+UIView.swift"
;
sourceTree
=
"<group>"
;
};
96F1DC871D654FDF0025F925
/* Material+CALayer.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
"Material+CALayer.swift"
;
sourceTree
=
"<group>"
;
};
9D054A6320D175AC00D0528D
/* Material+UIButton.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
"Material+UIButton.swift"
;
sourceTree
=
"<group>"
;
};
9D054A6420D175AC00D0528D
/* Material+UILabel.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
"Material+UILabel.swift"
;
sourceTree
=
"<group>"
;
};
9DE84D6F1FF0252500586C8B
/* RadioButtonGroup.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
RadioButtonGroup.swift
;
sourceTree
=
"<group>"
;
};
9DE84D701FF0252500586C8B
/* BaseButtonGroup.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
BaseButtonGroup.swift
;
sourceTree
=
"<group>"
;
};
9DE84D711FF0252500586C8B
/* CheckButtonGroup.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CheckButtonGroup.swift
;
sourceTree
=
"<group>"
;
};
...
...
@@ -702,6 +706,8 @@
966C17721F0439F600D3E83C
/* Material+MotionAnimation.swift */
,
9618006C1F4D384200CD77A1
/* Material+UIViewController.swift */
,
9DF74C4D20D15D84003C1D66
/* Material+UIColor.swift */
,
9D054A6320D175AC00D0528D
/* Material+UIButton.swift */
,
9D054A6420D175AC00D0528D
/* Material+UILabel.swift */
,
);
name
=
Extension
;
sourceTree
=
"<group>"
;
...
...
@@ -1013,9 +1019,11 @@
965E80D01DD4C50600D61E4B
/* RaisedButton.swift in Sources */
,
9DF58CEE20C098C60098968D
/* ErrorTextFieldValidator.swift in Sources */
,
96A183631E0C6CE200083C30
/* FABMenu.swift in Sources */
,
9D054A6520D175AC00D0528D
/* Material+UIButton.swift in Sources */
,
965E80D11DD4C50600D61E4B
/* IconButton.swift in Sources */
,
965E80D21DD4C50600D61E4B
/* Color.swift in Sources */
,
96BFC1541E5E486F0075DE1F
/* SpringAnimation.swift in Sources */
,
9D054A6620D175AC00D0528D
/* Material+UILabel.swift in Sources */
,
965E80D31DD4C50600D61E4B
/* Device.swift in Sources */
,
965E80FD1DD4D59500D61E4B
/* Toolbar.swift in Sources */
,
965E80D41DD4C50600D61E4B
/* Divider.swift in Sources */
,
...
...
Sources/iOS/Material+UIButton.swift
0 → 100644
View file @
a045b498
/*
* Copyright (C) 2018, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
* All rights reserved.
*
* Original Inspiration & Author
* Copyright (C) 2018 Orkhan Alikhanov <orkhan.alikhanov@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of CosmicMind nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
import
UIKit
public
extension
UIButton
{
/// Convenience way to change titleLabel font size.
var
fontSize
:
CGFloat
{
set
{
titleLabel
?
.
font
=
titleLabel
?
.
font
?
.
withSize
(
newValue
)
??
UIFont
.
systemFont
(
ofSize
:
newValue
)
}
get
{
return
titleLabel
?
.
font
?
.
pointSize
??
UIFont
.
buttonFontSize
}
}
}
Sources/iOS/Material+UILabel.swift
0 → 100644
View file @
a045b498
/*
* Copyright (C) 2018, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
* All rights reserved.
*
* Original Inspiration & Author
* Copyright (C) 2018 Orkhan Alikhanov <orkhan.alikhanov@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of CosmicMind nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
import
UIKit
public
extension
UILabel
{
/// Convenience way to change font size.
var
fontSize
:
CGFloat
{
set
{
font
=
font
?
.
withSize
(
newValue
)
??
UIFont
.
systemFont
(
ofSize
:
newValue
)
}
get
{
return
font
?
.
pointSize
??
UIFont
.
labelFontSize
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment