From dd4dd560b142ce07b04f0c279a7d1ec2aa268e36 Mon Sep 17 00:00:00 2001 From: Manoj Date: Wed, 15 Mar 2023 16:07:49 +0530 Subject: [PATCH] changes in ui --- .../partnerOnBoarding/ui/activities1/SignUpActivity.kt | 3 +++ .../partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt | 6 ++++-- app/src/main/res/layout/activity_login.xml | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt index 746149e..56d2177 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt @@ -1,6 +1,9 @@ package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1 +import android.os.Build import android.os.Bundle +import android.window.OnBackInvokedDispatcher +import androidx.activity.OnBackPressedCallback import com.nivesh.production.niveshfd.R import com.nivesh.production.niveshfd.databinding.ActivitySignupBinding import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt index 3f479a3..d3a049c 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt @@ -7,10 +7,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import com.nivesh.production.niveshfd.R import com.nivesh.production.niveshfd.databinding.FragmentAlmostThereBinding +import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity import com.nivesh.production.niveshfd.fd.util.Common -class AlmostThereFragment : Fragment() { +class AlmostThereFragment : BaseFragment() { private var _binding: FragmentAlmostThereBinding? = null private val binding get() = _binding!! @@ -103,7 +105,7 @@ class AlmostThereFragment : Fragment() { } binding.btnBack.setOnClickListener { - + requireActivity().onBackPressedDispatcher.onBackPressed() } binding.btnNext.setOnClickListener { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 15b248d..9a8a94f 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" android:background="@color/white" android:fillViewport="true" - android:padding="@dimen/margin_5" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent">