터치영역 버그 수정

ghkdemrdus · Nov 10, 2024 · 68244ba · 68244ba
1 parent 359c137
commit 68244ba
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/App/Moda/Info.plist b/App/Moda/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.3.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.0.2</string>
+	<string>1.3.0.0</string>
 	<key>GoogleServiceFileName</key>
 	<string>$(ENV_GOOGLE_INFO_PLIST)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/App/Moda/Sources/Components/PlainButton.swift b/App/Moda/Sources/Components/PlainButton.swift
@@ -27,6 +27,7 @@ struct PlainButton<Content: View>: View {
       action()
     } label: {
       label()
+        .contentTouchable()
     }
     .buttonStyle(PlainButtonStyle())
   }

diff --git a/App/Moda/Sources/Root/Bookmark/Components/BookmarkAddItemView.swift b/App/Moda/Sources/Root/Bookmark/Components/BookmarkAddItemView.swift
@@ -33,8 +33,10 @@ private extension BookmarkAddItemView {
           todo.isDone.toggle()
         } label: {
           todo.isDone
-          ? Image.imgCheckActive.frame(size: 36)
-          : Image.imgCheckDailyInactive.frame(size: 36)
+          ? Image.imgCheckActive
+            .frame(size: 36)
+          : Image.imgCheckDailyInactive
+            .frame(size: 36)
         }
         .padding(.bottom, 6)
 

diff --git a/App/Moda/Sources/Root/Home/Components/HomeAppReviewBannerView.swift b/App/Moda/Sources/Root/Home/Components/HomeAppReviewBannerView.swift
@@ -62,8 +62,8 @@ struct HomeAppReviewBannerView: View {
       } label: {
         Image.icAppReviewDelete
           .frame(size: 36)
-          .padding(.leading, 2)
       }
+      .padding(.leading, 2)
     }
     .padding(.horizontal, 16)
   }

diff --git a/App/Moda/Sources/Root/Home/HomeCore.swift b/App/Moda/Sources/Root/Home/HomeCore.swift
@@ -115,7 +115,7 @@ struct HomeCore: Reducer {
 
         case let .todoDelayed(todo, date):
           state.delayDate = date
-          state.delayTodo = todo
+          state.delayTodo = .init(content: todo.content, isDone: todo.isDone, category: todo.category)
           return .none
 
         default:
@@ -138,7 +138,7 @@ struct HomeCore: Reducer {
 
         case let .todoDelayed(todo, date):
           state.delayDate = date
-          state.delayTodo = todo
+          state.delayTodo = .init(content: todo.content, isDone: todo.isDone, category: todo.category)
           return .none
 
         default:

diff --git a/App/Moda/Sources/Root/Home/HomeView.swift b/App/Moda/Sources/Root/Home/HomeView.swift
@@ -76,6 +76,7 @@ private extension HomeView {
           send(.dateTapped($0))
         }
       )
+      .padding(.top, 8)
 
       ScrollView {
         VStack(spacing: 0) {
@@ -109,6 +110,7 @@ private extension HomeView {
             let height = UIScreen.heightExceptSafeArea
             - HomeMonthSelectorView.height
             - HomeDateSelectorView.height
+            - 8 // Date Top Padding
             - 50 // TabViewHeight
             - 24 // Bottom Padding
             - 32 // Scroll Vertical Padding

diff --git a/App/Moda/Sources/Root/MainTab/MainTabView.swift b/App/Moda/Sources/Root/MainTab/MainTabView.swift
@@ -167,9 +167,9 @@ private extension MainTabView {
             .renderingMode(.template)
             .frame(size: 32)
             .foregroundStyle(.white)
-            .padding(.top, 16 + UIApplication.shared.safeAreaTopHeight)
-            .padding(.leading, 20)
         }
+        .padding(.top, 16 + UIApplication.shared.safeAreaTopHeight)
+        .padding(.leading, 20)
       }
       .ignoresSafeArea()
     }

diff --git a/App/Moda/Sources/Util/VersionManager.swift b/App/Moda/Sources/Util/VersionManager.swift
@@ -48,7 +48,7 @@ public final class VersionManager {
       await userData.showAppReviewBanner.update(true)
     }
 
-    if lastVersion < version {
+    if lastVersion < "1.2.0" {
       await userData.showNotice.update(true)
     }
   }

diff --git a/App/ModaWidget/Info.plist b/App/ModaWidget/Info.plist
@@ -13,9 +13,9 @@
 	<key>CFBundleName</key>
 	<string>ModaWidget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.3.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.0.2</string>
+	<string>1.3.0.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>