added fade to items and changed spot to be the same

Author: olgaoznovich

watch/app/src/main/java/com/imsproject/watch/Properties.kt

@@ -123,7 +123,9 @@ var GRASS_PLANT_STROKE_WIDTH = 4.5f
 //shared
 var GRASS_WATER_RADIUS = 0f //initialized later
 var GRASS_WATER_ANGLE = 36
-var GRASS_WATER_VISIBILITY_THRESHOLD = 450
+var GRASS_WATER_VISIBILITY_THRESHOLD = 250
+var CURRENT_PLAYER_ITEM_ALPHA = 0.4f
+var OPPONENT_PLAYER_ITEM_ALPHA = 0.9f
 
 // ================== After game questions =============== |
 const val FIRST_QUESTION = "עד כמה חשת תחושת \"ביחד\" עם השותפ/ה במשחקון הזה?"

watch/app/src/main/java/com/imsproject/watch/viewmodel/FlowerGardenViewModel.kt

@@ -20,12 +20,14 @@ import com.imsproject.watch.BANANA_YELLOW_COLOR
 import com.imsproject.watch.AMOUNT_OF_FLOWERS
 import com.imsproject.watch.BROWN_COLOR
 import com.imsproject.watch.BUBBLE_PINK_COLOR
+import com.imsproject.watch.CURRENT_PLAYER_ITEM_ALPHA
 import com.imsproject.watch.DEEP_BLUE_COLOR
 import com.imsproject.watch.FLOWER_GARDEN_SYNC_TIME_THRESHOLD
 import com.imsproject.watch.FLOWER_RING_OFFSET_ANGLE
 import com.imsproject.watch.GRASS_GREEN_COLOR
 import com.imsproject.watch.GRASS_WATER_ANGLE
 import com.imsproject.watch.GRASS_WATER_RADIUS
+import com.imsproject.watch.OPPONENT_PLAYER_ITEM_ALPHA
 import com.imsproject.watch.ORANGE_COLOR
 import com.imsproject.watch.PACKAGE_PREFIX
 import com.imsproject.watch.PURPLE_WISTERIA_COLOR
@@ -65,8 +67,9 @@ class FlowerGardenViewModel : GameViewModel(GameType.FLOWER_GARDEN) {
     // ======================================
     class WaterDroplet(
         var timestamp: Long = 0,
+        var playerItemType: ItemType
     ) {
-        var color by mutableStateOf(WATER_BLUE_COLOR)
+        var color by mutableStateOf(WATER_BLUE_COLOR.copy(alpha = if (playerItemType == ItemType.WATER) CURRENT_PLAYER_ITEM_ALPHA else OPPONENT_PLAYER_ITEM_ALPHA))
         val centers : List<Pair<Float, Float>> =
             listOf(polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 0 * GRASS_WATER_ANGLE),
                     polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 2 * -GRASS_WATER_ANGLE),
@@ -84,15 +87,16 @@ class FlowerGardenViewModel : GameViewModel(GameType.FLOWER_GARDEN) {
 
     class Plant(
         var timestamp: Long = 0,
+        var playerItemType: ItemType
     ) {
         val centers : List<Pair<Float, Float>> =
-            listOf(polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 5 * -GRASS_WATER_ANGLE),
-                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 1 * GRASS_WATER_ANGLE),
-                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 1 * -GRASS_WATER_ANGLE),
-                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 3 * GRASS_WATER_ANGLE),
-                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 3 * -GRASS_WATER_ANGLE)
+            listOf(polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 0 * -GRASS_WATER_ANGLE),
+                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 2 * GRASS_WATER_ANGLE),
+                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 2 * -GRASS_WATER_ANGLE),
+                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 4 * GRASS_WATER_ANGLE),
+                polarToCartesian(GRASS_WATER_RADIUS, -90.0 + 4 * -GRASS_WATER_ANGLE)
             )
-        var color by mutableStateOf(GRASS_GREEN_COLOR)
+        var color by mutableStateOf(GRASS_GREEN_COLOR.copy(alpha = if (playerItemType == ItemType.PLANT) CURRENT_PLAYER_ITEM_ALPHA else OPPONENT_PLAYER_ITEM_ALPHA))
         var time = 0
     }
 
@@ -172,8 +176,8 @@ class FlowerGardenViewModel : GameViewModel(GameType.FLOWER_GARDEN) {
 
 
         if(ACTIVITY_DEBUG_MODE){
-            myItemType = ItemType.WATER
-//            myItemType = ItemType.PLANT
+//            myItemType = ItemType.WATER
+            myItemType = ItemType.PLANT
 
             viewModelScope.launch(Dispatchers.Default) {
                 while(true){
@@ -238,10 +242,10 @@ class FlowerGardenViewModel : GameViewModel(GameType.FLOWER_GARDEN) {
         // check the delta between taps and show new tap
         val opponentsLatestTimestamp =
             if((actor == playerId) == (myItemType == ItemType.WATER)) {
-                waterDropletSets.addLast(WaterDroplet(timestamp))
+                waterDropletSets.addLast(WaterDroplet(timestamp, myItemType))
                 if(grassPlantSets.isEmpty()) 0 else grassPlantSets.last().timestamp
             } else {
-                grassPlantSets.addLast(Plant(timestamp))
+                grassPlantSets.addLast(Plant(timestamp, myItemType))
                 if(waterDropletSets.isEmpty()) 0 else waterDropletSets.last().timestamp
             }