Skip to content

Commit

Permalink
Merge branch 'main' into dev-ridohendrawan
Browse files Browse the repository at this point in the history
  • Loading branch information
Ridho Saputra authored Apr 12, 2022
2 parents 5c70039 + 0f5a086 commit 0f87b14
Show file tree
Hide file tree
Showing 18 changed files with 596 additions and 2 deletions.
16 changes: 14 additions & 2 deletions abilitea.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
49BC74B427FF1B4600F8E614 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 49BC74B227FF1B4600F8E614 /* Main.storyboard */; };
49BC74B627FF1B4700F8E614 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 49BC74B527FF1B4700F8E614 /* Assets.xcassets */; };
49BC74B927FF1B4700F8E614 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 49BC74B727FF1B4700F8E614 /* LaunchScreen.storyboard */; };
AFECDA54280581DB00F76D78 /* QuestionImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFECDA53280581DB00F76D78 /* QuestionImageCell.swift */; };
AFECF0D82800749600305FEB /* TutorialStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AFECF0D72800749600305FEB /* TutorialStoryboard.storyboard */; };
AFECF0DA280074B700305FEB /* TutorialController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFECF0D9280074B700305FEB /* TutorialController.swift */; };
A19A056D280091340087843F /* ModuleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A19A056C280091340087843F /* ModuleCollectionViewCell.swift */; };
/* End PBXBuildFile section */

Expand All @@ -42,6 +45,9 @@
49BC74B527FF1B4700F8E614 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
49BC74B827FF1B4700F8E614 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
49BC74BA27FF1B4700F8E614 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AFECDA53280581DB00F76D78 /* QuestionImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestionImageCell.swift; sourceTree = "<group>"; };
AFECF0D72800749600305FEB /* TutorialStoryboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TutorialStoryboard.storyboard; sourceTree = "<group>"; };
AFECF0D9280074B700305FEB /* TutorialController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialController.swift; sourceTree = "<group>"; };
A19A056C280091340087843F /* ModuleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModuleCollectionViewCell.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -76,6 +82,7 @@
A19A056C280091340087843F /* ModuleCollectionViewCell.swift */,
49BC74B027FF1B4600F8E614 /* ViewController.swift */,
15BA4D242805634300C409D3 /* WelcomepageViewController.swift */,
AFECF0D9280074B700305FEB /* TutorialController.swift */,
);
path = Controller;
sourceTree = "<group>";
Expand Down Expand Up @@ -116,6 +123,8 @@
497033C2280019B90064E36F /* Models */,
497033C4280019C80064E36F /* System */,
49BC74B227FF1B4600F8E614 /* Main.storyboard */,
AFECF0D72800749600305FEB /* TutorialStoryboard.storyboard */,
AFECDA53280581DB00F76D78 /* QuestionImageCell.swift */,
);
path = abilitea;
sourceTree = "<group>";
Expand Down Expand Up @@ -184,6 +193,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
AFECF0D82800749600305FEB /* TutorialStoryboard.storyboard in Resources */,
498D5FBA28002D8700F80C79 /* .gitignore in Resources */,
49BC74B927FF1B4700F8E614 /* LaunchScreen.storyboard in Resources */,
49BC74B627FF1B4700F8E614 /* Assets.xcassets in Resources */,
Expand All @@ -201,6 +211,7 @@
15BA4D252805634300C409D3 /* WelcomepageViewController.swift in Sources */,
1569CD7227FF21A400DAEA4C /* questionFeederCrit.swift in Sources */,
15BA4D27280563EA00C409D3 /* SettingsViewController.swift in Sources */,
AFECDA54280581DB00F76D78 /* QuestionImageCell.swift in Sources */,
49BC74B127FF1B4600F8E614 /* ViewController.swift in Sources */,
49BC74AD27FF1B4600F8E614 /* AppDelegate.swift in Sources */,
1569CD7027FF218600DAEA4C /* questionFeederProb.swift in Sources */,
Expand All @@ -209,6 +220,7 @@
1569CD6E27FF216F00DAEA4C /* questionFeederNum.swift in Sources */,
49BC74AF27FF1B4600F8E614 /* SceneDelegate.swift in Sources */,
1569CD6A27FF210E00DAEA4C /* questionStructure.swift in Sources */,
AFECF0DA280074B700305FEB /* TutorialController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -362,7 +374,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Abilitea;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIMainStoryboardFile = TutorialStoryboard;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
Expand Down Expand Up @@ -391,7 +403,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Abilitea;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIMainStoryboardFile = TutorialStoryboard;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
Expand Down
70 changes: 70 additions & 0 deletions abilitea/Controller/TutorialController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
//
// TutorialController.swift
// abilitea
//
// Created by William Yulio on 08/04/22.
//

import Foundation
import UIKit


class TutorialViewController: UIViewController {

@IBOutlet weak var TableContainer: UITableView!

/// Outlets
@IBOutlet weak var QuestionText: UILabel!
@IBOutlet weak var CategoryLabel: UINavigationItem!
@IBOutlet weak var AnswerQuestionBtn: UIButton!



override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
TableContainer.delegate = self
TableContainer.dataSource = self

}

@IBAction func backToMainMenuBtn(_ sender: UIBarButtonItem) {
}

@IBAction func answerQuestionBtn(_ sender: Any) {


}



}

extension TutorialViewController: UITableViewDelegate{
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
print("you tapped me")
}


}

extension TutorialViewController: UITableViewDataSource{

// Asks the data source for a cell to insert in a particular location of the table view.

func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
// Fetch a cell of the appropriate type.
let cell = tableView.dequeueReusableCell(withIdentifier: "QuestionImageCell", for: indexPath)

// Configure the cell’s contents.
cell.textLabel!.text = "Cell text"

return cell
}

// Buat nentuin jumlah konten yang mau ditampilin ditable
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}

}
25 changes: 25 additions & 0 deletions abilitea/QuestionImageCell.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// QuestionImageCell.swift
// abilitea
//
// Created by William Yulio on 12/04/22.
//

//import UIKit
//
//class QuestionImageCell: UITableViewCell{
// var mainImageView : UIImageView = {
// var imageView = UIImageView()
// imageView.translatesAutoresizingMaskIntoConstraints = false
// return imageView
// }
//
// override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
// super.init(style: style, reuseIdentifier: reuseIdentifier)
// self.addSubview(mainImageView)
//
//
// mainImageView.leftAnchor.constraint(equalTo: self.leftAnchor).isActive = true
//
// }
//}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "William Yulio.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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "next.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
15 changes: 15 additions & 0 deletions abilitea/System/Assets.xcassets/icon-answer-btn.imageset/next.svg
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" : "next-3.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
15 changes: 15 additions & 0 deletions abilitea/System/Assets.xcassets/icon-done-btn.imageset/next-3.svg
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" : "Ellipse 3.svg",
"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,21 @@
{
"images" : [
{
"filename" : "next-2.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit 0f87b14

Please sign in to comment.