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

Merging work from GSoC 18 into develop #315

Merged
merged 22 commits into from
Aug 7, 2018
Merged

Merging work from GSoC 18 into develop #315

merged 22 commits into from
Aug 7, 2018

Commits on May 21, 2018

  1. Initial PR gsoc18 : PopupEventController (#262)

    justKD authored and sunjunkie committed May 21, 2018
    Configuration menu
    Copy the full SHA
    94f998c View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. Class handling intro sequences does not interfere with existing scena…

    …rio setup (#271)
    
    * StorySequencePlayer does not interfere with existing scenario setup and launch - Issue265
    
    - added ScenarioSequencePlayer delegate to ScenarioViewController
    - ScenarioViewController checks the scenarioID to see if an intro
    sequence should play
    - ScenarioSequencePlayer is a UIView that lays out its own subviews,
    and dismisses on tap via the delegate method sequenceDidFinish
    - existing setup functionality is not changed
    justKD authored and sunjunkie committed May 22, 2018
    Configuration menu
    Copy the full SHA
    2a76ed7 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2018

  1. Fixed Swift 4 deprecations (#275)

    justKD authored and sunjunkie committed May 26, 2018
    Configuration menu
    Copy the full SHA
    32ecbd5 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. First version of a complete intro sequence - all classes and dependen…

    …cies (#273)
    justKD authored and sunjunkie committed May 28, 2018
    Configuration menu
    Copy the full SHA
    2ccda51 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. Prepare for UI tests (#279)

    * Added UI test target
    * abstracted the collections of popups and sequences to their own
    struct in order to make it easier to assert types and retrieve for
    collections without needing to match strings.
    justKD authored and sunjunkie committed May 30, 2018
    Configuration menu
    Copy the full SHA
    a9f9a72 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. Issue 280 memory leak (#281)

    justKD authored and sunjunkie committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    6762f99 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Issue 277 ui tests for PopupEventPlayer (#284)

    justKD authored and sunjunkie committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    425d9e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Added ui tests for StorySequencePlayer (#283)

    justKD authored and sunjunkie committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    3cad2cb View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Issue 286 popup unit test (#289)

    justKD authored and sunjunkie committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    87c65dd View commit details
    Browse the repository at this point in the history
  2. Issue 285 storysequence unit tests (#291)

    justKD authored and sunjunkie committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    b16057e View commit details
    Browse the repository at this point in the history
  3. Issue 287 fix fading text ssp (#296)

    * Fix label text fading too soon;  When a left and right event both had text, the left event would fade as soon as it was on screen.
    justKD authored and sunjunkie committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    56b3ce8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b54026e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. Issue 270 outro example (#297)

    * Add example outro sequence and update ScenarioViewController to handle outs
    
    Moved the code to handle moving to the next question to a separate
    function in order to be able to delay it if an outro sequence was
    launched. This change fixes the unit test to account for that.
    justKD authored and sunjunkie committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    94e3a21 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2018

  1. Issue 260 crossplatform datasets (#300)

    * Add json datasets; updated to use json
    
    * Updated popup event player to not require a delegate
    justKD authored and sunjunkie committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    bb7039c View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. Issue 290 accessibility (#301)

    * Added accessibility IDs
    * Updated StorySequencePlayer UI tests to use accessibility identifiers in all cases
    justKD authored and sunjunkie committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    0e393ec View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Issue 292 swapping images (#302)

    * Updated image file names - For storysequenceplayer images, now standardizes as: “character_name^mood”. This is in preparation for a fix to the image swapping issue.
    * Updated the model and json to use the new file names
    * Fixed issue with swapping images instantly; still need to update the right side function
    * Fixing label fading again
    justKD authored and sunjunkie committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    ad74ff2 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. Changed PopupEventPlayer to use sound file names (#305)

    * Changed PopupEventPlayer to use sound file names instead of always using the same sounds via bool
    
    - now the model expects a slide in sound file name and badge sound file
    name
    - leaving one or both empty will negate playing a sound at that time
    justKD authored and sunjunkie committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    d016940 View commit details
    Browse the repository at this point in the history
  2. Account for black area in iPhoneX on-screen status bar (#309)

    Fix for story sequence player on iPhone X
    justKD authored and sunjunkie committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    446c84e View commit details
    Browse the repository at this point in the history
  3. Issue 306 skip indicator (#310)

    * Animate remembers original duration set during initialization
    
    * Story sequence player can show a skip notification
    justKD authored and sunjunkie committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    184d9c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2018

  1. Issue 299 unit tests - also closes Epic Issue 255 (#311)

    * Checked and updated unit test for StorySequences
    * Checked and updated unit test for PopupEventPlayer
    * Updated the PopupEventPlayer UI Test to use an accessibility identifier instead of view hierarchy searching
    * Updated unit and ui test comments
    justKD authored and sunjunkie committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    27f8b1e View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. Updated inline markdown comments (OOC classes) for Jazzy documentation (

    #316)
    
    * Updated inline markdown comments (OOC classes) for Jazzy documentation
    justKD authored and sunjunkie committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    f6c72ce View commit details
    Browse the repository at this point in the history
  2. Removed extra line at bottom (#317)

    justKD authored and sunjunkie committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    179458b View commit details
    Browse the repository at this point in the history