Skip to content
This repository has been archived by the owner on May 5, 2020. It is now read-only.

Completed the "ScenarioViewController" merging #72

Merged
merged 4 commits into from
May 31, 2017

Conversation

identity2
Copy link
Contributor

@identity2 identity2 commented May 31, 2017

Major Changes

  • Merged all the Choices-xScenes and Scene-xs VCs into a single ScenarioViewController.
  • Restructured the SQLite database, so that the current 2 scenarios could be stored together.
  • Redesigned segues between each VC.

Minor Changes

  • Kept the Choice Buttons in an (@IBOutlet) Array<UIButton>! instead of individual UIButton!s.
  • Replaced all of the UITextFields and UITextViews with UILabels, since no text input and text scrolling is required.
  • Renamed classes, variables and added comments to improve readability.
  • Added a placeholder VC for mini games.

Below is a picture for the newly designed Storyboard. (However, the "Customize Avatar" and "Shop" are not implemented yet.)
new segues

@identity2 identity2 changed the title Combined the redundant "Choices" VCs into one "ScenarioViewController" Combine the redundant "Choices" VCs into one "ScenarioViewController" May 31, 2017
@identity2 identity2 changed the title Combine the redundant "Choices" VCs into one "ScenarioViewController" Complete the "ScenarioViewController" merging May 31, 2017
@identity2 identity2 changed the title Complete the "ScenarioViewController" merging Completed the "ScenarioViewController" merging May 31, 2017
@sunjunkie sunjunkie merged commit 6310bfa into anitab-org:develop May 31, 2017
@sunjunkie
Copy link
Contributor

This is merged. However the error conditions need to be handled (replace print statements) in a future merge.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants