diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt index 1e0782d..65f2834 100644 --- a/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/benefit/BenefitActivity.kt @@ -106,7 +106,7 @@ class BenefitActivity : AppViewsActivity(), OnT } BOX_SUB_TASK_TYPE_ZERO_BUY -> { - + Router.ZeroBuy.startActivity(this@BenefitActivity) } } diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt index 4802de2..b43de2a 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt @@ -12,6 +12,7 @@ import android.view.animation.ScaleAnimation import androidx.annotation.NonNull import androidx.core.view.isVisible import com.ama.core.architecture.appBase.AppViewsEmptyViewModelFragment +import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.common.widget.PopMenuIconView import com.gamedog.vididin.R import com.gamedog.vididin.VididinEvents @@ -34,6 +35,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { private var mPlayer: YouTubePlayer? = null private var mVideoData: YoutubeVideo? = null private var mIsPlaying: Boolean = false + private var mIsIntroExpand: Boolean = false private var mCurPlayedSecond: Float = 0F private var mTotalDuration: Float = 0F private val mTickerTimer = TickerTimer() @@ -46,10 +48,6 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { override fun ViewBinding.initViews() { - maskView.setOnClickListener { - if (mIsPlaying) mPlayer?.pause() else mPlayer?.play() - } - playIcon.setOnClickListener { if (mIsPlaying) mPlayer?.pause() else mPlayer?.play() } @@ -72,6 +70,20 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { Router.Benefit.startActivity(requireActivity()) } )) + + setOnClickBatch(ivIntroExpand, maskView) { + when (this) { + maskView -> { + if (mIsPlaying) mPlayer?.pause() else mPlayer?.play() + } + + ivIntroExpand -> { + mIsIntroExpand = !mIsIntroExpand + tvVideoIntro.maxLines = if (mIsIntroExpand) 8 else 2 + ivIntroExpand.setImageResource(if (mIsIntroExpand) R.mipmap.arrow_down else R.mipmap.arrow_up) + } + } + } } diff --git a/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml b/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml index 9bf953d..76b81bb 100644 --- a/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml +++ b/app/src/main/res/layout/vididinapp_feature_home_item_layout.xml @@ -42,25 +42,36 @@ android:id="@+id/tv_video_from" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:singleLine="true" android:text="From" android:textSize="15sp" android:textColor="@color/white" /> - - + android:layout_height="wrap_content"> - + + diff --git a/app/src/main/res/mipmap-xxhdpi/arrow_down.webp b/app/src/main/res/mipmap-xxhdpi/arrow_down.webp new file mode 100644 index 0000000..b0fe01e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/arrow_down.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/arrow_up.webp b/app/src/main/res/mipmap-xxhdpi/arrow_up.webp new file mode 100644 index 0000000..c30505b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/arrow_up.webp differ