Skip to content

Commit

Permalink
Merge pull request #58 from TeamHY2/Feature/#57-RecordView_BottomCell
Browse files Browse the repository at this point in the history
[Feature] RecordView 기록 출력 컴포넌트 구현 #57
  • Loading branch information
Choe-ju authored Nov 6, 2024
2 parents a07244f + 7a92b07 commit 665d118
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 6 deletions.
23 changes: 18 additions & 5 deletions HongikYeolgong2.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
47F635052CC3EC1A0034EAA9 /* Department.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F635042CC3EC1A0034EAA9 /* Department.swift */; };
47F79B2E2CCCB7AA00DD0899 /* TimePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F79B2D2CCCB7AA00DD0899 /* TimePickerView.swift */; };
47F79B302CCCB7FC00DD0899 /* TimePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F79B2F2CCCB7FC00DD0899 /* TimePicker.swift */; };
98B5F00A2CDB362C007CF5FA /* Secrets-dev.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 98B5F0092CDB362C007CF5FA /* Secrets-dev.xcconfig */; };
98F9D8462CDA2E6D00DE12BB /* RecordCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F9D8452CDA2E6D00DE12BB /* RecordCell.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -137,7 +139,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
470722F62CBC09810046469F /* Secrets-dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Secrets-dev.xcconfig"; sourceTree = "<group>"; };
470722F92CBC0A870046469F /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
470722FD2CBC15DA0046469F /* NetworkProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtocol.swift; sourceTree = "<group>"; };
470723002CBC16680046469F /* AuthEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthEndpoint.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -255,6 +256,8 @@
47F635042CC3EC1A0034EAA9 /* Department.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Department.swift; sourceTree = "<group>"; };
47F79B2D2CCCB7AA00DD0899 /* TimePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimePickerView.swift; sourceTree = "<group>"; };
47F79B2F2CCCB7FC00DD0899 /* TimePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimePicker.swift; sourceTree = "<group>"; };
98B5F0092CDB362C007CF5FA /* Secrets-dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Secrets-dev.xcconfig"; sourceTree = "<group>"; };
98F9D8452CDA2E6D00DE12BB /* RecordCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordCell.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -537,6 +540,7 @@
47A147352CA1378B00A91F66 /* Record */ = {
isa = PBXGroup;
children = (
98F9D8422CDA2DE100DE12BB /* Component */,
475B86DE2CA1AF1E000534B2 /* RecordView.swift */,
);
path = Record;
Expand Down Expand Up @@ -694,7 +698,7 @@
47B1D49F2C9CB1740071B62B = {
isa = PBXGroup;
children = (
470722F62CBC09810046469F /* Secrets-dev.xcconfig */,
98B5F0092CDB362C007CF5FA /* Secrets-dev.xcconfig */,
479821D32CA24CFF002357EB /* .swiftlint.yml */,
47B1D4AA2C9CB1740071B62B /* HongikYeolgong2 */,
47B1D4BB2C9CB1760071B62B /* HongikYeolgong2Tests */,
Expand Down Expand Up @@ -838,6 +842,14 @@
path = Models;
sourceTree = "<group>";
};
98F9D8422CDA2DE100DE12BB /* Component */ = {
isa = PBXGroup;
children = (
98F9D8452CDA2E6D00DE12BB /* RecordCell.swift */,
);
path = Component;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -947,6 +959,7 @@
479821D42CA24CFF002357EB /* .swiftlint.yml in Resources */,
47A147642CA147A600A91F66 /* Pretendard-Bold.otf in Resources */,
47A147702CA147A600A91F66 /* SUITE-Medium.otf in Resources */,
98B5F00A2CDB362C007CF5FA /* Secrets-dev.xcconfig in Resources */,
47A1476A2CA147A600A91F66 /* Pretendard-SemiBold.otf in Resources */,
47A147662CA147A600A91F66 /* Pretendard-ExtraLight.otf in Resources */,
47A147712CA147A600A91F66 /* SUITE-Regular.otf in Resources */,
Expand Down Expand Up @@ -1089,6 +1102,7 @@
4786A1052CCA3352008635A4 /* StudySessionInteractor.swift in Sources */,
473E8EB22CCE5267000F102C /* SystemOverlay.swift in Sources */,
475B86DF2CA1AF1E000534B2 /* RecordView.swift in Sources */,
98F9D8462CDA2E6D00DE12BB /* RecordCell.swift in Sources */,
47A147792CA158E800A91F66 /* MainTabView.swift in Sources */,
47F79B302CCCB7FC00DD0899 /* TimePicker.swift in Sources */,
478FBCA32CD13A1E00256012 /* UserInfo.swift in Sources */,
Expand Down Expand Up @@ -1251,7 +1265,6 @@
};
47B1D4CD2C9CB1760071B62B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 470722F62CBC09810046469F /* Secrets-dev.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -1285,7 +1298,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.teamHY2.HongikYeolgong2;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.teamHY2.HongikYeolgong2";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.teamHY2.HongikYeolgong2 1730730522";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down Expand Up @@ -1331,7 +1344,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.teamHY2.HongikYeolgong2;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.teamHY2.HongikYeolgong2";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.teamHY2.HongikYeolgong2 1730730522";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down
50 changes: 50 additions & 0 deletions HongikYeolgong2/Presentation/Record/Component/RecordCell.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
//
// RecordCell.swift
// HongikYeolgong2
//
// Created by 최주원 on 11/5/24.
//

import SwiftUI

struct RecordCell: View {
let title: String
let hours: Int
let minutes: Int

var body: some View {
HStack{
VStack(alignment: .leading ,spacing: 8.adjustToScreenHeight) {
Text(title)
.font(.pretendard(size: 16, weight: .regular))
.foregroundStyle(.gray200)

Text("\(hours)H \(minutes)M")
.font(.pretendard(size: 16, weight: .semibold))
.foregroundStyle(.gray100)

}
.padding(.vertical, 18.adjustToScreenHeight)
.padding(.leading, 28.adjustToScreenWidth)
Spacer()
}
.frame(maxWidth: .infinity)
.background(.gray800)
.cornerRadius(4)
.overlay(
RoundedRectangle(cornerRadius: 4)
.stroke(
LinearGradient(
gradient: Gradient(colors: [.gray400, .gray600]),
startPoint: .topLeading,
endPoint: .bottomTrailing
),
lineWidth: 1
)
)
}
}

#Preview {
RecordCell(title: "연간", hours: 200, minutes: 4)
}
15 changes: 14 additions & 1 deletion HongikYeolgong2/Presentation/Record/RecordView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,20 @@ import SwiftUI

struct RecordView: View {
var body: some View {
Text("Record View")
VStack(spacing: 13.adjustToScreenHeight) {
Spacer()
// 기록 정보 출력부분
HStack(spacing: 13.adjustToScreenWidth) {
RecordCell(title: "연간", hours: 200, minutes: 4)
RecordCell(title: "이번학기", hours: 120, minutes: 4)
}
HStack(spacing: 13.adjustToScreenWidth) {
RecordCell(title: "월간", hours: 50, minutes: 4)
RecordCell(title: "투데이", hours: 3, minutes: 24)
}
}
.padding(.horizontal, 32.adjustToScreenWidth)
.padding(.bottom, 36.adjustToScreenHeight)
}
}

Expand Down
1 change: 1 addition & 0 deletions fastlane/Matchfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ type("appstore") # The default type, can be: appstore, adhoc, enterprise or deve

app_identifier(["com.teamHY2.HongikYeolgong2"])
username("seokki0706@gmail.com") # Your Apple Developer Portal username
clone_branch_directly(true)

# For all available options run `fastlane match --help`
# Remove the # in the beginning of the line to enable the other options
Expand Down

0 comments on commit 665d118

Please sign in to comment.