Rename views from custom to sc

almenscorner · almenscorner · commit 7fb88d13dd29 · 2024-12-09T08:33:47.000+01:00
diff --git a/SupportCompanion/AppDelegate.swift b/SupportCompanion/AppDelegate.swift
@@ -49,7 +49,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         popover.behavior = .transient // Closes when clicking outside
         popover.contentSize = NSSize(width: 500, height: 520)
         popover.contentViewController = NSHostingController(
-            rootView: CustomMenuView(
+            rootView: TrayMenuView(
                 viewModel: CardGridViewModel(appState: AppStateManager.shared)
             )
             .environmentObject(AppStateManager.shared)
diff --git a/SupportCompanion/Localizable.xcstrings b/SupportCompanion/Localizable.xcstrings
@@ -12,6 +12,9 @@
     },
     "%@%%" : {
 
+    },
+    "%@%% Patched" : {
+
     },
     "%@%% Used" : {
       "localizations" : {
@@ -1456,9 +1459,6 @@
           }
         }
       }
-    },
-    "Done" : {
-
     },
     "Error.CommandFailed" : {
       "comment" : "Error message when a command failed",
@@ -2433,9 +2433,6 @@
           }
         }
       }
-    },
-    "Pending: " : {
-
     },
     "PlatformSSO.LoginFrequency" : {
       "comment" : "Label for the login frequency",
@@ -2688,12 +2685,6 @@
           }
         }
       }
-    },
-    "Progress: " : {
-
-    },
-    "Quick Actions" : {
-
     },
     "Realm:" : {
 
@@ -2728,12 +2719,6 @@
     },
     "Rings" : {
 
-    },
-    "Run" : {
-
-    },
-    "Select an action" : {
-
     },
     "Select an option" : {
 
diff --git a/SupportCompanion/ViewModels/CardGridViewModel.swift b/SupportCompanion/ViewModels/CardGridViewModel.swift
@@ -32,8 +32,8 @@ class CardGridViewModel: ObservableObject {
             ]
         }
     
