Browse Source

working on almostthere screen

PankajBranch^2
Hemant Khadase 2 years ago
parent
commit
bd3bc4d07a
5 changed files with 217 additions and 30 deletions
  1. +135
    -17
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt
  2. +68
    -13
      app/src/main/res/layout/fragment_almost_there.xml
  3. +5
    -0
      app/src/main/res/values-hi-rIN/strings.xml
  4. +4
    -0
      app/src/main/res/values/colors.xml
  5. +5
    -0
      app/src/main/res/values/strings.xml

+ 135
- 17
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt View File

@ -7,9 +7,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.FragmentAlmostThereBinding import com.nivesh.production.niveshfd.databinding.FragmentAlmostThereBinding
import com.nivesh.production.niveshfd.databinding.FragmentSignupBinding
import com.nivesh.production.niveshfd.fd.util.Common import com.nivesh.production.niveshfd.fd.util.Common
class AlmostThereFragment : Fragment() { class AlmostThereFragment : Fragment() {
@ -29,40 +27,160 @@ class AlmostThereFragment : Fragment() {
} }
private fun init() { private fun init() {
binding.edtMobileNumber.addTextChangedListener(object : TextWatcher {
binding.edtDay.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {} override fun afterTextChanged(s: Editable?) {}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: 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()) { if (validate()) {
} }
} }
} }
private fun validate(): Boolean { 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( 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( 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( 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 { } else {
return true return true
} }


+ 68
- 13
app/src/main/res/layout/fragment_almost_there.xml View File

@ -49,22 +49,23 @@
<!-- Day --> <!-- Day -->
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlDay" android:id="@+id/tlDay"
app:layout_constraintStart_toStartOf="parent"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="@dimen/margin_100" android:layout_width="@dimen/margin_100"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_15" android:layout_marginTop="@dimen/margin_15"
android:hint="@string/day" android:hint="@string/day"
android:padding="@dimen/margin_3" android:padding="@dimen/margin_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnReferrer"> app:layout_constraintTop_toBottomOf="@+id/btnReferrer">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtDay" android:id="@+id/edtDay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="number"
android:gravity="center" android:gravity="center"
android:digits="@string/number"
android:inputType="number"
android:textColorHint="@color/greyColor2" android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14" android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" /> tool:ignore="TextContrastCheck" />
@ -74,7 +75,6 @@
<!-- Month --> <!-- Month -->
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlMonth" android:id="@+id/tlMonth"
app:layout_constraintStart_toEndOf="@+id/tlDay"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="@dimen/margin_100" android:layout_width="@dimen/margin_100"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -82,14 +82,16 @@
android:layout_marginTop="@dimen/margin_15" android:layout_marginTop="@dimen/margin_15"
android:hint="@string/month" android:hint="@string/month"
android:padding="@dimen/margin_3" android:padding="@dimen/margin_3"
app:layout_constraintStart_toEndOf="@+id/tlDay"
app:layout_constraintTop_toBottomOf="@+id/btnReferrer"> app:layout_constraintTop_toBottomOf="@+id/btnReferrer">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtMonth" android:id="@+id/edtMonth"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="number"
android:gravity="center" android:gravity="center"
android:digits="@string/number"
android:inputType="number"
android:textColorHint="@color/greyColor2" android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14" android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" /> tool:ignore="TextContrastCheck" />
@ -99,7 +101,6 @@
<!-- Year --> <!-- Year -->
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlYear" android:id="@+id/tlYear"
app:layout_constraintStart_toEndOf="@+id/tlMonth"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="@dimen/margin_150" android:layout_width="@dimen/margin_150"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -107,14 +108,16 @@
android:layout_marginTop="@dimen/margin_15" android:layout_marginTop="@dimen/margin_15"
android:hint="@string/year" android:hint="@string/year"
android:padding="@dimen/margin_3" android:padding="@dimen/margin_3"
app:layout_constraintStart_toEndOf="@+id/tlMonth"
app:layout_constraintTop_toBottomOf="@+id/btnReferrer"> app:layout_constraintTop_toBottomOf="@+id/btnReferrer">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtYear" android:id="@+id/edtYear"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="number"
android:gravity="center" android:gravity="center"
android:digits="@string/number"
android:inputType="number"
android:textColorHint="@color/greyColor2" android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14" android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" /> tool:ignore="TextContrastCheck" />
@ -137,6 +140,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text" android:inputType="text"
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ"
android:textColorHint="@color/greyColor2" android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14" android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" /> tool:ignore="TextContrastCheck" />
@ -158,7 +162,7 @@
android:id="@+id/edtEmail" android:id="@+id/edtEmail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text"
android:inputType="textEmailAddress"
android:textColorHint="@color/greyColor2" android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14" android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" /> tool:ignore="TextContrastCheck" />
@ -225,7 +229,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="number" android:inputType="number"
android:digits="@string/number"
android:maxLength="6" android:maxLength="6"
android:maxLines="1"
android:textColorHint="@color/greyColor2" android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14" android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" /> tool:ignore="TextContrastCheck" />
@ -277,6 +283,55 @@
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cbCheck"
android:layout_width="@dimen/margin_48"
android:layout_height="@dimen/margin_48"
android:layout_marginTop="@dimen/margin_20"
android:layout_marginEnd="@dimen/margin_25"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tlState" />
<TextView
android:id="@+id/byClicking"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_45"
android:layout_marginTop="@dimen/margin_25"
android:text="@string/byClicking"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cbCheck"
app:layout_constraintTop_toBottomOf="@id/tlState" />
<TextView
android:id="@+id/tvTermsAndCondition"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_45"
android:text="@string/terms_and_conditions"
android:textColor="@color/blue1"
app:layout_constraintStart_toEndOf="@+id/cbCheck"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/byClicking" />
<TextView
android:id="@+id/tvAnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_5"
android:text="@string/and"
app:layout_constraintStart_toEndOf="@+id/tvTermsAndCondition"
app:layout_constraintTop_toBottomOf="@id/byClicking" />
<TextView
android:id="@+id/tvPrivacyPolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_10"
android:text="@string/privacyPolicy"
android:textColor="@color/blue1"
app:layout_constraintStart_toEndOf="@+id/tvAnd"
app:layout_constraintTop_toBottomOf="@id/byClicking" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -284,29 +339,29 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnBack" android:id="@+id/btnBack"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="@dimen/margin_120" android:layout_width="@dimen/margin_120"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_20" android:layout_marginStart="@dimen/margin_20"
android:layout_marginBottom="@dimen/margin_20" android:layout_marginBottom="@dimen/margin_20"
android:text="@string/back"
android:backgroundTint="@color/white" android:backgroundTint="@color/white"
android:text="@string/back"
android:textColor="@color/red" android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15" app:cornerRadius="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnNext" android:id="@+id/btnNext"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="@dimen/margin_200" android:layout_width="@dimen/margin_200"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_30" android:layout_marginStart="@dimen/margin_30"
android:layout_marginBottom="@dimen/margin_20"
android:layout_marginEnd="@dimen/margin_20" android:layout_marginEnd="@dimen/margin_20"
android:layout_marginBottom="@dimen/margin_20"
android:backgroundTint="@color/red"
android:text="@string/next" android:text="@string/next"
android:textColor="@color/white" android:textColor="@color/white"
android:backgroundTint="@color/red"
app:cornerRadius="@dimen/margin_15" app:cornerRadius="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btnBack" /> app:layout_constraintStart_toEndOf="@+id/btnBack" />


+ 5
- 0
app/src/main/res/values-hi-rIN/strings.xml View File

@ -285,6 +285,11 @@
<string name="day">DD</string> <string name="day">DD</string>
<string name="month">MM</string> <string name="month">MM</string>
<string name="year">YYYY</string> <string name="year">YYYY</string>
<string name="byClicking">By clicking on next, you agree to accept our</string>
<string name="terms_and_conditions">terms and conditions</string>
<string name="and">and</string>
<string name="privacyPolicy">privacy policy.</string>
<string name="number">0123456789</string>
</resources> </resources>

+ 4
- 0
app/src/main/res/values/colors.xml View File

@ -13,6 +13,10 @@
<color name="blue">#1F5ACE</color> <color name="blue">#1F5ACE</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="lightBlue">#5077FF</color> <color name="lightBlue">#5077FF</color>
<color name="blue1">#006BFF</color>
<color name="greyColor1">#323131</color> <color name="greyColor1">#323131</color>
<color name="greyColor2">#757575</color> <color name="greyColor2">#757575</color>


+ 5
- 0
app/src/main/res/values/strings.xml View File

@ -292,6 +292,11 @@
<string name="day">DD</string> <string name="day">DD</string>
<string name="month">MM</string> <string name="month">MM</string>
<string name="year">YYYY</string> <string name="year">YYYY</string>
<string name="byClicking">By clicking on next, you agree to accept our</string>
<string name="terms_and_conditions">terms and conditions</string>
<string name="and">and</string>
<string name="privacyPolicy">privacy policy.</string>
<string name="number">0123456789</string>
</resources> </resources>

Loading…
Cancel
Save

Powered by TurnKey Linux.