fix: solve share bottomsheet issue

Author: uwaisalqadri

Giffy/Features/Detail/DetailView.swift

@@ -114,7 +114,6 @@ struct DetailView: View {
                 .tint(.Theme.green)
                 .font(.system(size: 80))
                 .frame(width: 10, height: 10)
-                .padding(.trailing, 20)
             } else {
               IconButton(
                 iconName: viewStore.state.shareImage != nil ? "doc.on.clipboard.fill" : "doc.on.clipboard",
@@ -125,7 +124,6 @@ struct DetailView: View {
                 }
               )
               .tapScaleEffect()
-              .padding(.trailing, 20)
             }
           }
 

Giffy/Features/Home/Button.swift

@@ -19,8 +19,8 @@ struct IconButton: View {
       Image(systemName: iconName)
         .font(.system(size: size))
         .foregroundColor(tint)
-        .frame(width: size, height: size)
         .contentShape(.rect)
+        .padding(6)
     }
     .buttonStyle(.plain)
   }

Giffy/Features/Search/SearchReducer.swift

@@ -5,22 +5,22 @@
 //  Created by Uwais Alqadri on 23/9/23.
 //
 
-import Foundation
-import ComposableArchitecture
 import Common
 import CommonUI
+import ComposableArchitecture
+import Foundation
 import SDWebImage
 
 @Reducer
 public struct SearchReducer {
-  
+
   @Route var router
   private let searchUseCase: SearchUseCase
 
   init(searchUseCase: SearchUseCase) {
     self.searchUseCase = searchUseCase
   }
-  
+
   @ObservableState
   public struct State: Equatable {
     var rightColumn: [Giffy] = []
@@ -30,35 +30,35 @@ public struct SearchReducer {
     var isLoading: Bool = false
     var shareImage: Data?
     var isEmpty: Bool = false
-    
+
     var share: StoreOf<ShareReducer> {
       Store(initialState: .init(shareImage)) {
         ShareReducer()
       }
     }
-    
+
     var allItems: [Giffy] {
       var combinedItems: [Giffy] = []
       let leftItems = items(.left)
       let rightItems = items(.right)
       let maxCount = max(rightItems.count, leftItems.count)
-      
+
       for index in 0..<maxCount {
         if index < rightItems.count {
-          combinedItems.append(rightItems[index]) // Add from right (odd indices)
+          combinedItems.append(rightItems[index])  // Add from right (odd indices)
         }
         if index < leftItems.count {
-          combinedItems.append(leftItems[index]) // Add from left (even indices)
+          combinedItems.append(leftItems[index])  // Add from left (even indices)
         }
       }
-      
+
       return combinedItems
     }
-    
+
     func currentPosition(_ giffy: Giffy) -> Int {
       allItems.firstIndex(where: { $0.id == giffy.id }) ?? 0
     }
-    
+
     func items(_ side: SearchReducer.GridSide) -> [Giffy] {
       switch side {
       case .right:
@@ -68,7 +68,7 @@ public struct SearchReducer {
       }
     }
   }
-  
+
   public enum Action {
     case initialFetch
     case fetch(request: String)
@@ -78,15 +78,15 @@ public struct SearchReducer {
     case showShare(Data?)
     case openFavorite
   }
-  
+
   public var body: some Reducer<State, Action> {
     Reduce { state, action in
       switch action {
       case .initialFetch:
         return .run { send in
           await send(.fetch(request: greetingText))
         }
-        
+
       case .fetch(let query):
         state.searchText = query
         state.isLoading = true
@@ -98,7 +98,7 @@ public struct SearchReducer {
             await send(.failed(error: error))
           }
         }
-        
+
       case .success(let data):
         state.isEmpty = data.isEmpty
         state.isLoading = false
@@ -108,18 +108,18 @@ public struct SearchReducer {
           state.leftColumn = GridSide.split(data, side: .left)
         }
         return .none
-        
+
       case .failed:
         state.isEmpty = true
         state.isLoading = false
         return .none
-        
+
       case let .showDetail(item):
         var allItems = state.allItems
         allItems[state.currentPosition(item)].isHighlighted = true
         router.present(.detail(items: allItems))
         return .none
-        
+
       case let .showShare(image):
         state.shareImage = image
         return .none
@@ -130,24 +130,24 @@ public struct SearchReducer {
       }
     }
   }
-  
+
   public var greetingText: String {
-      let hour = Calendar.current.component(.hour, from: Date())
-      switch hour {
-      case 5..<12:
-          return "Good Morning"
-      case 12..<17:
-          return "Good Afternoon"
-      case 17..<21:
-          return "Good Evening"
-      default:
-          return "Good Night"
-      }
+    let hour = Calendar.current.component(.hour, from: Date())
+    switch hour {
+    case 5..<12:
+      return "Morning"
+    case 12..<17:
+      return "Afternoon"
+    case 17..<21:
+      return "Evening"
+    default:
+      return "Night"
+    }
   }
-  
+
   public enum GridSide: CaseIterable {
     case right, left
-    
+
     static func split(_ items: [Giffy], side: GridSide) -> [Giffy] {
       let allItems = items.enumerated()
       switch side {

Giffy/Features/Sticker/StickerReducer.swift

@@ -53,8 +53,7 @@ public struct StickerReducer {
     case presentPhotoPicker(_ state: Bool)
     case toggleShowOriginalImage(_ state: Bool)
     case updateSticker(_ sticker: Sticker)
-    case shareSticker
-    case dismissShare
+    case shouldShowShare(_ state: Bool)
   }
 
   public var body: some Reducer<State, Action> {
@@ -85,12 +84,8 @@ public struct StickerReducer {
         state.currentSticker = sticker
         return .none
 
-      case .shareSticker:
-        state.isCopied = true
-        return .none
-        
-      case .dismissShare:
-        state.isCopied = false
+      case let .shouldShowShare(bool):
+        state.isCopied = bool
         return .none
       }
     }

Giffy/Features/Sticker/StickerView.swift

@@ -64,13 +64,13 @@ struct StickerView: View {
         shouldDismissOnTapOutside: true,
         isShowing: viewStore.binding(
           get: { $0.isCopied },
-          send: .dismissShare
+          send: { .shouldShowShare($0) }
         )
       ) {
         ShareView(store: viewStore.state.share)
       }
-      .onChange(of: viewStore.state.currentSticker) { sticker, _ in
-        tabState.isShowShare = sticker.imageData != nil
+      .onChange(of: viewStore.isCopied) { _, _ in
+        tabState.isShowShare = viewStore.isCopied
       }
       .navigationBarTitleDisplayMode(.inline)
       .toolbar {
@@ -86,7 +86,7 @@ struct StickerView: View {
               tint: .Theme.green,
               size: 15,
               onClick: {
-                viewStore.send(.shareSticker)
+                viewStore.send(.shouldShowShare(true))
               }
             )
             .tapScaleEffect()