Commit 81fb054

committed

调整动画duration

1 parent c2cbb89 commit 81fb054Copy full SHA for 81fb054

5 files changed

Lines changed: 11 additions & 9 deletions

File tree

app/src/main
- java/com/yyy/djk/dropdownmenu
  - DropDownMenu.java
- res/anim

`‎app/src/main/java/com/yyy/djk/dropdownmenu/DropDownMenu.java‎`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,9 @@ public void onClick(View v) {`
`176`	`176`	`* @param text`
`177`	`177`	`*/`
`178`	`178`	`public void setTabText(String text) {`
`179`		`- ((TextView) tabMenuView.getChildAt(current_tab_position)).setText(text);`
	`179`	`+ if (current_tab_position != 1) {`
	`180`	`+ ((TextView) tabMenuView.getChildAt(current_tab_position)).setText(text);`
	`181`	`+ }`
`180`	`182`	`}`
`181`	`183`
`182`	`184`	`public void setTabClickable(boolean clickable) {`
`@@ -193,9 +195,9 @@ public void closeMenu() {`
`193`	`195`	`((TextView) tabMenuView.getChildAt(current_tab_position)).setCompoundDrawablesWithIntrinsicBounds(null, null,`
`194`	`196`	`getResources().getDrawable(menuUnselectedIcon), null);`
`195`	`197`	`popupMenuViews.setVisibility(View.GONE);`
`196`		`- popupMenuViews.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_menu_out));`
	`198`	`+ popupMenuViews.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_menu_out));`
`197`	`199`	`maskView.setVisibility(GONE);`
`198`		`- maskView.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_mask_out));`
	`200`	`+ maskView.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_mask_out));`
`199`	`201`	`current_tab_position = -1;`
`200`	`202`
`201`	`203`	`}`
`@@ -223,9 +225,9 @@ private void switchMenu(View target) {`
`223`	`225`	`} else {`
`224`	`226`	`if (current_tab_position == -1) {`
`225`	`227`	`popupMenuViews.setVisibility(View.VISIBLE);`
`226`		`- popupMenuViews.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_menu_in));`
	`228`	`+ popupMenuViews.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_menu_in));`
`227`	`229`	`maskView.setVisibility(VISIBLE);`
`228`		`- maskView.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_mask_in));`
	`230`	`+ maskView.setAnimation(AnimationUtils.loadAnimation(getContext(),R.anim.dd_mask_in));`
`229`	`231`	`popupMenuViews.getChildAt(i / 2).setVisibility(View.VISIBLE);`
`230`	`232`	`} else {`
`231`	`233`	`popupMenuViews.getChildAt(i / 2).setVisibility(View.VISIBLE);`

`‎app/src/main/res/anim/dd_mask_in.xml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<set xmlns:android="http://schemas.android.com/apk/res/android"`
`3`		`- android:duration="200">`
	`3`	`+ android:duration="250">`
`4`	`4`	`<alpha`
`5`	`5`	`android:fromAlpha="0"`
`6`	`6`	`android:toAlpha="1"/>`

`‎app/src/main/res/anim/dd_mask_out.xml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<set xmlns:android="http://schemas.android.com/apk/res/android"`
`3`		`- android:duration="200">`
	`3`	`+ android:duration="250">`
`4`	`4`	`<alpha`
`5`	`5`	`android:fromAlpha="1"`
`6`	`6`	`android:toAlpha="0"/>`

`‎app/src/main/res/anim/dd_menu_in.xml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<set xmlns:android="http://schemas.android.com/apk/res/android"`
`3`		`- android:duration="200">`
	`3`	`+ android:duration="250">`
`4`	`4`	`<translate`
`5`	`5`	`android:fromYDelta="-100%p"`
`6`	`6`	`android:toYDelta="0"/>`

`‎app/src/main/res/anim/dd_menu_out.xml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`	`2`	`<set xmlns:android="http://schemas.android.com/apk/res/android"`
`3`		`- android:duration="200">`
	`3`	`+ android:duration="250">`
`4`	`4`	`<translate`
`5`	`5`	`android:fromYDelta="0"`
`6`	`6`	`android:toYDelta="-100%p"/>`

0 commit comments

Comments

(0)