-    func createRestartIntuneAgentButton(fontSize: CGFloat? = nil) -> CustomButton {
-        CustomButton(Constants.Actions.restartIntuneAgent, fontSize: fontSize) {
+    func createRestartIntuneAgentButton(fontSize: CGFloat? = nil) -> ScButton {
+        ScButton(Constants.Actions.restartIntuneAgent, fontSize: fontSize) {
             ActionHelpers.restartIntuneAgent { result in
                 ActionHelpers.handleResult(
                     operationName: "Restart Intune Agent",
@@ -50,8 +50,8 @@ class CardGridViewModel: ObservableObject {
         }
     }
     
-    func createGatherLogsButton(fontSize: CGFloat? = nil) -> CustomButton {
-        CustomButton(Constants.Actions.gatherLogs, fontSize: fontSize) {
+    func createGatherLogsButton(fontSize: CGFloat? = nil) -> ScButton {
+        ScButton(Constants.Actions.gatherLogs, fontSize: fontSize) {
             ActionHelpers.gatherLogs(preferences: self.appState.preferences) { result in
                 ActionHelpers.handleResult(
                     operationName: Constants.Actions.gatherLogs,
@@ -69,8 +69,8 @@ class CardGridViewModel: ObservableObject {
     
     func createRebootButton(
         onShowModal: @escaping (Int, String, String) -> Void
-    ) -> CustomButton {
-        CustomButton(Constants.Actions.reboot) {
+    ) -> ScButton {
+        ScButton(Constants.Actions.reboot) {
             await ActionHelpers.reboot { result in
                 DispatchQueue.main.async {
                     switch result {
@@ -86,8 +86,8 @@ class CardGridViewModel: ObservableObject {
         }
     }
     
-    func createChangePasswordButton(fontSize: CGFloat? = nil) -> CustomButton {
-        CustomButton(Constants.Actions.changePassword, fontSize: fontSize) {
+    func createChangePasswordButton(fontSize: CGFloat? = nil) -> ScButton {
+        ScButton(Constants.Actions.changePassword, fontSize: fontSize) {
             await ActionHelpers.openChangePassword(preferences: self.appState.preferences) { result in
                 ActionHelpers.handleResult(
                     operationName: Constants.Actions.changePassword,
@@ -108,7 +108,7 @@ class CardGridViewModel: ObservableObject {
         case `default`
     }
     
-    func createOpenManagementAppButton(type: ManagementAppURLType, fontSize: CGFloat? = nil) -> CustomButton {
+    func createOpenManagementAppButton(type: ManagementAppURLType, fontSize: CGFloat? = nil) -> ScButton {
         let appName: String
         let appURL: String
 
@@ -129,7 +129,7 @@ class CardGridViewModel: ObservableObject {
             appURL = ""
         }
 
-        return CustomButton("\(Constants.Actions.openManagementApp) \(appName)", fontSize: fontSize) {
+        return ScButton("\(Constants.Actions.openManagementApp) \(appName)", fontSize: fontSize) {
             ActionHelpers.openManagementApp(appURL: appURL)
         }
     }
diff --git a/SupportCompanion/Views/Cards/ActionsCard.swift b/SupportCompanion/Views/Cards/ActionsCard.swift
@@ -15,7 +15,7 @@ struct ActionsCard: View {
     
     var body: some View {
         if viewModel.isCardVisible("Actions") {
-            CustomCard(title: "\(Constants.CardTitle.actions)", titleImageName: "cursorarrow.click.2", content: {
+            ScCard(title: "\(Constants.CardTitle.actions)", titleImageName: "cursorarrow.click.2", content: {
                 // Precompute the filtered and chunked buttons
                 let visibleButtons = [
                     viewModel.isButtonVisible("ChangePassword") ? viewModel.createChangePasswordButton() : nil,
@@ -27,9 +27,9 @@ struct ActionsCard: View {
                     (appState.preferences.mode == Constants.modes.munki || appState.preferences.mode == Constants.modes.intune)
                         ? (viewModel.isButtonVisible("OpenManagementApp") ? viewModel.createOpenManagementAppButton(type: .default) : nil)
                         : nil,
-                    viewModel.isButtonVisible("GetSupport") ? CustomButton(Constants.Actions.getSupport) { ActionHelpers.openSupportPage(url: appState.preferences.supportPageURL) } : nil,
+                    viewModel.isButtonVisible("GetSupport") ? ScButton(Constants.Actions.getSupport) { ActionHelpers.openSupportPage(url: appState.preferences.supportPageURL) } : nil,
                     viewModel.isButtonVisible("GatherLogs") ? viewModel.createGatherLogsButton() : nil,
-                    viewModel.isButtonVisible("SoftwareUpdates") ? CustomButton(
+                    viewModel.isButtonVisible("SoftwareUpdates") ? ScButton(
                         Constants.Actions.softwareUpdate,
                         badgeNumber: appState.systemUpdateCache.updates.count,
                         helpText: appState.systemUpdateCache.updates.joined(separator: "\n"))
diff --git a/SupportCompanion/Views/Cards/AppCard.swift b/SupportCompanion/Views/Cards/AppCard.swift
@@ -46,7 +46,7 @@ struct AppCard: View {
     }
 
     var body: some View {
-        CustomCard(
+        ScCard(
             title: card.name,
             titleImageName: titleImage,
             imageSize: (40, 40),
@@ -78,7 +78,7 @@ struct AppCard: View {
                     }
 
                     if card.isSelfServe {
-                        CustomButton(Constants.General.manage, action: {
+                        ScButton(Constants.General.manage, action: {
                             Task {
                                 if !card.action.isEmpty {
                                     _ = try await ExecutionService.executeShellCommand(card.action)
diff --git a/SupportCompanion/Views/Cards/BatteryEvergreenStack.swift b/SupportCompanion/Views/Cards/BatteryEvergreenStack.swift
@@ -17,7 +17,7 @@ struct BatteryEvergreenStack: View {
         } else{
             VStack(alignment: .leading){
                 if viewModel.isCardVisible("Evergreen") && appState.preferences.mode == Constants.modes.munki {
-                    CustomCard(title: "\(Constants.CardTitle.evergreen)", titleImageName: "leaf.fill", content: {
+                    ScCard(title: "\(Constants.CardTitle.evergreen)", titleImageName: "leaf.fill", content: {
                         VStack(alignment: .leading) {
                             Text("Rings")
                                 .font(.system(size: 14))
@@ -40,7 +40,7 @@ struct BatteryEvergreenStack: View {
                 }
                 
                 if viewModel.isCardVisible("Battery") {
-                    CustomCard(title: "\(Constants.CardTitle.battery)", titleImageName: "battery.100percent.bolt", imageSize: (25,25), content: {
+                    ScCard(title: "\(Constants.CardTitle.battery)", titleImageName: "battery.100percent.bolt", imageSize: (25,25), content: {
                         VStack(alignment: .leading) {
                             CardData(info: appState.batteryInfoManager.batteryInfo.toKeyValuePairs())
                         }
diff --git a/SupportCompanion/Views/Cards/DeviceInformationCard.swift b/SupportCompanion/Views/Cards/DeviceInformationCard.swift
@@ -17,7 +17,7 @@ struct DeviceInformationCard: View {
         if viewModel.isCardVisible("DeviceInformation") {
             let groupedData = groupedDeviceInfoArray() // Precomputed grouped data
 
-            CustomCard(
+            ScCard(
                 title: "\(Constants.CardTitle.deviceInfo)",
                 titleImageName: "laptopcomputer",
                 buttonImageName: "doc.on.doc.fill",
diff --git a/SupportCompanion/Views/Cards/JsonCardView.swift b/SupportCompanion/Views/Cards/JsonCardView.swift
@@ -12,7 +12,7 @@ struct JsonCardView: View {
     let card: JsonCard
 
     var body: some View {
-        CustomCard(
+        ScCard(
             title: card.header,
             titleImageName: card.icon,
             content: {
diff --git a/SupportCompanion/Views/Cards/KSSOCard.swift b/SupportCompanion/Views/Cards/KSSOCard.swift
@@ -14,7 +14,7 @@ struct KSSOCard: View {
     var body: some View {
         VStack(alignment: .leading){
             if "" != appState.ssoInfoManager.kerberosSSO.username {
-                CustomCard(title: "\(Constants.CardTitle.kerberosSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {
+                ScCard(title: "\(Constants.CardTitle.kerberosSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {
                         VStack(alignment: .leading) {
                             CardData(info: appState.ssoInfoManager.kerberosSSO.toKeyValuePairs())
                         }
diff --git a/SupportCompanion/Views/Cards/PSSOCard.swift b/SupportCompanion/Views/Cards/PSSOCard.swift
@@ -15,7 +15,7 @@ struct PSSOCard: View {
     var body: some View {
         VStack(alignment: .leading){
             if "" != appState.ssoInfoManager.platformSSO.loginType {
-                CustomCard(title: "\(Constants.CardTitle.platformSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {
+                ScCard(title: "\(Constants.CardTitle.platformSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {
                         VStack(alignment: .leading) {
                             CardData(info: appState.ssoInfoManager.platformSSO.toKeyValuePairs())
                         }
diff --git a/SupportCompanion/Views/Cards/PatchingProgressCard.swift b/SupportCompanion/Views/Cards/PatchingProgressCard.swift
@@ -15,7 +15,7 @@ struct PatchingProgressCard: View {
     var body: some View {
         if viewModel.isCardVisible("ApplicationInstallProgress") {
             VStack {
-                CustomCard(title: "\(Constants.CardTitle.appPatchProgress)", titleImageName: "app.badge.checkmark", content: {
+                ScCard(title: "\(Constants.CardTitle.appPatchProgress)", titleImageName: "app.badge.checkmark", content: {
                     ZStack {
                         CircularProgressWithWave(
                             progress: appState.installPercentage / 100,
diff --git a/SupportCompanion/Views/Cards/PendingUpdatesCard.swift b/SupportCompanion/Views/Cards/PendingUpdatesCard.swift
@@ -15,7 +15,7 @@ struct PendingUpdatesCard: View {
     var body: some View {
         if viewModel.isCardVisible("PendingAppUpdates") {
             VStack {
-                CustomCard(
+                ScCard(
                     title: "\(Constants.CardTitle.pendingUpdates)",
                     titleImageName: "clock.fill",
                     content: {
diff --git a/SupportCompanion/Views/Cards/StorageDeviceManagementStack.swift b/SupportCompanion/Views/Cards/StorageDeviceManagementStack.swift
@@ -19,7 +19,7 @@ struct StorageDeviceManagementStack: View {
             VStack(alignment: .leading){
                 // Storage Card
                 if viewModel.isCardVisible(Constants.Cards.storageCardName) {
-                    CustomCard(title: "\(Constants.CardTitle.storage)",
+                    ScCard(title: "\(Constants.CardTitle.storage)",
                                titleImageName: "internaldrive.fill",
                                buttonImageName: "macwindow.on.rectangle",
                                buttonAction: { viewModel.openStoragePanel() },
@@ -55,7 +55,7 @@ struct StorageDeviceManagementStack: View {
                 
                 // Device Management Card
                 if viewModel.isCardVisible("DeviceManagement") {
-                    CustomCard(title: "\(Constants.CardTitle.deviceManagement)", titleImageName: "lock.shield", content:  {
+                    ScCard(title: "\(Constants.CardTitle.deviceManagement)", titleImageName: "lock.shield", content:  {
                         VStack(alignment: .leading, spacing: 5) {
                             CardData(info: appState.mdmInfoManager.mdmInfo.toKeyValuePairs())
                         }
diff --git a/SupportCompanion/Views/Cards/UserInfoCard.swift b/SupportCompanion/Views/Cards/UserInfoCard.swift
@@ -13,7 +13,7 @@ struct UserInfoCard: View {
     
     var body: some View {
         VStack(alignment: .leading){
-            CustomCard(title: "\(Constants.CardTitle.userInfo)", titleImageName: "person.fill", content: {
+            ScCard(title: "\(Constants.CardTitle.userInfo)", titleImageName: "person.fill", content: {
                     VStack(alignment: .leading) {
                         CardData(info: appState.userInfoManager.userInfo.toKeyValuePairs())
                     }
diff --git a/SupportCompanion/Views/CompactCards/CompactBatteryCard.swift b/SupportCompanion/Views/CompactCards/CompactBatteryCard.swift
@@ -5,7 +5,7 @@ struct CompactBatteryCard: View {
     @EnvironmentObject var appState: AppStateManager
 
     var body: some View {
-        CustomCardCompact(
+        ScCardCompact(
             title: "Battery",
             titleImageName: "battery.100percent",
             buttonImageName: "info.circle",
@@ -19,4 +19,4 @@ struct CompactBatteryCard: View {
             appState.batteryInfoManager.refresh()
         }
     }
-}
+}
diff --git a/SupportCompanion/Views/CompactCards/CompactDeviceCard.swift b/SupportCompanion/Views/CompactCards/CompactDeviceCard.swift
@@ -5,7 +5,7 @@ struct CompactDeviceCard: View {
     @EnvironmentObject var appState: AppStateManager
     
     var body: some View {
-        CustomCardCompact(
+        ScCardCompact(
             title: AppStateManager.shared.deviceInfoManager.deviceInfo?.hostName ?? "",
             titleImageName: "desktopcomputer",
             imageSize: (13, 13),
diff --git a/SupportCompanion/Views/CompactCards/CompactPatchProgressCard.swift b/SupportCompanion/Views/CompactCards/CompactPatchProgressCard.swift
@@ -6,32 +6,25 @@ struct CompactPatchProgressCard: View {
     @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
-        CustomCardCompact(
+        ScCardCompact(
             title: "Patch progress",
             titleImageName: "app",
             buttonImageName: "info.circle",
             buttonAction: {},
             imageSize: (13, 13),
             content: {
-                HStack {
-                    Text("Progress: ")
-                        .bold()
-                        .font(.system(size: 12))
-                    + Text("\(Int(appState.installPercentage))")
-                        .font(.system(size: 12))
-                        .foregroundColor(
-                            appState.installPercentage < 90 ? (colorScheme == .light ? .orangeLight : .orange)
-                            : appState.installPercentage < 60 ? (colorScheme == .light ? .redLight : .red)
-                            : .green)
-                    + Text("%")
-                        .font(.system(size: 12))
-                }
-                HStack {
-                    Text("Pending: ")
-                        .bold()
-                        .font(.system(size: 12))
-                    + Text("\(appState.pendingUpdatesCount)")
-                }
+                AnyView(
+                    ProgressView(
+                        value: appState.installPercentage,
+                        total: 100,
+                        label: {
+                            Text("\(String(format: "%.1f", appState.installPercentage))% Patched")
+                            .font(.system(size: 12))}
+                    )
+                    .tint(appState.installPercentage < 90 ? (colorScheme == .light ? .orangeLight : .orange)
+                        : appState.installPercentage < 60 ? (colorScheme == .light ? .redLight : .red)
+                        : .green)
+                )
             }
         )
         .onAppear {
diff --git a/SupportCompanion/Views/CompactCards/CompactStorageCard.swift b/SupportCompanion/Views/CompactCards/CompactStorageCard.swift
@@ -7,7 +7,7 @@ struct CompactStorageCard: View {
             
     var body: some View {
         VStack(alignment: .leading){
-            CustomCardCompact(
+            ScCardCompact(
                 title: AppStateManager.shared.storageInfoManager.storageInfo.name,
                 titleImageName: "internaldrive.fill",
                 buttonImageName: "info.circle",
@@ -36,4 +36,4 @@ struct CompactStorageCard: View {
             appState.storageInfoManager.refresh()
         }
     }
-}
+}
diff --git a/SupportCompanion/Views/PopupModal.swift b/SupportCompanion/Views/PopupModal.swift
@@ -25,7 +25,7 @@ struct PopupModal: View {
             }
             .padding(.bottom)
             
-            CustomButton(Constants.General.close){
+            ScButton(Constants.General.close){
                 isShowing = false
             }
         }
diff --git a/SupportCompanion/Views/QuickActions.swift b/SupportCompanion/Views/QuickActions.swift
diff --git a/SupportCompanion/Views/ScButton.swift b/SupportCompanion/Views/ScButton.swift
diff --git a/SupportCompanion/Views/ScCard.swift b/SupportCompanion/Views/ScCard.swift
diff --git a/SupportCompanion/Views/ScCardCompact.swift b/SupportCompanion/Views/ScCardCompact.swift
diff --git a/SupportCompanion/Views/ScCardCompactButton.swift b/SupportCompanion/Views/ScCardCompactButton.swift
diff --git a/SupportCompanion/Views/SelfService.swift b/SupportCompanion/Views/SelfService.swift
diff --git a/SupportCompanion/Views/TrayMenu.swift b/SupportCompanion/Views/TrayMenu.swift

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`49`	`49`	`popover.behavior = .transient // Closes when clicking outside`
`50`	`50`	`popover.contentSize = NSSize(width: 500, height: 520)`
`51`	`51`	`popover.contentViewController = NSHostingController(`
`52`		`- rootView: CustomMenuView(`
	`52`	`+ rootView: TrayMenuView(`
`53`	`53`	`viewModel: CardGridViewModel(appState: AppStateManager.shared)`
`54`	`54`	`)`
`55`	`55`	`.environmentObject(AppStateManager.shared)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@`
`12`	`12`	`},`
`13`	`13`	`"%@%%" : {`
`14`	`14`
	`15`	`+ },`
	`16`	`+ "%@%% Patched" : {`
	`17`	`+`
`15`	`18`	`},`
`16`	`19`	`"%@%% Used" : {`
`17`	`20`	`"localizations" : {`
`@@ -1456,9 +1459,6 @@`
`1456`	`1459`	`}`
`1457`	`1460`	`}`
`1458`	`1461`	`}`
`1459`		`- },`
`1460`		`- "Done" : {`
`1461`		`-`
`1462`	`1462`	`},`
`1463`	`1463`	`"Error.CommandFailed" : {`
`1464`	`1464`	`"comment" : "Error message when a command failed",`
`@@ -2433,9 +2433,6 @@`
`2433`	`2433`	`}`
`2434`	`2434`	`}`
`2435`	`2435`	`}`
`2436`		`- },`
`2437`		`- "Pending: " : {`
`2438`		`-`
`2439`	`2436`	`},`
`2440`	`2437`	`"PlatformSSO.LoginFrequency" : {`
`2441`	`2438`	`"comment" : "Label for the login frequency",`
`@@ -2688,12 +2685,6 @@`
`2688`	`2685`	`}`
`2689`	`2686`	`}`
`2690`	`2687`	`}`
`2691`		`- },`
`2692`		`- "Progress: " : {`
`2693`		`-`
`2694`		`- },`
`2695`		`- "Quick Actions" : {`
`2696`		`-`
`2697`	`2688`	`},`
`2698`	`2689`	`"Realm:" : {`
`2699`	`2690`
`@@ -2728,12 +2719,6 @@`
`2728`	`2719`	`},`
`2729`	`2720`	`"Rings" : {`
`2730`	`2721`
`2731`		`- },`
`2732`		`- "Run" : {`
`2733`		`-`
`2734`		`- },`
`2735`		`- "Select an action" : {`
`2736`		`-`
`2737`	`2722`	`},`
`2738`	`2723`	`"Select an option" : {`
`2739`	`2724`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ class CardGridViewModel: ObservableObject {`
`32`	`32`	`]`
`33`	`33`	`}`
`34`	`34`
`35`		`- func createRestartIntuneAgentButton(fontSize: CGFloat? = nil) -> CustomButton {`
`36`		`- CustomButton(Constants.Actions.restartIntuneAgent, fontSize: fontSize) {`
	`35`	`+ func createRestartIntuneAgentButton(fontSize: CGFloat? = nil) -> ScButton {`
	`36`	`+ ScButton(Constants.Actions.restartIntuneAgent, fontSize: fontSize) {`
`37`	`37`	`ActionHelpers.restartIntuneAgent { result in`
`38`	`38`	`ActionHelpers.handleResult(`
`39`	`39`	`operationName: "Restart Intune Agent",`
`@@ -50,8 +50,8 @@ class CardGridViewModel: ObservableObject {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- func createGatherLogsButton(fontSize: CGFloat? = nil) -> CustomButton {`
`54`		`- CustomButton(Constants.Actions.gatherLogs, fontSize: fontSize) {`
	`53`	`+ func createGatherLogsButton(fontSize: CGFloat? = nil) -> ScButton {`
	`54`	`+ ScButton(Constants.Actions.gatherLogs, fontSize: fontSize) {`
`55`	`55`	`ActionHelpers.gatherLogs(preferences: self.appState.preferences) { result in`
`56`	`56`	`ActionHelpers.handleResult(`
`57`	`57`	`operationName: Constants.Actions.gatherLogs,`
`@@ -69,8 +69,8 @@ class CardGridViewModel: ObservableObject {`
`69`	`69`
`70`	`70`	`func createRebootButton(`
`71`	`71`	`onShowModal: @escaping (Int, String, String) -> Void`
`72`		`- ) -> CustomButton {`
`73`		`- CustomButton(Constants.Actions.reboot) {`
	`72`	`+ ) -> ScButton {`
	`73`	`+ ScButton(Constants.Actions.reboot) {`
`74`	`74`	`await ActionHelpers.reboot { result in`
`75`	`75`	`DispatchQueue.main.async {`
`76`	`76`	`switch result {`
`@@ -86,8 +86,8 @@ class CardGridViewModel: ObservableObject {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- func createChangePasswordButton(fontSize: CGFloat? = nil) -> CustomButton {`
`90`		`- CustomButton(Constants.Actions.changePassword, fontSize: fontSize) {`
	`89`	`+ func createChangePasswordButton(fontSize: CGFloat? = nil) -> ScButton {`
	`90`	`+ ScButton(Constants.Actions.changePassword, fontSize: fontSize) {`
`91`	`91`	`await ActionHelpers.openChangePassword(preferences: self.appState.preferences) { result in`
`92`	`92`	`ActionHelpers.handleResult(`
`93`	`93`	`operationName: Constants.Actions.changePassword,`
`@@ -108,7 +108,7 @@ class CardGridViewModel: ObservableObject {`
`108`	`108`	case `default`
`109`	`109`	`}`
`110`	`110`
`111`		`- func createOpenManagementAppButton(type: ManagementAppURLType, fontSize: CGFloat? = nil) -> CustomButton {`
	`111`	`+ func createOpenManagementAppButton(type: ManagementAppURLType, fontSize: CGFloat? = nil) -> ScButton {`
`112`	`112`	`let appName: String`
`113`	`113`	`let appURL: String`
`114`	`114`
`@@ -129,7 +129,7 @@ class CardGridViewModel: ObservableObject {`
`129`	`129`	`appURL = ""`
`130`	`130`	`}`
`131`	`131`
`132`		`- return CustomButton("\(Constants.Actions.openManagementApp) \(appName)", fontSize: fontSize) {`
	`132`	`+ return ScButton("\(Constants.Actions.openManagementApp) \(appName)", fontSize: fontSize) {`
`133`	`133`	`ActionHelpers.openManagementApp(appURL: appURL)`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct KSSOCard: View {`
`14`	`14`	`var body: some View {`
`15`	`15`	`VStack(alignment: .leading){`
`16`	`16`	`if "" != appState.ssoInfoManager.kerberosSSO.username {`
`17`		`- CustomCard(title: "\(Constants.CardTitle.kerberosSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {`
	`17`	`+ ScCard(title: "\(Constants.CardTitle.kerberosSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {`
`18`	`18`	`VStack(alignment: .leading) {`
`19`	`19`	`CardData(info: appState.ssoInfoManager.kerberosSSO.toKeyValuePairs())`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct PSSOCard: View {`
`15`	`15`	`var body: some View {`
`16`	`16`	`VStack(alignment: .leading){`
`17`	`17`	`if "" != appState.ssoInfoManager.platformSSO.loginType {`
`18`		`- CustomCard(title: "\(Constants.CardTitle.platformSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {`
	`18`	`+ ScCard(title: "\(Constants.CardTitle.platformSSO)", titleImageName: "lock.fill", useMultiColor: false, content: {`
`19`	`19`	`VStack(alignment: .leading) {`
`20`	`20`	`CardData(info: appState.ssoInfoManager.platformSSO.toKeyValuePairs())`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ struct UserInfoCard: View {`
`13`	`13`
`14`	`14`	`var body: some View {`
`15`	`15`	`VStack(alignment: .leading){`
`16`		`- CustomCard(title: "\(Constants.CardTitle.userInfo)", titleImageName: "person.fill", content: {`
	`16`	`+ ScCard(title: "\(Constants.CardTitle.userInfo)", titleImageName: "person.fill", content: {`
`17`	`17`	`VStack(alignment: .leading) {`
`18`	`18`	`CardData(info: appState.userInfoManager.userInfo.toKeyValuePairs())`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ struct CompactBatteryCard: View {`
`5`	`5`	`@EnvironmentObject var appState: AppStateManager`
`6`	`6`
`7`	`7`	`var body: some View {`
`8`		`- CustomCardCompact(`
	`8`	`+ ScCardCompact(`
`9`	`9`	`title: "Battery",`
`10`	`10`	`titleImageName: "battery.100percent",`
`11`	`11`	`buttonImageName: "info.circle",`
`@@ -19,4 +19,4 @@ struct CompactBatteryCard: View {`
`19`	`19`	`appState.batteryInfoManager.refresh()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`-}`
	`22`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ struct CompactStorageCard: View {`
`7`	`7`
`8`	`8`	`var body: some View {`
`9`	`9`	`VStack(alignment: .leading){`
`10`		`- CustomCardCompact(`
	`10`	`+ ScCardCompact(`
`11`	`11`	`title: AppStateManager.shared.storageInfoManager.storageInfo.name,`
`12`	`12`	`titleImageName: "internaldrive.fill",`
`13`	`13`	`buttonImageName: "info.circle",`
`@@ -36,4 +36,4 @@ struct CompactStorageCard: View {`
`36`	`36`	`appState.storageInfoManager.refresh()`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ struct PopupModal: View {`
`25`	`25`	`}`
`26`	`26`	`.padding(.bottom)`
`27`	`27`
`28`		`- CustomButton(Constants.General.close){`
	`28`	`+ ScButton(Constants.General.close){`
`29`	`29`	`isShowing = false`
`30`	`30`	`}`
`31`	`31`	`}`