Skip to content
Permalink
Browse files

Version 0.7.0 (#30)

## 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
  • Loading branch information...
pylapp committed Sep 12, 2019
1 parent d44143a commit f266baae613807c261a6ca9d5d8814195e196db8
Showing with 5,555 additions and 422 deletions.
  1. +113 −5 CHANGELOG.md
  2. +2 −2 CONTRIBUTE.md
  3. +1 −1 README.md
  4. +15 −7 THIRD-PARTY.txt
  5. +201 −0 licenses/LICENSE-easylauncher.txt
  6. +21 −0 licenses/LICENSE-mockito.txt
  7. +109 −0 project/.idea/codeStyles/Project.xml
  8. +70 −6 project/app/build.gradle
  9. +0 −39 project/app/src/androidTest/java/com/orange/labs/orangetrainingbox/ExampleInstrumentedTest.kt
  10. +137 −0 ...c/androidTest/java/com/orange/labs/orangetrainingbox/btle/InstrumentedTestTrainingBoxViewModel.kt
  11. +91 −0 ...ect/app/src/androidTest/java/com/orange/labs/orangetrainingbox/ui/InstrumentedTestMainActivity.kt
  12. +127 −0 .../androidTest/java/com/orange/labs/orangetrainingbox/ui/animations/InstrumentedTestIconAnimator.kt
  13. +97 −0 ...pp/src/androidTest/java/com/orange/labs/orangetrainingbox/ui/demo/InstrumentedTestGesturesDemo.kt
  14. +277 −0 ...ndroidTest/java/com/orange/labs/orangetrainingbox/ui/demo/InstrumentedTestGesturesDemoListener.kt
  15. +155 −0 ...java/com/orange/labs/orangetrainingbox/ui/fragments/AbstractInstrumentedTestSimpleGameFragment.kt
  16. +60 −0 ...idTest/java/com/orange/labs/orangetrainingbox/ui/fragments/InstrumentedTestGameBalloonFragment.kt
  17. +60 −0 ...roidTest/java/com/orange/labs/orangetrainingbox/ui/fragments/InstrumentedTestGameSheepFragment.kt
  18. +60 −0 ...droidTest/java/com/orange/labs/orangetrainingbox/ui/fragments/InstrumentedTestGameStarFragment.kt
  19. +281 −0 ...dTest/java/com/orange/labs/orangetrainingbox/utils/properties/InstrumentedTestPropertiesReader.kt
  20. +3 −1 project/app/src/main/AndroidManifest.xml
  21. +65 −10 project/app/src/main/assets/app_configuration.properties
  22. +15 −6 project/app/src/main/assets/app_configuration.rules.properties
  23. +3 −1 ...p/src/main/java/com/orange/labs/orangetrainingbox/btle/{TrainingBox.kt → TrainingBoxViewModel.kt}
  24. +164 −0 project/app/src/main/java/com/orange/labs/orangetrainingbox/game/CollisionDetector.kt
  25. +23 −5 project/app/src/main/java/com/orange/labs/orangetrainingbox/game/InputsParser.kt
  26. +13 −7 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/MainActivity.kt
  27. +6 −3 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/animations/IconAnimator.kt
  28. +137 −0 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/demo/GesturesDemo.kt
  29. +30 −5 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/fragments/AbstractGameFragment.kt
  30. +27 −4 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/fragments/GameBalloonFragment.kt
  31. +422 −54 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/fragments/GameSheepFragment.kt
  32. +24 −3 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/fragments/GameStarFragment.kt
  33. +7 −7 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/fragments/MainActivityFragment.kt
  34. +81 −14 project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/settings/SettingsActivity.kt
  35. +8 −9 project/app/src/main/java/com/orange/labs/orangetrainingbox/{tools → utils}/logs/Logger.kt
  36. +66 −6 .../app/src/main/java/com/orange/labs/orangetrainingbox/{tools → utils}/properties/PropertiesKeys.kt
  37. +93 −53 ...pp/src/main/java/com/orange/labs/orangetrainingbox/{tools → utils}/properties/PropertiesReader.kt
  38. +143 −0 project/app/src/main/java/com/orange/labs/orangetrainingbox/utils/structures/Queue.kt
  39. +242 −0 project/app/src/main/java/com/orange/labs/orangetrainingbox/utils/structures/SensorDataSeries.kt
  40. +1 −0 project/app/src/main/res/layout/fragment_game_balloon_playing.xml
  41. +66 −44 project/app/src/main/res/layout/fragment_game_sheep_intro.xml
  42. +119 −7 project/app/src/main/res/layout/fragment_game_sheep_outro.xml
  43. +82 −7 project/app/src/main/res/layout/fragment_game_sheep_playing.xml
  44. +1 −0 project/app/src/main/res/layout/fragment_game_star_playing.xml
  45. +1 −0 project/app/src/main/res/layout/menu_item_balloon.xml
  46. +1 −0 project/app/src/main/res/layout/menu_item_sheep.xml
  47. +1 −0 project/app/src/main/res/layout/menu_item_space.xml
  48. +1 −0 project/app/src/main/res/layout/menu_item_star.xml
  49. +1 −0 project/app/src/main/res/layout/menu_item_toad.xml
  50. +0 −23 project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  51. +0 −23 project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  52. BIN project/app/src/main/res/mipmap-mdpi/ic_sheep_bang.png
  53. BIN project/app/src/main/res/mipmap-mdpi/ic_sheep_bump.png
  54. BIN project/app/src/main/res/mipmap-mdpi/ic_sheep_fence.png
  55. BIN project/app/src/main/res/mipmap-mdpi/ic_sheep_jump.png
  56. BIN project/app/src/main/res/mipmap-mdpi/ic_sheep_welcome_1.png
  57. BIN project/app/src/main/res/mipmap-mdpi/ic_sheep_welcome_2.png
  58. BIN project/app/src/main/res/mipmap-xxhdpi/ic_sheep_bang.png
  59. BIN project/app/src/main/res/mipmap-xxhdpi/ic_sheep_bump.png
  60. BIN project/app/src/main/res/mipmap-xxhdpi/ic_sheep_fence.png
  61. BIN project/app/src/main/res/mipmap-xxhdpi/ic_sheep_jump.png
  62. BIN project/app/src/main/res/mipmap-xxhdpi/ic_sheep_welcome_1.png
  63. BIN project/app/src/main/res/mipmap-xxhdpi/ic_sheep_welcome_2.png
  64. +13 −1 project/app/src/main/res/navigation/nav_graph.xml
  65. +28 −9 project/app/src/main/res/values-fr/strings.xml
  66. +42 −0 project/app/src/main/res/values-xhdpi/dimens.xml
  67. +41 −0 project/app/src/main/res/values-xxhdpi/dimens.xml
  68. +42 −0 project/app/src/main/res/values-xxxhdpi/dimens.xml
  69. +23 −1 project/app/src/main/res/values/dimens.xml
  70. +8 −1 project/app/src/main/res/values/licenses.xml
  71. +26 −7 project/app/src/main/res/values/strings.xml
  72. +38 −5 project/app/src/main/res/xml/preferences.xml
  73. +0 −33 project/app/src/test/java/com/orange/labs/orangetrainingbox/ExampleUnitTest.kt
  74. +224 −0 project/app/src/test/java/com/orange/labs/orangetrainingbox/game/UnitTestCollisionDetector.kt
  75. +149 −0 project/app/src/test/java/com/orange/labs/orangetrainingbox/game/UnitTestInputsParser.kt
  76. +113 −0 ...t/app/src/test/java/com/orange/labs/orangetrainingbox/ui/fragments/UnitTestGameBalloonFragment.kt
  77. +113 −0 ...ect/app/src/test/java/com/orange/labs/orangetrainingbox/ui/fragments/UnitTestGameSheepFragment.kt
  78. +113 −0 project/app/src/test/java/com/orange/labs/orangetrainingbox/ui/fragments/UnitTestGameStarFragment.kt
  79. +73 −0 .../app/src/test/java/com/orange/labs/orangetrainingbox/ui/fragments/UnitTestMainActivityFragment.kt
  80. +91 −0 project/app/src/test/java/com/orange/labs/orangetrainingbox/utils/logs/UnitTestLogger.kt
  81. +92 −0 ...ct/app/src/test/java/com/orange/labs/orangetrainingbox/utils/properties/UnitTestPropertiesKeys.kt
  82. +270 −0 project/app/src/test/java/com/orange/labs/orangetrainingbox/utils/structures/UnitTestQueue.kt
  83. +166 −0 .../app/src/test/java/com/orange/labs/orangetrainingbox/utils/structures/UnitTestSensorDataSeries.kt
  84. +3 −1 project/build.gradle
  85. +2 −2 project/gradle/wrapper/gradle-wrapper.properties
  86. +1 −1 tools/check-appconfiguration.sh
  87. +1 −1 tools/check-imagecredits.sh
  88. +29 −3 tools/{prepare-push.sh → prepare-release.sh}
  89. +64 −0 tools/run-instrumentedtests.sh
  90. +62 −0 tools/run-unittests.sh
  91. +1 −1 tools/update-changelog.sh
  92. +1 −1 tools/update-documentation.sh
  93. +3 −3 tools/update-versioncode.sh
@@ -100,20 +100,128 @@


<a name="0.6.0"></a>
## 0.6.0 "- version code: 21" (2019/07/22)
## 0.6.0 "- version code: 26" (2019/08/23)


## Bug Fixes

* #16 - lateinit proeprty used and not initialized ([ed672bd3](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/ed672bd3))
* #5 - size of sheep ([94222066](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/94222066))
* #5 - wording and text fields ([7e6df844](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/7e6df844))
* project - logs ([505a42ef](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/505a42ef))
* project - english i18n ([1dcf9a00](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/1dcf9a00))
* project - properties key use ([0eef3bc3](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/0eef3bc3))

## Features

* licenses - add ref to Orange Baah Boox GPL 3.0 license in the notices of the app ([5c9699dd](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/5c9699dd))
* licenses - more entries ([93cf2ded](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/93cf2ded))
* tool - add plugin for images metadata ([c8ab8bfd](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/c8ab8bfd))
* #15 - ribbons on app icons for aplha, beta and Orange PrimeZone ([05edb442](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/05edb442))
* #5 - sheep legs animation on the floor of intro screen ([bcab5edf](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/bcab5ed)
* #5 - sheep game properties ([4b01c87a](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/4b01c87a))
* #5 - sheep moves in playing mode ([e09f1382](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/e09f1382))
* #5 - move fences programatically only hard-coded config ([3b2c2df8](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/3b2c2df8))
* #5 - display fences with dedicated speed from in-app config ([199777f2](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/199777f2))
* project - remove parasites from sensor data records ([2652341c](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/2652341c))
* #5 - move sheep with sensors (raugh implemantation) ([bb3ee556](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/bb3ee556))

## Test

* project - Logger
* project - PropertiesKeys
* project - PropertiesReader
* project - Queue
* project - SensorDataSeries
* project - InputsParser
* project - InputsParser, PropertiesKeys



<a name="0.6.0"></a>
## 0.6.0 "- version code: 22" (2019/07/24)
## 0.6.0 "- version code: 27" (2019/08/29)


## Bug Fixes

* #5 - ❌ positions of florr, sheep, fences and widgets for x/xx/xxx-hdpi screens ([572a6096](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/572a6096))
* SensorDataSeries - ❌ parasite removal when 0 as max ([59b05cc4](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/59b05cc4))
* SensorDataSeries - ❌ parasite factor ([13d1bc8d](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/13d1bc8d))
* SensorDataSeries - ❌ parasite detection ([b4d42d8b](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/b4d42d8b))
* SensorDataSeries - ❌ parasite detection ([6a8d255b](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/6a8d255b))
* SensorDataSeries - ❌ parasite detection ([f46c52ff](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/f46c52ff))
* #5 - ❌ positions of sheep when sensor data to low ([22808e19](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/22808e19))
* #5 - ❌ positions of sheep when sensor data are very high ([7e63e88a](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/7e63e88a))
* tools - ❌ command status ([9f491f16](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/9f491f16))

## Features

* tool - 🔨 add plugin for images metadata ([c8ab8bfd](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/c8ab8bfd))
* tool - 🔨 add Shell script to run unit tests and check reports ([e68c59b6](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/e68c59b6))
* tool - 🔨 add Shell script to run instrumented tests and check reports ([dd99d079](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/dd99d079))

## Refactor

* project - 📦 TrainingBox

## Test

* project - ⭕ TrainingBoxViewModel
* project - ⭕ IconAnimator
* project - ⭕ IconAnimator
* project - ⭕ IconAnimator
* project - ⭕ GzmeStarFragment
* project - ⭕ GameBalloonFragment
* project - ⭕ GameSheepFragment
* project - ⭕ MainActivityFragment



<a name="0.6.0"></a>
## 0.6.0 "- version code: 28" (2019/09/03)


## Bug Fixes

* l10n - ❌ typo in french strings ([cd3154d0](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/cd3154d0))

## Features

* project - 🆕 demo mode ([6bd73d78](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/6bd73d78))

## Refactor

* #5 - 🔩 sheep game layout dimensions and game properties
* project - 🔩 tests

## Test

* project - ⭕ PropertiesReader
* project - ⭕ MainActivity
* project - ⭕ GameStarFragment
* project - ⭕ GameBalloonFragment
* project - ⭕ GameSheepFragment
* project - ⭕ factorisation
* project - ⭕ GesturesDemo



<a name="0.7.0"></a>
## 0.7.0 "- version code: 29" (2019/09/12)


## Bug Fixes

* #6 - ❌ collision detection ([b8afb2a8](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/b8afb2a8))
* #6 - ❌ wording ([f832a844](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/f832a844))
* #6 - ❌ icon animator ([b242fe71](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/b242fe71))

## Features

* #19 - Sheep game layout ([fd71b734](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/fd71b734))
* project - 🆕 detection of collisions between 2 views ([863b2ce5](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/863b2ce5))
* #6 - 🆕 collision detection in game ([a1746ccc](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/a1746ccc))
* #6- 🆕 game logic for sheep game ([8fafc906](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/8fafc906))
* #6- 🆕 game layout and text contents ([4902b4b1](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/4902b4b1))
* #7 - 🆕 speed of fences in preferences ([fb5d284c](https://gitlab.forge.orange-labs.fr/3dhandz/training-box/commits/fb5d284c))

## Test

* #6 - ⭕ CollisionDetector
@@ -61,10 +61,10 @@ Once your work is done, and the project is building and the app well running, yo
Before doing such operations, you should run the command:

```shell
./prepare-push.sh
./prepare-release.sh
```

This command will increase by 1 the version code of the app, build the HTML documentation, check configuration file for the app and update the changelog with the last commits. Have a look on the changelog to ensure it's clean.
This command will increase by 1 the version code of the app, build the HTML documentation, check configuration file for the app and update the changelog with the last commits. Have a look on the changelog to ensure it's clean. It will also check if images have copyrights notices in metadata, run unit tests and run instrumented tests.

The version name follows the pattern X.Y.Z, where Z is a value to increment for fixes, Y for minor evolutions and X for major evolutions. This value should be modified manually by you when you completed a release or a merge in the _dev_ branch.

@@ -16,7 +16,7 @@ The common training tools are not fun, there are no games. We provide with Baah
* a lovely assets


Sensorsor koystick have to be plugged to the box communicating with the apps using Bluetooth Low Energy.
Sensors or joystick have to be plugged to the box communicating with the apps using Bluetooth Low Energy.


## Pictures of the project
@@ -5,14 +5,18 @@ Component: Anko Copyright © JetBrains s.r.o 2016
License Text URL: licenses/LICENSE-anko.txt
Source Code: https://github.com/Kotlin/anko

Component: Gradle changelog plugin Copyright © Marc Poppleton 2017
License Text URL: licenses/LICENSE-changelog.txt
Source Code: https://github.com/marcpoppleton/gradle-changelog-plugin

Component: Dokka Copyright © JetBrains s.r.o 2018
License Text URL: licenses/LICENSE-dokka.txt
Source Code: https://github.com/Kotlin/dokka

Component: Easylauncher-gradle-plugin Copyright © Mikel 2018
License Text URL: licenses/LICENSE-easylauncher.txt
Source Code: https://github.com/akaita/easylauncher-gradle-plugin

Component: Gradle changelog plugin Copyright © Marc Poppleton 2017
License Text URL: licenses/LICENSE-changelog.txt
Source Code: https://github.com/marcpoppleton/gradle-changelog-plugin

Component: Kotlin Copyright © JetBrains s.r.o 2000 - 2018
License Text URL: licenses/LICENSE-kotlin.txt
Source Code: https://github.com/JetBrains/kotlin
@@ -31,10 +35,14 @@ Source Code: https://github.com/junit-team/junit4
================================================================================
MIT License
================================================================================
Component: Copyright Checker Copyright © Orange SA 2019
License Text URL: licenses/LICENSE-properties-file-checker.txt
Source Code: https://github.com/Orange-OpenSource/copyright-checker

Component: Properties File Checker Copyright © Orange SA 2019
License Text URL: licenses/LICENSE-properties-file-checker.txt
Source Code: https://github.com/Orange-OpenSource/gradle-properties-checker

Component: Copyright Checker Copyright © Orange SA 2019
License Text URL: licenses/LICENSE-properties-file-checker.txt
Source Code: https://github.com/Orange-OpenSource/copyright-checker
Component: Mockito Copyright © 2007 Mockito contributors
License Text URL: licenses/LICENSE-mockito.txt
Source Code: https://github.com/mockito/mockito

0 comments on commit f266baa

Please sign in to comment.
You can’t perform that action at this time.