Merge pull request #60 from winebarrel/show_service

Show service
winebarrel · Nov 4, 2024 · f2e4a26 · f2e4a26
2 parents 70627fa + 3e061ed
commit f2e4a26
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/PagerCall.xcodeproj/project.pbxproj b/PagerCall.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 				CODE_SIGN_ENTITLEMENTS = PagerCall/PagerCall.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 0;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 97A8B2WE2P;
@@ -308,7 +308,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.winebarrel.PagerCall;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -324,7 +324,7 @@
 				CODE_SIGN_ENTITLEMENTS = PagerCall/PagerCall.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 0;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 97A8B2WE2P;
@@ -339,7 +339,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.winebarrel.PagerCall;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/PagerCall/ContentView.swift b/PagerCall/ContentView.swift
@@ -35,18 +35,25 @@ struct ContentView: View {
                 }
             } else {
                 List(self.pagerDuty.incidents) { incident in
-                    Link(destination: URL(string: incident.htmlUrl)!) {
-                        Text(incident.urgency.rawValue)
-                            .font(.caption)
-                            .padding(.horizontal, 3)
-                            .foregroundColor(.white)
-                            .background(incident.urgency == .high ? .urgencyHigh : .gray, in: RoundedRectangle(cornerRadius: 5))
-                        Text(incident.title)
-                            .multilineTextAlignment(.leading)
-                            .underline(hoverId == incident.id)
-                            .onHover { hovering in
-                                hoverId = hovering ? incident.id : ""
-                            }
+                    VStack(alignment: .leading) {
+                        HStack(spacing: 2) {
+                            Text(incident.urgency.rawValue)
+                                .padding(.horizontal, 3)
+                                .foregroundColor(.white)
+                                .background(incident.urgency == .high ? .urgencyHigh : .gray, in: RoundedRectangle(cornerRadius: 5))
+                            Text("on")
+                            Text(incident.service.summary)
+                                .fontWeight(.bold)
+                        }.font(.caption)
+
+                        Link(destination: URL(string: incident.htmlUrl)!) {
+                            Text(incident.title)
+                                .multilineTextAlignment(.leading)
+                                .underline(hoverId == incident.id)
+                                .onHover { hovering in
+                                    hoverId = hovering ? incident.id : ""
+                                }
+                        }
                     }
                 }
             }

diff --git a/PagerCall/PagerDutyAPI.swift b/PagerCall/PagerDutyAPI.swift
@@ -4,8 +4,13 @@ struct Incident: Codable, Identifiable {
     let id: String
     let title: String
     let htmlUrl: String
+    let service: Service
     let urgency: Urgency
 
+    struct Service: Codable {
+        let summary: String
+    }
+
     enum Urgency: String, Codable {
         case high
         case low

diff --git a/PagerCall/PagerDutyModel.swift b/PagerCall/PagerDutyModel.swift
@@ -53,7 +53,7 @@ class PagerDuty: ObservableObject {
 
                 await Notification.notify(
                     id: inc.id,
-                    title: "\(emoji)PagerCall [\(inc.urgency)]",
+                    title: "\(emoji)PagerCall [\(inc.urgency)] on \(inc.service.summary)",
                     body: inc.title,
                     url: inc.htmlUrl
                 )

diff --git a/README.md b/README.md
@@ -12,11 +12,11 @@ https://github.com/winebarrel/PagerCall/releases/latest
 
 ### Show assigned incidents
 
-![](https://github.com/user-attachments/assets/7dc38ed0-70be-453e-ba9f-1ff13f08bfc4)
+![](https://github.com/user-attachments/assets/245b1668-c602-4d98-956f-0f24f6e40e37)
 
 ### Notifications
 
-![](https://github.com/user-attachments/assets/b039c93e-6df1-4b8a-ac14-676dd15525af)
+![](https://github.com/user-attachments/assets/cd37b6fc-7b40-446b-aac0-d51a3cb49e5e)
 
 ### Icon indicate PagerDuty status