Skip to content

[7주차] SwiftUI로 UI 짜기 심화편 (#10) #11

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

Open
kms0233 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

[7주차] SwiftUI로 UI 짜기 심화편 (#10) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffbb746
[Chore] 에셋 추가 (#10)
kms0233 Dec 12, 2024
94026f7
[Feat] 친구 리스트 View 구현 (#10)
kms0233 Dec 12, 2024
e8a5fc9
[Feat] 내 정보 View 구현 (#10)
kms0233 Dec 12, 2024
bca8bd3
[Feat] 월 선택 View 구현 (#10)
kms0233 Dec 12, 2024
590a78d
[Feat] 캘린더 View 구현 (#10)
kms0233 Dec 12, 2024
ec87bc2
[Feat] todo 리스트 View 구현 (#10)
kms0233 Dec 12, 2024
0746651
[Feat] TodoMate View 구현 (#10)
kms0233 Dec 12, 2024
aa04ca7
[Feat] todo 체크에 대한 ViewModel 적용 (#10)
kms0233 Dec 12, 2024
8c5befa
[Feat] 할일 추가하는 기능 구현 (#10)
kms0233 Dec 12, 2024
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
Binary file modified ...eproj/project.xcworkspace/xcuserdata/kimminseo.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion AND-SOPT-iOS/AND-SOPT-iOS/Applicaiton/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {

self.window = UIWindow(windowScene: windowScene)

let navigationController = UINavigationController(rootViewController: AppStoreViewController())
let navigationController = UINavigationController(rootViewController: TodoMateViewController())
self.window?.rootViewController = navigationController

self.window?.makeKeyAndVisible()
Expand Down
20 changes: 20 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/Colors/todo_brown.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x12",
"green" : "0x40",
"red" : "0x81"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
20 changes: 20 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/Colors/todo_gray.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xDE",
"green" : "0xDD",
"red" : "0xD7"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...xcassets/images/character_image.imageset/6c03e4c7e4a69ffef62b0c97745ea06c 1.jpg
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 ...xcassets/images/character_image.imageset/6c03e4c7e4a69ffef62b0c97745ea06c 2.jpg
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.xcassets/images/character_image.imageset/6c03e4c7e4a69ffef62b0c97745ea06c.jpg
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 ...OPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/character_image.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "6c03e4c7e4a69ffef62b0c97745ea06c.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "6c03e4c7e4a69ffef62b0c97745ea06c 1.jpg",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "6c03e4c7e4a69ffef62b0c97745ea06c 2.jpg",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
23 changes: 23 additions & 0 deletions ...PT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/character_image2.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "_ (14).jpeg",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "_ (14) 1.jpeg",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "_ (14) 2.jpeg",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...-SOPT-iOS/Global/Assets.xcassets/images/character_image2.imageset/_ (14) 1.jpeg
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 ...-SOPT-iOS/Global/Assets.xcassets/images/character_image2.imageset/_ (14) 2.jpeg
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 ...ND-SOPT-iOS/Global/Assets.xcassets/images/character_image2.imageset/_ (14).jpeg
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 ...PT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/character_image3.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "_ (15).jpeg",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "_ (15) 1.jpeg",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "_ (15) 2.jpeg",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...-SOPT-iOS/Global/Assets.xcassets/images/character_image3.imageset/_ (15) 1.jpeg
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 ...-SOPT-iOS/Global/Assets.xcassets/images/character_image3.imageset/_ (15) 2.jpeg
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 ...ND-SOPT-iOS/Global/Assets.xcassets/images/character_image3.imageset/_ (15).jpeg
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.
12 changes: 12 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/check.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "ddd.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
3 changes: 3 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/check.imageset/ddd.svg
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.
12 changes: 12 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/todo_checked.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "Group 35959.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions ...ND-SOPT-iOS/Global/Assets.xcassets/images/todo_checked.imageset/Group 35959.svg
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.
12 changes: 12 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/todo_none.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "Union.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
3 changes: 3 additions & 0 deletions ...OPT-iOS/AND-SOPT-iOS/Global/Assets.xcassets/images/todo_none.imageset/Union.svg
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.
68 changes: 68 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Presentation/week7/CalendarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//
// CalendarView.swift
// AND-SOPT-iOS
//
// Created by 김민서 on 12/12/24.
//

import SwiftUI

struct CalendarView: View {
let weekDays: [String]
let days: [Int]
let columns: [GridItem]

var body: some View {
VStack {
HStack {
ForEach(weekDays, id: \ .self) { day in
Text(day)
.frame(maxWidth: .infinity)
.foregroundColor(day == "토" ? .blue : day == "일" ? .red : .primary)
.font(.caption)
.fontWeight(.medium)
}
}
.padding(.bottom, 10)

LazyVGrid(columns: columns) {
ForEach(days, id: \ .self) { day in
CalendarDayView(day: day)
.padding(.bottom, 10)
}
}
}
}
}

struct CalendarDayView: View {
let day: Int

var body: some View {
VStack {
ZStack {
if day <= 15 {
Image("todo_checked")
.resizable()
.frame(width: 25, height: 25)
Image("check")
.resizable()
.frame(width: 15, height: 11)
} else {
Image("todo_none")
.resizable()
.frame(width: 25, height: 25)
Text("2")
.foregroundColor(.white)
.font(.caption)
.fontWeight(.bold)
}
}

Text("\(day)")
.foregroundColor(.primary)
.font(.caption2)
.fontWeight(.medium)
}
}
}
34 changes: 34 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Presentation/week7/FriendListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//
// FriendListView.swift
// AND-SOPT-iOS
//
// Created by 김민서 on 12/12/24.
//

import SwiftUI

struct FriendListView: View {
var body: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack {
ForEach(1...10, id: \ .self) { index in
VStack {
Image("character_image3")
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 50, height: 50)
.cornerRadius(25)
Text("친구 \(index)")
.font(.caption)
.fontWeight(.medium)
}
}
}
}
}
}


#Preview {
FriendListView()
}
25 changes: 25 additions & 0 deletions AND-SOPT-iOS/AND-SOPT-iOS/Presentation/week7/MonthSelectorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// WeekdayHeaderView.swift
// AND-SOPT-iOS
//
// Created by 김민서 on 12/12/24.
//

import SwiftUI

struct MonthSelectorView: View {
var body: some View {
HStack {
Text("2024년 11월")
.font(.subheadline)
.fontWeight(.bold)
Spacer()
Image(systemName: "chevron.left")
Image(systemName: "chevron.right")
}
}
}

#Preview {
MonthSelectorView()
}
Loading