diff --git a/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt b/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt index b210dff7f65936e5ee2d10c773e14bdf46da1bd5..752cdad114e161105c5174ac876647418963e644 100644 --- a/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt +++ b/app/src/main/java/com/futo/circles/feature/log_in/LogInFragment.kt @@ -31,11 +31,20 @@ class LogInFragment : Fragment(R.layout.log_in_fragment) { success = { navigateToBottomMenuFragment() }, error = { showError(it) } ) + viewModel.signUpEventResultLiveData.observeResponse( + this, + onRequestInvoked = { setLoadingState(false) }, + success = { navigateToSignUp() }, + error = { showError(it) } + ) } private fun setOnClickActions() { with(binding) { - btnSignUp.setOnClickListener { navigateToSignUp() } + btnSignUp.setOnClickWithLoading { + setLoadingState(true) + viewModel.startSignUp() + } btnLogin.setOnClickWithLoading { setLoadingState(true) @@ -49,7 +58,10 @@ class LogInFragment : Fragment(R.layout.log_in_fragment) { private fun setLoadingState(isLoading: Boolean) { setEnabledViews(!isLoading) - binding.btnLogin.setIsLoading(isLoading) + if (!isLoading) { + binding.btnLogin.setIsLoading(false) + binding.btnSignUp.setIsLoading(false) + } } private fun navigateToSignUp() { diff --git a/app/src/main/res/layout/log_in_fragment.xml b/app/src/main/res/layout/log_in_fragment.xml index b25c9925aa81227560c464a9aac8aeee9322542d..8fad7241e81525872fca6c0f52f17a8fce557671 100644 --- a/app/src/main/res/layout/log_in_fragment.xml +++ b/app/src/main/res/layout/log_in_fragment.xml @@ -145,9 +145,8 @@ app:layout_constraintEnd_toEndOf="@id/guidelineEnd" app:layout_constraintStart_toStartOf="@id/guidelineStart" /> - <com.google.android.material.button.MaterialButton + <com.futo.circles.view.LoadingButton android:id="@+id/btnSignUp" - style="@style/AccentButtonStyle" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/sign_up" diff --git a/app/src/main/res/navigation/nav_graph_start_host.xml b/app/src/main/res/navigation/nav_graph_start_host.xml index 2f58d0faed2c38a1df4957c0159ab4f9d6279703..dc820bcddecae8334e622df1e71095b4b9616e2a 100644 --- a/app/src/main/res/navigation/nav_graph_start_host.xml +++ b/app/src/main/res/navigation/nav_graph_start_host.xml @@ -23,7 +23,7 @@ <fragment android:id="@+id/signUpFragment" android:name="com.futo.circles.feature.sign_up.SignUpFragment" - android:label="Log In" + android:label="Sign up" tools:layout="@layout/sign_up_fragment"> <action android:id="@+id/action_signUpFragment_to_bottomNavigationFragment"