Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
89a787a
Merge Test
Jun 16, 2020
ee4fb71
Fixed Gitignore
Jun 16, 2020
49cd426
Removed the Test File
Jun 16, 2020
aeee481
Merge pull request #1 from coding-blocks/develop
swiftlysingh Jul 19, 2020
574a63f
Merge branch 'develop' of https://github.com/coding-blocks/CBOnlineAp…
swiftlysingh Jul 21, 2020
858ed57
Merge branch 'develop' of https://github.com/coding-blocks/CBOnlineAp…
swiftlysingh Jul 29, 2020
1520646
Tab Bar
swiftlysingh Jul 30, 2020
bc42822
Add Curve
swiftlysingh Jul 30, 2020
6809c0c
Onboarding Screen added
vaibhavbisht06 Jun 10, 2020
dacb444
Tab Bar Button
Jun 13, 2020
e88110d
Dashboard
Jun 19, 2020
abd7083
Tab Bar Complete
Jun 19, 2020
5ed166e
Complete Tab Bar
Jun 19, 2020
4d7a3fe
Complete Nav Bar
Jun 19, 2020
c3cbdac
Complete Nav Bar and Tab Bar
Jun 19, 2020
5143e12
Create Sub-Header
Jun 20, 2020
eb2531b
Create Sub-Header
Jun 20, 2020
58537d6
Create Doubts Sub-Header
Jun 22, 2020
59961a4
My Courses Sub-Header
Jun 23, 2020
de9a5c0
Add My Courses Card
Jun 23, 2020
24e8499
Change target to iOS Version 13
Jun 23, 2020
4dbc5fa
Update
swiftlysingh Jun 24, 2020
1016b67
Scroll View Added
swiftlysingh Jun 27, 2020
b017331
Add Top Button
swiftlysingh Jun 27, 2020
ce84777
Add Top Button Gradientd
swiftlysingh Jun 27, 2020
eeb2763
Gradiient Button
swiftlysingh Jul 4, 2020
6574080
Add Header Button
swiftlysingh Jul 4, 2020
90b9e20
Add popular course header
swiftlysingh Jul 4, 2020
b20b968
Update costraints
swiftlysingh Jul 4, 2020
d851fe2
Add Learning Track annd Trending Now
swiftlysingh Jul 4, 2020
5a2235b
ACorrect Colors
swiftlysingh Jul 4, 2020
cf577a4
Scroll View Added
swiftlysingh Jul 19, 2020
e2f02b4
Update Location of Continue Button
swiftlysingh Jul 19, 2020
aad62ec
Add Course Progress
swiftlysingh Jul 19, 2020
19f25ce
Add Shadow Func
swiftlysingh Jul 19, 2020
e86c3ef
Add Your Performance
swiftlysingh Jul 19, 2020
92d68e9
Add Performance Graph
swiftlysingh Jul 19, 2020
0b7a1d9
Dashboard Allmost complette
swiftlysingh Jul 19, 2020
bbf526e
Dashboard Comlpete
swiftlysingh Jul 19, 2020
3e3bccc
Conflict Resolved
swiftlysingh Jul 23, 2020
8447168
Add Gradient and Curve to progress bar
swiftlysingh Jul 29, 2020
5fc1e16
Dashboard requested changes
swiftlysingh Jul 29, 2020
6f0df63
Add gradient for progress>90
swiftlysingh Jul 31, 2020
6428b18
Merge Vaibhav's work
swiftlysingh Aug 1, 2020
540b5b4
Add TableViewCell
swiftlysingh Aug 1, 2020
af04b6d
Table View Complete
swiftlysingh Aug 1, 2020
a460c42
My Courses View
swiftlysingh Aug 2, 2020
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
158 changes: 95 additions & 63 deletions CBOnlineIos.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions CBOnlineIos/Assets.xcassets/courseImage.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "courseImage.jpg",
"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.
21 changes: 21 additions & 0 deletions CBOnlineIos/Assets.xcassets/fire.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "fire.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.
21 changes: 21 additions & 0 deletions CBOnlineIos/Assets.xcassets/graph.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "graph.jpeg",
"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.
21 changes: 21 additions & 0 deletions CBOnlineIos/Assets.xcassets/growth.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "growth.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.
21 changes: 21 additions & 0 deletions CBOnlineIos/Assets.xcassets/trophy.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "trophy.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.
42 changes: 42 additions & 0 deletions CBOnlineIos/Extensions/CA_Layer.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//
// CA_Layer.swift
// CBOnlineIos
//
// Created by Pushpinder Pal Singh on 19/07/20.
// Copyright © 2020 Coding Blocks. All rights reserved.
//

