diff --git a/feature/new_feedback/src/main/java/com/gh/gamecenter/feedback/view/help/HelpAndFeedbackFragment.kt b/feature/new_feedback/src/main/java/com/gh/gamecenter/feedback/view/help/HelpAndFeedbackFragment.kt index 9ceeb5d438..99f71aab02 100644 --- a/feature/new_feedback/src/main/java/com/gh/gamecenter/feedback/view/help/HelpAndFeedbackFragment.kt +++ b/feature/new_feedback/src/main/java/com/gh/gamecenter/feedback/view/help/HelpAndFeedbackFragment.kt @@ -1,7 +1,10 @@ package com.gh.gamecenter.feedback.view.help import android.os.Bundle -import android.view.* +import android.view.Gravity +import android.view.LayoutInflater +import android.view.MotionEvent +import android.view.View import android.view.ViewGroup.MarginLayoutParams import android.widget.LinearLayout import android.widget.PopupWindow @@ -65,7 +68,9 @@ class HelpAndFeedbackFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn && mIsCollapsed) initMenu() + changeToolbarStyle(mIsCollapsed) mBinding.run { swipeRefreshLayout.setColorSchemeResources(R.color.theme) swipeRefreshLayout.setOnRefreshListener { @@ -88,7 +93,7 @@ class HelpAndFeedbackFragment : BaseFragment() { } ViewCompat.setOnApplyWindowInsetsListener(appbar) { _, insets -> - (toolbar.layoutParams as ViewGroup.MarginLayoutParams).topMargin = + (toolbar.layoutParams as MarginLayoutParams).topMargin = insets.systemWindowInsetTop insets.consumeSystemWindowInsets() } @@ -99,9 +104,11 @@ class HelpAndFeedbackFragment : BaseFragment() { collapsingToolbar.scrimVisibleHeightTrigger = collapsingTrigger collapsingToolbar.scrimShownAction = { - mIsCollapsed = it - DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn && it) - changeToolbarStyle(it) + if (mIsCollapsed != it) { + mIsCollapsed = it + DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn && it) + changeToolbarStyle(it) + } } appbar.addOnOffsetChangedListener { appBarLayout, verticalOffset -> @@ -112,11 +119,6 @@ class HelpAndFeedbackFragment : BaseFragment() { mBinding.swipeRefreshLayout.isEnabled = absOffset <= 2 } - reuseNoConnection.connectionReloadTv.setOnClickListener { - reuseNoConnection.root.visibility = View.GONE - mViewModel.initData() - } - searchContainer.setOnClickListener { requireContext().startActivity(QaSearchActivity.getIntent(requireContext())) } @@ -149,6 +151,16 @@ class HelpAndFeedbackFragment : BaseFragment() { }) helpVideoRv.addOnItemTouchListener(object : RecyclerView.SimpleOnItemTouchListener() { override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean { + when (e.action) { + MotionEvent.ACTION_DOWN -> { + mBinding.swipeRefreshLayout.isEnabled = false + } + + MotionEvent.ACTION_UP -> { + mBinding.swipeRefreshLayout.isEnabled = true + } + } + val isStop = e.action == MotionEvent.ACTION_DOWN || e.action == MotionEvent.ACTION_MOVE if (isStop) mHelpVideoAdapter?.stopScroll() else mHelpVideoAdapter?.startScroll() return false @@ -327,6 +339,7 @@ class HelpAndFeedbackFragment : BaseFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn && mIsCollapsed) + changeToolbarStyle(mIsCollapsed) mBinding.run { helpVideoCv.setCardBackgroundColor(R.color.background_white.toColor(requireContext())) helpCenterCv.setCardBackgroundColor(R.color.background_white.toColor(requireContext())) diff --git a/feature/new_feedback/src/main/res/layout/fragment_help_and_feedback.xml b/feature/new_feedback/src/main/res/layout/fragment_help_and_feedback.xml index f4c4e9efdc..cf13cf919f 100644 --- a/feature/new_feedback/src/main/res/layout/fragment_help_and_feedback.xml +++ b/feature/new_feedback/src/main/res/layout/fragment_help_and_feedback.xml @@ -36,13 +36,6 @@ android:adjustViewBounds="true" app:srcCompat="@drawable/help_head" /> - - @@ -359,13 +353,5 @@ - - - \ No newline at end of file