wefree/min-vpn-client_v2
1
0 Fork 0
mirror of https://gitee.com/willfree/min-vpn-client_v2.git synced 2026-10-04 19:42:00 +08:00
Code Issues Projects Releases Wiki Activity

规范了animer函数（动画函数）

Browse Source
This commit is contained in:
free will committed 2021-08-12 22:24:01 +08:00
1 parent 62dd3fdb02
commit c32836e646
3 files changed
+5 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/pkusz/min_vpn_client/activity/login/LoginActivity.java
+2 -3
View File
@@ -24,7 +24,6 @@ import com.pkusz.min_vpn_client.model.MINVpnSettingAPI;
import com.pkusz.min_vpn_client.model.OriginalRequest.OriginalGetVpnInfoRequest;
import com.pkusz.min_vpn_client.model.OriginalRequest.OriginalLoginRequest;
import com.pkusz.min_vpn_client.utils.AccountValidatorRegexUtil;
import com.pkusz.min_vpn_client.utils.Base64Util;
import com.pkusz.min_vpn_client.utils.DigestUtilKt;
import org.jetbrains.annotations.NotNull;
@@ -180,7 +179,7 @@ public class LoginActivity extends MINVpnBaseActivity<LoginActivityPresenter>
// 监听键盘是否弹起
ActivityExtensionsKt.listenKeyboardVisible(this,(isOpen)->{
if(isOpen){
ViewExtensionKt.animer(imageView_imgLogo,
ViewExtensionKt.animer200(imageView_imgLogo,
ViewExtensionKt.scaleXAnimation(imageView_imgLogo,1f, 0.5f),
ViewExtensionKt.scaleYAnimation(imageView_imgLogo,1f, 0.5f),
ViewExtensionKt.transYAnimation(imageView_imgLogo,
@@ -192,7 +191,7 @@ public class LoginActivity extends MINVpnBaseActivity<LoginActivityPresenter>
ViewExtensionKt.transYAnimation(btnLogin,
0f, -DisplayUtils.dp2px(this, 90)));
}else{
ViewExtensionKt.animer(imageView_imgLogo,
ViewExtensionKt.animer200(imageView_imgLogo,
ViewExtensionKt.scaleXAnimation(imageView_imgLogo,0.5f, 1f),
ViewExtensionKt.scaleYAnimation(imageView_imgLogo,0.5f, 1f),
ViewExtensionKt.transYAnimation(imageView_imgLogo,
app/src/main/java/com/pkusz/min_vpn_client/activity/register/RegisterActivity.java
+2 -4
View File
@@ -7,7 +7,6 @@ package com.pkusz.min_vpn_client.activity.register;
* @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室
*/
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
@@ -18,7 +17,6 @@ import com.pkusz.min_vpn_client.activity.base.MINVpnBaseActivity;
import com.pkusz.min_vpn_client.activity.login.LoginActivity;
import com.pkusz.min_vpn_client.model.OriginalRequest.OriginalRegisterRequest;
import com.pkusz.min_vpn_client.utils.AccountValidatorRegexUtil;
import com.pkusz.min_vpn_client.utils.Base64Util;
import com.pkusz.min_vpn_client.utils.DigestUtilKt;
import org.jetbrains.annotations.NotNull;
@@ -173,7 +171,7 @@ public class RegisterActivity extends MINVpnBaseActivity<RegisterActivityPresent
// 监听键盘是否弹起
ActivityExtensionsKt.listenKeyboardVisible(this,(isOpen)->{
if(isOpen){
ViewExtensionKt.animer(imgLogo,
ViewExtensionKt.animer200(imgLogo,
ViewExtensionKt.scaleXAnimation(imgLogo,1f, 0.5f),
ViewExtensionKt.scaleYAnimation(imgLogo,1f, 0.5f),
ViewExtensionKt.transYAnimation(imgLogo,
@@ -194,7 +192,7 @@ public class RegisterActivity extends MINVpnBaseActivity<RegisterActivityPresent
0f, -DisplayUtils.dp2px(this, 90))
);
}else{
ViewExtensionKt.animer(imgLogo,
ViewExtensionKt.animer200(imgLogo,
ViewExtensionKt.scaleXAnimation(imgLogo, 0.5f,1f),
ViewExtensionKt.scaleYAnimation(imgLogo, 0.5f,1f),
ViewExtensionKt.transYAnimation(imgLogo,
locallib_quick_android/quick_android_base/src/main/java/cn/qjm253/quick_android_base/extensions/ViewExtension.kt
+1 -23
View File
@@ -142,18 +142,7 @@ fun View.animer1000(vararg animations: ObjectAnimator) {
animatorSet.start()
}
fun View.animer(vararg animations: ObjectAnimator, duration: Long) {
if (animations.isEmpty())
return
val animatorSet = AnimatorSet()
val builder = animatorSet.setDuration(duration)
.play(animations[0])
animations.filterIndexed { index, _ -> index != 0 }
.forEach { builder.with(it) }
animatorSet.start()
}
fun View.animer(vararg animations: ObjectAnimator) {
fun View.animer200(vararg animations: ObjectAnimator) {
if (animations.isEmpty())
return
val animatorSet = AnimatorSet()
@@ -164,17 +153,6 @@ fun View.animer(vararg animations: ObjectAnimator) {
animatorSet.start()
}
fun View.animer2(vararg animations: ObjectAnimator) {
if (animations.isEmpty())
return
val animatorSet = AnimatorSet()
val builder = animatorSet.setDuration(1000)
.play(animations[0])
animations.filterIndexed { index, _ -> index != 0 }
.forEach { builder.with(it) }
animatorSet.start()
}
/**
* 平移旋转渐变组合动画
*/