북마크 가이드 이미지 수정 및 버튼 UX 개선

ghkdemrdus · Oct 27, 2024 · 066f077 · 066f077
1 parent 2f3f317
commit 066f077
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 33 deletions.
diff --git a/App/Moda/Info.plist b/App/Moda/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.0.0</string>
+	<string>1.2.0.2</string>
 	<key>GoogleServiceFileName</key>
 	<string>$(ENV_GOOGLE_INFO_PLIST)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/App/Moda/Sources/Root/Bookmark/BookmarkEdit/BookmarkEditView.swift b/App/Moda/Sources/Root/Bookmark/BookmarkEdit/BookmarkEditView.swift
@@ -60,11 +60,13 @@ private extension BookmarkEditView {
           Text("완료")
             .font(.spoqaHans(size: 14, weight: .bold))
             .foregroundStyle(Color.iconTertiary)
-            .frame(height: 40)
+            .padding(6)
+            .contentTouchable()
         }
       }
       .frame(height: 40)
-      .padding(.horizontal, 20)
+      .padding(.leading, 20)
+      .padding(.trailing, 14)
 
       if store.bookmarks.isEmpty {
         Spacer()

diff --git a/App/Moda/Sources/Root/Bookmark/BookmarkEdit/Component/BookmarkEditItemView.swift b/App/Moda/Sources/Root/Bookmark/BookmarkEdit/Component/BookmarkEditItemView.swift
@@ -25,23 +25,26 @@ private extension BookmarkEditItemView {
   var content: some View {
     HStack {
       TextField("", text: $bookmark.title)
-        .font(.spoqaHans(size: 15, weight: .bold))
+        .font(.spoqaHans(size: 15))
         .foregroundStyle(Color.textPrimary)
         .frame(maxWidth: .infinity, alignment: .leading)
         .underline()
         .submitLabel(.done)
 
-      HStack(spacing: 2) {
+      HStack(spacing: 0) {
         PlainButton {
           onTapDelete(bookmark)
         } label: {
           Image.icDailyTrash
+            .frame(size: 28)
         }
 
         Image.icDailyReorder
+          .frame(size: 28)
       }
     }
-    .padding(.horizontal, 16)
+    .padding(.leading, 16)
+    .padding(.trailing, 14)
     .frame(height: Self.height)
     .background(
       RoundedRectangle(cornerRadius: 12)

diff --git a/App/Moda/Sources/Root/Bookmark/BookmarkTodoEdit/BookmarkTodoEditView.swift b/App/Moda/Sources/Root/Bookmark/BookmarkTodoEdit/BookmarkTodoEditView.swift
@@ -59,11 +59,14 @@ private extension BookmarkTodoEditView {
           Text("완료")
             .font(.spoqaHans(size: 14, weight: .bold))
             .foregroundStyle(Color.iconTertiary)
+            .padding(6)
+            .contentTouchable()
         }
       }
       .frame(height: 24)
       .padding(.top,12)
-      .padding(.horizontal, 20)
+      .padding(.leading, 20)
+      .padding(.trailing, 14)
 
       DraggableListView(
         items: $store.bookmark.todos,

diff --git a/App/ModaWidget/Info.plist b/App/ModaWidget/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.0.0</string>
+	<string>1.2.0.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/Core/ModaCore/Info.plist b/Core/ModaCore/Info.plist
@@ -21,13 +21,5 @@
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.widgetkit-extension</string>
 	</dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>SpoqaHanSansNeo-Bold.otf</string>
-		<string>SpoqaHanSansNeo-Light.otf</string>
-		<string>SpoqaHanSansNeo-Medium.otf</string>
-		<string>SpoqaHanSansNeo-Regular.otf</string>
-		<string>SpoqaHanSansNeo-Thin.otf</string>
-	</array>
 </dict>
 </plist>
diff --git a/Core/ModaData/Info.plist b/Core/ModaData/Info.plist
@@ -21,13 +21,5 @@
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.widgetkit-extension</string>
 	</dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>SpoqaHanSansNeo-Bold.otf</string>
-		<string>SpoqaHanSansNeo-Light.otf</string>
-		<string>SpoqaHanSansNeo-Medium.otf</string>
-		<string>SpoqaHanSansNeo-Regular.otf</string>
-		<string>SpoqaHanSansNeo-Thin.otf</string>
-	</array>
 </dict>
 </plist>
diff --git a/Core/ModaResource/Info.plist b/Core/ModaResource/Info.plist
@@ -21,13 +21,5 @@
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.widgetkit-extension</string>
 	</dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>SpoqaHanSansNeo-Bold.otf</string>
-		<string>SpoqaHanSansNeo-Light.otf</string>
-		<string>SpoqaHanSansNeo-Medium.otf</string>
-		<string>SpoqaHanSansNeo-Regular.otf</string>
-		<string>SpoqaHanSansNeo-Thin.otf</string>
-	</array>
 </dict>
 </plist>
diff --git a/...es/Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_day-1.png b/...es/Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_day-1.png
diff --git a/...rces/Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_day.png b/...rces/Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_day.png
diff --git a/.../Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_night-1.png b/.../Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_night-1.png
diff --git a/...es/Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_night.png b/...es/Assets.xcassets/Image/imgBookmarkGuideline.imageset/guide_bookmark_night.png
diff --git a/Tuist/ProjectDescriptionHelpers/Project+Target.swift b/Tuist/ProjectDescriptionHelpers/Project+Target.swift
@@ -125,7 +125,7 @@ public extension Target {
             name: "\(appExtension.name)Extension",
             infoPlist: .file(path: .relativeToApp("\(appExtension.name)/Info.plist")),
             sources: ["../\(appExtension.name)/Sources/**"],
-            resources: ["../\(appExtension.name)/Resources/**"],
+            resources: ["../\(appExtension.name)/Resources/Font/**"],
             entitlements: .file(path: .relativeToApp("\(appExtension.name)/\(appExtension.name).entitlements")),
             dependencies: dependencies,
             settings: appExtension.settings