Skip to content

Commit

Permalink
缩短动画时长
Browse files Browse the repository at this point in the history
  • Loading branch information
yilylong committed Aug 31, 2021
1 parent 16d0a6d commit 771a461
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions CBDialoglibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group='com.github.yilylong'
android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion 29
buildToolsVersion "29.0.3"

defaultConfig {
minSdkVersion 15
targetSdkVersion 26
versionCode 1
versionName "1.0"
versionName "1.1"
multiDexEnabled true
}
buildTypes {
Expand Down
4 changes: 2 additions & 2 deletions CBDialoglibrary/src/main/res/anim/dialog_close.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<set xmlns:android="http://schemas.android.com/apk/res/android" >

<scale
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:pivotX="50%"
android:pivotY="50%"
android:fromXScale="1"
Expand All @@ -11,7 +11,7 @@
android:toYScale="0" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="1"
android:toAlpha="0" />

Expand Down
4 changes: 2 additions & 2 deletions CBDialoglibrary/src/main/res/anim/dialog_open.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:shareInterpolator="true" >

<scale
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromXScale="0"
android:fromYScale="0"
android:interpolator="@android:anim/decelerate_interpolator"
Expand All @@ -13,7 +13,7 @@
android:toYScale="1" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="0"
android:toAlpha="1" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<set xmlns:android="http://schemas.android.com/apk/res/android" >

<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromYDelta="0"
android:toYDelta="100%" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="1"
android:toAlpha="0" />

Expand Down
4 changes: 2 additions & 2 deletions CBDialoglibrary/src/main/res/anim/dialog_slid_close_right.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<set xmlns:android="http://schemas.android.com/apk/res/android" >

<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromXDelta="0"
android:toXDelta="100%" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="1"
android:toAlpha="0" />

Expand Down
4 changes: 2 additions & 2 deletions CBDialoglibrary/src/main/res/anim/dialog_slid_close_top.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<set xmlns:android="http://schemas.android.com/apk/res/android" >

<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromYDelta="0"
android:toYDelta="-100%" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="1"
android:toAlpha="0" />

Expand Down
4 changes: 2 additions & 2 deletions CBDialoglibrary/src/main/res/anim/dialog_slid_open_right.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<set xmlns:android="http://schemas.android.com/apk/res/android" >

<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromXDelta="100%"
android:toXDelta="0" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="0"
android:toAlpha="1" />

Expand Down
4 changes: 2 additions & 2 deletions CBDialoglibrary/src/main/res/anim/dialog_slid_open_top.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<set xmlns:android="http://schemas.android.com/apk/res/android" >

<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromYDelta="-100%"
android:toYDelta="0" />

<alpha
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/anim_duration_short"
android:fromAlpha="0"
android:toAlpha="1" />

Expand Down
2 changes: 1 addition & 1 deletion CBDialoglibrary/src/main/res/values/integer.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="anim_duration_short">300</integer>
<integer name="anim_duration_short">200</integer>
</resources>
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion 29
buildToolsVersion "29.0.3"
defaultConfig {
applicationId 'com.zhl.sample'
minSdkVersion 15
targetSdkVersion 26
versionCode 1
versionName "1.0"
versionName "1.1"
}
buildTypes {
release {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

0 comments on commit 771a461

Please sign in to comment.