Revert "Updates Widget to include intensive care"

This reverts commit c898594.

Infected.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
  AD0F97A82579781700030E7C /* GroupedSummaries.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD0F97A22579763900030E7C /* GroupedSummaries.swift */; };
  AD131CBE2559D393003077F3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AD131CC02559D393003077F3 /* Localizable.strings */; };
  AD131CCA2559D94C003077F3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AD131CC02559D393003077F3 /* Localizable.strings */; };
- AD187E922586785800C5BCD7 /* NumberRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE73A8E254DDEB700C9FBD4 /* NumberRepresentation.swift */; };
  AD327F2C2546332E002CCE01 /* NumbersProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD327F2B2546332E002CCE01 /* NumbersProvider.swift */; };
  AD638D8E258FAF6000EDE19B /* LinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD638D8D258FAF6000EDE19B /* LinkView.swift */; };
  AD6680BC251F4C0800E669A7 /* RegionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD6680BB251F4C0800E669A7 /* RegionView.swift */; };
@@ -375,7 +374,6 @@
  buildActionMask = 2147483647;
  files = (
  ADBB7CE52517C1DA00F3C8B4 /* InfectedWidget.swift in Sources */,
- AD187E922586785800C5BCD7 /* NumberRepresentation.swift in Sources */,
  ADB7274D257D135700AB2DB1 /* UserDefaults+Infected.swift in Sources */,
  AD825CE12575A6F800CF681B /* Summary.swift in Sources */,
  ADE73A75254D7C8300C9FBD4 /* NumbersProvider.swift in Sources */,

Infected/RowView.swift

@@ -150,7 +150,7 @@ private extension NumberRepresentation {
  var symbolName: String {
  switch self {
  case .cases:
-  return "plus.rectangle.fill.on.folder.fill"
+ return "plus.rectangle.fill.on.folder.fill"
  case .hospitalizations, .hospitalOccupancy:
  return "cross.fill"
  case .intensiveCareOccupancy:

InfectedWidget/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,15 +1,6 @@
 {
  "colors" : [
  {
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "0x5E",
- "green" : "0x75",
- "red" : "0xE7"
- }
- },
  "idiom" : "universal"
  }
  ],

InfectedWidget/InfectedWidget.swift

@@ -69,38 +69,23 @@ struct InfectedWidgetEntryView : View {
 
  var body: some View {
  HStack {
- VStack(alignment: .leading, spacing: 8) {
+ VStack(alignment: .leading, spacing: 4) {
  Text("NL - \(Self.dateFormatter.string(from: entry.summary.updatedAt ?? Date()))")
  .font(Font.system(size: 14, weight: .semibold))
  .foregroundColor(.secondary)
  NumbersView(
- numberRepresentation: .cases,
- latestNumber: entry.summary.positiveCases.new ?? -1,
+ kindLocalizedStringKey: "New Cases",
+ latestNumber: entry.summary.positiveCases.new ?? 0,
  trendNumber: entry.summary.positiveCases.trend ?? 0
  )
- if let hospitalOccupancy = entry.summary.hospitalOccupancy {
- NumbersView(
- numberRepresentation: .hospitalOccupancy,
- latestNumber: hospitalOccupancy.newAdmissions ?? -1,
- trendNumber: hospitalOccupancy.newAdmissionsTrend ?? 0
- )
- } else {
- NumbersView(
- numberRepresentation: .hospitalizations,
- latestNumber: entry.summary.hospitalAdmissions.new ?? -1,
- trendNumber: entry.summary.hospitalAdmissions.trend ?? 0
- )
- }
- if let intensiveCareOccupancy = entry.summary.intensiveCareOccupancy {
- NumbersView(
- numberRepresentation: .intensiveCareOccupancy,
- latestNumber: intensiveCareOccupancy.newAdmissions ?? -1,
- trendNumber: intensiveCareOccupancy.newAdmissionsTrend ?? 0
- )
- }
  NumbersView(
- numberRepresentation: .deaths,
- latestNumber: entry.summary.deaths.new ?? -1,
+ kindLocalizedStringKey: "Hospitalizations",
+ latestNumber: entry.summary.hospitalAdmissions.new ?? 0,
+ trendNumber: entry.summary.hospitalAdmissions.trend ?? 0
+ )
+ NumbersView(
+ kindLocalizedStringKey: "Deaths",
+ latestNumber: entry.summary.deaths.new ?? 0,
  trendNumber: entry.summary.deaths.trend ?? 0
  )
  }
@@ -126,37 +111,22 @@ struct InfectedWidgetEntryView : View {
  return formatter
  }()
 
- let numberRepresentation: NumberRepresentation
+ let kindLocalizedStringKey: LocalizedStringKey
  let latestNumber: Int
  let trendNumber: Int
 
- var image: Image {
- switch numberRepresentation {
- case .deaths:
- return Image(numberRepresentation.symbolName)
- default:
- return Image(systemName: numberRepresentation.symbolName)
- }
- }
-
  var body: some View {
- ZStack(alignment: .leading) {
- HStack {
- image
- .frame(width: 15, height: 15)
- .font(.system(size: 18, weight: .light, design: .rounded))
- .imageScale(.small)
- .layoutPriority(50)
- HStack(alignment: .lastTextBaseline, spacing: 2) {
- Text(Self.numberFormatter.string(for: latestNumber) ?? "--")
- .font(.system(size: 18, weight: .bold, design: .rounded))
- .foregroundColor(.primary)
- .layoutPriority(100)
- Text(Self.trendNumberFormatter.string(for: trendNumber) ?? "--")
- .font(.system(size: 13, weight: .bold, design: .rounded))
- .foregroundColor(trendNumber.color)
- .lineLimit(1)
- }
+ VStack(alignment: .leading) {
+ Text(kindLocalizedStringKey)
+ .font(.system(size: 12, weight: .regular))
+ .foregroundColor(.secondary)
+ HStack(alignment: .lastTextBaseline, spacing: 4) {
+ Text(Self.numberFormatter.string(for: latestNumber) ?? "--")
+ .font(.system(size: 18, weight: .bold, design: .rounded))
+ .foregroundColor(.primary)
+ Text(Self.trendNumberFormatter.string(for: trendNumber) ?? "--")
+ .font(.system(size: 13, weight: .bold, design: .rounded))
+ .foregroundColor(trendNumber.color)
  }
  }
  }
@@ -238,23 +208,6 @@ private extension Int {
 
 }
 
-private extension NumberRepresentation {
-
- var symbolName: String {
- switch self {
- case .cases:
- return "plus.rectangle.on.folder"
- case .hospitalizations, .hospitalOccupancy:
- return "cross"
- case .intensiveCareOccupancy:
- return "waveform.path.ecg.rectangle"
- case .deaths:
- return "heart.broken"
- }
- }
-
-}
-
 #if DEBUG
 struct InfectedWidget_Previews: PreviewProvider {
  static var previews: some View {