karolina/avh-plan-ios
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configured colours and added additional images to ready app for iOS 13 dark mode

Browse Source
This commit is contained in:
Deniz Duezgoeren
2019-10-08 21:37:42 +02:00
parent b7bc097664
commit 85efe3955d
310 changed files with 6512 additions and 4492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AvH Plan/DataFetcher.swift
+31 -5
View File
@@ -388,11 +388,37 @@ class DataFetcher {
}
func getColourPalette() -> [UIColor] {
return [#colorLiteral(red: 1, green: 1, blue: 1, alpha: 1), #colorLiteral(red: 1, green: 0.4932718873, blue: 0.4739984274, alpha: 1), #colorLiteral(red: 1, green: 0.5781051517, blue: 0, alpha: 1), #colorLiteral(red: 0.9995340705, green: 0.988355577, blue: 0.4726552367, alpha: 1), #colorLiteral(red: 0.4500938654, green: 0.9813225865, blue: 0.4743030667, alpha: 1), #colorLiteral(red: 0.4508578777, green: 0.9882974029, blue: 0.8376303315, alpha: 1), #colorLiteral(red: 0.4620226622, green: 0.8382837176, blue: 1, alpha: 1), #colorLiteral(red: 0.476841867, green: 0.5048075914, blue: 1, alpha: 1), #colorLiteral(red: 0.8446564078, green: 0.5145705342, blue: 1, alpha: 1), #colorLiteral(red: 1, green: 0.5409764051, blue: 0.8473142982, alpha: 1), #colorLiteral(red: 0.6745098039, green: 0.5568627451, blue: 0.4078431373, alpha: 1), #colorLiteral(red: 0.7540688515, green: 0.7540867925, blue: 0.7540771365, alpha: 1), #colorLiteral(red: 0.9490196078, green: 0.5450980392, blue: 0.5098039216, alpha: 1), #colorLiteral(red: 0.9843137255, green: 0.737254902, blue: 0.01568627451, alpha: 1), #colorLiteral(red: 1, green: 0.9568627451, blue: 0.4588235294, alpha: 1), #colorLiteral(red: 0.8, green: 1, blue: 0.5647058824, alpha: 1), #colorLiteral(red: 0.6549019608, green: 1, blue: 0.9215686275, alpha: 1), #colorLiteral(red: 0.7960784314, green: 0.9411764706, blue: 0.9725490196, alpha: 1), #colorLiteral(red: 0.6823529412, green: 0.7960784314, blue: 0.9803921569, alpha: 1), #colorLiteral(red: 0.8431372549, green: 0.6823529412, blue: 0.9843137255, alpha: 1), #colorLiteral(red: 0.9921568627, green: 0.8117647059, blue: 0.9098039216, alpha: 1), #colorLiteral(red: 0.9019607843, green: 0.7882352941, blue: 0.6588235294, alpha: 1)]
return [UIColor(named: "colorDefault")!,
UIColor(named: "colorRed")!,
UIColor(named: "colorOrange")!,
UIColor(named: "colorYellow")!,
UIColor(named: "colorGreen")!,
UIColor(named: "colorCyan")!,
UIColor(named: "colorLightBlue")!,
UIColor(named: "colorBlue")!,
UIColor(named: "colorPurple")!,
UIColor(named: "colorPink")!,
UIColor(named: "colorBrown")!,
UIColor(named: "colorGrey")!,
UIColor(named: "colorRedAndroid")!,
UIColor(named: "colorOrangeAndroid")!,
UIColor(named: "colorYellowAndroid")!,
UIColor(named: "colorGreenAndroid")!,
UIColor(named: "colorCyanAndroid")!,
UIColor(named: "colorLightBlueAndroid")!,
UIColor(named: "colorBlueAndroid")!,
UIColor(named: "colorPurpleAndroid")!,
UIColor(named: "colorPinkAndroid")!,
UIColor(named: "colorBrownAndroid")!]
}
func getColourPaletteNames() -> [String] {
return [NSLocalizedString("white", comment: ""), NSLocalizedString("red", comment: ""), NSLocalizedString("orange", comment: ""), NSLocalizedString("yellow", comment: ""), NSLocalizedString("green", comment: ""), NSLocalizedString("cyan", comment: ""), NSLocalizedString("lightblue", comment: ""), NSLocalizedString("blue", comment: ""), NSLocalizedString("purple", comment: ""), NSLocalizedString("pink", comment: ""), NSLocalizedString("brown", comment: ""), NSLocalizedString("grey", comment: ""), NSLocalizedString("redA", comment: ""), NSLocalizedString("orangeA", comment: ""), NSLocalizedString("yellowA", comment: ""), NSLocalizedString("greenA", comment: ""), NSLocalizedString("cyanA", comment: ""), NSLocalizedString("lightblueA", comment: ""), NSLocalizedString("blueA", comment: ""), NSLocalizedString("purpleA", comment: ""), NSLocalizedString("pinkA", comment: ""), NSLocalizedString("brownA", comment: "")]
return [ls("white"), ls("red"), ls("orange"), ls("yellow"), ls("green"), ls("cyan"), ls("lightblue"), ls("blue"), ls("purple"), ls("pink"), ls("brown"), ls("grey"), ls("redA"), ls("orangeA"), ls("yellowA"), ls("greenA"), ls("cyanA"), ls("lightblueA"), ls("blueA"), ls("purpleA"), ls("pinkA"), ls("brownA")]
}
/// wrapper for returning a localized String without comment
func ls(_ s: String) -> String {
return NSLocalizedString(s, comment: "")
}
func getColour(for course: String) -> UIColor {
@@ -444,10 +470,10 @@ class DataFetcher {
if key != "" {
return self.getColourPalette()[prefs.integer(forKey: "colour-index-\(key)")]
} else {
return #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
return UIColor(named: "colorDefault")!
}
} else {
return #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
return UIColor(named: "colorDefault")!
}
}
@@ -470,7 +496,7 @@ class DataFetcher {
layer.cornerRadius = 12.0
layer.shadowColor = UIColor.gray.cgColor
layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
layer.shadowRadius = 1.5
layer.shadowRadius = 1.2 // 1.5
layer.shadowOpacity = 0.7
}