diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj index 8614ae5..afefb03 100644 --- a/AvH Plan.xcodeproj/project.pbxproj +++ b/AvH Plan.xcodeproj/project.pbxproj @@ -460,7 +460,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AvH Plan/Pods-AvH Plan-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AvH Plan/Pods-AvH Plan-frameworks.sh\"\n\"${PODS_ROOT}/Fabric/run\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -601,7 +601,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: k.duezgoeren@gmail.com (R9NVDFCQHW)"; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; diff --git a/AvH Plan/MenuViewCell.swift b/AvH Plan/MenuViewCell.swift index 915b2cf..e0117a5 100644 --- a/AvH Plan/MenuViewCell.swift +++ b/AvH Plan/MenuViewCell.swift @@ -11,4 +11,5 @@ import UIKit class MenuViewCell: GenericViewCell { @IBOutlet weak var content: UILabel! + @IBOutlet weak var tintView: UIView! } diff --git a/AvH Plan/MenuViewCell.xib b/AvH Plan/MenuViewCell.xib index f903301..63146c9 100644 --- a/AvH Plan/MenuViewCell.xib +++ b/AvH Plan/MenuViewCell.xib @@ -19,31 +19,32 @@ + + + + - - - - - - - - - - - - + + + + + + + + + diff --git a/AvH Plan/MenuViewController.swift b/AvH Plan/MenuViewController.swift index 4509dc6..5793bc0 100644 --- a/AvH Plan/MenuViewController.swift +++ b/AvH Plan/MenuViewController.swift @@ -71,11 +71,15 @@ class MenuViewController : UIViewController, UICollectionViewDataSource, UIColle func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { let cell = collectionView.dequeueReusableCell(withReuseIdentifier: identifier, for: indexPath as IndexPath) as! MenuViewCell - if self.items.count != 0 { - cell.content.text = self.items[indexPath.item] - } - - cell.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0) + + cell.content.text = self.items[indexPath.item] + cell.tintView.backgroundColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0) + let layer = cell.tintView.layer + layer.cornerRadius = 12.0 + layer.shadowColor = UIColor.gray.cgColor + layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + layer.shadowRadius = 1.5 + layer.shadowOpacity = 0.7 return cell } diff --git a/AvH Plan/PlanViewCell.xib b/AvH Plan/PlanViewCell.xib index e81dc62..603d504 100644 --- a/AvH Plan/PlanViewCell.xib +++ b/AvH Plan/PlanViewCell.xib @@ -20,16 +20,16 @@ - + - - - - - + @@ -79,16 +75,13 @@ - - - @@ -99,10 +92,10 @@ - - - - + + + + diff --git a/AvH Plan/PlanViewController.swift b/AvH Plan/PlanViewController.swift index aa62eee..b43c18d 100644 --- a/AvH Plan/PlanViewController.swift +++ b/AvH Plan/PlanViewController.swift @@ -96,8 +96,13 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle let course = self.substs[indexPath.item].course var image = df.getImage(from: course) - cell.backgroundColor = self.df.getColour(for: course) - cell.tintView.backgroundColor = cell.backgroundColor + let layer = cell.tintView.layer + layer.cornerRadius = 12.0 + layer.shadowColor = UIColor.gray.cgColor + layer.shadowOffset = CGSize(width: 0.0, height: 0.0) + layer.shadowRadius = 1.5 + layer.shadowOpacity = 0.7 + cell.tintView.backgroundColor = self.df.getColour(for: course) let dateString = self.substs[indexPath.item].date if dateString.count > 2 && dateString[dateString.startIndex...dateString.index(dateString.startIndex, offsetBy: 2)] == "psa" { @@ -107,7 +112,6 @@ class PlanViewController : UIViewController, UICollectionViewDataSource, UIColle indexOfPSA = indexPath.item } image = UIImage(named: "ic_idea_w") - cell.backgroundColor = #colorLiteral(red: 0, green: 0.4784313725, blue: 1, alpha: 1) cell.tintView.backgroundColor = #colorLiteral(red: 0, green: 0.4784313725, blue: 1, alpha: 1) cell.group.textColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0) cell.course.textColor = #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)