Merge pull request #874 from 0x1-company/font-style

refactor: font style
0x1-company · Oct 23, 2023 · b572d16 · b572d16
2 parents a58dc80 + 256f254
commit b572d16
Show file tree

Hide file tree

Showing 49 changed files with 125 additions and 150 deletions.
diff --git a/Packages/GodPackage/Sources/ActivityFeature/ActivityCard.swift b/Packages/GodPackage/Sources/ActivityFeature/ActivityCard.swift
@@ -48,10 +48,9 @@ public struct ActivityCard: View {
         VStack(alignment: .leading, spacing: 4) {
           HStack(spacing: 4) {
             Text(activity.node.user.displayName.ja)
-              .bold()
-              .font(.callout)
+              .font(.system(.callout, design: .rounded, weight: .bold))
             Text("received", bundle: .module)
-              .font(.footnote)
+              .font(.system(.footnote, design: .rounded))
           }
 
           Text(activity.node.question.text.ja)

diff --git a/Packages/GodPackage/Sources/AddFeature/ContactsReEnable.swift b/Packages/GodPackage/Sources/AddFeature/ContactsReEnable.swift
@@ -44,7 +44,7 @@ public struct ContactsReEnableView: View {
           .font(.system(size: 30))
         VStack(alignment: .leading, spacing: 4) {
           Text("Contacts are disabled", bundle: .module)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
           Text("Tap to re-enable", bundle: .module)
             .foregroundStyle(Color.white.opacity(0.6))
         }

diff --git a/Packages/GodPackage/Sources/AddFeature/FriendHeader.swift b/Packages/GodPackage/Sources/AddFeature/FriendHeader.swift
@@ -8,9 +8,9 @@ public struct FriendHeader: View {
       Divider()
 
       Text(title, bundle: .module)
-        .bold()
         .frame(maxWidth: .infinity, alignment: .leading)
         .frame(height: 34)
+        .font(.system(.body, design: .rounded, weight: .bold))
         .padding(.horizontal, 16)
         .foregroundColor(.secondary)
         .background(Color(uiColor: .quaternarySystemFill))

diff --git a/Packages/GodPackage/Sources/AddFeature/FriendRequestCard.swift b/Packages/GodPackage/Sources/AddFeature/FriendRequestCard.swift
@@ -80,11 +80,11 @@ public struct FriendRequestCardView: View {
 
         VStack(alignment: .leading) {
           Text(verbatim: viewStore.displayName)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
 
           Text(verbatim: viewStore.description)
             .foregroundStyle(.secondary)
-            .font(.footnote)
+            .font(.system(.footnote, design: .rounded))
         }
         .frame(maxWidth: .infinity, alignment: .leading)
 
@@ -93,8 +93,7 @@ public struct FriendRequestCardView: View {
             viewStore.send(.approveButtonTapped)
           } label: {
             Text("APPROVE", bundle: .module)
-              .font(.callout)
-              .bold()
+              .font(.system(.callout, design: .rounded, weight: .bold))
               .foregroundStyle(Color.white)
               .frame(height: 34)
               .padding(.horizontal, 12)

diff --git a/Packages/GodPackage/Sources/AddFeature/FriendRowCard.swift b/Packages/GodPackage/Sources/AddFeature/FriendRowCard.swift
@@ -85,11 +85,11 @@ public struct FriendRowCardView: View {
 
         VStack(alignment: .leading) {
           Text(verbatim: viewStore.displayName)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
 
           Text(verbatim: viewStore.description)
             .foregroundStyle(.secondary)
-            .font(.footnote)
+            .font(.system(.footnote, design: .rounded))
         }
         .frame(maxWidth: .infinity, alignment: .leading)
 
@@ -113,8 +113,7 @@ public struct FriendRowCardView: View {
                 EmptyView()
               default:
                 Text("ADD", bundle: .module)
-                  .font(.callout)
-                  .bold()
+                  .font(.system(.callout, design: .rounded, weight: .bold))
                   .foregroundStyle(Color.white)
                   .frame(height: 34)
                   .padding(.horizontal, 12)

diff --git a/Packages/GodPackage/Sources/AddFeature/InvitationCard.swift b/Packages/GodPackage/Sources/AddFeature/InvitationCard.swift
@@ -26,13 +26,13 @@ public struct InvitationCardView: View {
 
       VStack(alignment: .leading, spacing: 4) {
         Text(verbatim: displayName)
-          .bold()
+          .font(.system(.body, design: .rounded, weight: .bold))
       }
       .frame(maxWidth: .infinity, alignment: .leading)
 
       Button(action: action) {
         Text("INVITE", bundle: .module)
-          .bold()
+          .font(.system(.body, design: .rounded, weight: .bold))
           .frame(height: 34)
           .foregroundColor(.godService)
           .padding(.horizontal, 12)

diff --git a/Packages/GodPackage/Sources/EmailFeature/EmailSheet.swift b/Packages/GodPackage/Sources/EmailFeature/EmailSheet.swift
@@ -148,8 +148,8 @@ public struct EmailSheetView: View {
                   }
 
                 Text("Mail", bundle: .module)
-                  .bold()
                   .foregroundColor(.godBlack)
+                  .font(.system(.body, design: .rounded, weight: .bold))
               }
             }
 
@@ -168,8 +168,8 @@ public struct EmailSheetView: View {
                       .aspectRatio(contentMode: .fit)
                   }
                 Text("Gmail", bundle: .module)
-                  .bold()
                   .foregroundColor(.godBlack)
+                  .font(.system(.body, design: .rounded, weight: .bold))
               }
             }
 
@@ -188,8 +188,8 @@ public struct EmailSheetView: View {
                       .foregroundStyle(Color.white)
                   }
                 Text("Copy", bundle: .module)
-                  .bold()
                   .foregroundColor(.godBlack)
+                  .font(.system(.body, design: .rounded, weight: .bold))
               }
             }
 
@@ -205,10 +205,10 @@ public struct EmailSheetView: View {
               .frame(height: 48)
               .background {
                 Text("Close", bundle: .module)
-                  .bold()
                   .foregroundColor(.black)
                   .frame(height: 48)
                   .frame(maxWidth: .infinity)
+                  .font(.system(.body, design: .rounded, weight: .bold))
               }
           }
           .buttonStyle(HoldDownButtonStyle())

diff --git a/Packages/GodPackage/Sources/ForceUpdateFeature/ForceUpdate.swift b/Packages/GodPackage/Sources/ForceUpdateFeature/ForceUpdate.swift
@@ -39,15 +39,14 @@ public struct ForceUpdateView: View {
     WithViewStore(store, observe: { $0 }) { viewStore in
       VStack(spacing: 24) {
         Text("お知らせ", bundle: .module)
-          .bold()
-          .font(.title)
+          .font(.system(.title, design: .rounded, weight: .bold))
         Text("...おや？！Godのようすが...！\n最新バージョンへのアップデートをお願いします。", bundle: .module)
 
         Button {
           viewStore.send(.updateButtonTapped)
         } label: {
           Text("アップデート", bundle: .module)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
             .frame(height: 56)
             .padding(.horizontal, 32)
         }

diff --git a/Packages/GodPackage/Sources/GodFeature/ShareTheApp.swift b/Packages/GodPackage/Sources/GodFeature/ShareTheApp.swift
@@ -80,7 +80,7 @@ public struct ShareTheAppView: View {
             item: viewStore.shareURL
           ) {
             Text("Share the app", bundle: .module)
-              .bold()
+              .font(.system(.body, design: .rounded, weight: .bold))
               .frame(width: 188, height: 54)
               .background(Color.white)
               .clipShape(Capsule())

diff --git a/Packages/GodPackage/Sources/GodModeFeature/GodMode.swift b/Packages/GodPackage/Sources/GodModeFeature/GodMode.swift
@@ -150,7 +150,7 @@ public struct GodModeView: View {
           }
 
           Text("\(viewStore.product.displayPrice)/week", bundle: .module)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
 
           Button {
             store.send(.continueButtonTapped)
@@ -161,10 +161,10 @@ public struct GodModeView: View {
                   .progressViewStyle(.circular)
               } else {
                 Text("Continue", bundle: .module)
-                  .bold()
+                  .font(.system(.body, design: .rounded, weight: .bold))
               }
             }
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
             .frame(height: 56)
             .frame(maxWidth: .infinity)
             .foregroundColor(Color.white)

diff --git a/Packages/GodPackage/Sources/GodModeFeature/GodModeFunctions.swift b/Packages/GodPackage/Sources/GodModeFeature/GodModeFunctions.swift
@@ -43,7 +43,7 @@ public struct GodModeFunctions: View {
       }
       .padding(.horizontal, 100)
     }
-    .bold()
+    .font(.system(.body, design: .rounded, weight: .bold))
     .frame(height: 260)
     .tabViewStyle(.page)
     .multilineTextAlignment(.center)

diff --git a/Packages/GodPackage/Sources/InboxFeature/ActivatedGodMode.swift b/Packages/GodPackage/Sources/InboxFeature/ActivatedGodMode.swift
@@ -64,7 +64,7 @@ public struct ActivatedGodModeView: View {
           Text("OK", bundle: .module)
             .frame(height: 50)
             .frame(maxWidth: .infinity)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
             .foregroundColor(.white)
             .background(Color.godGray)
             .clipShape(Capsule())

diff --git a/Packages/GodPackage/Sources/InboxFeature/ChoiceGrid.swift b/Packages/GodPackage/Sources/InboxFeature/ChoiceGrid.swift
@@ -30,8 +30,7 @@ struct ChoiceGrid: View {
             Text(choice.text)
           }
         }
-        .font(.callout)
-        .bold()
+        .font(.system(.callout, design: .rounded, weight: .bold))
         .lineLimit(2)
         .multilineTextAlignment(.center)
         .padding(.horizontal, 16)

diff --git a/Packages/GodPackage/Sources/InboxFeature/FromGodTeam.swift b/Packages/GodPackage/Sources/InboxFeature/FromGodTeam.swift
@@ -60,7 +60,7 @@ public struct FromGodTeamView: View {
           .frame(width: 30, height: 30)
         Text("A girl in 9th grade\npicked you", bundle: .module)
       }
-      .bold()
+      .font(.system(.body, design: .rounded, weight: .bold))
       .frame(height: 48)
       .padding(.horizontal, 12)
       .background(Color.godWhite)
@@ -70,14 +70,15 @@ public struct FromGodTeamView: View {
       .cornerRadius(8)
 
       Text("This is your inbox", bundle: .module)
-        .font(.title3)
-        .bold()
+        .font(.system(.title3, design: .rounded, weight: .bold))
 
       Text("When people pick you\nyou will get a message here.", bundle: .module)
+        .font(.system(.body, design: .rounded))
 
       Spacer()
 
       Text("Tap anywhere to close", bundle: .module)
+        .font(.system(.body, design: .rounded))
     }
     .padding(.vertical, 40)
     .foregroundColor(Color.godWhite)

diff --git a/Packages/GodPackage/Sources/InboxFeature/InboxDetail.swift b/Packages/GodPackage/Sources/InboxFeature/InboxDetail.swift
@@ -267,8 +267,7 @@ public struct InboxDetailView: View {
                 )
 
                 Text(verbatim: "godapp.jp")
-                  .bold()
-                  .font(.title3)
+                  .font(.system(.title3, design: .rounded, weight: .bold))
               }
             }
             .padding(.horizontal, 36)
@@ -310,15 +309,15 @@ public struct InboxDetailView: View {
         action: InboxDetailLogic.Destination.Action.reveal
       ) { store in
         RevealView(store: store)
-          .presentationBackground(Material.ultraThinMaterial)
+          .presentationBackground(Color.clear)
       }
       .fullScreenCover(
         store: store.scope(state: \.$destination, action: InboxDetailLogic.Action.destination),
         state: /InboxDetailLogic.Destination.State.fullName,
         action: InboxDetailLogic.Destination.Action.fullName
       ) { store in
         FullNameView(store: store)
-          .presentationBackground(Material.ultraThinMaterial)
+          .presentationBackground(Color.clear)
       }
       .fullScreenCover(
         store: store.scope(state: \.$destination, action: InboxDetailLogic.Action.destination),

diff --git a/Packages/GodPackage/Sources/InboxFeature/InstagramStoryView.swift b/Packages/GodPackage/Sources/InboxFeature/InstagramStoryView.swift
@@ -25,16 +25,14 @@ struct InstagramStoryView: View {
             Text(verbatim: "\(gender)より")
           }
         }
-        .font(.callout)
-        .bold()
+        .font(.system(.callout, design: .rounded, weight: .bold))
         .lineLimit(2)
         .foregroundColor(.white)
         .frame(maxWidth: .infinity, alignment: .leading)
 
         if let schoolName {
           Text(schoolName)
-            .font(.body)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
             .foregroundColor(.godWhite)
             .frame(height: 32)
             .padding(.horizontal, 8)
@@ -44,8 +42,7 @@ struct InstagramStoryView: View {
       }
       VStack(spacing: 8) {
         Text(question)
-          .font(.callout)
-          .bold()
+          .font(.system(.callout, design: .rounded, weight: .bold))
           .foregroundColor(.godWhite)
           .lineLimit(2)
           .frame(height: 80, alignment: .center)
@@ -64,8 +61,7 @@ struct InstagramStoryView: View {
           .padding(.bottom, 4)
 
         Text(verbatim: "godapp.jp")
-          .font(.callout)
-          .bold()
+          .font(.system(.callout, design: .rounded, weight: .bold))
           .foregroundColor(.godWhite)
       }
       .padding(.horizontal, 16)

diff --git a/Packages/GodPackage/Sources/InboxFeature/NotificationsReEnable.swift b/Packages/GodPackage/Sources/InboxFeature/NotificationsReEnable.swift
@@ -44,7 +44,7 @@ public struct NotificationsReEnableView: View {
           .font(.system(size: 30))
         VStack(alignment: .leading, spacing: 4) {
           Text("Notifications are off", bundle: .module)
-            .bold()
+            .font(.system(.body, design: .rounded, weight: .bold))
           Text("Tap to re-enable", bundle: .module)
             .foregroundStyle(Color.white.opacity(0.6))
         }

diff --git a/Packages/GodPackage/Sources/MaintenanceFeature/Maintenance.swift b/Packages/GodPackage/Sources/MaintenanceFeature/Maintenance.swift
@@ -34,9 +34,10 @@ public struct MaintenanceView: View {
     WithViewStore(store, observe: { $0 }) { _ in
       VStack(spacing: 24) {
         Text("メンテナンス中", bundle: .module)
-          .bold()
-          .font(.title)
+          .font(.system(.title, design: .rounded, weight: .bold))
+
         Text("サービス再開までしばらくお待ち下さい。", bundle: .module)
+          .font(.system(.body, design: .rounded, weight: .bold))
       }
       .padding(.horizontal, 24)
       .frame(maxWidth: .infinity, maxHeight: .infinity)

diff --git a/Packages/GodPackage/Sources/OnboardFeature/AddFriends.swift b/Packages/GodPackage/Sources/OnboardFeature/AddFriends.swift
@@ -369,7 +369,7 @@ public struct AddFriendsView: View {
                   store.send(.inviteButtonTapped(contact))
                 } label: {
                   Text("INVITE", bundle: .module)
-                    .bold()
+                    .font(.system(.body, design: .rounded, weight: .bold))
                     .frame(height: 34)
                     .foregroundColor(.godService)
                     .padding(.horizontal, 12)
@@ -405,8 +405,8 @@ public struct AddFriendsView: View {
         Button("Next") {
           viewStore.send(.nextButtonTapped)
         }
-        .bold()
         .foregroundColor(Color.white)
+        .font(.system(.body, design: .rounded, weight: .bold))
       }
     }
   }

diff --git a/Packages/GodPackage/Sources/OnboardFeature/Button/NextButton.swift b/Packages/GodPackage/Sources/OnboardFeature/Button/NextButton.swift
@@ -27,7 +27,7 @@ public struct NextButton: View {
           Text("Next", bundle: .module)
         }
       }
-      .bold()
+      .font(.system(.body, design: .rounded, weight: .bold))
       .frame(height: 54)
       .frame(maxWidth: .infinity)
       .foregroundColor(Color.black)

diff --git a/Packages/GodPackage/Sources/OnboardFeature/FindFriend.swift b/Packages/GodPackage/Sources/OnboardFeature/FindFriend.swift
@@ -57,15 +57,14 @@ public struct FindFriendView: View {
         Spacer()
 
         Text("God uses your contacts\nto find friends", bundle: .module)
-          .bold()
           .foregroundColor(Color.godWhite)
+          .font(.system(.body, design: .rounded, weight: .bold))
 
         Button {
           viewStore.send(.findButtonTapped)
         } label: {
           Text("Find My Friends", bundle: .module)
-            .bold()
-            .font(.title3)
+            .font(.system(.title3, design: .rounded, weight: .bold))
             .frame(height: 54)
             .frame(maxWidth: .infinity)
             .foregroundColor(Color.black)