Add releasePlusNewBetas XcodeListCategory

Xcodes/Frontend/XcodeList/MainToolbar.swift

@@ -40,6 +40,8 @@ struct MainToolbarModifier: ViewModifier {
                             .tag(XcodeListCategory.release)
                         Label("BetaOnly", systemImage: "line.horizontal.3.decrease.circle.fill")
                             .tag(XcodeListCategory.beta)
+                        Label("ReleasePlusNewBetas", systemImage: "line.horizontal.3.decrease.circle.fill")
+                            .tag(XcodeListCategory.releasePlusNewBetas)
                     }
                 }
                 .help("FilterAvailableDescription")

Xcodes/Frontend/XcodeList/XcodeListCategory.swift

@@ -5,6 +5,7 @@ enum XcodeListCategory: String, CaseIterable, Identifiable, CustomStringConverti
     case all
     case release
     case beta
+    case releasePlusNewBetas
 
     var id: Self { self }
 
@@ -13,14 +14,15 @@ enum XcodeListCategory: String, CaseIterable, Identifiable, CustomStringConverti
             case .all: return localizeString("All")
             case .release: return localizeString("Release")
             case .beta: return localizeString("Beta")
+            case .releasePlusNewBetas: return localizeString("ReleasePlusNewBetas")
         }
     }
 
     var isManaged: Bool { PreferenceKey.xcodeListCategory.isManaged() }
 
     var versionFilter: XcodeListVersionFilter {
         switch self {
-        case .all:
+        case .all, .releasePlusNewBetas:
             return .all
         case .release:
             return .release

Xcodes/Frontend/XcodeList/XcodeListView.swift

@@ -21,7 +21,7 @@ struct XcodeListView: View {
     }
 
     private var visibleXcodes: [XcodeListEntry] {
-        appState.allXcodes
+        let entries = appState.allXcodes
             .enumerated()
             .map { XcodeListEntry(index: $0.offset, xcode: $0.element) }
             .applying(XcodeListFilters(
@@ -31,6 +31,19 @@ struct XcodeListView: View {
                 searchText: searchText,
                 installedOnly: isInstalledOnly
             ), item: \.listItem)
+
+        if category == .releasePlusNewBetas {
+            let releases = Set(
+                entries
+                    .filter { $0.xcode.version.isNotPrerelease }
+                    .map { $0.xcode.version.withoutIdentifiers }
+            )
+            return entries.filter {
+                $0.xcode.version.isNotPrerelease || !releases.contains($0.xcode.version.withoutIdentifiers)
+            }
+        } else {
+            return entries
+        }
     }
 
     private func latestReleaseForSelectedPrerelease(_ xcode: Xcode) -> Xcode? {
@@ -437,3 +450,9 @@ struct XcodeListView_Previews: PreviewProvider {
         .previewLayout(.sizeThatFits)
     }
 }
+
+private extension Version {
+    var withoutIdentifiers: Version {
+        Version(major, minor, patch)
+    }
+}

Xcodes/Resources/Localizable.xcstrings

@@ -22136,6 +22136,17 @@
         }
       }
     },
+    "ReleasePlusNewBetas" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Release & unreleased beta"
+          }
+        }
+      }
+    },
     "Required" : {
       "localizations" : {
         "ar" : {
@@ -26217,4 +26228,4 @@
     }
   },
   "version" : "1.0"
-}
+}