From ff69d1a2622d1036f1e3211aa2af0989dd0a2f26 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@virtual-artz.de>
Date: Fri, 27 Oct 2017 16:22:12 +0200
Subject: [PATCH] Made contact colors random again, but they still are
persistent
---
enzevalos_iphone.xcodeproj/project.pbxproj | 4 ---
enzevalos_iphone/ColorManager.swift | 33 ----------------------
enzevalos_iphone/Contact.swift | 16 +++--------
3 files changed, 4 insertions(+), 49 deletions(-)
delete mode 100644 enzevalos_iphone/ColorManager.swift
diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 0c7fc775..907654c3 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -193,7 +193,6 @@
F1984D741E1E92B300804E1E /* LabelStyleKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1984D731E1E92B300804E1E /* LabelStyleKit.swift */; };
F1ACF21C1E0C1C6800C1B843 /* ContactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1ACF21B1E0C1C6800C1B843 /* ContactViewController.swift */; };
F1AF938F1E2D04BA00755128 /* CustomCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1AF938E1E2D04BA00755128 /* CustomCells.swift */; };
- F1F070251FA0DF2A004A860A /* ColorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F070241FA0DF2A004A860A /* ColorManager.swift */; };
F1F070281FA0DF3F004A860A /* Inbox.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F1F070261FA0DF3F004A860A /* Inbox.storyboard */; };
F678F71DFB726D912D039FFF /* Pods_enzevalos_iphoneTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9B9CE43043CF806E1C02FCA /* Pods_enzevalos_iphoneTests.framework */; };
/* End PBXBuildFile section */
@@ -476,7 +475,6 @@
F19B29011E02DCAC00B29DD1 /* enzevalos_iphone.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = enzevalos_iphone.entitlements; sourceTree = "<group>"; };
F1ACF21B1E0C1C6800C1B843 /* ContactViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactViewController.swift; sourceTree = "<group>"; };
F1AF938E1E2D04BA00755128 /* CustomCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomCells.swift; sourceTree = "<group>"; };
- F1F070241FA0DF2A004A860A /* ColorManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorManager.swift; sourceTree = "<group>"; };
F1F070271FA0DF3F004A860A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Inbox.storyboard; sourceTree = "<group>"; };
F7FFF15F83AF4B88F0324F10 /* Pods-enzevalos_iphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphone.release.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -702,7 +700,6 @@
47B91AC11EC0C1FB000AE3EE /* data */ = {
isa = PBXGroup;
children = (
- F1F070241FA0DF2A004A860A /* ColorManager.swift */,
472F39921E279792009260FB /* protocols */,
472F396F1E14F75C009260FB /* DataHandler.swift */,
47691A8B1ECC3EC7004BCFC5 /* EphemeralMail.swift */,
@@ -1403,7 +1400,6 @@
472F39881E1FA377009260FB /* KeyRecord.swift in Sources */,
8428A8661F436A11007649A5 /* ArrowTableViewCell.swift in Sources */,
F1ACF21C1E0C1C6800C1B843 /* ContactViewController.swift in Sources */,
- F1F070251FA0DF2A004A860A /* ColorManager.swift in Sources */,
475B00351F7B9565006CDD41 /* CryptoObject.swift in Sources */,
A1EB057E1D956848008659C1 /* VENDataDelegate.swift in Sources */,
8428A86F1F436A1E007649A5 /* InviteFriendViewController.swift in Sources */,
diff --git a/enzevalos_iphone/ColorManager.swift b/enzevalos_iphone/ColorManager.swift
deleted file mode 100644
index 4ba5b266..00000000
--- a/enzevalos_iphone/ColorManager.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// ColorManager.swift
-// enzevalos_iphone
-//
-// Created by jakobsbode on 20.10.17.
-// Copyright © 2017 fu-berlin. All rights reserved.
-//
-
-import Foundation
-
-class ColorManager {
- public static var colors: [UIColor] = [
- UIColor.init(red: 0, green: 0, blue: 0.8, alpha: 1),
- UIColor.init(red: 0, green: 0.8, blue: 0, alpha: 1),
- UIColor.init(red: 0.8, green: 0, blue: 0, alpha: 1),
- UIColor.init(red: 0.8, green: 0, blue: 0.8, alpha: 1),
- UIColor.init(red: 0, green: 0.8, blue: 0.8, alpha: 1),
- UIColor.init(red: 0.8, green: 0.8, blue: 0, alpha: 1),
- UIColor.init(red: 0.6, green: 0.4, blue: 0.8, alpha: 1),
- UIColor.init(red: 0.6, green: 0.8, blue: 0.4, alpha: 1),
- UIColor.init(red: 0.4, green: 0.6, blue: 0.8, alpha: 1),
- UIColor.init(red: 0.4, green: 0.8, blue: 0.6, alpha: 1),
- UIColor.init(red: 0.8, green: 0.4, blue: 0.6, alpha: 1),
- UIColor.init(red: 0.8, green: 0.4, blue: 0.4, alpha: 1),
- UIColor.init(red: 0.4, green: 0.8, blue: 0.4, alpha: 1),
- UIColor.init(red: 0.4, green: 0.4, blue: 0.8, alpha: 1),
- UIColor.init(red: 0.8, green: 0.5, blue: 0.2, alpha: 1),
- UIColor.init(red: 0.5, green: 0.8, blue: 0.2, alpha: 1),
- UIColor.init(red: 0.8, green: 0.2, blue: 0.5, alpha: 1),
- UIColor.init(red: 0.2, green: 0.5, blue: 0.8, alpha: 1),
- UIColor.init(red: 0.8, green: 0.5, blue: 0.0, alpha: 1)
- ]
-}
diff --git a/enzevalos_iphone/Contact.swift b/enzevalos_iphone/Contact.swift
index 7ed62b2b..be51de7b 100644
--- a/enzevalos_iphone/Contact.swift
+++ b/enzevalos_iphone/Contact.swift
@@ -78,20 +78,12 @@ extension Contact {
if let color = enzCon.color {
return color
}
-
- //let red = CGFloat(arc4random_uniform(8))
- //let green = CGFloat(arc4random_uniform(8))
- //let blue = CGFloat(arc4random_uniform(8))
- let random = Int(arc4random_uniform(UInt32(ColorManager.colors.count)))
-
-
- let color = ColorManager.colors[random] //UIColor.init(red: red/10.0+0.2, green: green/10.0+0.2, blue: blue/10.0+0.2, alpha: 1)
- enzCon.color = color
- return color
+
+ enzCon.color = UIColor(hue: CGFloat(arc4random()) / CGFloat(UINT32_MAX), saturation: 1, brightness: 0.75, alpha: 1)
+ return enzCon.color!
}
// Overflow?!
- let prim: Int
- prim = 653
+ let prim = 653
let hash = (abs(self.name.hash)) % prim
return UIColor(hue: CGFloat(hash) / CGFloat(prim), saturation: 1, brightness: 0.75, alpha: 1)
--
GitLab