Skip to content

Commit 188904b

Browse files
authored
Migrate client events list to SwiftUI and GRDB for database (home-assistant#3206)
1 parent 19c3d6e commit 188904b

20 files changed

+435
-436
lines changed

HomeAssistant.xcodeproj/project.pbxproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,8 @@
543543
420B10042B1CF6D800D383D8 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 420B10032B1CF6D800D383D8 /* SharedAssets.xcassets */; };
544544
420B10092B1D12DD00D383D8 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 420B10082B1D129B00D383D8 /* Colors.xcassets */; };
545545
420B100C2B1D204400D383D8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 420B100B2B1D204400D383D8 /* Assets.xcassets */; };
546+
420C1BB22CF7DA9100AF22E7 /* ClientEventsLogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 420C1BB12CF7DA9100AF22E7 /* ClientEventsLogView.swift */; };
547+
420C1BB52CF7DC1400AF22E7 /* ClientEventsLogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 420C1BB42CF7DC1400AF22E7 /* ClientEventsLogViewModel.swift */; };
546548
420D5AE32C5A860900624A08 /* LocationPermissionSensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 420D5AE22C5A860900624A08 /* LocationPermissionSensor.swift */; };
547549
420D5AE42C5A860900624A08 /* LocationPermissionSensor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 420D5AE22C5A860900624A08 /* LocationPermissionSensor.swift */; };
548550
420E2AE32C4746BB004921D8 /* WidgetBasicViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 420E2AE22C4746BB004921D8 /* WidgetBasicViewModel.swift */; };
@@ -1105,8 +1107,6 @@
11051107
D03D894720E0BC1800D4F28D /* Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03D891720E0A85200D4F28D /* Shared.framework */; };
11061108
D03D894D20E0BC2700D4F28D /* ClientEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A6367120DB7D1100E5C49B /* ClientEventTests.swift */; };
11071109
D05A4D32216DD206009FD1EB /* MJPEGStreamer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05A4D31216DD206009FD1EB /* MJPEGStreamer.swift */; };
1108-
D06C751020D87FAF00E9DB7F /* ClientEventCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06C750F20D87FAF00E9DB7F /* ClientEventCell.swift */; };
1109-
D0B25BD221323CA600678C2C /* ClientEventPayloadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B25BD121323CA600678C2C /* ClientEventPayloadViewController.swift */; };
11101110
D0B25BD62133128800678C2C /* UNNotificationContent+ClientEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B25BD52133128800678C2C /* UNNotificationContent+ClientEvent.swift */; };
11111111
D0B25BD7213312AE00678C2C /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B627CB081D83C87B0057173E /* UserNotifications.framework */; };
11121112
D0BE440A2104224600C74314 /* TokenInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BE44092104224600C74314 /* TokenInfo.swift */; };
@@ -1132,8 +1132,6 @@
11321132
D0EEF322214DE56B00D1D360 /* LocationTrigger.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0EEF321214DE56B00D1D360 /* LocationTrigger.swift */; };
11331133
D0EEF324214DF2B700D1D360 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E857A11CB1CCCC00F96925 /* Utils.swift */; };
11341134
D0EEF335214EB77100D1D360 /* CLLocation+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C2C17E20D1F64D00BD810B /* CLLocation+Extensions.swift */; };
1135-
D0FF79D220D87D200034574D /* ClientEventTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FF79D120D87D200034574D /* ClientEventTableViewController.swift */; };
1136-
D0FF79D520D87DB10034574D /* ClientEvents.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D0FF79D420D87DB10034574D /* ClientEvents.storyboard */; };
11371135
FC8E9421FDB864726918B612 /* Pods-watchOS-WatchExtension-Watch-metadata.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9249824D575933DFA1530BB2 /* Pods-watchOS-WatchExtension-Watch-metadata.plist */; };
11381136
FD3BC66329B9FF8F00B19FBE /* CarPlaySceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD3BC66229B9FF8F00B19FBE /* CarPlaySceneDelegate.swift */; };
11391137
FD3BC66C29BA00D600B19FBE /* CarPlayEntitiesListTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD3BC66B29BA00D600B19FBE /* CarPlayEntitiesListTemplate.swift */; };
@@ -1825,6 +1823,8 @@
18251823
420B10032B1CF6D800D383D8 /* SharedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SharedAssets.xcassets; sourceTree = "<group>"; };
18261824
420B10082B1D129B00D383D8 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
18271825
420B100B2B1D204400D383D8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1826+
420C1BB12CF7DA9100AF22E7 /* ClientEventsLogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventsLogView.swift; sourceTree = "<group>"; };
1827+
420C1BB42CF7DC1400AF22E7 /* ClientEventsLogViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventsLogViewModel.swift; sourceTree = "<group>"; };
18281828
420D5AE22C5A860900624A08 /* LocationPermissionSensor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationPermissionSensor.swift; sourceTree = "<group>"; };
18291829
420E2AE22C4746BB004921D8 /* WidgetBasicViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetBasicViewModel.swift; sourceTree = "<group>"; };
18301830
420E2AE42C4746CD004921D8 /* WidgetBasicSizeStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetBasicSizeStyle.swift; sourceTree = "<group>"; };
@@ -2489,11 +2489,9 @@
24892489
D03D894220E0BC1800D4F28D /* HomeAssistant-Tests-Shared.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HomeAssistant-Tests-Shared.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
24902490
D03D894620E0BC1800D4F28D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
24912491
D05A4D31216DD206009FD1EB /* MJPEGStreamer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MJPEGStreamer.swift; sourceTree = "<group>"; };
2492-
D06C750F20D87FAF00E9DB7F /* ClientEventCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventCell.swift; sourceTree = "<group>"; };
24932492
D0A6367120DB7D1100E5C49B /* ClientEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventTests.swift; sourceTree = "<group>"; };
24942493
D0A6367420DBE93400E5C49B /* Realm+Initialization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Realm+Initialization.swift"; sourceTree = "<group>"; };
24952494
D0B25BCC2130CAB400678C2C /* Bonjour.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bonjour.swift; sourceTree = "<group>"; };
2496-
D0B25BD121323CA600678C2C /* ClientEventPayloadViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventPayloadViewController.swift; sourceTree = "<group>"; };
24972495
D0B25BD52133128800678C2C /* UNNotificationContent+ClientEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotificationContent+ClientEvent.swift"; sourceTree = "<group>"; };
24982496
D0BE44092104224600C74314 /* TokenInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenInfo.swift; sourceTree = "<group>"; };
24992497
D0BE440D210437F900C74314 /* AuthenticationRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationRoutes.swift; sourceTree = "<group>"; };
@@ -2512,8 +2510,6 @@
25122510
D0EEF321214DE56B00D1D360 /* LocationTrigger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationTrigger.swift; sourceTree = "<group>"; };
25132511
D0FF79CB20D778B50034574D /* ClientEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEvent.swift; sourceTree = "<group>"; };
25142512
D0FF79CD20D85C3A0034574D /* ClientEventStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventStore.swift; sourceTree = "<group>"; };
2515-
D0FF79D120D87D200034574D /* ClientEventTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientEventTableViewController.swift; sourceTree = "<group>"; };
2516-
D0FF79D420D87DB10034574D /* ClientEvents.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ClientEvents.storyboard; sourceTree = "<group>"; };
25172513
D27653D385E4CEB58E52A350 /* Pods_iOS_Extensions_Widgets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_Extensions_Widgets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
25182514
D404CC38F07CE4476FCF69B4 /* Pods-iOS-Shared-iOS-Tests-Shared.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-Shared-iOS-Tests-Shared.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-Shared-iOS-Tests-Shared/Pods-iOS-Shared-iOS-Tests-Shared.release.xcconfig"; sourceTree = "<group>"; };
25192515
D5E3CB71A877FCB1F0F5DE99 /* Pods-iOS-Extensions-Share.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-Extensions-Share.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-Extensions-Share/Pods-iOS-Extensions-Share.release.xcconfig"; sourceTree = "<group>"; };
@@ -3611,6 +3607,15 @@
36113607
path = Home;
36123608
sourceTree = "<group>";
36133609
};
3610+
420C1BB32CF7DBF300AF22E7 /* ClientEventsLogView */ = {
3611+
isa = PBXGroup;
3612+
children = (
3613+
420C1BB12CF7DA9100AF22E7 /* ClientEventsLogView.swift */,
3614+
420C1BB42CF7DC1400AF22E7 /* ClientEventsLogViewModel.swift */,
3615+
);
3616+
path = ClientEventsLogView;
3617+
sourceTree = "<group>";
3618+
};
36143619
420F53E62C4E9AA9003C8415 /* Action */ = {
36153620
isa = PBXGroup;
36163621
children = (
@@ -4675,6 +4680,7 @@
46754680
1169B7AC25AA76E30035F2AE /* MaterialDesignIcons+Eureka.swift */,
46764681
1164DA2025FBEE8600515E8A /* TemplateEditViewController.swift */,
46774682
1127381B2622B6F300F5E312 /* DebugSettingsViewController.swift */,
4683+
420C1BB32CF7DBF300AF22E7 /* ClientEventsLogView */,
46784684
119DE9552633A8C40099F7D8 /* SettingsRootDataSource.swift */,
46794685
);
46804686
path = Settings;
@@ -4926,10 +4932,6 @@
49264932
D03D893720E0AF1B00D4F28D /* ClientEvents */ = {
49274933
isa = PBXGroup;
49284934
children = (
4929-
D06C750F20D87FAF00E9DB7F /* ClientEventCell.swift */,
4930-
D0FF79D420D87DB10034574D /* ClientEvents.storyboard */,
4931-
D0FF79D120D87D200034574D /* ClientEventTableViewController.swift */,
4932-
D0B25BD121323CA600678C2C /* ClientEventPayloadViewController.swift */,
49334935
1112AE9A25F71775007A541A /* LocationHistoryListViewController.swift */,
49344936
1112AEBA25F717E9007A541A /* LocationHistoryDetailViewController.swift */,
49354937
);
@@ -5980,7 +5982,6 @@
59805982
B606169A1D1F117800249C11 /* US-EN-Alexa-Water-Detected-In-Kitchen.wav in Resources */,
59815983
B606168F1D1F117700249C11 /* US-EN-Alexa-Motion-In-Garage.wav in Resources */,
59825984
B60616311D1F117700249C11 /* US-EN-Morgan-Freeman-Setting-The-Mood.wav in Resources */,
5983-
D0FF79D520D87DB10034574D /* ClientEvents.storyboard in Resources */,
59845985
B606162F1D1F117700249C11 /* US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav in Resources */,
59855986
B60616131D1F117700249C11 /* US-EN-Morgan-Freeman-Boyfriend-Is-Arriving.wav in Resources */,
59865987
B606163E1D1F117700249C11 /* US-EN-Morgan-Freeman-Turning-Off-The-Air-Conditioner.wav in Resources */,
@@ -6758,7 +6759,6 @@
67586759
1112AE9B25F71775007A541A /* LocationHistoryListViewController.swift in Sources */,
67596760
426EE49B2CA4194E00A5EF4F /* OnboardingWelcomeView.swift in Sources */,
67606761
B68EDD03215F0E2900DD6B28 /* NotificationCategoryConfigurator.swift in Sources */,
6761-
D0FF79D220D87D200034574D /* ClientEventTableViewController.swift in Sources */,
67626762
42D5ACCE2C636F2B00D9C4E2 /* WatchConfigurationViewModel.swift in Sources */,
67636763
117D8A0824A9347F00580913 /* UIColor+CSSRGB.swift in Sources */,
67646764
11F3D74C2495377B00C05BBA /* SensorListViewController.swift in Sources */,
@@ -6768,6 +6768,7 @@
67686768
39A32EE22C0E384E00985722 /* UIImage+scaledToSize.swift in Sources */,
67696769
425573CC2B5574AD00145217 /* CarPlayAreasZonesTemplate+Build.swift in Sources */,
67706770
42A47A8C2C4547B800C9B43D /* WebViewExternalMessageHandler+Build.swift in Sources */,
6771+
420C1BB22CF7DA9100AF22E7 /* ClientEventsLogView.swift in Sources */,
67716772
B626AAF11D8F972800A0D225 /* SettingsDetailViewController.swift in Sources */,
67726773
42E6C08C2CE4F7A8007CA622 /* DownloadManagerViewModel.swift in Sources */,
67736774
1127381C2622B6F300F5E312 /* DebugSettingsViewController.swift in Sources */,
@@ -6824,6 +6825,7 @@
68246825
1130F532253A1E7400F371BE /* ComplicationListViewController.swift in Sources */,
68256826
B6B2E6A5216ACE4400D39A26 /* ActionConfigurator.swift in Sources */,
68266827
42EFFAEC2C8882DD002F10FC /* CarPlayConfigurationView.swift in Sources */,
6828+
420C1BB52CF7DC1400AF22E7 /* ClientEventsLogViewModel.swift in Sources */,
68276829
420E2AE92C474729004921D8 /* WidgetCircularView.swift in Sources */,
68286830
11B92AF2266F23DA00786588 /* NotificationManagerLocalPushInterfaceExtension.swift in Sources */,
68296831
11B62DC024F2F06100E5CB55 /* UIApplication+OpenSettings.swift in Sources */,
@@ -6890,7 +6892,6 @@
68906892
11A48D8124CA8ADB0021BDD9 /* NotificationCategory+Observation.swift in Sources */,
68916893
1100D51D2496AECE00B1073C /* PermissionStatusRow.swift in Sources */,
68926894
42E6C08A2CE4F4FA007CA622 /* DownloadManagerView.swift in Sources */,
6893-
D0B25BD221323CA600678C2C /* ClientEventPayloadViewController.swift in Sources */,
68946895
42E95C572CA45EFA0010ECE3 /* OnboardingErrorView.swift in Sources */,
68956896
B641BC1F1E2097EF002CCBC1 /* AboutViewController.swift in Sources */,
68966897
42E95C592CA46AD50010ECE3 /* ActivityView.swift in Sources */,
@@ -6922,7 +6923,6 @@
69226923
4273C4882C8857B00065A5B4 /* ControlOpenPage.swift in Sources */,
69236924
3E02C0E22CA7FCBF00102131 /* IntentSensorsAppEntity.swift in Sources */,
69246925
11A71C8B24A5848B00D9565F /* ZoneManagerProcessor.swift in Sources */,
6925-
D06C751020D87FAF00E9DB7F /* ClientEventCell.swift in Sources */,
69266926
42A47A852C45218D00C9B43D /* WebViewExternalMessageHandler.swift in Sources */,
69276927
B63CAE6B2150D2E300A68AFB /* VoiceShortcutsManager.swift in Sources */,
69286928
1164DA3225FBF5D600515E8A /* UITextView+CodeRow.swift in Sources */,

Sources/App/ClientEvents/ClientEventCell.swift

-7
This file was deleted.

Sources/App/ClientEvents/ClientEventPayloadViewController.swift

-30
This file was deleted.

0 commit comments

Comments
 (0)