Merge branch 'feature/(#9)-main_publishing' of https://github.com/GRA…

…M-DSM/KillerGram-iOS into feature/(#9)-main_publishing # Conflicts: # Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift # Projects/App/Sources/Application/DI/AppComponent.swift # Projects/App/Sources/Application/NeedleGenerated.swift # Projects/Feature/BaseFeature/Sources/AppState.swift # Projects/Feature/RootFeature/Sources/RootView.swift # Projects/Feature/SigninFeature/Sources/SigninView.swift # Projects/Feature/SigninFeature/Sources/SigninViewModel.swift
GRAM-DSM · Apr 26, 2024 · a22f935 · a22f935
2 parents b486eb3 + 8b8d5cd
commit a22f935
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift b/Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift
@@ -24,11 +24,15 @@ extension ModulePaths: MicroTargetPathConvertable {
 
 public extension ModulePaths {
     enum Feature: String, MicroTargetPathConvertable {
+<<<<<<< HEAD
 <<<<<<< HEAD
         case SignupFeature
 =======
         case MainFeature
 >>>>>>> 8b8d5cd (✨ MainFeature 추가)
+=======
+        case MainFeature
+>>>>>>> 8b8d5cd6a2187113736b925a2cfddd283026de4d
         case SigninFeature
         case SplashFeature
         case RootFeature

diff --git a/Projects/App/Sources/Application/DI/AppComponent.swift b/Projects/App/Sources/Application/DI/AppComponent.swift
@@ -6,13 +6,10 @@ import SplashFeature
 import SplashFeatureInterface
 import SigninFeature
 import SigninFeatureInterface
-<<<<<<< HEAD
 import SignupFeature
 import SignupFeatureInterface
-=======
 import MainFeature
 import MainFeatureInterface
->>>>>>> 8b8d5cd (✨ MainFeature 추가)
 
 public final class AppComponent: BootstrapComponent {
 //    private let _keychain: any Keychain
@@ -43,7 +40,6 @@ public extension AppComponent {
     var signinFactory: any SigninFactory {
         SigninComponent(parent: self)
     }
-<<<<<<< HEAD
     // Signup
     var signupEmailVerifyFactory: any SignupEmailVerifyFactory {
         SignupEmailVerifyComponent(parent: self)
@@ -65,9 +61,8 @@ public extension AppComponent {
     }
     var signupCheckLevelFactory: any SignupCheckLevelFactory {
         SignupCheckLevelComponent(parent: self)
-=======
+    }
     var mainFactory: any MainFactory {
         MainComponent(parent: self)
->>>>>>> 8b8d5cd (✨ MainFeature 추가)
     }
 }
diff --git a/Projects/App/Sources/Application/NeedleGenerated.swift b/Projects/App/Sources/Application/NeedleGenerated.swift
@@ -90,6 +90,7 @@ private func factory997eaa831d16af15eee5f47b58f8f304c97af4d5(_ component: Needle
     return SignupGenderDependency65e2a6565372eb41f4acProvider(appComponent: parent1(component) as! AppComponent)
 }
 private class SignupCheckLevelDependencye4ec84c7d38354a454aeProvider: SignupCheckLevelDependency {
+
 private class MainDependency7c6a5b4738b211b8e155Provider: MainDependency {
 
 

diff --git a/Projects/Feature/BaseFeature/Sources/AppState.swift b/Projects/Feature/BaseFeature/Sources/AppState.swift
@@ -14,10 +14,7 @@ public struct AppState: DynamicProperty {
 public final class AppStateProvider: ObservableObject {
     @Published public var sceneFlow: SceneFlow
     @Published public var rule: RuleExample
-<<<<<<< HEAD
 
-=======
->>>>>>> 8b8d5cd (✨ MainFeature 추가)
     public init(sceneFlow: SceneFlow, rule: RuleExample) {
         self.sceneFlow = sceneFlow
         self.rule = rule

diff --git a/Projects/Feature/SigninFeature/Sources/SigninViewModel.swift b/Projects/Feature/SigninFeature/Sources/SigninViewModel.swift
@@ -5,7 +5,6 @@ final class SigninViewModel: BaseViewModel {
     @Published var email: String = ""
     @Published var password: String = ""
     @Published var isSuccessToSignin: Bool = false
-
     @Published var isNavigatedToSignup: Bool = false
 
     func signinButtonDidTap() {
@@ -14,5 +13,5 @@ final class SigninViewModel: BaseViewModel {
 
     func signupButtonDidTap() {
         self.isNavigatedToSignup = true
-    }
+
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         return SignupGenderDependency65e2a6565372eb41f4acProvider(appComponent: parent1(component) as! AppComponent)
     }
     private class SignupCheckLevelDependencye4ec84c7d38354a454aeProvider: SignupCheckLevelDependency {
     private class MainDependency7c6a5b4738b211b8e155Provider: MainDependency {
@@ Expand Down @@