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 9ee5946..746149e 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,9 +1,6 @@
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
@@ -31,22 +28,22 @@ class SignUpActivity : BaseActivity() {
.commit()
}
- @Deprecated("Deprecated in Java")
- override fun onBackPressed() {
- if (Build.VERSION.SDK_INT >= 33) {
- onBackInvokedDispatcher.registerOnBackInvokedCallback(
- OnBackInvokedDispatcher.PRIORITY_DEFAULT
- ) {
- exitOnBackPressed()
- }
- } else {
- onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
- override fun handleOnBackPressed() {
- exitOnBackPressed()
- }
- })
- }
- }
+// @Deprecated("Deprecated in Java")
+// override fun onBackPressed() {
+// if (Build.VERSION.SDK_INT >= 33) {
+// onBackInvokedDispatcher.registerOnBackInvokedCallback(
+// OnBackInvokedDispatcher.PRIORITY_DEFAULT
+// ) {
+// exitOnBackPressed()
+// }
+// } else {
+// onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+// override fun handleOnBackPressed() {
+// exitOnBackPressed()
+// }
+// })
+// }
+// }
private fun exitOnBackPressed() {
if (isTaskRoot) {
@@ -55,6 +52,4 @@ class SignUpActivity : BaseActivity() {
}
}
-
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
index 19c02d9..589123e 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
@@ -1,12 +1,12 @@
package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
-import android.os.Build.VERSION_CODES.R
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.FragmentGetStartedBinding
-import com.nivesh.production.niveshfd.databinding.FragmentOtpBinding
+import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
private const val ARG_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2"
@@ -39,7 +39,15 @@ class GetStartedFragment : BaseFragment() {
private fun init() {
-
+ binding.btnNext.setOnClickListener {
+ replaceFragment(
+ activity as BaseActivity,
+ R.id.signUpContainer,
+ AlmostThereFragment(),
+ "GET STARTED",
+ true
+ )
+ }
}
companion object {
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt
index deb6507..6b82277 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt
@@ -57,13 +57,19 @@ class OTPFragment : BaseFragment() {
binding.txtDigit.text = getString(R.string.sixDigitOTP).plus(" ").plus("+91.00000.00000")
- binding.txtResendOTP.setOnClickListener{
+ binding.txtResendOTP.setOnClickListener {
}
binding.btnSubmit.setOnClickListener {
if (validate()) {
- replaceFragment(activity as BaseActivity, R.id.signUpContainer,GetStartedFragment(),"GET STARTED", true)
+ replaceFragment(
+ activity as BaseActivity,
+ R.id.signUpContainer,
+ GetStartedFragment(),
+ "GET STARTED",
+ true
+ )
}
}
}
@@ -158,7 +164,4 @@ class OTPFragment : BaseFragment() {
}
}
-
-
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
index 037d684..116893b 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
@@ -76,6 +76,4 @@ class SignUpFragment : BaseFragment() {
return true
}
}
-
-
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_get_started.xml b/app/src/main/res/layout/fragment_get_started.xml
index de4de58..c1c441f 100644
--- a/app/src/main/res/layout/fragment_get_started.xml
+++ b/app/src/main/res/layout/fragment_get_started.xml
@@ -337,7 +337,7 @@
android:layout_marginBottom="@dimen/margin_20"
android:layout_marginStart="@dimen/margin_5"
android:layout_marginEnd="@dimen/margin_15"
- android:text="@string/next"
+ android:text="@string/continueText"
android:textColor="@color/white"
android:backgroundTint="@color/red"
app:cornerRadius="@dimen/margin_15"
@@ -346,16 +346,6 @@
app:layout_constraintStart_toEndOf="@+id/saveDraft"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/saveDraft"
- app:layout_constraintRight_toRightOf="parent"
- />
-
-
-
-
-
-
-
-
-
+ app:layout_constraintRight_toRightOf="parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 8a983b7..83c26e6 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -309,6 +309,9 @@
Let’s get started
SAVE DRAFT
Format (.png or .jpg)
-
+ Hello blank fragment
+ enter Mobile or Email
+ enter Password
+ Login With Google
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7e31d75..81ef46a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -43,11 +43,11 @@
- @color/white
-
+
+
+
+
+