fixed crash where viewmodels would not be unique

TUM-Dev · Jul 7, 2020 · 4f3c081 · 4f3c081
1 parent 9d114f8
commit 4f3c081
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/TUM Campus App.xcodeproj/project.pbxproj b/TUM Campus App.xcodeproj/project.pbxproj
@@ -1165,7 +1165,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = LQ83GZ8GRK;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1214,7 +1214,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = LQ83GZ8GRK;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/TUM Campus App/Info.plist b/TUM Campus App/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSContactsUsageDescription</key>
-	<string>TUM Campus App can add contacts from TUM Online to your address book</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -24,6 +22,8 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSContactsUsageDescription</key>
+	<string>TUM Campus App can add contacts from TUM Online to your address book</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>TUM Campus App uses your location to show you the distance to the next cafeteria</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

diff --git a/TUM Campus App/Lecture Detail/LectureDetailViewModel.swift b/TUM Campus App/Lecture Detail/LectureDetailViewModel.swift
@@ -11,22 +11,26 @@ import Foundation
 struct LectureDetailViewModel: Hashable {
     var sections: [Section]
 
-    struct Section: Hashable {
+    struct Section: Identifiable, Hashable {
+        let id = UUID()
         let name: String
         let cells: [AnyHashable]
     }
 
-    struct Header: Hashable {
+    struct Header: Identifiable, Hashable {
+        let id = UUID()
         let title: String
         let subtitle: String
     }
 
-    struct Cell: Hashable {
+    struct Cell: Identifiable, Hashable {
+        let id = UUID()
         let key: String
         let value: String
     }
 
-    struct LinkCell: Hashable {
+    struct LinkCell: Identifiable, Hashable {
+        let id = UUID()
         let name: String
         let link: URL
     }

diff --git a/TUM Campus App/Movie Detail/MovieDetailViewModel.swift b/TUM Campus App/Movie Detail/MovieDetailViewModel.swift
@@ -11,22 +11,26 @@ import UIKit
 struct MovieDetailViewModel: Hashable {
     let sections: [Section]
 
-    struct Section: Hashable {
+    struct Section: Identifiable, Hashable {
+        let id = UUID()
         let name: String
         let cells: [AnyHashable]
     }
 
-    struct Header: Hashable {
+    struct Header: Identifiable, Hashable {
+        let id = UUID()
         let imageURL: URL?
         let title: String?
     }
 
-    struct Cell: Hashable {
+    struct Cell: Identifiable, Hashable {
+        let id = UUID()
         let key: String
         let value: String
     }
 
-    struct LinkCell: Hashable {
+    struct LinkCell: Identifiable, Hashable {
+        let id = UUID()
         let name: String
         let link: URL
     }

diff --git a/TUM Campus App/Person Detail/PersonDetailViewModel.swift b/TUM Campus App/Person Detail/PersonDetailViewModel.swift
@@ -11,26 +11,29 @@ import UIKit
 struct PersonDetailViewModel: Hashable {
     let sections: [Section]
 
-    struct Header: Hashable {
+    struct Header: Identifiable, Hashable {
+        let id = UUID()
         let image: UIImage?
         let imageURL: URL?
         let name: String
     }
 
-    struct Cell: Hashable {
+    struct Cell: Identifiable, Hashable {
         enum ActionType {
             case call
             case mail
             case openURL
             case showRoom
         }
 
+        let id = UUID()
         let key: String
         let value: String
         let actionType: ActionType?
     }
 
-    struct Section: Hashable {
+    struct Section: Identifiable, Hashable {
+        let id = UUID()
         let name: String
         let cells: [AnyHashable]
     }