@@ -40,7 +40,7 @@ struct CameraView: View {
40
40
} label: {
41
41
ZStack {
42
42
Circle ( )
43
- . fill ( model. isRecording ? . red : DamusColors . white )
43
+ . fill ( model. isRecording ? . red : DamusColors . black )
44
44
. frame ( width: model. isRecording ? 85 : 65 , height: model. isRecording ? 85 : 65 , alignment: . center)
45
45
46
46
Circle ( )
@@ -70,7 +70,6 @@ struct CameraView: View {
70
70
. aspectRatio ( contentMode: . fill)
71
71
. frame ( width: 60 , height: 60 )
72
72
. clipShape ( RoundedRectangle ( cornerRadius: 10 , style: . continuous) )
73
- // .animation(.spring())
74
73
}
75
74
if model. isPhotoProcessing {
76
75
ProgressView ( )
@@ -123,7 +122,7 @@ struct CameraView: View {
123
122
NavigationView {
124
123
GeometryReader { reader in
125
124
ZStack {
126
- Color . black. edgesIgnoringSafeArea ( . all)
125
+ DamusColors . black. edgesIgnoringSafeArea ( . all)
127
126
128
127
CameraPreview ( session: model. session)
129
128
. padding ( . bottom, 175 )
@@ -173,36 +172,33 @@ struct CameraView: View {
173
172
174
173
Spacer ( )
175
174
176
- VStack {
175
+ HStack ( alignment: . center) {
176
+ if !model. mediaItems. isEmpty {
177
+ NavigationLink ( destination: Text ( model. mediaItems. map { $0. url. absoluteString } . joined ( separator: " , " ) ) ) {
178
+ capturedPhotoThumbnail
179
+ }
180
+ . frame ( width: 100 , alignment: . leading)
181
+ }
182
+
177
183
Spacer ( )
178
184
179
- HStack {
180
- if !model. mediaItems. isEmpty {
181
- NavigationLink ( destination: Text ( model. mediaItems. map { $0. url. absoluteString } . joined ( separator: " , " ) ) ) {
182
- capturedPhotoThumbnail
183
- }
184
- }
185
-
186
- Spacer ( )
187
-
188
- captureButton
189
-
190
- Spacer ( )
191
-
192
- if !model. mediaItems. isEmpty {
193
- Button ( action: {
194
- action ( model. mediaItems)
195
- presentationMode. wrappedValue. dismiss ( )
196
- model. stop ( )
197
- } ) {
198
- Text ( " Upload " )
199
- . frame ( width: 100 , height: 50 , alignment: . center)
200
- . foregroundColor ( DamusColors . white)
201
- . overlay {
202
- RoundedRectangle ( cornerRadius: 24 )
203
- . stroke ( DamusColors . white, lineWidth: 2 )
204
- }
205
- }
185
+ captureButton
186
+
187
+ Spacer ( )
188
+
189
+ if !model. mediaItems. isEmpty {
190
+ Button ( action: {
191
+ action ( model. mediaItems)
192
+ presentationMode. wrappedValue. dismiss ( )
193
+ model. stop ( )
194
+ } ) {
195
+ Text ( " Upload " )
196
+ . frame ( width: 100 , height: 40 , alignment: . center)
197
+ . foregroundColor ( DamusColors . white)
198
+ . overlay {
199
+ RoundedRectangle ( cornerRadius: 24 )
200
+ . stroke ( DamusColors . white, lineWidth: 2 )
201
+ }
206
202
}
207
203
}
208
204
}
0 commit comments