Skip to content

Commit 2bc77d3

Browse files
author
Aaron
committed
Icon images created and minor changes to files for renaming
1 parent 9806fce commit 2bc77d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+292
-46
lines changed

‎ClassSplit.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@
616616
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
617617
INFOPLIST_FILE = Grouper/Info.plist;
618618
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
619-
PRODUCT_NAME = ClassSplit;
619+
PRODUCT_NAME = classsplit;
620620
PROVISIONING_PROFILE = "";
621621
};
622622
name = Debug;
@@ -630,7 +630,7 @@
630630
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
631631
INFOPLIST_FILE = Grouper/Info.plist;
632632
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
633-
PRODUCT_NAME = ClassSplit;
633+
PRODUCT_NAME = classsplit;
634634
PROVISIONING_PROFILE = "";
635635
};
636636
name = Release;

‎Grouper/CreateEditDetailViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ - (void)dealloc
9292
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView {
9393
// The attributed string for the title of the empty dataset
9494

95-
NSString *text = @"Let's Add Some People!";
95+
NSString *text = @"Let's Add Some Students!";
9696

9797
NSDictionary *attributes = @{NSFontAttributeName: [UIFont boldSystemFontOfSize:18.0],
9898
NSForegroundColorAttributeName: [UIColor darkGrayColor]};
@@ -102,7 +102,7 @@ - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView {
102102

103103
- (NSAttributedString *)descriptionForEmptyDataSet:(UIScrollView *)scrollView {
104104
// The attributed string for the description of the empty dataset
105-
NSString *text = @"Tap the plus to add a person to your new list";
105+
NSString *text = @"Tap the plus to add a student to your new list";
106106

107107
NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
108108
paragraph.lineBreakMode = NSLineBreakByWordWrapping;

‎Grouper/CreateEditViewController.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ - (void)viewDidLoad {
5151
- (void)viewWillAppear:(BOOL)animated {
5252
[super viewWillAppear:YES];
5353
[self.navigationController setNavigationBarHidden:NO];
54-
[self.navigationItem setTitle:@"Lists"];
54+
[self.navigationItem setTitle:@"Classes"];
5555
[self.tableView reloadData];
5656

5757
self.navigationController.toolbarHidden = NO;
@@ -92,13 +92,13 @@ - (void)addNewNameList:(id)sender
9292
{
9393

9494

95-
UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Add List"
96-
message:@"Enter List Name"
95+
UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Add Class"
96+
message:@"Enter Class Name"
9797
preferredStyle:UIAlertControllerStyleAlert];
9898

9999
[alert addTextFieldWithConfigurationHandler:^(UITextField *textField)
100100
{
101-
textField.placeholder = @"List Name";
101+
textField.placeholder = @"Class Name";
102102
textField.autocapitalizationType = UITextAutocapitalizationTypeWords;
103103
[[NSNotificationCenter defaultCenter] addObserver:self
104104
selector:@selector(alertTextFieldDidChange:)
@@ -142,7 +142,7 @@ - (void)dealloc
142142
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView {
143143
// The attributed string for the title of the empty dataset
144144

145-
NSString *text = @"Looks Like You Need to Create Lists!";
145+
NSString *text = @"Looks Like You Need to Create Classes!";
146146

147147
NSDictionary *attributes = @{NSFontAttributeName: [UIFont boldSystemFontOfSize:18.0],
148148
NSForegroundColorAttributeName: [UIColor darkGrayColor]};
@@ -152,7 +152,7 @@ - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView {
152152

153153
- (NSAttributedString *)descriptionForEmptyDataSet:(UIScrollView *)scrollView {
154154
// The attributed string for the description of the empty dataset
155-
NSString *text = @"Create a new list by tapping the plus";
155+
NSString *text = @"Create a new class by tapping the plus";
156156

157157
NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
158158
paragraph.lineBreakMode = NSLineBreakByWordWrapping;

‎Grouper/HomeViewController.xib‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
55
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
66
</dependencies>
77
<objects>
@@ -26,35 +26,27 @@
2626
</userGuides>
2727
<subviews>
2828
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tEI-CH-zwd">
29-
<rect key="frame" x="236" y="134" width="129" height="36"/>
29+
<rect key="frame" x="236" y="282" width="129" height="36"/>
3030
<fontDescription key="fontDescription" type="system" pointSize="20"/>
3131
<state key="normal" title="Create Groups">
32+
<color key="titleColor" red="0.18198148906230927" green="0.69426733255386353" blue="0.53024792671203613" alpha="1" colorSpace="calibratedRGB"/>
3233
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
3334
</state>
3435
<connections>
3536
<action selector="createGroups:" destination="-1" eventType="touchUpInside" id="IAR-Gr-kmH"/>
3637
</connections>
3738
</button>
38-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DZI-cT-3BJ">
39-
<rect key="frame" x="227" y="282" width="146" height="36"/>
40-
<fontDescription key="fontDescription" type="system" pointSize="20"/>
41-
<state key="normal" title="Create/Edit Lists">
42-
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
43-
</state>
44-
<connections>
45-
<action selector="viewEditLists:" destination="-1" eventType="touchUpInside" id="MQU-xu-td1"/>
46-
</connections>
47-
</button>
48-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Grouper" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BaI-dY-fF6">
49-
<rect key="frame" x="8" y="558" width="73" height="24"/>
39+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ClassSplit" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BaI-dY-fF6">
40+
<rect key="frame" x="8" y="558" width="89" height="24"/>
5041
<fontDescription key="fontDescription" type="system" pointSize="20"/>
51-
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
42+
<color key="textColor" red="0.52106726169586182" green="0.24050712585449219" blue="0.68248951435089111" alpha="1" colorSpace="calibratedRGB"/>
5243
<nil key="highlightedColor"/>
5344
</label>
5445
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1qx-ND-3Lr">
5546
<rect key="frame" x="244" y="433" width="112" height="36"/>
5647
<fontDescription key="fontDescription" type="system" pointSize="20"/>
5748
<state key="normal" title="View Groups">
49+
<color key="titleColor" red="0.18198148906230927" green="0.69426733255386353" blue="0.53024792671203613" alpha="1" colorSpace="calibratedRGB"/>
5850
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
5951
</state>
6052
<connections>
@@ -71,21 +63,32 @@
7163
<action selector="about:" destination="-1" eventType="touchUpInside" id="zmo-1L-Bek"/>
7264
</connections>
7365
</button>
66+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DZI-cT-3BJ">
67+
<rect key="frame" x="227" y="131" width="146" height="36"/>
68+
<fontDescription key="fontDescription" type="system" pointSize="20"/>
69+
<state key="normal" title="Manage Classes">
70+
<color key="titleColor" red="0.18198148906230927" green="0.69426733255386353" blue="0.53024792671203613" alpha="1" colorSpace="calibratedRGB"/>
71+
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
72+
</state>
73+
<connections>
74+
<action selector="viewEditLists:" destination="-1" eventType="touchUpInside" id="MQU-xu-td1"/>
75+
</connections>
76+
</button>
7477
</subviews>
7578
<color key="backgroundColor" red="0.90823972225189209" green="0.92638683319091797" blue="0.9317171573638916" alpha="1" colorSpace="calibratedRGB"/>
7679
<constraints>
77-
<constraint firstAttribute="bottom" secondItem="eay-T7-afm" secondAttribute="bottom" constant="12" id="3Zk-N6-mI6"/>
78-
<constraint firstItem="tEI-CH-zwd" firstAttribute="top" secondItem="Fti-JM-VvH" secondAttribute="top" constant="134" id="Aq9-IW-u0Q"/>
79-
<constraint firstItem="1qx-ND-3Lr" firstAttribute="centerX" secondItem="Fti-JM-VvH" secondAttribute="centerX" id="Pw2-tk-NcN"/>
80-
<constraint firstItem="DZI-cT-3BJ" firstAttribute="centerY" secondItem="Fti-JM-VvH" secondAttribute="centerY" id="U8C-pe-F4b"/>
81-
<constraint firstItem="DZI-cT-3BJ" firstAttribute="centerX" secondItem="tEI-CH-zwd" secondAttribute="centerX" id="Xct-e3-aQ5"/>
82-
<constraint firstAttribute="bottom" secondItem="1qx-ND-3Lr" secondAttribute="bottom" constant="131" id="kcF-Er-w64"/>
83-
<constraint firstItem="eay-T7-afm" firstAttribute="trailing" secondItem="Fti-JM-VvH" secondAttribute="trailingMargin" id="oda-K8-BvI"/>
84-
<constraint firstItem="BaI-dY-fF6" firstAttribute="leading" secondItem="Fti-JM-VvH" secondAttribute="leadingMargin" id="t1F-5F-Jg0"/>
85-
<constraint firstItem="DZI-cT-3BJ" firstAttribute="centerX" secondItem="1qx-ND-3Lr" secondAttribute="centerX" id="yHk-Hk-CoM"/>
86-
<constraint firstItem="eay-T7-afm" firstAttribute="baseline" secondItem="BaI-dY-fF6" secondAttribute="baseline" id="yuG-4Z-egc"/>
80+
<constraint firstItem="tEI-CH-zwd" firstAttribute="centerY" secondItem="Fti-JM-VvH" secondAttribute="centerY" id="E7d-Gk-2fX"/>
81+
<constraint firstItem="DZI-cT-3BJ" firstAttribute="top" secondItem="Fti-JM-VvH" secondAttribute="top" constant="131" id="J09-zc-6dJ"/>
82+
<constraint firstItem="1qx-ND-3Lr" firstAttribute="centerX" secondItem="tEI-CH-zwd" secondAttribute="centerX" id="LTS-n0-1y2"/>
83+
<constraint firstItem="tEI-CH-zwd" firstAttribute="centerX" secondItem="DZI-cT-3BJ" secondAttribute="centerX" id="X6p-Ol-XD8"/>
84+
<constraint firstItem="eay-T7-afm" firstAttribute="trailing" secondItem="Fti-JM-VvH" secondAttribute="trailingMargin" id="Xdf-PB-bOF"/>
85+
<constraint firstItem="BaI-dY-fF6" firstAttribute="baseline" secondItem="eay-T7-afm" secondAttribute="baseline" id="ZMr-M9-5uZ"/>
86+
<constraint firstAttribute="bottom" secondItem="eay-T7-afm" secondAttribute="bottom" constant="12" id="eV2-Zm-0NA"/>
87+
<constraint firstItem="DZI-cT-3BJ" firstAttribute="centerX" secondItem="Fti-JM-VvH" secondAttribute="centerX" id="ehj-jR-TBo"/>
88+
<constraint firstAttribute="bottom" secondItem="1qx-ND-3Lr" secondAttribute="bottom" constant="131" id="eox-Dm-Cek"/>
89+
<constraint firstItem="BaI-dY-fF6" firstAttribute="leading" secondItem="Fti-JM-VvH" secondAttribute="leadingMargin" id="kdB-Jk-wYA"/>
8790
</constraints>
88-
<point key="canvasLocation" x="807" y="415"/>
91+
<point key="canvasLocation" x="577" y="399"/>
8992
</view>
9093
</objects>
9194
</document>

‎Grouper/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 77 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
22
"images" : [
3+
{
4+
"size" : "29x29",
5+
"idiom" : "iphone",
6+
"filename" : "Icon-Small.png",
7+
"scale" : "1x"
8+
},
39
{
410
"idiom" : "iphone",
511
"size" : "29x29",
@@ -16,18 +22,21 @@
1622
"scale" : "2x"
1723
},
1824
{
19-
"idiom" : "iphone",
2025
"size" : "40x40",
26+
"idiom" : "iphone",
27+
"filename" : "Icon-40@3x.png",
2128
"scale" : "3x"
2229
},
2330
{
24-
"idiom" : "iphone",
2531
"size" : "60x60",
32+
"idiom" : "iphone",
33+
"filename" : "Icon-60@2x.png",
2634
"scale" : "2x"
2735
},
2836
{
29-
"idiom" : "iphone",
3037
"size" : "60x60",
38+
"idiom" : "iphone",
39+
"filename" : "Icon-60@3x.png",
3140
"scale" : "3x"
3241
},
3342
{
@@ -36,29 +45,89 @@
3645
"scale" : "1x"
3746
},
3847
{
39-
"idiom" : "ipad",
4048
"size" : "29x29",
49+
"idiom" : "ipad",
50+
"filename" : "Icon-Small@2x.png",
4151
"scale" : "2x"
4252
},
4353
{
44-
"idiom" : "ipad",
4554
"size" : "40x40",
55+
"idiom" : "ipad",
56+
"filename" : "Icon-40.png",
4657
"scale" : "1x"
4758
},
4859
{
49-
"idiom" : "ipad",
5060
"size" : "40x40",
61+
"idiom" : "ipad",
62+
"filename" : "Icon-40@2x.png",
5163
"scale" : "2x"
5264
},
5365
{
54-
"idiom" : "ipad",
5566
"size" : "76x76",
67+
"idiom" : "ipad",
68+
"filename" : "Icon-76.png",
5669
"scale" : "1x"
5770
},
5871
{
59-
"idiom" : "ipad",
6072
"size" : "76x76",
73+
"idiom" : "ipad",
74+
"filename" : "Icon-76@2x.png",
6175
"scale" : "2x"
76+
},
77+
{
78+
"size" : "24x24",
79+
"idiom" : "watch",
80+
"scale" : "2x",
81+
"role" : "notificationCenter",
82+
"subtype" : "38mm"
83+
},
84+
{
85+
"size" : "27.5x27.5",
86+
"idiom" : "watch",
87+
"scale" : "2x",
88+
"role" : "notificationCenter",
89+
"subtype" : "42mm"
90+
},
91+
{
92+
"size" : "29x29",
93+
"idiom" : "watch",
94+
"role" : "companionSettings",
95+
"scale" : "2x"
96+
},
97+
{
98+
"size" : "29x29",
99+
"idiom" : "watch",
100+
"filename" : "Icon-Small@3x.png",
101+
"role" : "companionSettings",
102+
"scale" : "3x"
103+
},
104+
{
105+
"size" : "40x40",
106+
"idiom" : "watch",
107+
"scale" : "2x",
108+
"role" : "appLauncher",
109+
"subtype" : "38mm"
110+
},
111+
{
112+
"size" : "44x44",
113+
"idiom" : "watch",
114+
"scale" : "2x",
115+
"role" : "longLook",
116+
"subtype" : "42mm"
117+
},
118+
{
119+
"size" : "86x86",
120+
"idiom" : "watch",
121+
"scale" : "2x",
122+
"role" : "quickLook",
123+
"subtype" : "38mm"
124+
},
125+
{
126+
"size" : "98x98",
127+
"idiom" : "watch",
128+
"scale" : "2x",
129+
"role" : "quickLook",
130+
"subtype" : "42mm"
62131
}
63132
],
64133
"info" : {

‎Grouper/Images.xcassets/AppIcon.appiconset/Icon-40.png‎

2.01 KB

‎Grouper/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png‎

4.42 KB

‎Grouper/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png‎

7.04 KB

‎Grouper/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png‎

7.04 KB

‎Grouper/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png‎

11.1 KB

0 commit comments

Comments
 (0)