✨[feat]: 1.0.2 배포

버그 수정
DDD-Community · Nov 12, 2024 · 8150dd3 · 8150dd3
1 parent 24e67db
commit 8150dd3
Show file tree

Hide file tree

Showing 15 changed files with 142 additions and 119 deletions.
diff --git a/...s/ProjectTemplatePlugin/ProjectDescriptionHelpers/Project+Templete/Extension+String.swift b/...s/ProjectTemplatePlugin/ProjectDescriptionHelpers/Project+Templete/Extension+String.swift
@@ -9,7 +9,7 @@ import Foundation
 import ProjectDescription
 
 extension String {
-    public static func appVersion(version: String = "1.0.1") -> String {
+    public static func appVersion(version: String = "1.0.2") -> String {
         return version
     }
 

diff --git a/...e/Plugins/ProjectTemplatePlugin/ProjectDescriptionHelpers/infoPlist/InfoPlistValues.swift b/...e/Plugins/ProjectTemplatePlugin/ProjectDescriptionHelpers/infoPlist/InfoPlistValues.swift
@@ -201,7 +201,7 @@ public struct InfoPlistValues {
         infoPlist.merge(setCFBundleInfoDictionaryVersion("6.0")) { (_, new) in new }
         infoPlist.merge(setCFBundleName("OPeace")) { (_, new) in new }
         infoPlist.merge(setCFBundlePackageType("APPL")) { (_, new) in new }
-        infoPlist.merge(setCFBundleShortVersionString(.appVersion(version: "1.0.0"))) { (_, new) in new }
+      infoPlist.merge(setCFBundleShortVersionString(.appVersion(version: .appVersion()))) { (_, new) in new }
         infoPlist.merge(setAppTransportSecurity()) { (_, new) in new }
         infoPlist.merge(setApplicationQueriesSchemes()) { (_, new) in new }
         infoPlist.merge(setCFBundleURLTypes()) { (_, new) in new }

diff --git a/OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj b/OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj
diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Auth/SignUpAge/View/SignUpAgeView.swift b/OPeace/Projects/Presentation/Presentation/Sources/Auth/SignUpAge/View/SignUpAgeView.swift
@@ -36,28 +36,11 @@ public struct SignUpAgeView: View {
 
           chekcAgeErrorText()
 
-          Spacer()
-            .frame(height: UIScreen.screenHeight * 0.352)
-
-          CustomButton(
-            action: {
-              store.send(.async(.fetchJobList))
-              Task {
-                try await Task.sleep(nanoseconds: UInt64(5))
-                store.send(.switchTabs)
-              }
-
-            }, title: store.presntNextViewButtonTitle,
-            config: CustomButtonConfig.create()
-            ,isEnable: store.enableButton
-          )
-          .padding(.horizontal, 20)
-
-          Spacer()
-            .frame(height: 16)
         }
         .bounce(false)
 
+        chekcAgeSignUpButton()
+
       }
       .onAppear {
         store.send(.view(.apperName))
@@ -106,8 +89,6 @@ extension SignUpAgeView {
       Text(store.signUpAgeSubTitle)
         .pretendardFont(family: .Regular, size: 16)
         .foregroundStyle(Color.gray300)
-
-
     }
   }
 
@@ -193,4 +174,28 @@ extension SignUpAgeView {
       }
     }
   }
+
+  @ViewBuilder
+  private func chekcAgeSignUpButton() -> some View {
+    VStack {
+      Spacer()
+
+      CustomButton(
+        action: {
+          store.send(.async(.fetchJobList))
+          Task {
+            try await Task.sleep(nanoseconds: UInt64(5))
+            store.send(.switchTabs)
+          }
+
+        }, title: store.presntNextViewButtonTitle,
+        config: CustomButtonConfig.create()
+        ,isEnable: store.enableButton
+      )
+      .padding(.horizontal, 20)
+
+      Spacer()
+        .frame(height: 16)
+    }
+  }
 }
diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Auth/SignUpJob/View/SignUpJobView.swift b/OPeace/Projects/Presentation/Presentation/Sources/Auth/SignUpJob/View/SignUpJobView.swift
@@ -40,7 +40,7 @@ public struct SignUpJobView: View {
           signUpJobSelect()
 
           Spacer()
-            .frame(height: UIScreen.screenHeight * 0.145)
+            .frame(height: UIScreen.main.nativeBounds.width == 750 ?   UIScreen.screenHeight * 0.2 :  UIScreen.screenHeight * 0.145)
 
           CustomButton(
             action: {

diff --git a/...s/Presentation/Presentation/Sources/CreateQuestion/WirteAnswer/View/WirteAnswerView.swift b/...s/Presentation/Presentation/Sources/CreateQuestion/WirteAnswer/View/WirteAnswerView.swift
@@ -42,29 +42,11 @@ public struct WriteAnswerView: View {
                 ScrollView {
                     writeAnswerChoice()
 
-                    Spacer()
-                        .frame(height: UIScreen.screenHeight * 0.45)
-
-                    CustomButton(
-                        action: {
-                            store.send(.async(.createQuestion(
-                                emoji: store.createQuestionUserModel.createQuestionEmoji.convertEmojiToUnicode(store.createQuestionUserModel.createQuestionEmoji),
-                                title: store.createQuestionUserModel.createQuestionTitle ,
-                                choiceA: store.choiceAtext,
-                                choiceB: store.choiceBtext)))
-                            store.userInfoModel?.isCreateQuestion = true
-
-
-                        }, title: store.presntWriteUploadViewButtonTitle,
-                        config: CustomButtonConfig.create()
-                        ,isEnable: !store.choiceAtext.isEmpty && !store.choiceBtext.isEmpty &&  store.enableButton)
-                    .padding(.horizontal, 20)
-
-                    Spacer()
-                        .frame(height: 16)
-
                 }
                 .bounce(false)
+
+              wirteAnswerButton()
+
             }
             .onTapGesture {
                 UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
@@ -154,4 +136,31 @@ extension WriteAnswerView {
                 .focused($choiceBFocus)
         }
     }
+
+  @ViewBuilder
+  private func wirteAnswerButton() -> some View {
+    VStack{
+      Spacer()
+          .frame(height: UIScreen.screenHeight * 0.45)
+
+      CustomButton(
+          action: {
+              store.send(.async(.createQuestion(
+                  emoji: store.createQuestionUserModel.createQuestionEmoji.convertEmojiToUnicode(store.createQuestionUserModel.createQuestionEmoji),
+                  title: store.createQuestionUserModel.createQuestionTitle ,
+                  choiceA: store.choiceAtext,
+                  choiceB: store.choiceBtext)))
+              store.userInfoModel?.isCreateQuestion = true
+
+
+          }, title: store.presntWriteUploadViewButtonTitle,
+          config: CustomButtonConfig.create()
+          ,isEnable: !store.choiceAtext.isEmpty && !store.choiceBtext.isEmpty &&  store.enableButton)
+      .padding(.horizontal, 20)
+
+      Spacer()
+          .frame(height: 16)
+
+    }
+  }
 }
diff --git a/...esentation/Presentation/Sources/CreateQuestion/WriteQuestion/View/WriteQuestionView.swift b/...esentation/Presentation/Sources/CreateQuestion/WriteQuestion/View/WriteQuestionView.swift
@@ -44,25 +44,10 @@ public struct WriteQuestionView: View {
                     selectQuestionEmojeView()
 
                     wittingQustionView()
-
-                    Spacer()
-                        .frame(height: UIScreen.screenHeight * 0.35)
-
-                    CustomButton(
-                        action: {
-                            store.send(.navigation(.presntWriteAnswer))
-                        }, title: store.presntNextViewButtonTitle,
-                        config: CustomButtonConfig.create()
-                        ,isEnable: !store.createQuestionUserModel.createQuestionTitle.isEmpty &&
-                        store.emojiImage != nil
-                        && store.enableButton
-                    )
-                    .padding(.horizontal, 20)
-
-                    Spacer()
-                        .frame(height: 16)
                 }
                 .bounce(false)
+
+              writeQuestionButton()
 
             }
             .popup(item: $store.scope(state: \.destination?.floatingPopUP, action: \.destination.floatingPopUP)) { floatingPopUpStore in
@@ -179,7 +164,6 @@ extension WriteQuestionView {
         .padding()
     }
 
-
     @ViewBuilder
     private func wittingQustionView() -> some View {
         VStack {
@@ -215,6 +199,27 @@ extension WriteQuestionView {
         .padding(.horizontal ,20)
 
     }
+
+  @ViewBuilder
+  private func writeQuestionButton() -> some View {
+    VStack {
+      Spacer()
+
+      CustomButton(
+          action: {
+              store.send(.navigation(.presntWriteAnswer))
+          }, title: store.presntNextViewButtonTitle,
+          config: CustomButtonConfig.create()
+          ,isEnable: !store.createQuestionUserModel.createQuestionTitle.isEmpty &&
+          store.emojiImage != nil
+          && store.enableButton
+      )
+      .padding(.horizontal, 20)
+
+      Spacer()
+          .frame(height: 16)
+    }
+  }
 }
 
 

diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Home/Main/Reducer/Home.swift b/OPeace/Projects/Presentation/Presentation/Sources/Home/Main/Reducer/Home.swift
@@ -77,6 +77,7 @@ public struct Home {
 
     @Shared(.inMemory("questionID")) var reportQuestionID: Int = 0
     @Shared(.appStorage("lastViewedPage")) var lastViewedPage: Int = .zero
+    @Shared(.appStorage("checkVersionShowPopUp")) var checkVersionShowPopUp: Bool = false
 
     @Presents var destination: Destination.State?
 
@@ -313,7 +314,7 @@ public struct Home {
               #logDebug("Firebase minimum_version: \(minVesrsion)")
                 let appStoreVersion = try await AppStoreVersionFetcher.fetchAppStoreVersion(bundleID: bundleID)
 
-              if VersionComparer.shouldShowUpdatePopup(minimumVersion: appStoreVersion, appStoreVersion: minVesrsion) {
+              if VersionComparer.shouldShowUpdatePopup(minimumVersion: minVesrsion, appStoreVersion: appStoreVersion) {
                   #logDebug("Firebase minimum_version is higher than App Store version.")
                     await completion()
                 } else {

diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Home/Main/View/HomeView.swift b/OPeace/Projects/Presentation/Presentation/Sources/Home/Main/View/HomeView.swift
@@ -36,9 +36,12 @@ public struct HomeView: View {
         store.send(.async(.appearData))
 //        startRefreshData()
         appearFloatingPopUp()
-        store.send(.view(.checkVersion {
-          store.send(.view(.appearCheckUpdatePopUp))
-        }))
+
+        if !store.checkVersionShowPopUp {
+          store.send(.view(.checkVersion {
+            store.send(.view(.appearCheckUpdatePopUp))
+          }))
+        }
       }
       .onDisappear {
         store.send(.async(.clearFilter))
@@ -166,8 +169,10 @@ public struct HomeView: View {
         title: "업데이트 해주세요",
         confirmAction: {
           store.send(.view(.forceUpate))
+          store.checkVersionShowPopUp = true
         },
         cancelAction: {
+          store.checkVersionShowPopUp = true
           store.send(.view(.closePopUp))
         }
       )

diff --git a/...Projects/Presentation/Presentation/Sources/Profile/EditProfile/View/EditProfileView.swift b/...Projects/Presentation/Presentation/Sources/Profile/EditProfile/View/EditProfileView.swift
@@ -48,7 +48,7 @@ public struct EditProfileView: View {
                     signUpJobSelect()
 
                     Spacer()
-                        .frame(height: UIScreen.screenHeight * 0.1)
+                    .frame(height: UIScreen.main.nativeBounds.width == 750 ?   UIScreen.screenHeight * 0.15 :  UIScreen.screenHeight * 0.1)
 
                     CustomButton(
                         action: {

diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Profile/WithDraw/View/WithDrawView.swift b/OPeace/Projects/Presentation/Presentation/Sources/Profile/WithDraw/View/WithDrawView.swift
@@ -39,23 +39,22 @@ public struct WithDrawView: View {
                     withDrawTitleView()
 
                     withDrawReasonTextFieldView()
-
-                    Spacer()
-                        .frame(height: UIScreen.screenHeight * 0.5)
-
-                    CustomButton(
-                        action: {
-                            store.send(.async(.deletUserSocialType(reason: store.withDrawTitle)))
-                        }, title: store.withDrawButtonComplete,
-                        config: CustomButtonConfig.create()
-                        ,isEnable: !store.withDrawTitle.isEmpty
-                    )
-                    .padding(.horizontal, 20)
-
-                    Spacer()
-                        .frame(height: 16)
                 }
                 .bounce(false)
+
+              Spacer()
+
+              CustomButton(
+                  action: {
+                      store.send(.async(.deletUserSocialType(reason: store.withDrawTitle)))
+                  }, title: store.withDrawButtonComplete,
+                  config: CustomButtonConfig.create()
+                  ,isEnable: !store.withDrawTitle.isEmpty
+              )
+              .padding(.horizontal, 20)
+
+              Spacer()
+                  .frame(height: 16)
 
             }
             .onTapGesture {

diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Splash/Reducer/Splash.swift b/OPeace/Projects/Presentation/Presentation/Sources/Splash/Reducer/Splash.swift
@@ -24,6 +24,7 @@ public struct Splash {
 
     var checkUserVerifyModel:   CheckUserDTOModel? = nil
     var refreshTokenModel: RefreshDTOModel? = nil
+    @Shared(.appStorage("checkVersionShowPopUp")) var checkVersionShowPopUp: Bool = false
 
   }
 

diff --git a/OPeace/Projects/Presentation/Presentation/Sources/Splash/View/SplashView.swift b/OPeace/Projects/Presentation/Presentation/Sources/Splash/View/SplashView.swift
@@ -12,31 +12,32 @@ import DesignSystem
 import ComposableArchitecture
 
 public struct SplashView: View {
-    @Bindable var store: StoreOf<Splash>
-
-    public init(
-        store: StoreOf<Splash>
-    ) {
-        self.store = store
+  @Bindable var store: StoreOf<Splash>
+
+  public init(
+    store: StoreOf<Splash>
+  ) {
+    self.store = store
+  }
+
+  public var body: some View {
+    ZStack {
+      Image(asset: store.backgroundmage)
+        .resizable()
+        .scaledToFill()
+        .ignoresSafeArea(.all)
+
+      Image(asset: store.applogoImage)
+        .resizable() 
+        .scaledToFit()
+        .frame(height: 48)
+
     }
-
-    public var body: some View {
-        ZStack {
-            Image(asset: store.backgroundmage)
-                .resizable()
-                .scaledToFill()
-                .ignoresSafeArea(.all)
-
-            Image(asset: store.applogoImage)
-                .resizable() 
-                .scaledToFit()
-                .frame(height: 48)
-
-        }
-        .onAppear {
-            store.send(.async(.checkUserVerfiy))
-        }
+    .onAppear {
+      store.send(.async(.checkUserVerfiy))
+      store.checkVersionShowPopUp = false
     }
+  }
 }
 
 
diff --git a/OPeace/Projects/Shared/DesignSystem/Sources/UI/CardView/CardItemView.swift b/OPeace/Projects/Shared/DesignSystem/Sources/UI/CardView/CardItemView.swift
@@ -614,9 +614,6 @@ extension CardItemView {
       return combinedSegments
     }
 
-
-
-
   @ViewBuilder
   private func choiceAnswerRoundView(
     choiceTitleA: String,

diff --git a/OPeace/Projects/Shared/DesignSystem/Sources/UI/CustomPOPUP/View/CheckSignUpPopUp.swift b/OPeace/Projects/Shared/DesignSystem/Sources/UI/CustomPOPUP/View/CheckSignUpPopUp.swift
@@ -42,7 +42,7 @@ public struct CheckSignUpPopUp: View {
     public var body: some View{
         RoundedRectangle(cornerRadius: 20)
             .fill(Color.gray500)
-            .frame(height: UIScreen.screenHeight * 0.58)
+            .frame(height:  UIScreen.main.nativeBounds.width == 750 ? UIScreen.screenHeight * 0.74 : UIScreen.screenHeight * 0.58)
             .padding(.horizontal, 31)
             .overlay(alignment: .center) {
                 VStack {
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ public struct Splash { @@
         var checkUserVerifyModel:   CheckUserDTOModel? = nil
         var refreshTokenModel: RefreshDTOModel? = nil
+        @Shared(.appStorage("checkVersionShowPopUp")) var checkVersionShowPopUp: Bool = false
       }
@@ Expand Down @@