import UIKit

extension CALayer {

/// Function to add Shadow
/// - Parameters:
/// - color: The Colour of the Shadow
/// - alpha: Transparency Value
/// - x: X axis of shadow
/// - y: y axis of shadow
/// - blur: blur of the shadow
/// - spread: spread of the shadow
func applySketchShadow(
color: UIColor = .black,
alpha: Float = 0.5,
x: CGFloat = 0,
y: CGFloat = 2,
blur: CGFloat = 4,
spread: CGFloat = 0)
{
shadowColor = color.cgColor
shadowOpacity = alpha
shadowOffset = CGSize(width: x, height: y)
shadowRadius = blur / 2.0
if spread == 0 {
shadowPath = nil
} else {
let dx = -spread
let rect = bounds.insetBy(dx: dx, dy: dx)
shadowPath = UIBezierPath(rect: rect).cgPath
}
}
}

90 changes: 0 additions & 90 deletions CBOnlineIos/Extensions/Extensions+UIView.swift

This file was deleted.

26 changes: 26 additions & 0 deletions CBOnlineIos/Presentation/DashboardViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// DashboardViewController.swift
// CBOnlineIos
//
// Created by Pushpinder Pal Singh on 19/06/20.
// Copyright © 2020 Coding Blocks. All rights reserved.
//

import UIKit

class DashboardViewController: UIViewController {

@IBOutlet weak var navBarView: UIView!
@IBOutlet var performaceViews: [UIView]!
@IBOutlet weak var CourseProgress: CustomHorizontalProgressView!
override func viewDidLoad() {
super.viewDidLoad()
navBarView.layer.cornerRadius = 20
for views in performaceViews{
views.layer.applySketchShadow(color: .gray, alpha: 0.3, x: 0, y: 0, blur: 0, spread: 1)
}
CourseProgress.progress = 91
}

}

46 changes: 46 additions & 0 deletions CBOnlineIos/Presentation/ExploreViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//
// ExploreViewController.swift
// CBOnlineIos
//
// Created by Pushpinder Pal Singh on 19/06/20.
// Copyright © 2020 Coding Blocks. All rights reserved.
//

import UIKit

class ExploreViewController: UIViewController {

@IBOutlet weak var navBarView: UIView!
@IBOutlet weak var headerButton: UIView!
@IBOutlet weak var headerButtonTopic: UILabel!
@IBOutlet weak var headerViewCoursesText: UILabel!
@IBOutlet weak var headerViewCoursesImage: UIImageView!

let gradient = CAGradientLayer()

override func viewDidLoad() {
super.viewDidLoad()
setNavBar()
setHeaderButton()
}
func setNavBar(){
navBarView.layer.cornerRadius = 20
navBarView.clipsToBounds = true
navBarView.layer.maskedCorners = [.layerMinXMaxYCorner,.layerMaxXMaxYCorner]
}
func setHeaderButton(){
gradient.cornerRadius = 10
gradient.frame = headerButton.bounds
gradient.colors = [UIColor.rgb(red: 4, green: 103, blue: 246).cgColor, UIColor.rgb(red: 4, green: 16, blue: 176).cgColor]
gradient.startPoint = CGPoint(x: 0.0, y: 0.5)
gradient.endPoint = CGPoint(x: 1.0, y: 0.5)
headerButton.layer.addSublayer(gradient)
headerButton.addSubview(headerButtonTopic)
headerButton.addSubview(headerViewCoursesText)
headerButton.addSubview(headerViewCoursesImage)
}

@IBAction func headerButtonPressed(_ sender: UIButton) {
print("Whats up dog?")
}
}
29 changes: 29 additions & 0 deletions CBOnlineIos/Presentation/MyCourseTableViewCell.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// MyCourseTableViewCell.swift
// CBOnlineIos
//
// Created by Pushpinder Pal Singh on 30/07/20.
// Copyright © 2020 Coding Blocks. All rights reserved.
//

import UIKit

class MyCourseTableViewCell: UITableViewCell {

@IBOutlet weak var courseImage: UIImageView!
@IBOutlet weak var headerLabel: UILabel!
@IBOutlet weak var detailLabel: UILabel!
@IBOutlet weak var progressLabel: UILabel!
@IBOutlet weak var progressView: CustomHorizontalProgressView!

override func awakeFromNib() {
super.awakeFromNib()
}

override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)

// Configure the view for the selected state
}

}
Loading