Skip to content

Commit

Permalink
[FEATURE] 메인 화면 구성
Browse files Browse the repository at this point in the history
  • Loading branch information
leegyoungmin authored Sep 21, 2023
2 parents 90a9308 + 1613c28 commit b55912f
Show file tree
Hide file tree
Showing 23 changed files with 720 additions and 35 deletions.
60 changes: 60 additions & 0 deletions igoMoney/igoMoney.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
180FC6A42ABB4BC500DD8477 /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 180FC6A32ABB4BC500DD8477 /* APIClient.swift */; };
184BBE2D2AB9F61D00A810DB /* SignInWithAppleDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 184BBE2C2AB9F61D00A810DB /* SignInWithAppleDelegate.swift */; };
184BBE322AB9FAF800A810DB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 184BBE312AB9FAF800A810DB /* LaunchScreen.storyboard */; };
18599A432ABC12FF0075DE76 /* RoundedCorner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A422ABC12FF0075DE76 /* RoundedCorner.swift */; };
18599A452ABC2A950075DE76 /* ChallengeCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A442ABC2A950075DE76 /* ChallengeCore.swift */; };
18599A492ABC32160075DE76 /* MyChallengeSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A482ABC32160075DE76 /* MyChallengeSection.swift */; };
18599A4B2ABC321E0075DE76 /* MyChallengeSectionCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A4A2ABC321E0075DE76 /* MyChallengeSectionCore.swift */; };
18599A4E2ABC32790075DE76 /* EmptyChallengeListSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A4D2ABC32790075DE76 /* EmptyChallengeListSection.swift */; };
18599A502ABC329C0075DE76 /* EmptyChallengeListSectionCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A4F2ABC329C0075DE76 /* EmptyChallengeListSectionCore.swift */; };
18599A532ABC34640075DE76 /* ChallengeInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A522ABC34640075DE76 /* ChallengeInformation.swift */; };
18599A572ABC35C70075DE76 /* EmptyChallengeDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A562ABC35C70075DE76 /* EmptyChallengeDetail.swift */; };
18599A592ABC43D80075DE76 /* EmptyChallengeDetailCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18599A582ABC43D80075DE76 /* EmptyChallengeDetailCore.swift */; };
18606F492AB9D20A00025C37 /* ProfileSettingCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18606F482AB9D20A00025C37 /* ProfileSettingCore.swift */; };
187252C72ABC07AE00DCF08C /* MainTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 187252C62ABC07AE00DCF08C /* MainTab.swift */; };
187252C92ABC07C700DCF08C /* MainCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 187252C82ABC07C700DCF08C /* MainCore.swift */; };
Expand Down Expand Up @@ -64,6 +73,15 @@
184BBE2C2AB9F61D00A810DB /* SignInWithAppleDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInWithAppleDelegate.swift; sourceTree = "<group>"; };
184BBE302AB9FA7B00A810DB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
184BBE312AB9FAF800A810DB /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
18599A422ABC12FF0075DE76 /* RoundedCorner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedCorner.swift; sourceTree = "<group>"; };
18599A442ABC2A950075DE76 /* ChallengeCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChallengeCore.swift; sourceTree = "<group>"; };
18599A482ABC32160075DE76 /* MyChallengeSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyChallengeSection.swift; sourceTree = "<group>"; };
18599A4A2ABC321E0075DE76 /* MyChallengeSectionCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyChallengeSectionCore.swift; sourceTree = "<group>"; };
18599A4D2ABC32790075DE76 /* EmptyChallengeListSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyChallengeListSection.swift; sourceTree = "<group>"; };
18599A4F2ABC329C0075DE76 /* EmptyChallengeListSectionCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyChallengeListSectionCore.swift; sourceTree = "<group>"; };
18599A522ABC34640075DE76 /* ChallengeInformation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChallengeInformation.swift; sourceTree = "<group>"; };
18599A562ABC35C70075DE76 /* EmptyChallengeDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyChallengeDetail.swift; sourceTree = "<group>"; };
18599A582ABC43D80075DE76 /* EmptyChallengeDetailCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyChallengeDetailCore.swift; sourceTree = "<group>"; };
18606F482AB9D20A00025C37 /* ProfileSettingCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSettingCore.swift; sourceTree = "<group>"; };
187252C62ABC07AE00DCF08C /* MainTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTab.swift; sourceTree = "<group>"; };
187252C82ABC07C700DCF08C /* MainCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCore.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -204,10 +222,41 @@
path = UserClient;
sourceTree = "<group>";
};
18599A472ABC32060075DE76 /* MyChallengeSection */ = {
isa = PBXGroup;
children = (
18599A482ABC32160075DE76 /* MyChallengeSection.swift */,
18599A4A2ABC321E0075DE76 /* MyChallengeSectionCore.swift */,
);
path = MyChallengeSection;
sourceTree = "<group>";
};
18599A4C2ABC325E0075DE76 /* EmptyChallengeListSection */ = {
isa = PBXGroup;
children = (
18599A552ABC35B40075DE76 /* EmptyChallengeDetail */,
18599A4D2ABC32790075DE76 /* EmptyChallengeListSection.swift */,
18599A4F2ABC329C0075DE76 /* EmptyChallengeListSectionCore.swift */,
);
path = EmptyChallengeListSection;
sourceTree = "<group>";
};
18599A552ABC35B40075DE76 /* EmptyChallengeDetail */ = {
isa = PBXGroup;
children = (
18599A562ABC35C70075DE76 /* EmptyChallengeDetail.swift */,
18599A582ABC43D80075DE76 /* EmptyChallengeDetailCore.swift */,
);
path = EmptyChallengeDetail;
sourceTree = "<group>";
};
187252CC2ABC0B6200DCF08C /* ChallengeScene */ = {
isa = PBXGroup;
children = (
18599A4C2ABC325E0075DE76 /* EmptyChallengeListSection */,
18599A472ABC32060075DE76 /* MyChallengeSection */,
187252CD2ABC0B7B00DCF08C /* ChallengeScene.swift */,
18599A442ABC2A950075DE76 /* ChallengeCore.swift */,
);
path = ChallengeScene;
sourceTree = "<group>";
Expand All @@ -233,6 +282,7 @@
isa = PBXGroup;
children = (
18CD8F2F2AB9A1EF006FEA6F /* Provier.swift */,
18599A522ABC34640075DE76 /* ChallengeInformation.swift */,
);
path = Models;
sourceTree = "<group>";
Expand Down Expand Up @@ -266,6 +316,7 @@
18CD8F312AB9A57D006FEA6F /* Constants.swift */,
180FC68C2ABB12FC00DD8477 /* UIApplication + Extensions.swift */,
180FC6902ABB157200DD8477 /* Bundle+Extensions.swift */,
18599A422ABC12FF0075DE76 /* RoundedCorner.swift */,
);
path = Utility;
sourceTree = "<group>";
Expand Down Expand Up @@ -357,13 +408,18 @@
184BBE2D2AB9F61D00A810DB /* SignInWithAppleDelegate.swift in Sources */,
18D6236C2AB8BACD006EAC39 /* AuthButton.swift in Sources */,
180FC68D2ABB12FC00DD8477 /* UIApplication + Extensions.swift in Sources */,
18599A4B2ABC321E0075DE76 /* MyChallengeSectionCore.swift in Sources */,
180FC6A42ABB4BC500DD8477 /* APIClient.swift in Sources */,
18606F492AB9D20A00025C37 /* ProfileSettingCore.swift in Sources */,
180FC6A22ABB48DC00DD8477 /* Networking.swift in Sources */,
18599A572ABC35C70075DE76 /* EmptyChallengeDetail.swift in Sources */,
18CD8F2D2AB995F5006FEA6F /* SignUpCore.swift in Sources */,
18599A532ABC34640075DE76 /* ChallengeInformation.swift in Sources */,
18599A452ABC2A950075DE76 /* ChallengeCore.swift in Sources */,
187252CB2ABC081F00DCF08C /* MainRoundTabBar.swift in Sources */,
180FC6912ABB157200DD8477 /* Bundle+Extensions.swift in Sources */,
180FC69B2ABB35D200DD8477 /* APIError.swift in Sources */,
18599A492ABC32160075DE76 /* MyChallengeSection.swift in Sources */,
187252C72ABC07AE00DCF08C /* MainTab.swift in Sources */,
180FC67D2ABAF62500DD8477 /* AuthController.swift in Sources */,
18CD8F302AB9A1EF006FEA6F /* Provier.swift in Sources */,
Expand All @@ -372,13 +428,17 @@
180FC69E2ABB488F00DD8477 /* UserClient.swift in Sources */,
187252CE2ABC0B7B00DCF08C /* ChallengeScene.swift in Sources */,
180FC6972ABB35A800DD8477 /* HTTPMethod.swift in Sources */,
18599A502ABC329C0075DE76 /* EmptyChallengeListSectionCore.swift in Sources */,
18599A432ABC12FF0075DE76 /* RoundedCorner.swift in Sources */,
180363AA2AB82DCD00082F8A /* igoMoneyApp.swift in Sources */,
18CD8F272AB970C3006FEA6F /* AuthCore.swift in Sources */,
180FC6992ABB35C000DD8477 /* HTTPBody.swift in Sources */,
18CD8F322AB9A57D006FEA6F /* Constants.swift in Sources */,
18CD8F352AB9BC58006FEA6F /* ProfileSettingView.swift in Sources */,
18599A4E2ABC32790075DE76 /* EmptyChallengeListSection.swift in Sources */,
187252D12ABC0BA800DCF08C /* MyPageScene.swift in Sources */,
187252C92ABC07C700DCF08C /* MainCore.swift in Sources */,
18599A592ABC43D80075DE76 /* EmptyChallengeDetailCore.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "default_profile.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x45",
"green" : "0x45",
"red" : "0x45"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x64",
"green" : "0x64",
"red" : "0x64"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ struct ProfileSettingView: View {
.font(.system(size: 18, weight: .bold))
.foregroundColor(
viewStore.nickNameState == .completeConfirm ?
Color.black : ColorConstants.gray7
Color.black : ColorConstants.gray4
)
.padding(.vertical)
.background(
viewStore.nickNameState == .completeConfirm ?
ColorConstants.primary3 : ColorConstants.gray8
ColorConstants.primary3 : ColorConstants.gray5
)
.cornerRadius(8)
.padding([.horizontal, .bottom], 24)
Expand Down Expand Up @@ -98,7 +98,7 @@ struct InputHeaderView: View {
if let detail = detail {
Text(detail)
.font(.system(size: 12, weight: .medium))
.foregroundColor(ColorConstants.gray6)
.foregroundColor(ColorConstants.gray3)
}
}
}
Expand Down Expand Up @@ -127,13 +127,13 @@ struct InputFormView: View {
}
.font(.system(size: 12, weight: .medium))
.foregroundColor(
viewStore.nickNameState == .disableConfirm ? ColorConstants.gray7 : .white
viewStore.nickNameState == .disableConfirm ? ColorConstants.gray4 : .white
)
.padding(.horizontal, 8)
.padding(.vertical, 5)
.background(
viewStore.nickNameState == .disableConfirm ?
ColorConstants.gray7 : viewStore.nickNameState == .completeConfirm ?
ColorConstants.gray4 : viewStore.nickNameState == .completeConfirm ?
ColorConstants.primary3 : ColorConstants.primary
)
.cornerRadius(.infinity)
Expand Down
39 changes: 39 additions & 0 deletions igoMoney/igoMoney/Source/ChallengeScene/ChallengeCore.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
//
// ChallengeCore.swift
// igoMoney
//
// Copyright (c) 2023 Minii All rights reserved.

import ComposableArchitecture
import SwiftUI

struct ChallengeCore: Reducer {
struct State: Equatable {
var myChallengeState = MyChallengeSectionCore.State(color: .red)
var emptyChallengeListState = EmptyChallengeListSectionCore.State()
}

enum Action {
case myChallengeAction(MyChallengeSectionCore.Action)
case emptyChallengeAction(EmptyChallengeListSectionCore.Action)
}

var body: some Reducer<State, Action> {
Reduce { state, action in
switch action {
case .myChallengeAction:
return .none
case .emptyChallengeAction:
return .none
}
}

Scope(state: \.myChallengeState, action: /Action.myChallengeAction) {
MyChallengeSectionCore()
}

Scope(state: \.emptyChallengeListState, action: /Action.emptyChallengeAction) {
EmptyChallengeListSectionCore()
}
}
}
Loading

0 comments on commit b55912f

Please sign in to comment.