kanno927 commited on
Commit
2c44d83
·
1 Parent(s): 8e3bef7

feature(#134): update ui/ux of Watch app

Browse files
WatchApp/WatchApp Watch App/Assets.xcassets/.DS_Store ADDED
Binary file (6.15 kB). View file
 
WatchApp/WatchApp Watch App/Assets.xcassets/AccentColor.colorset/Contents.json ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "colors" : [
3
+ {
4
+ "idiom" : "universal"
5
+ }
6
+ ],
7
+ "info" : {
8
+ "author" : "xcode",
9
+ "version" : 1
10
+ }
11
+ }
WatchApp/WatchApp Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json ADDED
@@ -0,0 +1,13 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "images" : [
3
+ {
4
+ "idiom" : "universal",
5
+ "platform" : "watchos",
6
+ "size" : "1024x1024"
7
+ }
8
+ ],
9
+ "info" : {
10
+ "author" : "xcode",
11
+ "version" : 1
12
+ }
13
+ }
WatchApp/WatchApp Watch App/Assets.xcassets/Contents.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "info" : {
3
+ "author" : "xcode",
4
+ "version" : 1
5
+ }
6
+ }
WatchApp/WatchApp Watch App/Components/ContactRow.swift CHANGED
@@ -29,17 +29,15 @@ struct ContactRow: View {
29
  Text(contact.displayName)
30
  .italic()
31
  .font(.system(size: 15))
32
- .foregroundColor(.black)
33
  .padding(5)
34
  Spacer()
35
  Image(systemName: "phone.fill")
36
  .resizable()
37
  .frame(width: 17, height: 17)
38
- .foregroundColor(.black)
39
  }
40
- .listRowBackground(Color.red)
41
- .padding(5)
42
- .background(Color.white)
43
  .clipShape(ContactBubble())
44
  }
45
  }
 
29
  Text(contact.displayName)
30
  .italic()
31
  .font(.system(size: 15))
32
+ .foregroundColor(.white)
33
  .padding(5)
34
  Spacer()
35
  Image(systemName: "phone.fill")
36
  .resizable()
37
  .frame(width: 17, height: 17)
38
+ .foregroundColor(.white)
39
  }
40
+ .background(Color.clear)
 
 
41
  .clipShape(ContactBubble())
42
  }
43
  }
WatchApp/WatchApp Watch App/Pages/ChatView.swift CHANGED
@@ -30,8 +30,7 @@ struct ChatView: View {
30
  .font(.system(size: 20))
31
  .frame(maxWidth: .infinity)
32
  }
33
- }.frame(width: 45, height: 45).foregroundColor(.green)
34
- .background(Color.green.opacity(0.3))
35
  .cornerRadius(5).buttonStyle(PlainButtonStyle())
36
 
37
  TextField("", text: $newMessage, onEditingChanged: { (isChanged) in
@@ -42,7 +41,7 @@ struct ChatView: View {
42
  }).frame(height: 45)
43
  .overlay(
44
  RoundedRectangle(cornerRadius: 6)
45
- .stroke(Color.green, lineWidth: 1)
46
  )
47
  Button(action: {
48
 
@@ -51,9 +50,8 @@ struct ChatView: View {
51
  Image(systemName: "paperplane.fill")
52
  .font(.system(size: 20))
53
  .frame(maxWidth: .infinity)
54
- }.frame(width: 45, height: 45).foregroundColor(.green)
55
- .background(Color.green.opacity(0.3))
56
- .cornerRadius(5).buttonStyle(PlainButtonStyle())
57
  }
58
  }.edgesIgnoringSafeArea(.bottom)
59
  }
 
30
  .font(.system(size: 20))
31
  .frame(maxWidth: .infinity)
32
  }
33
+ }.frame(width: 45, height: 45)
 
34
  .cornerRadius(5).buttonStyle(PlainButtonStyle())
35
 
36
  TextField("", text: $newMessage, onEditingChanged: { (isChanged) in
 
41
  }).frame(height: 45)
42
  .overlay(
43
  RoundedRectangle(cornerRadius: 6)
44
+ .stroke(Color.white, lineWidth: 1)
45
  )
46
  Button(action: {
47
 
 
50
  Image(systemName: "paperplane.fill")
51
  .font(.system(size: 20))
52
  .frame(maxWidth: .infinity)
53
+ }.frame(width: 45, height: 45)
54
+ .cornerRadius(5)
 
55
  }
56
  }.edgesIgnoringSafeArea(.bottom)
57
  }
WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings ADDED
@@ -0,0 +1,5 @@
 
 
 
 
 
 
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+ <plist version="1.0">
4
+ <dict/>
5
+ </plist>
WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcuserdata/darkhorse.xcuserdatad/UserInterfaceState.xcuserstate CHANGED
Binary files a/WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcuserdata/darkhorse.xcuserdatad/UserInterfaceState.xcuserstate and b/WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcuserdata/darkhorse.xcuserdatad/UserInterfaceState.xcuserstate differ
 
WatchApp/WatchApp.xcodeproj/project.xcworkspace/xcuserdata/darkhorse.xcuserdatad/WorkspaceSettings.xcsettings ADDED
@@ -0,0 +1,14 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+ <plist version="1.0">
4
+ <dict>
5
+ <key>BuildLocationStyle</key>
6
+ <string>UseAppPreferences</string>
7
+ <key>CustomBuildLocationType</key>
8
+ <string>RelativeToDerivedData</string>
9
+ <key>DerivedDataLocationStyle</key>
10
+ <string>Default</string>
11
+ <key>ShowSharedSchemesAutomaticallyEnabled</key>
12
+ <true/>
13
+ </dict>
14
+ </plist>
WatchApp/WatchApp.xcodeproj/xcuserdata/darkhorse.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist CHANGED
@@ -3,4 +3,22 @@
3
  uuid = "78398B09-67A6-447A-BDF1-6FF7D60370C3"
4
  type = "1"
5
  version = "2.0">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6
  </Bucket>
 
3
  uuid = "78398B09-67A6-447A-BDF1-6FF7D60370C3"
4
  type = "1"
5
  version = "2.0">
6
+ <Breakpoints>
7
+ <BreakpointProxy
8
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
9
+ <BreakpointContent
10
+ uuid = "CD74F7A6-629E-4D64-B2EF-98510C1B484E"
11
+ shouldBeEnabled = "Yes"
12
+ ignoreCount = "0"
13
+ continueAfterRunningActions = "No"
14
+ filePath = "WatchApp Watch App/MainView.swift"
15
+ startingColumnNumber = "9223372036854775807"
16
+ endingColumnNumber = "9223372036854775807"
17
+ startingLineNumber = "13"
18
+ endingLineNumber = "13"
19
+ landmarkName = "previews"
20
+ landmarkType = "24">
21
+ </BreakpointContent>
22
+ </BreakpointProxy>
23
+ </Breakpoints>
24
  </Bucket>