Skip to content

Commit c364646

Browse files
committed
Merge branch 'release/0.15.2'
2 parents 6341875 + 3411875 commit c364646

File tree

4 files changed

+48
-17
lines changed

4 files changed

+48
-17
lines changed

Core/Sources/HostApp/AccountSettings/CodeiumView.swift

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,13 @@ struct CodeiumView: View {
154154
Text("Status: Signed In")
155155

156156
Button(action: {
157-
viewModel.isSignedIn = false
157+
Task {
158+
do {
159+
try await viewModel.signOut()
160+
} catch {
161+
toast(Text(error.localizedDescription), .error)
162+
}
163+
}
158164
}) {
159165
Text("Sign Out")
160166
}
@@ -232,21 +238,31 @@ struct CodeiumSignInView: View {
232238
.stroke(Color(nsColor: .separatorColor), lineWidth: 1)
233239
)
234240

235-
Button(action: {
236-
isGeneratingKey = true
237-
Task {
238-
do {
239-
try await viewModel.signIn(token: token)
240-
isGeneratingKey = false
241-
isPresented = false
242-
} catch {
243-
isGeneratingKey = false
244-
toast(Text(error.localizedDescription), .error)
245-
}
241+
HStack {
242+
Spacer()
243+
244+
Button(action: {
245+
isPresented = false
246+
}) {
247+
Text("Cancel")
246248
}
247-
}) {
248-
Text(isGeneratingKey ? "Signing In.." : "Sign In")
249-
}.disabled(isGeneratingKey)
249+
250+
Button(action: {
251+
isGeneratingKey = true
252+
Task {
253+
do {
254+
try await viewModel.signIn(token: token)
255+
isGeneratingKey = false
256+
isPresented = false
257+
} catch {
258+
isGeneratingKey = false
259+
toast(Text(error.localizedDescription), .error)
260+
}
261+
}
262+
}) {
263+
Text(isGeneratingKey ? "Signing In.." : "Sign In")
264+
}.disabled(isGeneratingKey)
265+
}
250266
}
251267
.padding()
252268
.onAppear {

ExtensionService/Assets.xcassets/MenuBarIcon.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"author" : "xcode",
2121
"version" : 1
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

Version.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
APP_VERSION = 0.15.1
2-
APP_BUILD = 151
1+
APP_VERSION = 0.15.2
2+
APP_BUILD = 152

appcast.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
33
<channel>
44
<title>Copilot for Xcode</title>
5+
<item>
6+
<title>0.15.2</title>
7+
<pubDate>Sun, 14 May 2023 20:58:20 +0800</pubDate>
8+
<sparkle:version>152</sparkle:version>
9+
<sparkle:shortVersionString>0.15.2</sparkle:shortVersionString>
10+
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
11+
<sparkle:releaseNotesLink>
12+
https://github.com/intitni/CopilotForXcode/releases/tag/0.15.2
13+
</sparkle:releaseNotesLink>
14+
<enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.15.2/Copilot.for.Xcode.app.zip" length="21294564" type="application/octet-stream" sparkle:edSignature="NVRyyoRlnsGb18kaeFzvjr3jxrM+1T8mb/rrKQYCiKh2hJw/uTH/m9STUB3PKEfZAihzeY7CUAMl+ZOaj+YhBQ=="/>
15+
</item>
16+
517
<item>
618
<title>0.15.1</title>
719
<pubDate>Sun, 14 May 2023 17:18:15 +0800</pubDate>

0 commit comments

Comments
 (0)