clean code

Author: ming1016

SwiftPamphletApp.xcodeproj/project.pbxproj

@@ -991,6 +991,20 @@
 			path = UseViewComponent;
 			sourceTree = "<group>";
 		};
+		0846234D2BAC59AF003373D9 /* App */ = {
+			isa = PBXGroup;
+			children = (
+				083554E227572BB60095E0EE /* AppVM.swift */,
+				086A5F432744EE2800FECE02 /* SwiftPamphletAppConfig.swift */,
+				086A5F062744E88E00FECE02 /* SwiftPamphletAppApp.swift */,
+				08AEAEF4277F0A1E00B969E2 /* SPSidebar.swift */,
+				08AEAEF0277F09D000B969E2 /* IntroView.swift */,
+				08AEAEF2277F09FA00B969E2 /* NavView.swift */,
+				084E1A6427B51EDB0072BBB6 /* AutoTask.swift */,
+			);
+			path = App;
+			sourceTree = "<group>";
+		};
 		084E1A6127B517990072BBB6 /* SwiftThoseThings */ = {
 			isa = PBXGroup;
 			children = (
@@ -1093,24 +1107,18 @@
 		086A5F052744E88E00FECE02 /* SwiftPamphletApp */ = {
 			isa = PBXGroup;
 			children = (
+				0846234D2BAC59AF003373D9 /* App */,
+				084417732B99B8EA0049297D /* HomeUI */,
 				0887A5982BA28F3600131359 /* Guide */,
 				08397E212B9EE83F00DFDD02 /* InfoOrganizer */,
+				086A5F252744ECD700FECE02 /* GitHubAPI */,
 				08ED801A2B9D1EDA0069B7EC /* Setting */,
 				080124FD27EC62DC00E44222 /* SwiftPamphletAppDebug.entitlements */,
 				08CD61FB27758B22008C0935 /* Core */,
 				080387652766FF3200519B15 /* Network */,
 				086A5F482744EF2B00FECE02 /* ViewComponet */,
 				08BE637A27CDD9E7002BC6A8 /* DataSorting */,
 				086A5F472744EF0800FECE02 /* Resource */,
-				086A5F252744ECD700FECE02 /* GitHubAPI */,
-				084417732B99B8EA0049297D /* HomeUI */,
-				083554E227572BB60095E0EE /* AppVM.swift */,
-				086A5F432744EE2800FECE02 /* SwiftPamphletAppConfig.swift */,
-				086A5F062744E88E00FECE02 /* SwiftPamphletAppApp.swift */,
-				08AEAEF4277F0A1E00B969E2 /* SPSidebar.swift */,
-				08AEAEF0277F09D000B969E2 /* IntroView.swift */,
-				08AEAEF2277F09FA00B969E2 /* NavView.swift */,
-				084E1A6427B51EDB0072BBB6 /* AutoTask.swift */,
 				086A5F0A2744E89100FECE02 /* Assets.xcassets */,
 				086A5F0F2744E89100FECE02 /* SwiftPamphletApp.entitlements */,
 				086A5F0C2744E89100FECE02 /* Preview Content */,

SwiftPamphletApp/AppVM.swift SwiftPamphletApp/App/AppVM.swift

@@ -12,9 +12,6 @@ struct EditDeveloper: View {
     @Bindable var dev: DeveloperModel
     @State var vm: UserVM
     @State private var tabSelct = 1
-    var isCleanUnread = false
-    @State private var unReadCount = 0
-    var isShowUserEventLink = true
 
     var body: some View {
         TextField("请输入账号:", text: $dev.name)
@@ -73,7 +70,7 @@ struct EditDeveloper: View {
 
         TabView(selection: $tabSelct) {
 
-            DeveloperEventView(events: vm.events, isShowUserEventLink: isShowUserEventLink, unReadCount: unReadCount)
+            DeveloperEventView(events: vm.events)
                 .tabItem {
                     Image(systemName: "keyboard")
                     Text("事件")
@@ -83,7 +80,7 @@ struct EditDeveloper: View {
                     vm.doing(.inEvent)
                 }
                 .tag(1)
-            DeveloperEventView(events: vm.receivedEvents, isShowActor: true, isShowUserEventLink: isShowUserEventLink)
+            DeveloperEventView(events: vm.receivedEvents)
                 .tabItem {
                     Image(systemName: "keyboard.badge.ellipsis")
                     Text("Ta 接收的事件")
@@ -100,26 +97,19 @@ struct EditDeveloper: View {
 
 struct DeveloperEventView: View {
     var events: [EventModel]
-    var isShowActor = false
-    var isShowUserEventLink = true
-    var unReadCount = 0
     var body: some View {
         List {
             ForEach(Array(events.enumerated()), id: \.0) { i, event in
-
-                if isShowUserEventLink == true {
-                    NavigationLink {
-                        UserEventLinkDestination(event: event)
-                    } label: {
-                        AUserEventLabel(
-                            event: event,
-                            isShowActor: isShowActor,
-                            isUnRead: unReadCount > 0 && i < unReadCount
-                        )
-                    } // end NavigationLink
-                } else {
-                    AUserEventLabel(event: event, isShowActor: isShowActor, isUnRead: unReadCount > 0 && i < unReadCount)
-                }
+                
+                NavigationLink {
+                    UserEventLinkDestination(event: event)
+                } label: {
+                    AUserEventLabel(
+                        event: event,
+                        isShowActor: false,
+                        isUnRead: false
+                    )
+                } // end NavigationLink
             } // end ForEach
         }//  end List
         .id(UUID()) // 优化 commits 有多个时数据变化可能影响的性能。这样做每次更新都产生新的视图，因此无法做动画效果。相当于 UITableView 上的 reloadData()

SwiftPamphletApp/AutoTask.swift SwiftPamphletApp/App/AutoTask.swift

@@ -18,12 +18,12 @@ struct InfoRowView: View {
     var body: some View {
         VStack(alignment:.leading) {
             HStack {
-                if info.category != nil {
-                    Text(info.category?.name ?? "")
-                }
                 if info.star == true {
                     Image(systemName: "star.fill")
                 }
+                if info.category != nil {
+                    Text(info.category?.name ?? "")
+                }
                 Spacer()
             }
             .foregroundColor(light: .secondary, dark: .secondary)