From 10defafc2fb7ed5209bd7ee3d61406eb790164d2 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 28 Nov 2019 10:06:48 +1100 Subject: [PATCH] Start implementing style guide --- Signal.xcodeproj/project.pbxproj | 16 ++++++++++++++++ .../Utilities/Style Guide/CGFloat+Loki.swift | 19 +++++++++++++++++++ .../Utilities/Style Guide/UIColor+Loki.swift | 13 +++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 Signal/src/Loki/Utilities/Style Guide/CGFloat+Loki.swift create mode 100644 Signal/src/Loki/Utilities/Style Guide/UIColor+Loki.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 5b8ec972e..7b03254a3 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -584,6 +584,8 @@ B89841E322B7579F00B1BDC6 /* NewConversationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */; }; B8B26C8F234D629C004ED98C /* MentionCandidateSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */; }; B8B26C91234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */; }; + B8BB82A0238F322400BA5194 /* UIColor+Loki.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BB829F238F322400BA5194 /* UIColor+Loki.swift */; }; + B8BB82A2238F356100BA5194 /* CGFloat+Loki.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8BB82A1238F356100BA5194 /* CGFloat+Loki.swift */; }; B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; }; BFF3FB9730634F37D25903F4 /* Pods_Signal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D17BB5C25D615AB49813100C /* Pods_Signal.framework */; }; @@ -1396,6 +1398,8 @@ B89841E222B7579F00B1BDC6 /* NewConversationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationVC.swift; sourceTree = ""; }; B8B26C8E234D629C004ED98C /* MentionCandidateSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionCandidateSelectionView.swift; sourceTree = ""; }; B8B26C90234D8CBD004ED98C /* MentionCandidateSelectionViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MentionCandidateSelectionViewDelegate.swift; sourceTree = ""; }; + B8BB829F238F322400BA5194 /* UIColor+Loki.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Loki.swift"; sourceTree = ""; }; + B8BB82A1238F356100BA5194 /* CGFloat+Loki.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Loki.swift"; sourceTree = ""; }; B90418E4183E9DD40038554A /* DateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateUtil.h; sourceTree = ""; }; B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = ""; }; B97940251832BD2400BD66CB /* UIUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIUtil.h; sourceTree = ""; }; @@ -2700,11 +2704,21 @@ children = ( B84664F4235022F30083A1CD /* MentionUtilities.swift */, B86BD08323399ACF000F5AE3 /* Modal.swift */, + B8BB82A3238F356800BA5194 /* Style Guide */, B885D5F52334A32100EE0D8E /* UIView+Constraint.swift */, ); path = Utilities; sourceTree = ""; }; + B8BB82A3238F356800BA5194 /* Style Guide */ = { + isa = PBXGroup; + children = ( + B8BB82A1238F356100BA5194 /* CGFloat+Loki.swift */, + B8BB829F238F322400BA5194 /* UIColor+Loki.swift */, + ); + path = "Style Guide"; + sourceTree = ""; + }; B8BFFF392355426100102A27 /* Messaging */ = { isa = PBXGroup; children = ( @@ -3763,6 +3777,7 @@ 4505C2BF1E648EA300CEBF41 /* ExperienceUpgrade.swift in Sources */, EF764C351DB67CC5000D9A87 /* UIViewController+Permissions.m in Sources */, 45CD81EF1DC030E7004C9430 /* SyncPushTokensJob.swift in Sources */, + B8BB82A0238F322400BA5194 /* UIColor+Loki.swift in Sources */, 34D2CCE0206939B400CB1A14 /* DebugUIMessagesAssetLoader.m in Sources */, 4CEB78C92178EBAB00F315D2 /* OWSSessionResetJobRecord.m in Sources */, 45794E861E00620000066731 /* CallUIAdapter.swift in Sources */, @@ -3794,6 +3809,7 @@ B80C6B572384A56D00FDBC8B /* DeviceLinksVC.swift in Sources */, 34A8B3512190A40E00218A25 /* MediaAlbumCellView.swift in Sources */, 34D1F0AE1F867BFC0066283D /* OWSMessageCell.m in Sources */, + B8BB82A2238F356100BA5194 /* CGFloat+Loki.swift in Sources */, 4C4AEC4520EC343B0020E72B /* DismissableTextField.swift in Sources */, 4CB5F26720F6E1E2004D1B42 /* MenuActionsViewController.swift in Sources */, 3496955E219B605E00DCFE74 /* PhotoLibrary.swift in Sources */, diff --git a/Signal/src/Loki/Utilities/Style Guide/CGFloat+Loki.swift b/Signal/src/Loki/Utilities/Style Guide/CGFloat+Loki.swift new file mode 100644 index 000000000..03c816241 --- /dev/null +++ b/Signal/src/Loki/Utilities/Style Guide/CGFloat+Loki.swift @@ -0,0 +1,19 @@ + +@objc public extension CGFloat { + + // MARK: - Alpha Values + @objc public static let inactiveElementOpacity = CGFloat(0.6) + + // MARK: - Font Sizes + @objc public static let smallFontSize = CGFloat(13) + @objc public static let regularFontSize = CGFloat(15) + @objc public static let largeFontSize = CGFloat(20) + @objc public static let veryLargeFontSize = CGFloat(25) + @objc public static let massiveFontSize = CGFloat(50) + + // MARK: - Element Sizes + @objc public static let buttonHeight = CGFloat(34) + @objc public static let accentLineThickness = CGFloat(4) + @objc public static let regularAvatarSize = CGFloat(45) + @objc public static let largeAvatarSize = CGFloat(65) +} diff --git a/Signal/src/Loki/Utilities/Style Guide/UIColor+Loki.swift b/Signal/src/Loki/Utilities/Style Guide/UIColor+Loki.swift new file mode 100644 index 000000000..c206876f5 --- /dev/null +++ b/Signal/src/Loki/Utilities/Style Guide/UIColor+Loki.swift @@ -0,0 +1,13 @@ + +@objc public extension UIColor { + + @objc public convenience init(hex value: UInt) { + let red = CGFloat((value >> 16) & 0xff) / 255 + let green = CGFloat((value >> 8) & 0xff) / 255 + let blue = CGFloat((value >> 0) & 0xff) / 255 + self.init(red: red, green: green, blue: blue, alpha: 1) + } + + @objc public static let accent = UIColor(hex: 0x00F782) + @objc public static let text = UIColor(hex: 0xFFFFFF) +}