From bd3bc4d07aa5636a0f95881e9059d5c33acb18bd Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 10 Mar 2023 15:45:55 +0530 Subject: [PATCH] working on almostthere screen --- .../ui/fragments1/AlmostThereFragment.kt | 152 ++++++++++++++++-- .../main/res/layout/fragment_almost_there.xml | 81 ++++++++-- app/src/main/res/values-hi-rIN/strings.xml | 5 + app/src/main/res/values/colors.xml | 4 + app/src/main/res/values/strings.xml | 5 + 5 files changed, 217 insertions(+), 30 deletions(-) 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 3ce69ca..b1e6a48 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,9 +7,7 @@ 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.databinding.FragmentSignupBinding import com.nivesh.production.niveshfd.fd.util.Common class AlmostThereFragment : Fragment() { @@ -29,40 +27,160 @@ class AlmostThereFragment : Fragment() { } private fun init() { - binding.edtMobileNumber.addTextChangedListener(object : TextWatcher { + binding.edtDay.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - Common.removeError(binding.tlMobileNumber) + Common.removeError(binding.tlDay) } }) + binding.edtMonth.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) {} + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + Common.removeError(binding.tlMonth) + } + }) + binding.edtYear.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) {} + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + Common.removeError(binding.tlYear) + } + }) + + binding.edtFullName.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) {} + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + Common.removeError(binding.tlFullName) + } + }) + + binding.edtEmail.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) {} + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + Common.removeError(binding.tlEmail) + } + }) + + binding.edtAddressLine1.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) {} + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + Common.removeError(binding.tlAddressLine1) + } + }) + + binding.edtPinCode.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) {} + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + Common.removeError(binding.tlPinCode) + } + }) + + binding.spCity.setOnClickListener { + + } + + binding.spState.setOnClickListener { + + } + binding.cbCheck.setOnClickListener { + + } + + binding.tvTermsAndCondition.setOnClickListener{ + + } + binding.tvPrivacyPolicy.setOnClickListener{ + + } + + binding.btnBack.setOnClickListener { + + } - binding.btnSignUp.setOnClickListener { + binding.btnNext.setOnClickListener { if (validate()) { } } + + } private fun validate(): Boolean { - return if (binding.edtMobileNumber.text.toString().isEmpty()) { // EditText + return if (binding.edtDay.text.toString().isEmpty()) { // EditText + Common.commonErrorMethod( + binding.edtDay, + binding.tlDay, + "" + ) + } else if (binding.edtMonth.text.toString().isEmpty()) { // EditText + Common.commonErrorMethod( + binding.edtMonth, + binding.tlMonth, + "" + ) + } else if (binding.edtYear.text.toString().isEmpty()) { // EditText + Common.commonErrorMethod( + binding.edtYear, + binding.tlYear, + "" + ) + } else if (binding.edtFullName.text.toString().isEmpty()) { // EditText Common.commonErrorMethod( - binding.edtMobileNumber, - binding.tlMobileNumber, - getString(R.string.emptyMobileNumber) + binding.edtFullName, + binding.tlFullName, + "" ) - } else if (!Common.isIndianMobileNo(binding.edtMobileNumber.text.toString())) { // EditText + } else if (binding.edtEmail.text.toString().isEmpty()) { // EditText Common.commonErrorMethod( - binding.edtMobileNumber, - binding.tlMobileNumber, - getString(R.string.inValidIndianMobileNumber) + binding.edtFullName, + binding.tlFullName, + "" ) - } else if (binding.edtMobileNumber.text?.length != 10) { // EditText + } else if (!Common.isValidEmail(binding.edtEmail.text.toString())) { // EditText Common.commonErrorMethod( - binding.edtMobileNumber, - binding.tlMobileNumber, - getString(R.string.inValidMobileNumber) + binding.edtFullName, + binding.tlFullName, + "" + ) + } else if (binding.edtAddressLine1.text.toString().isEmpty()) { // EditText + Common.commonErrorMethod( + binding.edtAddressLine1, + binding.tlAddressLine1, + "" + ) + } else if (binding.edtPinCode.text.toString().isEmpty()) { // EditText + Common.commonErrorMethod( + binding.edtPinCode, + binding.tlPinCode, + "" + ) + } else if (binding.edtPinCode.text.toString().length != 6) { // EditText + Common.commonErrorMethod( + binding.edtPinCode, + binding.tlPinCode, + "" + ) + } else if (binding.spCity.text.toString().isEmpty()) { // EditText + Common.commonSpinnerErrorMethod( + binding.spCity, + binding.tlCity, + "" + ) + } else if (binding.spState.text.toString().isEmpty()) { // EditText + Common.commonSpinnerErrorMethod( + binding.spState, + binding.tlState, + "" ) + }else if (!binding.cbCheck.isChecked) { // EditText + return false; } else { return true } diff --git a/app/src/main/res/layout/fragment_almost_there.xml b/app/src/main/res/layout/fragment_almost_there.xml index 0f65136..fd1a9d8 100644 --- a/app/src/main/res/layout/fragment_almost_there.xml +++ b/app/src/main/res/layout/fragment_almost_there.xml @@ -49,22 +49,23 @@ @@ -74,7 +75,6 @@ @@ -99,7 +101,6 @@ @@ -137,6 +140,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" + android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" android:textColorHint="@color/greyColor2" android:textSize="@dimen/text_size_14" tool:ignore="TextContrastCheck" /> @@ -158,7 +162,7 @@ android:id="@+id/edtEmail" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="text" + android:inputType="textEmailAddress" android:textColorHint="@color/greyColor2" android:textSize="@dimen/text_size_14" tool:ignore="TextContrastCheck" /> @@ -225,7 +229,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="number" + android:digits="@string/number" android:maxLength="6" + android:maxLines="1" android:textColorHint="@color/greyColor2" android:textSize="@dimen/text_size_14" tool:ignore="TextContrastCheck" /> @@ -277,6 +283,55 @@ + + + + + + + + + @@ -284,29 +339,29 @@ diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 76dc463..c4e750e 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -285,6 +285,11 @@ DD MM YYYY + By clicking on next, you agree to accept our + terms and conditions + and + privacy policy. + 0123456789 \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 64e0f58..3949958 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,6 +13,10 @@ #1F5ACE #00000000 #5077FF + #006BFF + + + #323131 #757575 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7bb88e7..c342c07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -292,6 +292,11 @@ DD MM YYYY + By clicking on next, you agree to accept our + terms and conditions + and + privacy policy. + 0123456789 \ No newline at end of file