Skip to content

Commit 3a12373

Browse files
NatashaTheRobotNatashaTheRobot
committed
updated icons and watch app
1 parent 9ffca4a commit 3a12373

File tree

25 files changed

+23
-24
lines changed

25 files changed

+23
-24
lines changed

‎try! Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
"images" : [
33
{
44
"idiom" : "watch",
5-
"filename" : "watch_86@2x.png",
6-
"screen-width" : "<=145",
7-
"scale" : "2x"
5+
"scale" : "2x",
6+
"screen-width" : "<=145"
87
},
98
{
109
"idiom" : "watch",
11-
"filename" : "watch_98@2x.png",
12-
"screen-width" : ">145",
13-
"scale" : "2x"
10+
"scale" : "2x",
11+
"screen-width" : ">145"
1412
}
1513
],
1614
"info" : {

‎try! Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/watch_86@2x.png‎

-3.67 KB
Binary file not shown.

‎try! Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/watch_98@2x.png‎

-4.1 KB
Binary file not shown.

‎try! Extension/ComplicationController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ComplicationController: NSObject, CLKComplicationDataSource {
1414

1515
fileprivate let conferenceStartDate = Date.date(year: 2018, month: 3, day: 1, hour: 0, minute: 0, second: 0)
1616
fileprivate let headerText = "try! Tokyo"
17-
fileprivate let bodyText = "🇯🇵🐥🎉"
17+
fileprivate let bodyText = "🗼🐥🎉"
1818

1919
fileprivate let sessionBlocks: [SessionBlock] = {
2020
let days = ConferenceDay.all

‎try! Today/Base.lproj/TodayInterface.storyboard‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="LtN-0K-VPa">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="LtN-0K-VPa">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
89
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
910
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1011
</dependencies>
@@ -39,14 +40,14 @@
3940
<nil key="textColor"/>
4041
<nil key="highlightedColor"/>
4142
</label>
42-
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo_BLR.png" translatesAutoresizingMaskIntoConstraints="NO" id="RvP-kc-YDV">
43+
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="RvP-kc-YDV">
4344
<rect key="frame" x="11" y="33" width="68" height="68"/>
4445
<constraints>
4546
<constraint firstAttribute="height" constant="68" id="Iao-0u-D7H"/>
4647
<constraint firstAttribute="width" constant="68" id="Z5b-gD-nQf"/>
4748
</constraints>
4849
</imageView>
49-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="🇮🇳🐥🎉" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k4I-Vd-A7T" userLabel="Formatted Type">
50+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="🗼🐥🎉" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k4I-Vd-A7T" userLabel="Formatted Type">
5051
<rect key="frame" x="90" y="59" width="203" height="18"/>
5152
<constraints>
5253
<constraint firstAttribute="height" constant="18" id="n0L-V5-RhZ"/>
@@ -119,6 +120,6 @@
119120
</scene>
120121
</scenes>
121122
<resources>
122-
<image name="Logo_BLR.png" width="1024" height="1024"/>
123+
<image name="Logo.png" width="180" height="180"/>
123124
</resources>
124125
</document>

‎try! Today/Logo_BLR.png‎

-20.7 KB
Binary file not shown.

‎try! Tokyo/Logo.png‎

24.2 KB
Loading

‎try!/Assets.xcassets/AppIcon.appiconset/Appicon_TrySwift.png‎

-65.3 KB
Binary file not shown.

‎try!/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,61 @@
33
{
44
"size" : "24x24",
55
"idiom" : "watch",
6-
"filename" : "Icon-24@2x.png",
6+
"filename" : "watch_24@2x.png",
77
"scale" : "2x",
88
"role" : "notificationCenter",
99
"subtype" : "38mm"
1010
},
1111
{
1212
"size" : "27.5x27.5",
1313
"idiom" : "watch",
14-
"filename" : "Icon-27.5@2x.png",
14+
"filename" : "watch_27.5@2x.png",
1515
"scale" : "2x",
1616
"role" : "notificationCenter",
1717
"subtype" : "42mm"
1818
},
1919
{
2020
"size" : "29x29",
2121
"idiom" : "watch",
22-
"filename" : "Icon-29@2x.png",
22+
"filename" : "watch_29@2x.png",
2323
"role" : "companionSettings",
2424
"scale" : "2x"
2525
},
2626
{
2727
"size" : "29x29",
2828
"idiom" : "watch",
29-
"filename" : "Icon-29@3x.png",
29+
"filename" : "watch_29@3x.png",
3030
"role" : "companionSettings",
3131
"scale" : "3x"
3232
},
3333
{
3434
"size" : "40x40",
3535
"idiom" : "watch",
36-
"filename" : "Icon-40@2x.png",
36+
"filename" : "watch_40@2x-1.png",
3737
"scale" : "2x",
3838
"role" : "appLauncher",
3939
"subtype" : "38mm"
4040
},
4141
{
4242
"size" : "86x86",
4343
"idiom" : "watch",
44-
"filename" : "Icon-86@2x.png",
44+
"filename" : "watch_86@2x.png",
4545
"scale" : "2x",
4646
"role" : "quickLook",
4747
"subtype" : "38mm"
4848
},
4949
{
5050
"size" : "98x98",
5151
"idiom" : "watch",
52-
"filename" : "Icon-98@2x.png",
52+
"filename" : "watch_98@2x.png",
5353
"scale" : "2x",
5454
"role" : "quickLook",
5555
"subtype" : "42mm"
5656
},
5757
{
5858
"size" : "1024x1024",
5959
"idiom" : "watch-marketing",
60-
"filename" : "Appicon_TrySwift.png",
60+
"filename" : "WatchLogo_TKO.png",
6161
"scale" : "1x"
6262
}
6363
],

‎try!/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png‎

-3.36 KB
Binary file not shown.

0 commit comments

Comments
 (0)