Skip to content
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.

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

Untitled Pull Request #4

Open
wants to merge 5 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions smartClass.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
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 */; };
BE3B01C32A23CBEC008C1073 /* TimetableCardFull.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE3B01C22A23CBEC008C1073 /* TimetableCardFull.swift */; };
BEA6EBD32A1FC3C000F28AE1 /* TimetableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA6EBD22A1FC3C000F28AE1 /* TimetableView.swift */; };
BEA6EBD52A1FC46400F28AE1 /* TimetableCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA6EBD42A1FC46400F28AE1 /* TimetableCard.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -28,6 +31,9 @@
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>"; };
BE3B01C22A23CBEC008C1073 /* TimetableCardFull.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableCardFull.swift; sourceTree = "<group>"; };
BEA6EBD22A1FC3C000F28AE1 /* TimetableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableView.swift; sourceTree = "<group>"; };
BEA6EBD42A1FC46400F28AE1 /* TimetableCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableCard.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -60,6 +66,7 @@
A8700DF12A1DDAD500D60253 /* smartClass */ = {
isa = PBXGroup;
children = (
BEA6EBD12A1FC3AA00F28AE1 /* Timetable */,
A8700E092A1DDC9D00D60253 /* Extension */,
A8700E062A1DDC4900D60253 /* Modifiers */,
A8700E032A1DDBFC00D60253 /* Info.plist */,
Expand Down Expand Up @@ -105,6 +112,16 @@
path = Extension;
sourceTree = "<group>";
};
BEA6EBD12A1FC3AA00F28AE1 /* Timetable */ = {
isa = PBXGroup;
children = (
BEA6EBD22A1FC3C000F28AE1 /* TimetableView.swift */,
BEA6EBD42A1FC46400F28AE1 /* TimetableCard.swift */,
BE3B01C22A23CBEC008C1073 /* TimetableCardFull.swift */,
);
path = Timetable;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -180,6 +197,9 @@
A8700E082A1DDC6100D60253 /* CustomFont.swift in Sources */,
A8700E052A1DDC2A00D60253 /* FontManager.swift in Sources */,
A8700DF32A1DDAD500D60253 /* smartClassApp.swift in Sources */,
BEA6EBD52A1FC46400F28AE1 /* TimetableCard.swift in Sources */,
BEA6EBD32A1FC3C000F28AE1 /* TimetableView.swift in Sources */,
BE3B01C32A23CBEC008C1073 /* TimetableCardFull.swift in Sources */,
A8700E0B2A1DDCAD00D60253 /* View.ext.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"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
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.914",
"green" : "0.424",
"red" : "0.231"
}
},
"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" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.690",
"green" : "0.690",
"red" : "0.690"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions smartClass/Assets.xcassets/Timetable colors/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.408",
"green" : "0.408",
"red" : "0.408"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions smartClass/Assets.xcassets/Timetable icons/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "image 14.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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,12 @@
{
"images" : [
{
"filename" : "image 16.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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,12 @@
{
"images" : [
{
"filename" : "image 15-2.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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,21 @@
{
"images" : [
{
"filename" : "Group 107.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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,12 @@
{
"images" : [
{
"filename" : "Rectangle 113.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions smartClass/Timetable/TimetableCard.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
//
// TimetableCard.swift
// smartClass
//
// Created by artemiithefrog on 25.05.2023.
//

import SwiftUI

struct TimetableCard: View {

private var lesson = "Основы программирования"
private var lessonTime = "17:00 - 18:30"
var buildingNumber = 9
private var audienceNumber = 201

var body: some View {
VStack(alignment: .leading) {
HStack {
Text("\(lesson)")
.customFont(font: FontManager.Nunito.bold, size: 16)
.padding(.top, 19)
.padding(.leading, 25)
Spacer()
NavigationLink(destination: TimetableCardFull()) {
Image("arrowIconRight")
.resizable()
.frame(width: 17, height: 17)
.padding(.top, 20)
.padding(.trailing, 25)
}.navigationTitle(Text(""))
}
Text("\(lessonTime)")
.customFont(font: FontManager.Nunito.regular, size: 12)
.foregroundColor(.white)
.padding(EdgeInsets(top: 3, leading: 10, bottom: 2, trailing: 10))
.background(Color("BlueColor"))
.cornerRadius(12)
.padding(.leading, 25)
HStack {
Image("buildingIcon")
.resizable()
.frame(width: 16, height: 16)
.padding(.leading, 25)
Text("корпус: ")
.customFont(font: FontManager.Nunito.regular, size: 14)
.foregroundColor(Color("TextGrayColor"))
Text("\(buildingNumber)")
.customFont(font: FontManager.Nunito.regular, size: 14)
.padding(.leading, -8)
Image("audienceIcon")
.resizable()
.frame(width: 16, height: 16)
.padding(.leading, 25)
Text("аудитория: ")
.customFont(font: FontManager.Nunito.regular, size: 14)
.foregroundColor(Color("TextGrayColor"))
Text("\(audienceNumber)")
.customFont(font: FontManager.Nunito.regular, size: 14)
.padding(.leading, -8)
}
.padding(.bottom, 33)
}
.background(Color("BackgroundGrayColor"))
.cornerRadius(20)
.tint(Color.black)
}
}

struct TimetableCard_Previews: PreviewProvider {
static var previews: some View {
TimetableCard()
}
}
Loading