Skip to content

Commit c9070df

Browse files
claired4claired4
committed
made some changes
1 parent bc9cf23 commit c9070df

File tree

4 files changed

+24
-27
lines changed

4 files changed

+24
-27
lines changed

‎Wilcox Bells/Base.lproj/Main.storyboard

+2-8
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<action selector="switchDay:" destination="qhV-xc-bvF" eventType="valueChanged" id="C4S-te-GaH"/>
186186
</connections>
187187
</segmentedControl>
188-
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="v0s-zb-AwR">
188+
<tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="v0s-zb-AwR" userLabel="tableview">
189189
<rect key="frame" x="16" y="399" width="343" height="299"/>
190190
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
191191
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -204,20 +204,14 @@
204204
<outlet property="delegate" destination="qhV-xc-bvF" id="5vL-u9-8DW"/>
205205
</connections>
206206
</tableView>
207-
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vmG-WQ-YOK">
208-
<rect key="frame" x="67" y="193" width="240" height="128"/>
209-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
210-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
211-
</view>
212207
</subviews>
213208
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
214209
<viewLayoutGuide key="safeArea" id="4bS-OI-VFX"/>
215210
</view>
216211
<navigationItem key="navigationItem" title="Daily Schedules" id="DCB-Hl-5f3"/>
217212
<connections>
218213
<outlet property="switchDay" destination="MiH-Vx-CFu" id="cWu-iy-eEz"/>
219-
<outlet property="tableView" destination="v0s-zb-AwR" id="jI1-6z-GEG"/>
220-
<outlet property="view" destination="vmG-WQ-YOK" id="6i6-hT-aBQ"/>
214+
<outlet property="tableview" destination="v0s-zb-AwR" id="JYc-UO-Hfn"/>
221215
</connections>
222216
</viewController>
223217
<placeholder placeholderIdentifier="IBFirstResponder" id="qHM-wr-Nlz" userLabel="First Responder" sceneMemberID="firstResponder"/>

‎Wilcox Bells/Cell/CustomCell.xib

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<objects>
1313
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
1414
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
15-
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CustomCell" id="KGk-i7-Jjw" customClass="CustomCell" customModule="Wilcox_Bells" customModuleProvider="target">
15+
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="customCell" id="KGk-i7-Jjw" customClass="CustomCell" customModule="Wilcox_Bells" customModuleProvider="target">
1616
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
1717
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
1818
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
1919
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
2020
<autoresizingMask key="autoresizingMask"/>
2121
<subviews>
22-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S9m-Bg-pPj">
22+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S9m-Bg-pPj" userLabel="Period">
2323
<rect key="frame" x="16" y="11" width="42" height="21"/>
2424
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2525
<fontDescription key="fontDescription" type="system" pointSize="17"/>

‎Wilcox Bells/ViewController.swift

+17-14
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
// Wilcox Bells
33
//
44
// Created by Claire Dong on 7/17/18.
5-
// Copyright © 2018 Wilcox High School. All rights reserved.
5+
// Copyright ©o 2018 Wilcox High School. All rights reserved.
66

77
import UIKit
88
import UserNotifications
99

1010
class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
1111

12+
@IBOutlet weak var tableview: UITableView!
1213
//@IBOutlet weak var tableView: UITableView!
13-
@IBOutlet weak var viewForTable: UIView!
14-
var tableview: UITableView!
14+
//@IBOutlet weak var viewForTable: UIView!
15+
//var tableview: UITableView!
1516

1617
@IBAction func switchDay(_ sender: UISegmentedControl) {
1718
p = sender.selectedSegmentIndex
@@ -33,33 +34,35 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
3334
@IBOutlet weak var morning: UILabel!
3435
@IBOutlet weak var weekend: UILabel!
3536

36-
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
37+
38+
func tableView(_ tV: UITableView, numberOfRowsInSection section: Int) -> Int {
3739
return sched[p].count
3840
}
39-
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
40-
let cell = tableView.dequeueReusableCell(withIdentifier: "CustomCell") as! CustomCell
41+
func tableView(_ tV: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
42+
let cell = tV.dequeueReusableCell(withIdentifier: "customCell") as! CustomCell
4143
let str = sched[p][indexPath.row].components(separatedBy: " ")
4244
cell.customInit(period: str[0], time: str[1])
4345
return cell
4446
}
4547

4648
override func viewDidLoad() {
47-
print(viewForTable)
48-
tableview = UITableView(frame: viewForTable.frame)
49-
viewForTable.addSubview(tableview)
49+
//print(viewForTable)
50+
//tableview = UITableView(frame: viewForTable.frame)
51+
//viewForTable.addSubview(tableview)
5052

5153
//print(tableView)
52-
//tableView = UITableView()
53-
tableview.dataSource = self
54-
tableview.delegate = self
54+
//tableview = UITableView()
55+
p = 0
56+
57+
//tableview.dataSource = self
58+
//tableview.delegate = self
5559

5660
UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound], completionHandler: {didAllow, error in})
5761
super.viewDidLoad()
5862

5963
let nib = UINib(nibName: "CustomCell", bundle: nil)
60-
tableview.register(nib, forCellReuseIdentifier: "CustomCell")
64+
tableview.register(nib, forCellReuseIdentifier: "customCell")
6165

62-
p = 0
6366

6467
message.isHidden = true;
6568
minLeft.isHidden = true;

‎WilcoxBells.xcodeproj/xcuserdata/clairedong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
ignoreCount = "0"
1111
continueAfterRunningActions = "No"
1212
filePath = "Wilcox Bells/ViewController.swift"
13-
timestampString = "557609194.193181"
13+
timestampString = "557699436.652272"
1414
startingColumnNumber = "9223372036854775807"
1515
endingColumnNumber = "9223372036854775807"
16-
startingLineNumber = "60"
17-
endingLineNumber = "60"
16+
startingLineNumber = "64"
17+
endingLineNumber = "64"
1818
landmarkName = "viewDidLoad()"
1919
landmarkType = "7">
2020
</BreakpointContent>

0 commit comments

Comments
 (0)