diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/InputPanel.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/InputPanel.kt index b664dc6..09037be 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/InputPanel.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/InputPanel.kt @@ -19,17 +19,11 @@ class InputPanel @JvmOverloads constructor(context: Context, attrs: AttributeSet binding = inflate(ChatInputpanelBinding::inflate) binding?.run { chatPopMenu.setMenuList(mutableListOf( - PopMenuIconView.MenuItem(R.mipmap.ic_launcher) { - Toast.makeText(context, "首页", Toast.LENGTH_SHORT).show() + PopMenuIconView.MenuItem(R.mipmap.chat_ai_talk) { + Toast.makeText(context, "聊天", Toast.LENGTH_SHORT).show() }, - PopMenuIconView.MenuItem(R.mipmap.ic_launcher) { - Toast.makeText(context, "设置", Toast.LENGTH_SHORT).show() - }, - PopMenuIconView.MenuItem(R.mipmap.ic_launcher) { - Toast.makeText(context, "分享", Toast.LENGTH_SHORT).show() - }, - PopMenuIconView.MenuItem(R.mipmap.ic_launcher) { - Toast.makeText(context, "收藏", Toast.LENGTH_SHORT).show() + PopMenuIconView.MenuItem(R.mipmap.chat_ai_phone) { + Toast.makeText(context, "通话", Toast.LENGTH_SHORT).show() } )) } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/PopMenuIconView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/PopMenuIconView.kt index ccc7a84..1d54215 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/PopMenuIconView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/Chat/PopMenuIconView.kt @@ -1,6 +1,7 @@ package com.remax.visualnovel.ui.Chat +import android.animation.Animator import android.animation.AnimatorSet import android.animation.ValueAnimator import android.content.Context @@ -29,7 +30,7 @@ class PopMenuIconView @JvmOverloads constructor( ) private val mMenuItemList = mutableListOf() - private var isMenuShowing = true + private var isMenuShowing = false private var itemSpacing = 0 private var itemSize = 0 @@ -62,7 +63,7 @@ class PopMenuIconView @JvmOverloads constructor( setImageResource(menuItem.iconResId) layoutParams = LinearLayout.LayoutParams(itemSize, itemSize).apply { - if (index < mMenuItemList.size - 1) { + if (/*index < mMenuItemList.size - 1*/true) { bottomMargin = itemSpacing } } @@ -72,7 +73,7 @@ class PopMenuIconView @JvmOverloads constructor( dismissMenu() } - mBinding!!.llMenuContainer.addView(this) + mBinding!!.llMenuContainer.addView(this, 0) } } } @@ -86,6 +87,7 @@ class PopMenuIconView @JvmOverloads constructor( isMenuShowing = true mBinding?.run { + divider.visibility = VISIBLE llMenuContainer.visibility = VISIBLE ivTrigger.setImageResource(R.mipmap.chat_down) @@ -131,6 +133,25 @@ class PopMenuIconView @JvmOverloads constructor( duration = 300 interpolator = DecelerateInterpolator() playTogether(valueYAnim) + addListener(object: Animator.AnimatorListener{ + override fun onAnimationCancel(animation: Animator) { + llMenuContainer.visibility = GONE + divider.visibility = GONE + } + + override fun onAnimationEnd(animation: Animator) { + llMenuContainer.visibility = GONE + divider.visibility = GONE + } + + override fun onAnimationRepeat(animation: Animator) { + + } + + override fun onAnimationStart(animation: Animator) { + + } + }) start() } } diff --git a/VisualNovel/app/src/main/res/layout/layout_pop_icon_menu_view.xml b/VisualNovel/app/src/main/res/layout/layout_pop_icon_menu_view.xml index 887397b..d046008 100644 --- a/VisualNovel/app/src/main/res/layout/layout_pop_icon_menu_view.xml +++ b/VisualNovel/app/src/main/res/layout/layout_pop_icon_menu_view.xml @@ -2,13 +2,13 @@ + android:visibility="gone" + > + + \ No newline at end of file