Skip to content

Untitled Pull Request #8

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
rwrun wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Untitled Pull Request #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions smartClass.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
A8700E052A1DDC2A00D60253 /* FontManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E042A1DDC2A00D60253 /* FontManager.swift */; };
A8700E082A1DDC6100D60253 /* CustomFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E072A1DDC6100D60253 /* CustomFont.swift */; };
A8700E0B2A1DDCAD00D60253 /* View.ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E0A2A1DDCAD00D60253 /* View.ext.swift */; };
A8700E272A24B71500D60253 /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E262A24B71500D60253 /* CalendarView.swift */; };
A8700E292A24B96500D60253 /* Date.ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E282A24B96500D60253 /* Date.ext.swift */; };
A8700E2B2A24BA2100D60253 /* CalendarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E2A2A24BA2100D60253 /* CalendarViewModel.swift */; };
A8700E2D2A24BBA900D60253 /* Color.ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8700E2C2A24BBA900D60253 /* Color.ext.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -28,6 +32,10 @@
A8700E042A1DDC2A00D60253 /* FontManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontManager.swift; sourceTree = "<group>"; };
A8700E072A1DDC6100D60253 /* CustomFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomFont.swift; sourceTree = "<group>"; };
A8700E0A2A1DDCAD00D60253 /* View.ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.ext.swift; sourceTree = "<group>"; };
A8700E262A24B71500D60253 /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
A8700E282A24B96500D60253 /* Date.ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.ext.swift; sourceTree = "<group>"; };
A8700E2A2A24BA2100D60253 /* CalendarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewModel.swift; sourceTree = "<group>"; };
A8700E2C2A24BBA900D60253 /* Color.ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.ext.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -65,7 +73,9 @@
A8700E032A1DDBFC00D60253 /* Info.plist */,
A8700E002A1DDB6B00D60253 /* Fonts */,
A8700DF22A1DDAD500D60253 /* smartClassApp.swift */,
A8700E2A2A24BA2100D60253 /* CalendarViewModel.swift */,
A8700DF42A1DDAD500D60253 /* ContentView.swift */,
A8700E262A24B71500D60253 /* CalendarView.swift */,
A8700DF62A1DDAD600D60253 /* Assets.xcassets */,
A8700DF82A1DDAD600D60253 /* Preview Content */,
);
Expand Down Expand Up @@ -101,6 +111,8 @@
isa = PBXGroup;
children = (
A8700E0A2A1DDCAD00D60253 /* View.ext.swift */,
A8700E282A24B96500D60253 /* Date.ext.swift */,
A8700E2C2A24BBA900D60253 /* Color.ext.swift */,
);
path = Extension;
sourceTree = "<group>";
Expand Down Expand Up @@ -176,10 +188,14 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A8700E2B2A24BA2100D60253 /* CalendarViewModel.swift in Sources */,
A8700DF52A1DDAD500D60253 /* ContentView.swift in Sources */,
A8700E082A1DDC6100D60253 /* CustomFont.swift in Sources */,
A8700E272A24B71500D60253 /* CalendarView.swift in Sources */,
A8700E052A1DDC2A00D60253 /* FontManager.swift in Sources */,
A8700E292A24B96500D60253 /* Date.ext.swift in Sources */,
A8700DF32A1DDAD500D60253 /* smartClassApp.swift in Sources */,
A8700E2D2A24BBA900D60253 /* Color.ext.swift in Sources */,
A8700E0B2A1DDCAD00D60253 /* View.ext.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
38 changes: 38 additions & 0 deletions smartClass/Assets.xcassets/Blue.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.945",
"green" : "0.431",
"red" : "0.149"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.945",
"green" : "0.431",
"red" : "0.149"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions smartClass/Assets.xcassets/Gray.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.957",
"green" : "0.957",
"red" : "0.957"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.957",
"green" : "0.957",
"red" : "0.957"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 38 additions & 0 deletions smartClass/Assets.xcassets/Red.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.290",
"green" : "0.290",
"red" : "0.996"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.290",
"green" : "0.290",
"red" : "0.996"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
178 changes: 178 additions & 0 deletions smartClass/CalendarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
//
// CalendarView.swift
// smartClass
//
// Created by Ислам Батыргереев on 29.05.2023.
//

import SwiftUI

struct CalendarView: View {
let daysName = ["пн","вт","ср","чт","пт","сб","вс"]
@ObservedObject var calendarViewModel = CalendarViewModel()
@State var curentMonth: Int = 0
@State var currentDate = Date()
let calendarGrid = Array(repeating: GridItem(.flexible()), count: 7)
@State var today = Date()

var body: some View {

VStack(alignment: .leading){
Text("Календарь")
.customFont(font: FontManager.main)
.padding(.leading, 20)
.foregroundColor(.gray)
VStack{

VStack(spacing: 30){
VStack(spacing: 24){
HStack{
//left
HStack{
Button {
curentMonth -= 1
} label: {
Image(systemName: "chevron.left")
.foregroundColor(.black)
}

}
Spacer()
VStack{
Text(extraDate(currentDate: currentDate)[1])
.customFont(font: FontManager.Nunito.bold, size: 14)
Text(extraDate(currentDate: currentDate)[0])
.customFont(font: FontManager.Nunito.bold, size: 20)
.foregroundColor(.mBlue)
}
Spacer()
//right
HStack{
Button {
curentMonth += 1
} label: {
Image(systemName: "chevron.right")
.foregroundColor(.black)
}

}
}
.padding(.horizontal, 20)

HStack(spacing: 0){
ForEach(daysName, id: \.self) { day in
Text(day)
.frame(maxWidth: .infinity)
.customFont(font: FontManager.Nunito.black)
}
}
}

LazyVGrid(columns: calendarGrid, spacing: 10) {
ForEach(extractDate(curentMonth: curentMonth)) { value in
CardView(value: value)
.environmentObject(calendarViewModel)
.overlay {
if sameDate(date1: value.date, date2: today), value.day != -1 {
ZStack{
Circle()
.stroke(Color.mBlue, lineWidth: 4)
.frame(width: 35, height: 35)
}
.zIndex(0)
}
}
.onTapGesture {
today = value.date
currentDate = value.date
//
}
}
}
.onChange(of: curentMonth) { newValue in
currentDate = getCurrenMonth(curentMonth: curentMonth)
today = Date()
}
}

}
.padding(.vertical, 20)
.padding(.horizontal, 10)
.background(Color.mGray)
.cornerRadius(20)

}
.padding()


}
}


struct CardView: View{
@ObservedObject var calendarViewModel = CalendarViewModel()
var value: DateValue

var body: some View{
VStack{
if value.day != -1 {

if let selectDay = calendarViewModel.availableDays.first(where: { day in
return sameDate(date1: day.date, date2: value.date)
}){
ZStack{
Circle()
.frame(width: 35, height: 35)
.clipShape(Circle())
.foregroundColor(Color.mBlue)

Text("\(value.day)")
.foregroundColor(.white)
.overlay {
ZStack{
Circle()
.frame(width: 20, height: 20)
.foregroundColor(Color.mRed)
Text("\(selectDay.times.count)")
.customFont(font: FontManager.main, size: 14)
.foregroundColor(.white)
}
.offset(x: -15, y: -15)
}
}
} else {
Text("\(value.day)")
.frame(width: 35, height: 35)
.clipShape(Circle())
}
}
}
}
}


struct CalendarView_Previews: PreviewProvider {
static var previews: some View {
CalendarView()
}
}


struct DateValue: Identifiable{
var id = UUID().uuidString
var day: Int
var date: Date
var isTime: Bool = false
var lessons: [Lesson] = []
}

struct Lesson: Identifiable, Equatable{
var id = UUID().uuidString
var date: Date
var times: [Times]
}

struct Times: Identifiable, Equatable{
var id = UUID().uuidString
var time: String
}
Loading