From 769ba6cf45cc9646471d82713cc5aa471a74644e Mon Sep 17 00:00:00 2001 From: Deniz Duezgoeren Date: Wed, 21 Aug 2019 11:33:45 +0200 Subject: [PATCH] Cancelled courses now struck through, switched the colour picker method from using an if tree to a simplified switch statement --- AvH Plan/AppDelegate.swift | 1 + AvH Plan/DataFetcher.swift | 79 +++++++++++-------------------- AvH Plan/PlanViewController.swift | 11 +++++ 3 files changed, 39 insertions(+), 52 deletions(-) diff --git a/AvH Plan/AppDelegate.swift b/AvH Plan/AppDelegate.swift index 8037126..f80c7bc 100644 --- a/AvH Plan/AppDelegate.swift +++ b/AvH Plan/AppDelegate.swift @@ -37,6 +37,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { Messaging.messaging().subscribe(toTopic: "substitutions-ios") Messaging.messaging().subscribe(toTopic: "substitutions-broadcast") + Crashlytics.sharedInstance().setUserIdentifier(UserDefaults.standard.string(forKey: "username")) return true } diff --git a/AvH Plan/DataFetcher.swift b/AvH Plan/DataFetcher.swift index b07662c..9a13b91 100644 --- a/AvH Plan/DataFetcher.swift +++ b/AvH Plan/DataFetcher.swift @@ -262,58 +262,33 @@ class DataFetcher { func getImage(from icon: String) -> UIImage? { var imagePath = "" let i = icon.lowercased() - if i.contains("deu") || i.contains("dep") || i.contains("daz") { - imagePath = "ic_german" - } else if i.contains("mat") || i.contains("map") { - imagePath = "ic_maths" - } else if i.contains("eng") || i.contains("enp") || i.contains("ena") { - imagePath = "ic_english" - } else if i.contains("spo") || i.contains("spp") || i.contains("spth") { - imagePath = "ic_pe" - } else if i.contains("pol") || i.contains("pop") { - imagePath = "ic_politics" - } else if i.contains("dar") || i.contains("dap") { - imagePath = "ic_drama" - } else if i.contains("phy") || i.contains("php") { - imagePath = "ic_physics" - } else if i.contains("bio") || i.contains("bip") || i.contains("nw") { - imagePath = "ic_biology" - } else if i.contains("che") || i.contains("chp") { - imagePath = "ic_chemistry" - } else if i.contains("phi") || i.contains("psp") { - imagePath = "ic_philosophy" - } else if i.contains("laa") || i.contains("laf") || i.contains("lat") { - imagePath = "ic_latin" - } else if i.contains("spa") || i.contains("spf") { - imagePath = "ic_spanish" - } else if i.contains("fra") || i.contains("frf") || i.contains("frz") { - imagePath = "ic_french" - } else if i.contains("inf") { - imagePath = "ic_compsci" - } else if i.contains("ges") { - imagePath = "ic_history" - } else if i.contains("rel") { - imagePath = "ic_religion" - } else if i.contains("geg") || i.contains("wuk") { - imagePath = "ic_geography" - } else if i.contains("kun") { - imagePath = "ic_arts" - } else if i.contains("mus") { - imagePath = "ic_music" - } else if i.contains("tue") { - imagePath = "ic_turkish" - } else if i.contains("chi") { - imagePath = "ic_chinese" - } else if i.contains("gll") { - imagePath = "ic_gll" - } else if i.contains("wat") { - imagePath = "ic_wat" - } else if i.contains("för") { - imagePath = "ic_help" - } else if i.contains("wp") || i.contains("met") { - imagePath = "ic_pencil" - } else { - return nil + switch true { + case i.contains("deu"), i.contains("dep"), i.contains("daz"): imagePath = "ic_german" + case i.contains("mat"), i.contains("map"): imagePath = "ic_maths" + case i.contains("eng"), i.contains("enp"), i.contains("ena"): imagePath = "ic_english" + case i.contains("spo"), i.contains("spp"), i.contains("spth"): imagePath = "ic_pe" + case i.contains("pol"), i.contains("pop"): imagePath = "ic_politics" + case i.contains("dar"), i.contains("dap"): imagePath = "ic_drama" + case i.contains("phy"), i.contains("php"): imagePath = "ic_physics" + case i.contains("bio"), i.contains("bip"), i.contains("nw"): imagePath = "ic_biology" + case i.contains("che"), i.contains("chp"): imagePath = "ic_chemistry" + case i.contains("phi"), i.contains("psp"): imagePath = "ic_philosophy" + case i.contains("laa"), i.contains("laf"), i.contains("lat"): imagePath = "ic_latin" + case i.contains("spa"), i.contains("spf"): imagePath = "ic_spanish" + case i.contains("fra") || i.contains("frf") || i.contains("frz"): imagePath = "ic_french" + case i.contains("inf"): imagePath = "ic_compsci" + case i.contains("ges"): imagePath = "ic_history" + case i.contains("rel"): imagePath = "ic_religion" + case i.contains("geg"), i.contains("wuk"): imagePath = "ic_geography" + case i.contains("kun"): imagePath = "ic_arts" + case i.contains("mus"): imagePath = "ic_music" + case i.contains("tue"): imagePath = "ic_turkish" + case i.contains("chi"): imagePath = "ic_chinese" + case i.contains("gll"): imagePath = "ic_gll" + case i.contains("wat"): imagePath = "ic_wat" + case i.contains("för"): imagePath = "ic_help" + case i.contains("wp"), i.contains("met"): imagePath = "ic_pencil" + default: return nil } return UIImage(named: imagePath) } diff --git a/AvH Plan/PlanViewController.swift b/AvH Plan/PlanViewController.swift index b43c18d..8f3048c 100644 --- a/AvH Plan/PlanViewController.swift +++ b/AvH Plan/PlanViewController.swift @@ -8,6 +8,7 @@ import UIKit import MagazineLayout +import Crashlytics class PlanViewController : UIViewController, UICollectionViewDataSource, UICollectionViewDelegateMagazineLayout { @@ -58,6 +59,10 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle self.collectionView.reloadData() } + override func viewDidLoad() { + super.viewDidLoad() + } + func getViewType() -> String { return "plan" } @@ -134,6 +139,12 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle } } + let add = self.substs[indexPath.item].additional.lowercased() + if add.contains("eigenverantwortliches arbeiten") || add.contains("entfall") || add.contains("fällt aus"){ + mutableStrings[2].addAttribute(NSAttributedString.Key.strikethroughStyle, value: 2, range: NSMakeRange(0, mutableStrings[2].length)) + mutableStrings[3].addAttribute(NSAttributedString.Key.strikethroughStyle, value: 2, range: NSMakeRange(0, mutableStrings[3].length)) + } + cell.group.attributedText = mutableStrings[0] cell.additional.text = self.substs[indexPath.item].additional cell.time.attributedText = mutableStrings[1]