fix: notch: expanded: control icons

Author: monuk7735

MewNotch.xcodeproj/project.pbxproj

@@ -317,7 +317,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = "1.0.3-beta";
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.monuk7735.mew.notch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -355,7 +355,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = "1.0.3-beta";
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.monuk7735.mew.notch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

MewNotch/View/Notch/Expanded/Controls/FileShelfControlView.swift

@@ -1,36 +1,40 @@
 //
-//  FileShelfControlView.swift
+//  NotchViewTypeControlView.swift
 //  MewNotch
 //
 //  Created by Monu Kumar on 03/07/25.
 //
 
 import SwiftUI
 
-struct FileShelfControlView: View {
+struct NotchViewTypeControlView: View {
 
     @ObservedObject var notchViewModel: NotchViewModel
     @ObservedObject var expandedNotchViewModel: ExpandedNotchViewModel
 
+    var notchViewType: ExpandedNotchViewModel.NotchViewType
+    
     var body: some View {
         GenericControlView(
             notchViewModel: notchViewModel
         ) {
-            Button(
-                action: {
+            Image(systemName: expandedNotchViewModel.currentView == notchViewType ? notchViewType.imageSystemNameSelected : notchViewType.imageSystemName )
+                .resizable()
+                .scaledToFit()
+                .frame(
+                    maxWidth: .infinity,
+                    maxHeight: .infinity
+                )
+                .onTapGesture {
                     withAnimation {
-                        let oldView = expandedNotchViewModel.currentView
-                        expandedNotchViewModel.currentView = oldView == .Shelf ? .Home : .Shelf
+                        guard notchViewType != expandedNotchViewModel.currentView else { return }
+                        withAnimation {
+                            expandedNotchViewModel.currentView = notchViewType
+                        }
                     }
                 }
-            ) {
-                Image(
-                    systemName: "document.circle.fill"
-                )
-                .resizable()
-                .scaledToFit()
-            }
-            .buttonStyle(.plain)
+                .opacity(expandedNotchViewModel.currentView == notchViewType ? 1 : 0.7)
+                .foregroundStyle(expandedNotchViewModel.currentView == notchViewType ? .blue : .primary)
         }
     }
 }

MewNotch/View/Notch/Expanded/Controls/GenericControlView.swift

@@ -15,7 +15,7 @@ struct GenericControlView<Content: View>: View {
 
     var body: some View {
         content()
-            .padding(notchViewModel.minimalHUDPadding * 1.5)
+            .padding(notchViewModel.minimalHUDPadding * 1.2)
             .frame(
                 width: notchViewModel.notchSize.height,
                 height: notchViewModel.notchSize.height

MewNotch/View/Notch/Expanded/ExpandedNotchView.swift

@@ -23,17 +23,19 @@ struct ExpandedNotchView: View {
     var body: some View {
         VStack {
             HStack(
-                alignment: .top
+                alignment: .top,
+                spacing: 4
             ) {
-                GenericControlView(
-                    notchViewModel: notchViewModel
-                ) {
-                    Text(" ")
-                }
+                NotchViewTypeControlView(
+                    notchViewModel: notchViewModel,
+                    expandedNotchViewModel: expandedNotchViewModel,
+                    notchViewType: .Home
+                )
 
-                FileShelfControlView(
+                NotchViewTypeControlView(
                     notchViewModel: notchViewModel,
-                    expandedNotchViewModel: expandedNotchViewModel
+                    expandedNotchViewModel: expandedNotchViewModel,
+                    notchViewType: .Shelf
                 )
 
                 collapsedNotchView

MewNotch/ViewModel/Notch/ExpandedNotchViewModel.swift

@@ -9,9 +9,31 @@ import SwiftUI
 
 class ExpandedNotchViewModel: ObservableObject {
 
-    enum NotchViewType {
+    enum NotchViewType: String, CaseIterable, Identifiable {
+        var id: String {
+            self.rawValue
+        }
+        
         case Home
         case Shelf
+        
+        var imageSystemName: String {
+            switch self {
+            case .Home:
+                return "house.circle"
+            case .Shelf:
+                return "bookmark.circle"
+            }
+        }
+        
+        var imageSystemNameSelected: String {
+            switch self {
+            case .Home:
+                return "house.circle.fill"
+            case .Shelf:
+                return "bookmark.circle.fill"
+            }
+        }
     }
 
     @Published var currentView: NotchViewType = .Home