Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Sheep game layout #19

Merged
merged 91 commits into from Sep 5, 2019

Conversation

@pylapp
Copy link
Member

commented Aug 13, 2019

Pull request related to #5

pylapp added 2 commits Aug 13, 2019
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
pylapp added 25 commits Aug 13, 2019
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Fix animation repeat issue when acvtivity paused and resumed

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Read default speed from properties
- Read default number of fences from config

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Work on baahbox sensor data processing

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Record sensor data in a queue
- Compute average for these records
- Define trends using the averages differences

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Sheep move offset

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Durations for animations

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
pylapp added 24 commits Aug 29, 2019
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
…eports

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Add gesture listener fro scrolls on X and Y axis
- Add flag for demo mode
- Add management of demo in star, balloon and sheep games

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
- Enable the feature from config file
- Activate the demo mode from app settings

Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
Signed-off-by: Pierre-Yves Lapersonne (Orange) <pierreyves.lapersonne@orange.com>
@pylapp pylapp marked this pull request as ready for review Sep 5, 2019
@pylapp pylapp removed the do not merge yet label Sep 5, 2019
@pylapp pylapp merged commit fd71b73 into dev Sep 5, 2019
@pylapp pylapp deleted the 5-game-sheep-layout branch Sep 5, 2019
pylapp added a commit that referenced this pull request Sep 12, 2019
## Features

* tool - add plugin for images metadata
* #15 - ribbons on app icons for aplha, beta and Orange PrimeZone
* #5 - sheep legs animation on the floor of intro screen
* #5 - sheep game properties
* #5 - sheep moves in playing mode
* #5 - move fences programatically only hard-coded config
* #5 - display fences with dedicated speed from in-app config
* project - remove parasites from sensor data records
* #5 - move sheep with sensors (raugh implemantation)
* tool - 🔨 add Shell script to run unit tests and check reports
* tool - 🔨 add Shell script to run instrumented tests and check reports
* project - 🆕 demo mode
* #19 - Sheep game layout
* project - 🆕 detection of collisions between 2 views
* #6 - 🆕 collision detection in game
* #6- 🆕 game logic for sheep game
* #6- 🆕 game layout and text contents
* #7 - 🆕 speed of fences in preferences


## Bug Fixes

* #16 - lateinit proeprty used and not initialized
* #5 - size of sheep
* #5 - wording and text fields
* project - logs
* project - english i18n
* project - properties key use
* #5 -   positions of florr, sheep, fences and widgets for x/xx/xxx-hdpi screens
* SensorDataSeries -   parasite removal when 0 as max
* SensorDataSeries -   parasite factor
* SensorDataSeries -   parasite detection 
* #5 -   positions of sheep when sensor data to low 
* #5 -   positions of sheep when sensor data are very high 
* tools -   command status
* l10n -  typo in french strings
* #6 -  collision detection
* #6 -  wording
* #6 -  icon animator

## Test

* project - Logger
* project - PropertiesKeys
* project - PropertiesReader
* project - Queue
* project - SensorDataSeries
* project - InputsParser, PropertiesKeys
* project - ⭕ TrainingBoxViewModel
* project - ⭕ IconAnimator
* project - ⭕ MainActivityFragment
* project - ⭕ PropertiesReader
* project - ⭕ MainActivity
* project - ⭕ GameStarFragment
* project - ⭕ GameBalloonFragment
* project - ⭕ GameSheepFragment
* project - ⭕ factorisation
* project - ⭕ GesturesDemo
* #6 - ⭕ CollisionDetector

## Refactor

* project - 📦 TrainingBox
* #5 - 🔩 sheep game layout dimensions and game properties
* project - 🔩 tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.