Skip to content

Merge it#18

Merged
ranjani23 merged 63 commits intocodeforboston:developfrom
bhavsar-dhara:mergeIt
Jul 11, 2018
Merged

Merge it#18
ranjani23 merged 63 commits intocodeforboston:developfrom
bhavsar-dhara:mergeIt

Conversation

@bhavsar-dhara
Copy link
Collaborator

No description provided.

stevemanone and others added 30 commits April 23, 2018 20:19
Changes are mostly for 4/24 demonstration and including a very messy way
to 'disable' certain videos (videos do not lead to youtube player when clicked,
and only specific videos are allowed).
This includes creating a smaller (less pixels) version of the App
Landing page (original picture would not show up on the small phone
screen) and slighly changing the logic used to hide the remenant
(setting opacity to 0 seemed to only dim but not completely hide the
remnant icon).
Save it as metadata WIP
This will need revisiting, but getFontScale() did not work as expected.
Very preliminary version of nav bar, does not have functionality for
contextual help or remnant icon logic (ie. remnant icon appearing after
viewing 2 videos).
icons in the nav bar are no longer 'Button' components).  The YouTube
API link is not hard coded.
sashamaryl and others added 25 commits June 19, 2018 23:43
Keys of <Section> should match the names of the screens defined in TabNav,
currently:

screen      section
------      -------
Chooser --> Home (Objects)
RemnantChooser --> Remnants
About --> Resources
@ranjani23
Copy link
Collaborator

Looks good! We have a lot of changes, probably review it when we merge from dev branch to main.. Ship it to dev branch!

@ranjani23 ranjani23 merged commit 901f5b8 into codeforboston:develop Jul 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants