diff --git a/MemoryTree/Assets.xcassets/TreeLeafierAnimals.imageset/Contents.json b/MemoryTree/Assets.xcassets/TreeLeafierAnimals.imageset/Contents.json new file mode 100644 index 0000000..6d735c2 --- /dev/null +++ b/MemoryTree/Assets.xcassets/TreeLeafierAnimals.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "TreeLeafierAnimals.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MemoryTree/Assets.xcassets/TreeLeafierAnimals.imageset/TreeLeafierAnimals.png b/MemoryTree/Assets.xcassets/TreeLeafierAnimals.imageset/TreeLeafierAnimals.png new file mode 100644 index 0000000..dce8404 Binary files /dev/null and b/MemoryTree/Assets.xcassets/TreeLeafierAnimals.imageset/TreeLeafierAnimals.png differ diff --git a/MemoryTree/ContentView.swift b/MemoryTree/ContentView.swift index 323b456..2b8f1e2 100644 --- a/MemoryTree/ContentView.swift +++ b/MemoryTree/ContentView.swift @@ -35,10 +35,12 @@ struct ContentView: View { var treeImageName: String { if entries.isEmpty { return "TreeBare" - } else if entries.count < 3 { + } else if entries.count < 3 { // 1-2 return "TreeLeafy" - } else { + } else if entries.count < 5 { // 3-4 return "TreeLeafier" + } else { // 5+ + return "TreeLeafierAnimals" } } @@ -85,7 +87,7 @@ struct ContentView: View { isEditing.toggle() } label: { Image(treeImageName) - .renderingMode(.template) + .renderingMode(entries.count > 0 ? .original : .template) .resizable() .scaledToFit() .foregroundColor(.white) @@ -134,11 +136,21 @@ struct ContentView_Previews: PreviewProvider { ContentView(entries: [ Entry(text: "Coffee"), - Entry(text: "Marion berries"), Entry(text: "Burritos"), + Entry(text: "Mountains"), ]) .previewDisplayName("Leafier") + + ContentView(entries: [ + Entry(text: "Coffee"), + Entry(text: "Burritos"), + Entry(text: "Mountains"), + Entry(text: "Trees"), + Entry(text: "Clean Water"), + ]) + .previewDisplayName("Leafier with Animals") } .tint(.white) + .previewLayout(.sizeThatFits) } }