fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

adjust animations

Browse Source
This commit is contained in:
darthpaul
2022-09-20 18:37:48 +01:00
parent 0686bdae05
commit 1450f87e0f
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
View File

@ -703,7 +703,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
if (media_size_toggle_group.isVisible() || if (media_size_toggle_group.isVisible() ||
flash_toggle_group.isVisible() flash_toggle_group.isVisible()
) { ) {
val transitionSet = createTransition() val transitionSet = createTransition(isClosing = true)
TransitionManager.go(defaultScene, transitionSet) TransitionManager.go(defaultScene, transitionSet)
return true return true
} }
@ -765,15 +765,17 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
media_size_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors) media_size_toggle_group.children.map { it as MaterialButton }.forEach(::setButtonColors)
} }
private fun createTransition(): Transition { private fun createTransition(isClosing: Boolean = false): Transition {
val fadeTransition = Fade() val fadeTransition = Fade()
val changeBounds = ChangeBounds().apply { val changeBounds = ChangeBounds().apply {
interpolator = OvershootInterpolator() interpolator = OvershootInterpolator()
} }
return TransitionSet().apply { return TransitionSet().apply {
if (!isClosing) {
addTransition(changeBounds) addTransition(changeBounds)
}
addTransition(fadeTransition) addTransition(fadeTransition)
this.duration = 200L this.duration = resources.getInteger(R.integer.icon_anim_duration).toLong()
} }
} }

4
app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
View File

@ -7,14 +7,14 @@
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set> <set>
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:valueFrom="0.9" android:valueFrom="0.9"
android:valueTo="1" android:valueTo="1"
android:valueType="floatType" /> android:valueType="floatType" />
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:valueFrom="0.9" android:valueFrom="0.9"

4
app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
View File

@ -7,14 +7,14 @@
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set> <set>
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:valueFrom="1" android:valueFrom="1"
android:valueTo="0.9" android:valueTo="0.9"
android:valueType="floatType" /> android:valueType="floatType" />
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:valueFrom="1" android:valueFrom="1"

4
app/src/main/res/drawable/video_rec_idle_to_record.xml
View File

@ -7,7 +7,7 @@
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set> <set>
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:valueFrom="1" android:valueFrom="1"
@ -15,7 +15,7 @@
android:valueType="floatType" /> android:valueType="floatType" />
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:valueFrom="1" android:valueFrom="1"

4
app/src/main/res/drawable/video_rec_record_to_idle.xml
View File

@ -7,7 +7,7 @@
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set> <set>
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:valueFrom="0" android:valueFrom="0"
@ -15,7 +15,7 @@
android:valueType="floatType" /> android:valueType="floatType" />
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:valueFrom="0" android:valueFrom="0"

4
app/src/main/res/drawable/video_rec_unpressed_to_pressed.xml
View File

@ -7,14 +7,14 @@
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set> <set>
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:valueFrom="1" android:valueFrom="1"
android:valueTo="0.9" android:valueTo="0.9"
android:valueType="floatType" /> android:valueType="floatType" />
<objectAnimator <objectAnimator
android:duration="@integer/shutter_anim_duration" android:duration="@integer/icon_anim_duration"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:valueFrom="1" android:valueFrom="1"

2
app/src/main/res/values/integers.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<integer name="shutter_anim_duration">200</integer> <integer name="icon_anim_duration">200</integer>
</resources> </resources>