1. Small UI refinements and 2. Preparing release 3.8

Closes #633
gdombiak · Feb 12, 2023 · 55328a6 · 55328a6
1 parent 99a56f7
commit 55328a6
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 36 deletions.
diff --git a/OctoPod TV/Assets.xcassets/Camera/Camera.imageset/Contents.json b/OctoPod TV/Assets.xcassets/Camera/Camera.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "video-camera_24.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/OctoPod TV/Assets.xcassets/Camera/Camera.imageset/video-camera_24.png b/OctoPod TV/Assets.xcassets/Camera/Camera.imageset/video-camera_24.png
diff --git a/OctoPod TV/DetailedView.swift b/OctoPod TV/DetailedView.swift
@@ -169,43 +169,40 @@ struct NormalCameraView: View {
                 self.cancel(enabled: false)
             }
             Spacer()
-            if self.cameraService.hasPrevious || self.cameraService.hasNext {
-                if self.cameraService.hasPrevious {
-                    Button(action: {
-                        self.cameraService.renderPrevious()
-                    }) {
-                        HStack {
-                            Image("Back")
-                            Text("Camera")
-                                .lineLimit(1)
-                                .minimumScaleFactor(0.70)
+            ZStack(alignment: .topLeading) {
+                Image("Camera")
+                    .offset(x: 10, y: -12)
+                HStack() {
+                    if self.cameraService.hasPrevious || self.cameraService.hasNext {
+                        if self.cameraService.hasPrevious {
+                            Button(action: {
+                                self.cameraService.renderPrevious()
+                            }) {
+                                Image("Back")
+                            }
+                        }
+                        if self.cameraService.hasNext {
+                            Button(action: {
+                                self.cameraService.renderNext()
+                            }) {
+                                Image("Next")
+                            }
                         }
                     }
-                }
-                if self.cameraService.hasNext {
                     Button(action: {
-                        self.cameraService.renderNext()
+                        cameraMaximized = true
                     }) {
-                        HStack {
-                            Text("Camera")
-                                .lineLimit(1)
-                                .minimumScaleFactor(0.70)
-                            Image("Next")
-                        }
+                        Image("Expand")
                     }
+                    .prefersDefaultFocus(true, in: self.namespace)
                 }
+                .padding(.horizontal, 30)
+                .padding(.vertical, 25)
+                .overlay(
+                    RoundedRectangle(cornerRadius: 16)
+                        .stroke(.white.opacity(0.5), lineWidth: 4)
+                )
             }
-            Button(action: {
-                cameraMaximized = true
-            }) {
-                HStack {
-                    Image("Expand")
-                    Text("Expand")
-                        .minimumScaleFactor(0.70)
-                        .lineLimit(1)
-                }
-            }
-            .prefersDefaultFocus(true, in: self.namespace)
         }
     }
 
@@ -323,16 +320,15 @@ struct MaximizedCameraView: View {
                     }
                     .background(Color.gray.opacity(0.80))
                     .frame(maxWidth: geometry.size.width / 4)
+                    .offset(x: -50)
                     Spacer()
                     Button(action: {
                         cameraMaximized = false
                     }) {
-                        HStack {
-                            Image("Restore")
-                            Text("Restore")
-                        }
+                        Image("Restore")
                     }
                     .prefersDefaultFocus(true, in: self.namespace)
+                    .offset(x: 40)
                 }
                 Spacer()
             }

diff --git a/OctoPod.xcodeproj/project.pbxproj b/OctoPod.xcodeproj/project.pbxproj
@@ -3483,7 +3483,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7;
+				MARKETING_VERSION = 3.8;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.OctoPod.OctoPod;
@@ -3512,7 +3512,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7;
+				MARKETING_VERSION = 3.8;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.OctoPod.OctoPod;
 				PRODUCT_NAME = "$(TARGET_NAME)";