Make submission button floating

hyperskill · Mar 22, 2024 · 6e25efd · 6e25efd
1 parent 9a31c3b
commit 6e25efd
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 29 deletions.
diff --git a/...ava/org/hyperskill/app/android/step_quiz/view/factory/StepQuizViewStateDelegateFactory.kt b/...ava/org/hyperskill/app/android/step_quiz/view/factory/StepQuizViewStateDelegateFactory.kt
@@ -2,13 +2,15 @@ package org.hyperskill.app.android.step_quiz.view.factory
 
 import android.view.View
 import org.hyperskill.app.android.databinding.FragmentStepQuizBinding
+import org.hyperskill.app.android.databinding.LayoutQuizButtonsBinding
 import org.hyperskill.app.android.databinding.LayoutStepQuizDescriptionBinding
 import org.hyperskill.app.step_quiz.presentation.StepQuizFeature
 import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate
 
 object StepQuizViewStateDelegateFactory {
     fun create(
         fragmentStepQuizBinding: FragmentStepQuizBinding,
+        stepQuizButtonsBinding: LayoutQuizButtonsBinding,
         descriptionBinding: LayoutStepQuizDescriptionBinding?,
         skeletonView: View,
         vararg quizViews: View
@@ -35,7 +37,7 @@ object StepQuizViewStateDelegateFactory {
                     *listOfNotNull(
                         fragmentStepQuizBinding.stepQuizFeedbackBlocks.root,
                         descriptionBinding?.stepQuizDescription,
-                        fragmentStepQuizBinding.stepQuizButtons.stepQuizSubmitButton,
+                        stepQuizButtonsBinding.stepQuizSubmitButton,
                         *quizViews
                     ).toTypedArray()
                 )

diff --git a/...c/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt b/...c/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt
@@ -7,12 +7,17 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.core.view.children
+import androidx.core.view.doOnNextLayout
 import androidx.core.view.isVisible
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
@@ -27,6 +32,7 @@ import org.hyperskill.app.android.core.view.ui.dialog.dismissDialogFragmentIfExi
 import org.hyperskill.app.android.core.view.ui.fragment.parentOfType
 import org.hyperskill.app.android.core.view.ui.navigation.requireRouter
 import org.hyperskill.app.android.databinding.FragmentStepQuizBinding
+import org.hyperskill.app.android.databinding.LayoutQuizButtonsBinding
 import org.hyperskill.app.android.databinding.LayoutStepQuizDescriptionBinding
 import org.hyperskill.app.android.main.view.ui.navigation.MainScreen
 import org.hyperskill.app.android.main.view.ui.navigation.MainScreenRouter
@@ -74,7 +80,15 @@ abstract class DefaultStepQuizFragment :
 
     private val stepQuizViewModel: StepQuizViewModel by viewModels { viewModelFactory }
 
-    protected val viewBinding: FragmentStepQuizBinding by viewBinding(FragmentStepQuizBinding::bind)
+    private val viewBinding: FragmentStepQuizBinding by viewBinding(FragmentStepQuizBinding::bind)
+    protected val stepQuizButtons: LayoutQuizButtonsBinding by viewBinding(
+        vbFactory = LayoutQuizButtonsBinding::bind,
+        viewProvider = {
+            requireParentFragment()
+                .requireView()
+                .findViewById(R.id.stepQuizButtons)
+        }
+    )
 
     private var stepQuizStateDelegate: ViewStateDelegate<StepQuizFeature.StepQuizState>? = null
 
@@ -135,14 +149,15 @@ abstract class DefaultStepQuizFragment :
 
         stepQuizStateDelegate = StepQuizViewStateDelegateFactory.create(
             fragmentStepQuizBinding = viewBinding,
+            stepQuizButtonsBinding = stepQuizButtons,
             descriptionBinding = descriptionBinding,
             skeletonView = skeletonView,
             quizViews = quizViews
         )
         stepQuizFeedbackBlocksDelegate =
             StepQuizFeedbackBlocksDelegate(requireContext(), viewBinding.stepQuizFeedbackBlocks)
         stepQuizFormDelegate = createStepQuizFormDelegate().also { delegate ->
-            delegate.customizeSubmissionButton(viewBinding.stepQuizButtons.stepQuizSubmitButton)
+            delegate.customizeSubmissionButton(stepQuizButtons.stepQuizSubmitButton)
         }
         stepQuizHintsDelegate = StepQuizHintsDelegate(
             binding = viewBinding.stepQuizHints,
@@ -171,35 +186,35 @@ abstract class DefaultStepQuizFragment :
 
     private fun initButtonsViewStateDelegate() {
         stepQuizButtonsViewStateDelegate = ViewStateDelegate<StepQuizButtonsState>().apply {
-            addState<StepQuizButtonsState.Submit>(viewBinding.stepQuizButtons.stepQuizSubmitButton)
-            addState<StepQuizButtonsState.Retry>(viewBinding.stepQuizButtons.stepQuizRetryButton)
+            addState<StepQuizButtonsState.Submit>(stepQuizButtons.stepQuizSubmitButton)
+            addState<StepQuizButtonsState.Retry>(stepQuizButtons.stepQuizRetryButton)
             addState<StepQuizButtonsState.Continue>(
-                viewBinding.stepQuizButtons.stepQuizContinueButton,
-                viewBinding.stepQuizButtons.stepQuizContinueFrame
+                stepQuizButtons.stepQuizContinueButton,
+                stepQuizButtons.stepQuizContinueFrame
             )
             addState<StepQuizButtonsState.RetryLogoAndSubmit>(
-                viewBinding.stepQuizButtons.stepQuizRetryLogoOnlyButton,
-                viewBinding.stepQuizButtons.stepQuizSubmitButton
+                stepQuizButtons.stepQuizRetryLogoOnlyButton,
+                stepQuizButtons.stepQuizSubmitButton
             )
             addState<StepQuizButtonsState.RetryLogoAndContinue>(
-                viewBinding.stepQuizButtons.stepQuizRetryLogoOnlyButton,
-                viewBinding.stepQuizButtons.stepQuizContinueButton,
-                viewBinding.stepQuizButtons.stepQuizContinueFrame
+                stepQuizButtons.stepQuizRetryLogoOnlyButton,
+                stepQuizButtons.stepQuizContinueButton,
+                stepQuizButtons.stepQuizContinueFrame
             )
         }
     }
 
     private fun setupQuizButtons() {
-        viewBinding.stepQuizButtons.stepQuizSubmitButton.setOnClickListener {
+        stepQuizButtons.stepQuizSubmitButton.setOnClickListener {
             onSubmitButtonClicked()
         }
-        viewBinding.stepQuizButtons.stepQuizRetryButton.setOnClickListener {
+        stepQuizButtons.stepQuizRetryButton.setOnClickListener {
             onRetryButtonClicked()
         }
-        viewBinding.stepQuizButtons.stepQuizRetryLogoOnlyButton.setOnClickListener {
+        stepQuizButtons.stepQuizRetryLogoOnlyButton.setOnClickListener {
             onRetryButtonClicked()
         }
-        viewBinding.stepQuizButtons.stepQuizContinueButton.setOnClickListener {
+        stepQuizButtons.stepQuizContinueButton.setOnClickListener {
             parentOfType(StepCompletionHost::class.java)
                 ?.onNewMessage(StepCompletionFeature.Message.ContinuePracticingClicked)
         }
@@ -385,7 +400,7 @@ abstract class DefaultStepQuizFragment :
         stepQuizFeedbackBlocksDelegate?.setState(
             stepQuizFeedbackMapper.mapToStepQuizFeedbackState(step.block.name, state)
         )
-        viewBinding.stepQuizButtons.stepQuizSubmitButton.isEnabled = StepQuizResolver.isQuizEnabled(state)
+        stepQuizButtons.stepQuizSubmitButton.isEnabled = StepQuizResolver.isQuizEnabled(state)
 
         when (val submissionState = state.submissionState) {
             is StepQuizFeature.SubmissionState.Loaded -> {
@@ -407,6 +422,7 @@ abstract class DefaultStepQuizFragment :
                     else -> StepQuizButtonsState.Submit
                 }
                 stepQuizButtonsViewStateDelegate?.switchState(buttonsState)
+                updateFeedbackMargin()
 
                 val replyValidation = submissionState.replyValidation
                 if (replyValidation is ReplyValidationResult.Error) {
@@ -417,6 +433,15 @@ abstract class DefaultStepQuizFragment :
             }
             is StepQuizFeature.SubmissionState.Empty -> {
                 stepQuizButtonsViewStateDelegate?.switchState(StepQuizButtonsState.Submit)
+                updateFeedbackMargin()
+            }
+        }
+    }
+
+    private fun updateFeedbackMargin() {
+        stepQuizButtons.root.doOnNextLayout { buttons ->
+            viewBinding.root.updateLayoutParams<MarginLayoutParams> {
+                bottomMargin = buttons.height + buttons.marginBottom + buttons.marginTop
             }
         }
     }

diff --git a/...main/java/org/hyperskill/app/android/step_quiz_code/view/fragment/CodeStepQuizFragment.kt b/...main/java/org/hyperskill/app/android/step_quiz_code/view/fragment/CodeStepQuizFragment.kt
@@ -200,7 +200,7 @@ class CodeStepQuizFragment :
                     lang = lang,
                     code = code,
                     step = step,
-                    isShowRetryButton = viewBinding.stepQuizButtons.stepQuizRetryLogoOnlyButton.isVisible
+                    isShowRetryButton = stepQuizButtons.stepQuizRetryLogoOnlyButton.isVisible
                 )
             )
             .showIfNotExists(childFragmentManager, CodeStepQuizFullScreenDialogFragment.TAG)

diff --git a/androidHyperskillApp/src/main/res/layout/fragment_stage_step_wrapper.xml b/androidHyperskillApp/src/main/res/layout/fragment_stage_step_wrapper.xml
@@ -88,4 +88,14 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <include
+        android:id="@+id/stepQuizButtons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        layout="@layout/layout_quiz_buttons" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/androidHyperskillApp/src/main/res/layout/fragment_step_practice.xml b/androidHyperskillApp/src/main/res/layout/fragment_step_practice.xml
@@ -49,4 +49,14 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <include
+        android:id="@+id/stepQuizButtons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        layout="@layout/layout_quiz_buttons" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/androidHyperskillApp/src/main/res/layout/fragment_step_quiz.xml b/androidHyperskillApp/src/main/res/layout/fragment_step_quiz.xml
@@ -62,18 +62,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/stepQuizButtons"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <include
-        android:id="@+id/stepQuizButtons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        layout="@layout/layout_quiz_buttons" />
+        app:layout_constraintStart_toStartOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>