diff --git a/Shared/Assets.xcassets/default_image/Contents.json b/Shared/Assets.xcassets/default_image/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Shared/Assets.xcassets/default_image/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/average.imageset/Contents.json b/Shared/Assets.xcassets/default_image/average.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/average.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/average.imageset/Contents.json diff --git a/Shared/Assets.xcassets/average.imageset/meh-regular.png b/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png similarity index 100% rename from Shared/Assets.xcassets/average.imageset/meh-regular.png rename to Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png diff --git a/Shared/Assets.xcassets/bad.imageset/Contents.json b/Shared/Assets.xcassets/default_image/bad.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/bad.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/bad.imageset/Contents.json diff --git a/Shared/Assets.xcassets/bad.imageset/frown-regular 2.png b/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular 2.png similarity index 100% rename from Shared/Assets.xcassets/bad.imageset/frown-regular 2.png rename to Shared/Assets.xcassets/default_image/bad.imageset/frown-regular 2.png diff --git a/Shared/Assets.xcassets/good.imageset/Contents.json b/Shared/Assets.xcassets/default_image/good.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/good.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/good.imageset/Contents.json diff --git a/Shared/Assets.xcassets/good.imageset/grin-regular.png b/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png similarity index 100% rename from Shared/Assets.xcassets/good.imageset/grin-regular.png rename to Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png diff --git a/Shared/Assets.xcassets/great.imageset/Contents.json b/Shared/Assets.xcassets/default_image/great.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/great.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/great.imageset/Contents.json diff --git a/Shared/Assets.xcassets/great.imageset/smile-beam-regular.png b/Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png similarity index 100% rename from Shared/Assets.xcassets/great.imageset/smile-beam-regular.png rename to Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png diff --git a/Shared/Assets.xcassets/horrible.imageset/Contents.json b/Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/horrible.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json diff --git a/Shared/Assets.xcassets/horrible.imageset/sad-tear-regular.png b/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png similarity index 100% rename from Shared/Assets.xcassets/horrible.imageset/sad-tear-regular.png rename to Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png diff --git a/Shared/Assets.xcassets/default_image/missing.imageset/Contents.json b/Shared/Assets.xcassets/default_image/missing.imageset/Contents.json new file mode 100644 index 0000000..9a3b0fe --- /dev/null +++ b/Shared/Assets.xcassets/default_image/missing.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "x-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/default_image/missing.imageset/x-solid.png b/Shared/Assets.xcassets/default_image/missing.imageset/x-solid.png new file mode 100644 index 0000000..05877e0 Binary files /dev/null and b/Shared/Assets.xcassets/default_image/missing.imageset/x-solid.png differ diff --git a/Shared/Models/MoodImagable.swift b/Shared/Models/MoodImagable.swift index 3bf0e0d..ec44d81 100644 --- a/Shared/Models/MoodImagable.swift +++ b/Shared/Models/MoodImagable.swift @@ -75,9 +75,9 @@ final class EmojiMoodImages: MoodImagable { case .great: return Image(uiImage: "😀".textToImage()!) case .missing: - return Image("missing", bundle: .main) + return Image("x-solid", bundle: .main) case .placeholder: - return Image("missing", bundle: .main) + return Image("x-solid", bundle: .main) } } } @@ -96,9 +96,9 @@ final class HandEmojiMoodImages: MoodImagable { case .great: return Image(uiImage: "🙏".textToImage()!) case .missing: - return Image("missing", bundle: .main) + return Image("x-solid", bundle: .main) case .placeholder: - return Image("missing", bundle: .main) + return Image("x-solid", bundle: .main) } } } diff --git a/Shared/views/MonthView/MonthDetailView.swift b/Shared/views/MonthView/MonthDetailView.swift index a5ff9e4..84ff0b7 100644 --- a/Shared/views/MonthView/MonthDetailView.swift +++ b/Shared/views/MonthView/MonthDetailView.swift @@ -51,6 +51,7 @@ struct MonthDetailView: View { Image(systemName: "square.and.arrow.up") + .foregroundColor(textColor) .padding(.trailing) .onTapGesture { let impactMed = UIImpactFeedbackGenerator(style: .heavy) diff --git a/Shared/views/MonthView/MonthView.swift b/Shared/views/MonthView/MonthView.swift index 2756a0a..8860b53 100644 --- a/Shared/views/MonthView/MonthView.swift +++ b/Shared/views/MonthView/MonthView.swift @@ -182,7 +182,7 @@ extension MonthView { homeViewTwoSectionHeaderView(month: month, year: year) Image(systemName: "square.and.arrow.up") - .padding([.trailing, .bottom]) + .foregroundColor(textColor) .onTapGesture { let impactMed = UIImpactFeedbackGenerator(style: .heavy) impactMed.impactOccurred()