Merge pull request #68 from novoda/feature/rm-66-cell-short-description

Feature [RM66] Cell Short Description
novoda · Aug 9, 2021 · dabd26b · dabd26b
2 parents 027f8ca + af55595
commit dabd26b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/Rick-and-Morty/Rick And Morty/Models/Character.swift b/Rick-and-Morty/Rick And Morty/Models/Character.swift
@@ -15,6 +15,10 @@ protocol Character {
     var description: String { get }
 }
 
+protocol ShortCharacterDescription {
+    var shortDescription: String { get }
+}
+
 extension Character {
     var id: UUID { UUID() }
 }
diff --git a/Rick-and-Morty/Rick And Morty/Models/Morty.swift b/Rick-and-Morty/Rick And Morty/Models/Morty.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct Morty: Character {
+struct Morty: Character, ShortCharacterDescription {
     let name: String
     let image: String
     let shortDescription: String

diff --git a/Rick-and-Morty/Rick And Morty/Views/CharacterCell.swift b/Rick-and-Morty/Rick And Morty/Views/CharacterCell.swift
@@ -26,17 +26,26 @@ struct CharacterCell: View {
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(character.name)
-                    Text(character.description)
+                    Text(description(for: character))
                 }
 
                 if imagePosition == .right {
                     CharacterCellImage(character: character)
                 }
+                Spacer()
             }
             .padding()
         }
         .buttonStyle(PlainButtonStyle())
     }
+
+    func description(for character: Character) -> String {
+        if let c = character as? ShortCharacterDescription {
+            return c.shortDescription
+        }
+
+        return character.description
+    }
 }
 
 struct CharacterCellImage: View {