Aperture: Fix and enable video_{start,end}_rec_square animations
Fixed /w https://shapeshifter.design
Change-Id: I64edfb475b242fd1a9b8bacb9b2e915dffd2c866
diff --git a/app/src/main/java/org/lineageos/aperture/MainActivity.kt b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
index e9cf14e..89d3917 100644
--- a/app/src/main/java/org/lineageos/aperture/MainActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
@@ -368,8 +368,7 @@
CameraMode.PHOTO -> startShutterAnimation(ShutterAnimation.PhotoCapture)
CameraMode.VIDEO -> {
if (!cameraController.isRecording) {
- // TODO: This animation doesn't work
-// startShutterAnimation(ShutterAnimation.VideoStart)
+ startShutterAnimation(ShutterAnimation.VideoStart)
}
}
else -> {}
@@ -557,8 +556,7 @@
}
} else if (it is VideoRecordEvent.Finalize) {
runOnUiThread {
- // TODO: This animation doesn't work
-// startShutterAnimation(ShutterAnimation.VideoEnd)
+ startShutterAnimation(ShutterAnimation.VideoEnd)
recordChip.isVisible = false
}
cameraSoundsUtils.playStopVideoRecording()
diff --git a/app/src/main/res/animator/video_end_rec_square.xml b/app/src/main/res/animator/video_end_rec_square.xml
index 048f18c..6fa5725 100644
--- a/app/src/main/res/animator/video_end_rec_square.xml
+++ b/app/src/main/res/animator/video_end_rec_square.xml
@@ -8,7 +8,7 @@
android:duration="300"
android:interpolator="@android:interpolator/fast_out_slow_in"
android:propertyName="pathData"
- android:valueFrom="M27 27H45V45H27V27Z"
+ android:valueFrom="M 27 27 C 33 27 39 27 45 27 C 45 33 45 39 45 45 C 39 45 33 45 27 45 C 27 39 27 33 27 27 Z"
android:valueTo="M 13.373 13.373 C 25.869 0.876 46.131 0.876 58.627 13.373 C 71.124 25.869 71.124 46.131 58.627 58.627 C 46.131 71.124 25.869 71.124 13.373 58.627 C 0.876 46.131 0.876 25.869 13.373 13.373 Z"
android:valueType="pathType" />
</set>
diff --git a/app/src/main/res/animator/video_start_rec_square.xml b/app/src/main/res/animator/video_start_rec_square.xml
index f92bb8c..7d892b5 100644
--- a/app/src/main/res/animator/video_start_rec_square.xml
+++ b/app/src/main/res/animator/video_start_rec_square.xml
@@ -9,6 +9,6 @@
android:interpolator="@android:interpolator/fast_out_slow_in"
android:propertyName="pathData"
android:valueFrom="M 13.373 13.373 C 25.869 0.876 46.131 0.876 58.627 13.373 C 71.124 25.869 71.124 46.131 58.627 58.627 C 46.131 71.124 25.869 71.124 13.373 58.627 C 0.876 46.131 0.876 25.869 13.373 13.373 Z"
- android:valueTo="M27 27H45V45H27V27Z"
+ android:valueTo="M 27 27 C 33 27 39 27 45 27 C 45 33 45 39 45 45 C 39 45 33 45 27 45 C 27 39 27 33 27 27 Z"
android:valueType="pathType" />
</set>