Adds Team rookie year and Event week number to respective views (#967)

* info * remove new line
the-blue-alliance · Aug 13, 2024 · 6c91ddf · 6c91ddf
1 parent 1951d31
commit 6c91ddf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/the-blue-alliance-ios/ViewControllers/Events/Event/EventInfoViewController.swift b/the-blue-alliance-ios/ViewControllers/Events/Event/EventInfoViewController.swift
@@ -113,7 +113,7 @@ class EventInfoViewController: TBATableViewController, Observable {
                 return cell
             case .twitter:
                 let cell = self.tableView(tableView, detailCellForRowAtIndexPath: indexPath)
-                cell.textLabel?.text = "View #\(self.event.key) on Twitter"
+                cell.textLabel?.text = "View \(self.event.key) on Twitter"
                 return cell
             case .youtube:
                 let cell = self.tableView(tableView, detailCellForRowAtIndexPath: indexPath)

diff --git a/the-blue-alliance-ios/ViewControllers/Teams/Team/TeamInfoViewController.swift b/the-blue-alliance-ios/ViewControllers/Teams/Team/TeamInfoViewController.swift
@@ -10,6 +10,7 @@ private enum TeamInfoSection: Int {
 
 private enum TeamInfoItem {
     case location
+    case rookieYear
     case sponsors
     case website
     case twitter
@@ -75,6 +76,8 @@ class TeamInfoViewController: TBATableViewController, Observable {
             switch item {
             case .location:
                 return self.tableView(tableView, locationCellForRowAt: indexPath)
+            case .rookieYear:
+                return self.tableView(tableView, rookieYearCellForRowAt: indexPath)
             case .sponsors:
                 return self.tableView(tableView, sponsorCellForRowAt: indexPath)
             case .website:
@@ -83,7 +86,7 @@ class TeamInfoViewController: TBATableViewController, Observable {
                 return cell
             case .twitter:
                 let cell = self.tableView(tableView, linkCellForRowAt: indexPath)
-                cell.textLabel?.text = "View #\(self.team.key) on Twitter"
+                cell.textLabel?.text = "View \(self.team.key) on Twitter"
                 return cell
             case .youtube:
                 let cell = self.tableView(tableView, linkCellForRowAt: indexPath)
@@ -108,7 +111,8 @@ class TeamInfoViewController: TBATableViewController, Observable {
             infoItems.append(.location)
         }
         if team.name != nil {
-            infoItems.append(.sponsors)
+            infoItems.append(.rookieYear)
+            infoItems.append(.sponsors)            
         }
 
         if !infoItems.isEmpty {
@@ -146,6 +150,18 @@ class TeamInfoViewController: TBATableViewController, Observable {
 
         return cell
     }
+
+    private func tableView(_ tableView: UITableView, rookieYearCellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(indexPath: indexPath) as ReverseSubtitleTableViewCell
+
+        cell.titleLabel?.text = "Rookie Year"
+        cell.subtitleLabel?.text = String(team.rookieYear!)
+
+        cell.accessoryType = .none
+        cell.selectionStyle = .none
+
+        return cell
+    }
 
     private func tableView(_ tableView: UITableView, sponsorCellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(indexPath: indexPath) as BasicTableViewCell

diff --git a/the-blue-alliance-ios/ViewElements/Info/InfoCellViewModel.swift b/the-blue-alliance-ios/ViewElements/Info/InfoCellViewModel.swift
@@ -9,7 +9,7 @@ struct InfoCellViewModel {
 
     init(event: Event) {
         nameString = event.name ?? event.key
-        subtitleStrings = [event.locationString, event.dateString].compactMap({ $0 })
+        subtitleStrings = [event.locationString, event.dateString, event.weekString].compactMap({ $0 })
     }
 
     init(team: Team) {