Skip to content

[Feat] #130 - 마이페이지 러닝 기록 UI 구현 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 10, 2023
Merged

[Feat] #130 - 마이페이지 러닝 기록 UI 구현 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
67ffb65
[Feat] #130 - emptyView 구현
dlwogus0128 May 6, 2023
d0a940c
[Feat] #130 - 스탬프 획득 조건 UI 변경
dlwogus0128 May 6, 2023
8cc9b71
[Feat] #130 - 닉네임 수정 페이지 구현
dlwogus0128 May 6, 2023
09be69a
[Feat] #130 - 닉네임 수정 페이지 push로 변경
dlwogus0128 May 6, 2023
c8f2455
[Feat] #130 - 버전 정보 받아오기
dlwogus0128 May 6, 2023
07b8a5b
[Feat] #130 - 러닝 기록 편집기능 셀 선택까지 구현
dlwogus0128 May 8, 2023
493d3d9
[Feat] #130 - 중복 코드 함수로
dlwogus0128 May 10, 2023
6a8c232
git pull origin develop
dlwogus0128 May 10, 2023
1a80500
[Feat] #130 - ActivityRecordDetailVC 파일 생성
dlwogus0128 May 10, 2023
dbdf14e
[Feat] #130 - AcivityRecordDetailVC UI 구현 중..
dlwogus0128 May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
A3D1A77929CF03D200DD54EC /* AuthRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3D1A77829CF03D200DD54EC /* AuthRouter.swift */; };
A3D1A77E29CF09B600DD54EC /* SignInResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3D1A77D29CF09B600DD54EC /* SignInResponseDto.swift */; };
A3D1A78029CF142E00DD54EC /* UserManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3D1A77F29CF142E00DD54EC /* UserManager.swift */; };
A3DB8C472A0B64830081AF2D /* ActivityRecordDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3DB8C462A0B64830081AF2D /* ActivityRecordDetailVC.swift */; };
A3E55BA029C815B10000D85D /* SignInSocialLoginVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */; };
A3F67AE2296D33AC001598A2 /* MyPageDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE1296D33AC001598A2 /* MyPageDto.swift */; };
A3F67AEA296E4936001598A2 /* ActivityRecordInfoDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3F67AE9296E4936001598A2 /* ActivityRecordInfoDto.swift */; };
Expand Down Expand Up @@ -177,6 +178,7 @@
A3D1A77829CF03D200DD54EC /* AuthRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRouter.swift; sourceTree = "<group>"; };
A3D1A77D29CF09B600DD54EC /* SignInResponseDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInResponseDto.swift; sourceTree = "<group>"; };
A3D1A77F29CF142E00DD54EC /* UserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManager.swift; sourceTree = "<group>"; };
A3DB8C462A0B64830081AF2D /* ActivityRecordDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityRecordDetailVC.swift; sourceTree = "<group>"; };
A3E55B9F29C815B10000D85D /* SignInSocialLoginVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInSocialLoginVC.swift; sourceTree = "<group>"; };
A3E55BA529C8AB0A0000D85D /* Runnect-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Runnect-iOS.entitlements"; sourceTree = "<group>"; };
A3F67AE1296D33AC001598A2 /* MyPageDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageDto.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -360,6 +362,7 @@
A3BC2F2A2962C3D500198261 /* GoalRewardInfoVC.swift */,
A3BC2F2C2962C3F200198261 /* ActivityRecordInfoVC.swift */,
A3BC2F2E2962C40A00198261 /* UploadedCourseInfoVC.swift */,
A3DB8C462A0B64830081AF2D /* ActivityRecordDetailVC.swift */,
);
path = InfoVC;
sourceTree = "<group>";
Expand Down Expand Up @@ -1360,6 +1363,7 @@
CEE59FDA29DD6F7D00C791F1 /* Providers.swift in Sources */,
CE5875A029601500005D967E /* Toast.swift in Sources */,
CE40BB1E2968054F0030ABCA /* BaseResponse.swift in Sources */,
A3DB8C472A0B64830081AF2D /* ActivityRecordDetailVC.swift in Sources */,
CE14677C2965C1B100DCEA1B /* RunningRecordVC.swift in Sources */,
CE6B63D829673450003F900F /* ListEmptyView.swift in Sources */,
A3C2CAD329E4F77C00EC525B /* TermsOfServiceVC.swift in Sources */,
Expand Down Expand Up @@ -1609,7 +1613,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.runnect.Runnect-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1646,7 +1650,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.runnect.Runnect-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
3 changes: 2 additions & 1 deletion Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ enum ImageLiterals {
static var imgLogo: UIImage { .load(named: "img_logo") }
static var imgPaper: UIImage { .load(named: "img_paper") }
static var imgPerson: UIImage { .load(named: "img_person") }
static var imgRecordContainerSelected: UIImage { .load(named: "img_record_container_selected") }
static var imgRecordContainer: UIImage { .load(named: "img_record_container") }
static var imgStampC1: UIImage { .load(named: "img_stamp_c1") }
static var imgStampC2: UIImage { .load(named: "img_stamp_c2") }
static var imgStampC3: UIImage { .load(named: "img_stamp_c3") }
Expand All @@ -76,7 +78,6 @@ enum ImageLiterals {
static var imgKakaoLogin: UIImage { .load(named: "img_kakao_login")}
}


extension UIImage {
static func load(named imageName: String) -> UIImage {
guard let image = UIImage(named: imageName, in: nil, compatibleWith: nil) else {
Expand Down
23 changes: 23 additions & 0 deletions ...S/Runnect-iOS/Global/Resource/Assets.xcassets/img_record_container.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Subtract.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Subtract@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Subtract@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...-iOS/Global/Resource/Assets.xcassets/img_record_container.imageset/Subtract.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...S/Global/Resource/Assets.xcassets/img_record_container.imageset/Subtract@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...S/Global/Resource/Assets.xcassets/img_record_container.imageset/Subtract@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions ...-iOS/Global/Resource/Assets.xcassets/img_record_container_selected.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Subtract.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Subtract@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Subtract@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...al/Resource/Assets.xcassets/img_record_container_selected.imageset/Subtract.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Resource/Assets.xcassets/img_record_container_selected.imageset/Subtract@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...Resource/Assets.xcassets/img_record_container_selected.imageset/Subtract@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomNavigationBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,12 @@ extension CustomNavigationBar {

extension CustomNavigationBar {
@objc private func popToPreviousVC() {
guard let vc = vc else { return }
self.vc?.navigationController?.popViewController(animated: true)
if vc.presentingViewController != nil {
self.vc?.dismiss(animated: true)

}
}

@objc private func searchLocation() {
Expand Down
16 changes: 8 additions & 8 deletions Runnect-iOS/Runnect-iOS/Network/Model/MyPageModel/GoalRewardInfoModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ extension GoalRewardInfoModel {
static var stampNameList: [GoalRewardInfoModel] {
return [
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC1, stampStandard: "그린 코스 1개"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC2, stampStandard: "그린 코스 5개"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC3, stampStandard: "그린 코스 10개"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC2, stampStandard: "그린 코스 10개"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampC3, stampStandard: "그린 코스 30개"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS1, stampStandard: "스크랩 1회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS2, stampStandard: "스크랩 5회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS3, stampStandard: "스크랩 10회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS2, stampStandard: "스크랩 20회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampS3, stampStandard: "스크랩 40회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampU1, stampStandard: "업로드 1회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampU2, stampStandard: "업로드 5회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampU3, stampStandard: "업로드 10회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampU2, stampStandard: "업로드 10회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampU3, stampStandard: "업로드 30회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR1, stampStandard: "달리기 1회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR2, stampStandard: "달리기 5회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR2, stampStandard: "달리기 10회")
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR2, stampStandard: "달리기 15회"),
GoalRewardInfoModel(stampImg: ImageLiterals.imgStampR2, stampStandard: "달리기 30회")
]
}

Expand Down
Loading