diff --git a/nirvana-ios/Assets.xcassets/wallpapers/beach3.imageset/Contents.json b/nirvana-ios/Assets.xcassets/wallpapers/beach3.imageset/Contents.json new file mode 100644 index 0000000..22756ea --- /dev/null +++ b/nirvana-ios/Assets.xcassets/wallpapers/beach3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "beach3.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/wallpapers/beach3.imageset/beach3.jpg b/nirvana-ios/Assets.xcassets/wallpapers/beach3.imageset/beach3.jpg new file mode 100644 index 0000000..0021bbe Binary files /dev/null and b/nirvana-ios/Assets.xcassets/wallpapers/beach3.imageset/beach3.jpg differ diff --git a/nirvana-ios/Assets.xcassets/wallpapers/flowers.imageset/Contents.json b/nirvana-ios/Assets.xcassets/wallpapers/flowers.imageset/Contents.json new file mode 100644 index 0000000..bce9cc0 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/wallpapers/flowers.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "flowers.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/wallpapers/flowers.imageset/flowers.jpg b/nirvana-ios/Assets.xcassets/wallpapers/flowers.imageset/flowers.jpg new file mode 100644 index 0000000..72f3089 Binary files /dev/null and b/nirvana-ios/Assets.xcassets/wallpapers/flowers.imageset/flowers.jpg differ diff --git a/nirvana-ios/Assets.xcassets/wallpapers/glosspink.imageset/Contents.json b/nirvana-ios/Assets.xcassets/wallpapers/glosspink.imageset/Contents.json new file mode 100644 index 0000000..6e33a54 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/wallpapers/glosspink.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "glosspink.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/wallpapers/glosspink.imageset/glosspink.jpg b/nirvana-ios/Assets.xcassets/wallpapers/glosspink.imageset/glosspink.jpg new file mode 100644 index 0000000..b62b7bc Binary files /dev/null and b/nirvana-ios/Assets.xcassets/wallpapers/glosspink.imageset/glosspink.jpg differ diff --git a/nirvana-ios/Assets.xcassets/wallpapers/mountains.imageset/Contents.json b/nirvana-ios/Assets.xcassets/wallpapers/mountains.imageset/Contents.json new file mode 100644 index 0000000..9bdf864 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/wallpapers/mountains.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mountains.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/wallpapers/mountains.imageset/mountains.jpg b/nirvana-ios/Assets.xcassets/wallpapers/mountains.imageset/mountains.jpg new file mode 100644 index 0000000..135efcc Binary files /dev/null and b/nirvana-ios/Assets.xcassets/wallpapers/mountains.imageset/mountains.jpg differ diff --git a/nirvana-ios/Assets.xcassets/wallpapers/snowwhite.imageset/Contents.json b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite.imageset/Contents.json new file mode 100644 index 0000000..fd9b2bd --- /dev/null +++ b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "snowwhite.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/wallpapers/snowwhite.imageset/snowwhite.jpg b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite.imageset/snowwhite.jpg new file mode 100644 index 0000000..9034696 Binary files /dev/null and b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite.imageset/snowwhite.jpg differ diff --git a/nirvana-ios/Assets.xcassets/wallpapers/snowwhite2.imageset/Contents.json b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite2.imageset/Contents.json new file mode 100644 index 0000000..a9ed2a6 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "snowwhite2.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/wallpapers/snowwhite2.imageset/snowwhite2.jpg b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite2.imageset/snowwhite2.jpg new file mode 100644 index 0000000..3e73938 Binary files /dev/null and b/nirvana-ios/Assets.xcassets/wallpapers/snowwhite2.imageset/snowwhite2.jpg differ diff --git a/nirvana-ios/Globals/systemImages.swift b/nirvana-ios/Globals/systemImages.swift index cb759cf..e5481a2 100644 --- a/nirvana-ios/Globals/systemImages.swift +++ b/nirvana-ios/Globals/systemImages.swift @@ -14,7 +14,13 @@ struct SystemImages { "clouds2", "waves", "beach", - "beach2" + "beach2", + "beach3", + "flowers", + "mountains", + "snowwhite", + "snowwhite2", + "glosspink" ] static let avatars = [ diff --git a/nirvana-ios/Views/Convos/ConvoFooterView.swift b/nirvana-ios/Views/Convos/ConvoFooterView.swift index fd3c5ea..cc1b0b6 100644 --- a/nirvana-ios/Views/Convos/ConvoFooterView.swift +++ b/nirvana-ios/Views/Convos/ConvoFooterView.swift @@ -107,7 +107,7 @@ struct ConvoFooterView: View { } } .frame(maxWidth: .infinity, maxHeight: 60) // 60 is the height of the footer control big circle - .background(Color.white.opacity(0.5)) + .background(Color.white.opacity(0.8)) .clipShape(RoundedRectangle(cornerRadius: 30, style: .continuous)) .shadow(color: Color.black.opacity(0.25), radius: 30, x: 0, y: 20) } diff --git a/nirvana-ios/Views/InnerCircle/CircleFooterView.swift b/nirvana-ios/Views/InnerCircle/CircleFooterView.swift index 6d79bc2..da5a603 100644 --- a/nirvana-ios/Views/InnerCircle/CircleFooterView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleFooterView.swift @@ -122,7 +122,7 @@ struct CircleFooterView: View { .padding(.trailing, 10) } .frame(maxWidth: .infinity, maxHeight: 60) // 60 is the height of the footer control big circle - .background(Color.white.opacity(0.5)) + .background(Color.white.opacity(0.8)) .clipShape(RoundedRectangle(cornerRadius: 30, style: .continuous)) .shadow(color: Color.black.opacity(0.25), radius: 30, x: 0, y: 20) .transition(.scale) diff --git a/nirvana-ios/Views/Templates/WavesGlassBackgroundView.swift b/nirvana-ios/Views/Templates/WavesGlassBackgroundView.swift index 70dbc2b..2d1af19 100644 --- a/nirvana-ios/Views/Templates/WavesGlassBackgroundView.swift +++ b/nirvana-ios/Views/Templates/WavesGlassBackgroundView.swift @@ -15,7 +15,6 @@ struct WavesGlassBackgroundView: View { var isRecording: Bool = false @State var animateWaves = false - @State var backgroundImage = "" let recordingColors = [NirvanaColor.solidBlue, NirvanaColor.dimTeal, Color.orange.opacity(0.8), NirvanaColor.teal.opacity(0.7), NirvanaColor.teal.opacity(0.7), NirvanaColor.solidTeal.opacity(0.7), NirvanaColor.solidBlue] let normalColors = [NirvanaColor.solidBlue, NirvanaColor.dimTeal, Color.orange.opacity(0.4), NirvanaColor.teal.opacity(0.5), NirvanaColor.teal.opacity(0.3), NirvanaColor.solidTeal.opacity(0.3), NirvanaColor.solidBlue] @@ -28,12 +27,14 @@ struct WavesGlassBackgroundView: View { center: .bottom, angle: .degrees(120)) - Image("beach2") + Image("glosspink") .resizable() + .blur(radius: 5) + LinearGradient(gradient: Gradient( - colors: [NirvanaColor.white.opacity(0.2), NirvanaColor.white.opacity(1.0)]), startPoint: .bottom, endPoint: .top) + colors: [NirvanaColor.white.opacity(0), NirvanaColor.white.opacity(1.0)]), startPoint: .bottom, endPoint: .top) getWave(peakPercentage: 0.4, troughPercentage: 0.65, peakAltercation: baseLineY, troughAltercation: baseLineY - 50) .foregroundColor(NirvanaColor.dimTeal.opacity(0.5)) @@ -67,10 +68,6 @@ struct WavesGlassBackgroundView: View { .onAppear() { // start repeat animation for waves self.animateWaves = true - - // randomly choose a wallpaper out of all available - let randomInt = Int.random(in: 0..