braille-systems#278 make gradient flash

zuevval · Oct 17, 2020 · 114e439 · 114e439
1 parent 86fab49
commit 114e439
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 8 deletions.
diff --git a/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt b/app/src/main/java/com/github/braillesystems/learnbraille/ui/screens/practice/CardFragment.kt
@@ -1,5 +1,6 @@
 package com.github.braillesystems.learnbraille.ui.screens.practice
 
+import android.graphics.drawable.TransitionDrawable
 import android.os.Bundle
 import android.os.Vibrator
 import android.view.*
@@ -17,8 +18,6 @@ import com.github.braillesystems.learnbraille.databinding.FragmentCardBinding
 import com.github.braillesystems.learnbraille.res.captionRules
 import com.github.braillesystems.learnbraille.res.deckTagToName
 import com.github.braillesystems.learnbraille.res.inputMarkerPrintRules
-import com.github.braillesystems.learnbraille.utils.announceCorrect
-import com.github.braillesystems.learnbraille.utils.announceIncorrect
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainer
 import com.github.braillesystems.learnbraille.ui.brailletrainer.BrailleTrainerSignalHandler
 import com.github.braillesystems.learnbraille.ui.inputPrint
@@ -120,9 +119,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
             block = { title = title(viewModel) },
             softBlock = {
                 announceCorrect()
-                val colorFrom = context?.let { ContextCompat.getColor(it, R.color.colorBackground) }
-                val colorTo = context?.let { ContextCompat.getColor(it, R.color.lightGreen) }
-                animateView(binding.constraintLayout, colorFrom, colorTo)
+                binding.constraintLayout.background = context?.let { ContextCompat.getDrawable(it, R.drawable.background_animation_green) }
+                val transition = binding.constraintLayout.background as TransitionDrawable
+                transition.startTransition(500)
+                transition.reverseTransition(500)
             }
         )
 
@@ -134,9 +134,10 @@ class CardFragment : AbstractFragmentWithHelp(R.string.practice_help) {
                 ?: checkedToast(getString(R.string.input_loading))
             title = title(viewModel)
 
-            val colorFrom = context?.let { ContextCompat.getColor(it, R.color.colorBackground) }
-            val colorTo = context?.let { ContextCompat.getColor(it, R.color.lightRed) }
-            animateView(binding.constraintLayout, colorFrom, colorTo)
+            binding.constraintLayout.background = context?.let { ContextCompat.getDrawable(it, R.drawable.background_animation_red) }
+            val transition = binding.constraintLayout.background as TransitionDrawable
+            transition.startTransition(500)
+            transition.reverseTransition(500)
         }
 
         viewModel.observeEventHint(

diff --git a/app/src/main/res/drawable/background_animation_green.xml b/app/src/main/res/drawable/background_animation_green.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/background_blank" />
+    <item android:drawable="@drawable/background_gradient_green" />
+</transition>
diff --git a/app/src/main/res/drawable/background_animation_red.xml b/app/src/main/res/drawable/background_animation_red.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/background_blank" />
+    <item android:drawable="@drawable/background_gradient_red" />
+</transition>
diff --git a/app/src/main/res/drawable/background_blank.xml b/app/src/main/res/drawable/background_blank.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorBackground" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/background_gradient_green.xml b/app/src/main/res/drawable/background_gradient_green.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:startColor="@color/colorBackground"
+                android:endColor="@color/lightGreen"
+                android:angle="90"/>
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/background_gradient_red.xml b/app/src/main/res/drawable/background_gradient_red.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:startColor="@color/colorBackground"
+                android:centerColor="@color/colorBackground"
+                android:endColor="@color/lightRed"
+                android:angle="90"/>
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
@@ -14,6 +14,7 @@
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@drawable/background_animation_red"
         tools:context=".ui.screens.practice.CardFragment">
 
         <TextView