Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 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
f1cd66b
Add Curve
swiftlysingh Aug 2, 2020
34cc620
Add Curve with Common Class
swiftlysingh Aug 2, 2020
8a3e96e
Onboarding Screen added
vaibhavbisht06 Jun 10, 2020
565f202
Tab Bar Button
Jun 13, 2020
c7e25ce
Dashboard
Jun 19, 2020
7da0e0f
Tab Bar Complete
Jun 19, 2020
d3907e0
Complete Tab Bar
Jun 19, 2020
e3ddcab
Complete Nav Bar
Jun 19, 2020
0ce92ca
Complete Nav Bar and Tab Bar
Jun 19, 2020
f3e6817
Create Sub-Header
Jun 20, 2020
b7da8e2
Create Sub-Header
Jun 20, 2020
d5b0b3c
Create Doubts Sub-Header
Jun 22, 2020
b6b2ef7
My Courses Sub-Header
Jun 23, 2020
cc286d2
Add My Courses Card
Jun 23, 2020
f404c5b
Change target to iOS Version 13
Jun 23, 2020
66b14da
Update
swiftlysingh Jun 24, 2020
42cfd09
Scroll View Added
swiftlysingh Jun 27, 2020
32aef94
Add Top Button
swiftlysingh Jun 27, 2020
32daba5
Add Top Button Gradientd
swiftlysingh Jun 27, 2020
8468ece
Gradiient Button
swiftlysingh Jul 4, 2020
3e8c11c
Add Header Button
swiftlysingh Jul 4, 2020
908ce54
Add popular course header
swiftlysingh Jul 4, 2020
6b33c50
Update costraints
swiftlysingh Jul 4, 2020
868d0af
Add Learning Track annd Trending Now
swiftlysingh Jul 4, 2020
6cf25df
ACorrect Colors
swiftlysingh Jul 4, 2020
b8fbcdc
Scroll View Added
swiftlysingh Jul 19, 2020
4e0fbd7
Update Location of Continue Button
swiftlysingh Jul 19, 2020
648e51c
Add Course Progress
swiftlysingh Jul 19, 2020
2c8a546
Add Shadow Func
swiftlysingh Jul 19, 2020
a0fceb2
Add Your Performance
swiftlysingh Jul 19, 2020
18fe54b
Add Performance Graph
swiftlysingh Jul 19, 2020
0bb8beb
Dashboard Allmost complette
swiftlysingh Jul 19, 2020
de091bc
Dashboard Comlpete
swiftlysingh Jul 19, 2020
13570eb
Conflict Resolved
swiftlysingh Jul 23, 2020
e82e3d2
Add Gradient and Curve to progress bar
swiftlysingh Jul 29, 2020
1b22fc1
Dashboard requested changes
swiftlysingh Jul 29, 2020
61e8977
Add gradient for progress>90
swiftlysingh Jul 31, 2020
b812ba6
Merge Vaibhav's work
swiftlysingh Aug 1, 2020
c98eb9e
Update Padding and other
swiftlysingh Aug 2, 2020
6d7ac4d
Merge Tab Bar Branch
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
150 changes: 87 additions & 63 deletions CBOnlineIos.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

487 changes: 487 additions & 0 deletions CBOnlineIos.xcodeproj/project.pbxproj.orig

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions CBOnlineIos/Assets.xcassets/course_image.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "course_image.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/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?")
}
}
65 changes: 65 additions & 0 deletions CBOnlineIos/Presentation/MyCoursesViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
//
// MyCoursesViewController.swift
// CBOnlineIos
//
// Created by Pushpinder Pal Singh on 23/06/20.
// Copyright © 2020 Coding Blocks. All rights reserved.
//

import UIKit

class MyCoursesViewController: UIViewController {

@IBOutlet weak var recentlyAdded: UIButton!
override func viewDidLoad() {
super.viewDidLoad()

self.view = view
setUPCardView()
setupanimationbutton()
}
let cardView = UIView()

let recentlyAccessed = UIButton()
let expiredCourses = UIButton()
let freeTrials = UIButton()
let allCourses = UIButton()
let premium = UIButton()
let active = UIButton()
var cardViewBottom : NSLayoutConstraint!

func setUPCardView(){
view.addSubview(cardView)
cardView.backgroundColor = .black
cardView.layer.cornerRadius = 12
setupCardViewConstrains()
setUpRecentlyButton()
}

func setUpRecentlyButton() {
cardView.addSubview(recentlyAccessed)
recentlyAccessed.setTitle("Recently Added", for: .normal)

}

func setupanimationbutton(){
recentlyAdded.addTarget(self, action: #selector(animate), for: .touchUpInside)
}
@objc func animate(){
cardView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -10).isActive = true
UIView.animate(withDuration: 0.4) {
self.view.layoutIfNeeded()
}
}


func setupCardViewConstrains(){
cardView.translatesAutoresizingMaskIntoConstraints = false
cardView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 10).isActive = true
cardView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -10).isActive = true
cardView.heightAnchor.constraint(equalToConstant: 360).isActive = true
cardViewBottom = cardView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 500)
cardViewBottom.isActive = true
}

}
Loading