diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt index c842662..39d3bdc 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepOneBajajFDFragment.kt @@ -17,7 +17,7 @@ import com.nivesh.production.bajajfd.databinding.FragmentBajajfdStepOneBinding import com.nivesh.production.bajajfd.interfaces.BajajFDInterface import com.nivesh.production.bajajfd.model.GetRatesRequest import com.nivesh.production.bajajfd.ui.activity.BajajFdMainActivity -import com.nivesh.production.bajajfd.util.Constants.Companion.showDialogValidation +import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel @@ -58,6 +58,7 @@ class StepOneBajajFDFragment : Fragment() { } override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + binding.tlDepositAmount.error = null } }) @@ -71,13 +72,14 @@ class StepOneBajajFDFragment : Fragment() { ) binding.tvInterestPayout.setAdapter(adapter) binding.tvInterestPayout.setOnItemClickListener { parent, view, position, id -> + binding.spInterestPayout.error = null binding.tvFrequency.text = binding.tvInterestPayout.text } // Tenure binding.tvTenure.setAdapter(adapter) binding.tvTenure.setOnItemClickListener { parent, view, position, id -> - // getRatesApi() + // getRatesApi() } @@ -88,7 +90,7 @@ class StepOneBajajFDFragment : Fragment() { // Maturity Options binding.radioGroup.setOnCheckedChangeListener { group, checkedId -> rgMaturity = group.findViewById(checkedId) - Log.e("rgMaturity", "-->"+rgMaturity.text) + Log.e("rgMaturity", "-->" + rgMaturity.text) } // TAX Deduct @@ -110,24 +112,24 @@ class StepOneBajajFDFragment : Fragment() { } private fun validation(): Boolean { - if (binding.edtAmount.text?.isEmpty()!!){ + if (binding.edtAmount.text?.isEmpty()!!) { return false - showDialogValidation(activity, "") - }else if (binding.tvInterestPayout.text.isEmpty()){ + binding.tlDepositAmount.error = "" + } else if (binding.tvInterestPayout.text.isEmpty()) { return false - showDialogValidation(activity, "") - }else if (binding.tvTenure.text.isEmpty()){ + binding.spInterestPayout.error = "" + } else if (binding.tvTenure.text.isEmpty()) { return false - showDialogValidation(activity, "") - }else{ - return true + binding.spInterestTenure.error = "" + } else { + return true } } private fun getRatesApi() { val getRatesRequest = GetRatesRequest() - getRatesRequest.fdProvider = "" + getRatesRequest.fdProvider = "Bajaj" getRatesRequest.frequency = "" getRatesRequest.type = "" stepOneBajajFDViewModel.getRates(getRatesRequest) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt new file mode 100644 index 0000000..841b4b7 --- /dev/null +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Common.kt @@ -0,0 +1,124 @@ +package com.nivesh.production.bajajfd.util + +import android.app.Activity +import android.app.AlertDialog +import android.content.Context +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import android.os.Build +import android.provider.ContactsContract +import android.util.Patterns +import com.nivesh.production.bajajfd.BajajApplication +import java.util.regex.Matcher +import java.util.regex.Pattern + +class Common { + + companion object{ + /** + *Before use this method write following code in model class + app:Application(in activity and model) + changes in hasInternetConnection + val connectivityManager = getApplication().getSystemService(.... + **/ + //internet check + private fun isNetworkAvailable(): Boolean { + val connectivityManager = BajajApplication().getSystemService( + Context.CONNECTIVITY_SERVICE + ) as ConnectivityManager + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + + val activeNetwork = connectivityManager.activeNetwork ?: return false + val capabilities = + connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false + return when { + capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true + capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true + capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true + else -> false + } + } else { + connectivityManager.activeNetworkInfo?.run { + return when (type) { + ConnectivityManager.TYPE_WIFI -> true + ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -> true + ConnectivityManager.TYPE_ETHERNET -> true + else -> false + } + } + } + return false + } + //valid email check + private fun isValidEmail(emailText:String?): String? { + + if(!emailText?.let { Patterns.EMAIL_ADDRESS.matcher(it).matches() }!!) + { + return "Invalid Email Address" + } + return null + } + //valid Name Check + private fun isValidName(nameText: String?): String { + val pattern = Pattern.compile(("^[a-zA-Z\\s]{2,70}$")) + val matcher = pattern.matcher(nameText) + if (!matcher.matches()) { + return "Enter Valid Name" + } + return "" + + } + //validPanCard + private fun isValidPanCardNo(panCardNo: String?): Boolean { + // Regex to check valid PAN Card number. + val regex = "[A-Z]{5}[0-9]{4}[A-Z]{1}" + // Compile the ReGex + val p = Pattern.compile(regex) + // If the PAN Card number + // is empty return false + if (panCardNo == null) { + return false + } + // Pattern class contains matcher() method + // to find matching between given + // PAN Card number using regular expression. + val m = p.matcher(panCardNo) + // Return if the PAN Card number + // matched the ReGex + return m.matches() + } + //is Indian mobile Number + private fun isIndianMobileNo(mobileNumber: String?): Boolean { + //(0/91): number starts with (0/91) + //[7-9]: starting of the number may contain a digit between 0 to 9 + //[0-9]: then contains digits 0 to 9 + val pattern: Pattern = Pattern.compile("^[6-9]\\d{9}$") + //the matcher() method creates a matcher that will match the given input against this pattern + val match: Matcher = pattern.matcher(mobileNumber) + //returns a boolean value + return match.matches() + } + + fun showDialogValidation(activity: Activity?, message: CharSequence?) { + val builder = AlertDialog.Builder(activity) + builder.setMessage(message) + builder.setPositiveButton("OK") { dialogInterface, i -> + dialogInterface.dismiss() + } + builder.show() + } + + fun showDialogWithTwoButtons(activity: Activity?, message: CharSequence?) { + val builder = AlertDialog.Builder(activity) + builder.setMessage(message) + builder.setPositiveButton("OK") { dialogInterface, i -> + dialogInterface.dismiss() + } + builder.setNegativeButton("Cancel") { dialogInterface, i -> + dialogInterface.dismiss() + } + builder.show() + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt b/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt index bb4e3be..b4aaeae 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/util/Constants.kt @@ -1,131 +1,9 @@ package com.nivesh.production.bajajfd.util -import android.app.Activity -import android.app.AlertDialog -import android.content.Context -import android.net.ConnectivityManager -import android.net.ConnectivityManager.TYPE_ETHERNET -import android.net.ConnectivityManager.TYPE_WIFI -import android.net.NetworkCapabilities.* -import android.os.Build -import android.provider.ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -import android.util.Patterns -import com.nivesh.production.bajajfd.BajajApplication -import java.util.regex.Matcher -import java.util.regex.Pattern - class Constants() { companion object { - const val BASE_URL ="https://www.providential.in/api/" - /** - *Before use this method write following code in model class - app:Application(in activity and model) - changes in hasInternetConnection - val connectivityManager = getApplication().getSystemService(.... - - **/ - - //internet check - private fun isNetworkAvailable(): Boolean { - val connectivityManager = BajajApplication().getSystemService( - Context.CONNECTIVITY_SERVICE - ) as ConnectivityManager - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - - val activeNetwork = connectivityManager.activeNetwork ?: return false - val capabilities = - connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false - return when { - capabilities.hasTransport(TRANSPORT_WIFI) -> true - capabilities.hasTransport(TRANSPORT_CELLULAR) -> true - capabilities.hasTransport(TRANSPORT_ETHERNET) -> true - else -> false - } - } else { - connectivityManager.activeNetworkInfo?.run { - return when (type) { - TYPE_WIFI -> true - TYPE_MOBILE -> true - TYPE_ETHERNET -> true - else -> false - } - } - } - return false - } - - - //valid email check - private fun isValidEmail(emailText:String?): String? { - - if(!emailText?.let { Patterns.EMAIL_ADDRESS.matcher(it).matches() }!!) - { - return "Invalid Email Address" - } - return null - } - //valid Name Check - private fun isValidName(nameText: String?): String { - val pattern = Pattern.compile(("^[a-zA-Z\\s]{2,70}$")) - val matcher = pattern.matcher(nameText) - if (!matcher.matches()) { - return "Enter Valid Name" - } - return "" - - } - //validPanCard - private fun isValidPanCardNo(panCardNo: String?): Boolean { - // Regex to check valid PAN Card number. - val regex = "[A-Z]{5}[0-9]{4}[A-Z]{1}" - // Compile the ReGex - val p = Pattern.compile(regex) - // If the PAN Card number - // is empty return false - if (panCardNo == null) { - return false - } - // Pattern class contains matcher() method - // to find matching between given - // PAN Card number using regular expression. - val m = p.matcher(panCardNo) - // Return if the PAN Card number - // matched the ReGex - return m.matches() - } - //is Indian mobile Number - private fun isIndianMobileNo(mobileNumber: String?): Boolean { - //(0/91): number starts with (0/91) - //[7-9]: starting of the number may contain a digit between 0 to 9 - //[0-9]: then contains digits 0 to 9 - val pattern: Pattern = Pattern.compile("^[6-9]\\d{9}$") - //the matcher() method creates a matcher that will match the given input against this pattern - val match: Matcher = pattern.matcher(mobileNumber) - //returns a boolean value - return match.matches() - } - - fun showDialogValidation(activity: Activity?, message: CharSequence?) { - val builder = AlertDialog.Builder(activity) - builder.setMessage(message) - builder.setPositiveButton("OK") { dialogInterface, i -> - dialogInterface.dismiss() - } - builder.show() - } - - fun showDialogWithTwoButtons(activity: Activity?, message: CharSequence?) { - val builder = AlertDialog.Builder(activity) - builder.setMessage(message) - builder.setPositiveButton("OK") { dialogInterface, i -> - dialogInterface.dismiss() - } - builder.setNegativeButton("Cancel") { dialogInterface, i -> - dialogInterface.dismiss() - } - builder.show() - } + const val BASE_URL = "https://providential.in/WebApi_Bajaj/api/" } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_bajajfd_step_four.xml b/app/src/main/res/layout/fragment_bajajfd_step_four.xml index 1b45c80..0b8cd45 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_four.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_four.xml @@ -56,8 +56,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:paddingStart="@dimen/_5sdp" - android:paddingEnd="@dimen/_5sdp" + android:paddingStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:text="Rating: FAAA by CRISIL" android:textColor="@color/light_text" app:layout_constraintLeft_toLeftOf="parent" @@ -71,8 +71,8 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:background="@color/grey_bg" - android:paddingStart="@dimen/_5sdp" - android:paddingEnd="@dimen/_5sdp" + android:paddingStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:text="Make payment" android:textColor="@color/black" app:layout_constraintEnd_toEndOf="parent" @@ -84,8 +84,8 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dp" - android:paddingEnd="@dimen/_5sdp" + android:layout_marginStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:paddingStart="0dp" android:text="Invested Amount" android:textSize="@dimen/text_size_14" @@ -99,10 +99,10 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/_5sdp" - android:layout_marginEnd="@dimen/_7sdp" - android:paddingStart="@dimen/_5sdp" - android:paddingEnd="@dimen/_5sdp" + android:layout_marginTop="@dimen/margin_10" + android:layout_marginEnd="@dimen/margin_15" + android:paddingStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:text="Rs. 50,000" android:textColor="@color/black" android:textSize="@dimen/text_size_14" @@ -117,8 +117,8 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dp" - android:paddingEnd="@dimen/_5sdp" + android:layout_marginStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:paddingStart="0dp" android:text="Tenure" android:textSize="@dimen/text_size_14" @@ -133,11 +133,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="2 Years" - android:paddingStart="@dimen/_5sdp" - android:paddingEnd="@dimen/_5sdp" - android:layout_marginTop="@dimen/_5sdp" - android:layout_marginEnd="@dimen/_7sdp" - android:layout_marginStart="@dimen/_5sdp" + android:paddingStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" + android:layout_marginTop="@dimen/margin_10" + android:layout_marginEnd="@dimen/margin_15" + android:layout_marginStart="@dimen/margin_10" android:textColor="@color/black" android:textSize="@dimen/text_size_14" app:layout_constraintEnd_toEndOf="parent" @@ -151,8 +151,8 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dp" - android:paddingEnd="@dimen/_5sdp" + android:layout_marginStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:paddingStart="0dp" android:text="Interest Payout" android:textSize="@dimen/text_size_14" @@ -168,8 +168,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginEnd="8dp" - android:paddingStart="@dimen/_5sdp" - android:paddingEnd="@dimen/_5sdp" + android:paddingStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:text="Monthly" android:textSize="@dimen/text_size_14" app:layout_constraintEnd_toEndOf="parent" @@ -183,8 +183,8 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dp" - android:paddingEnd="@dimen/_5sdp" + android:layout_marginStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:paddingStart="0dp" android:text="Rate of Interest" android:textSize="@dimen/text_size_14" @@ -200,8 +200,8 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginEnd="8dp" - android:paddingStart="@dimen/_5sdp" - android:paddingEnd="@dimen/_5sdp" + android:paddingStart="@dimen/margin_10" + android:paddingEnd="@dimen/margin_10" android:textSize="@dimen/text_size_14" android:text="6.75%" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_bajajfd_step_one.xml b/app/src/main/res/layout/fragment_bajajfd_step_one.xml index c6cdaa0..6ca28e2 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml @@ -1,12 +1,13 @@ - + tool:context=".ui.fragment.StepTwoBajajFDFragment"> @@ -199,7 +199,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="@dimen/margin_15" - android:paddingEnd="@dimen/margin_15"> + android:paddingEnd="@dimen/margin_20"> - + android:padding="@dimen/margin_15"> @@ -69,8 +70,8 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_20" - android:layout_marginBottom="1dp" + android:layout_marginTop="@dimen/margin_15" + android:layout_marginBottom="@dimen/margin_1" android:text="All fields are mandatory other then optional" android:textColor="@color/light_text" android:textSize="@dimen/text_size_14" /> @@ -82,8 +83,8 @@ style="@style/semiBoldStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="10dp" - android:paddingEnd="10dp" + android:paddingStart="@dimen/margin_18" + android:paddingEnd="@dimen/margin_10" android:background="@color/grey_bg" android:padding="@dimen/margin_1" android:text="Personal Details" @@ -103,13 +104,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" + android:layout_margin="@dimen/margin_5" android:hint="Enter Mobile Number"> @@ -119,13 +122,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" + android:layout_margin="@dimen/margin_5" android:hint="Date Of Birth"> @@ -135,41 +140,67 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" - android:layout_marginTop="5dp" + android:layout_margin="@dimen/margin_5" android:hint="Enter PAN Number"> - + + + + + + + + + + + + + android:layout_height="@dimen/margin_48" + android:layout_margin="@dimen/margin_5" + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> + + + @@ -179,14 +210,16 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" - android:layout_marginTop="5dp" + android:layout_margin="@dimen/margin_5" + android:layout_marginTop="@dimen/margin_5" android:hint="@string/middle_name"> @@ -196,42 +229,70 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" + android:layout_margin="@dimen/margin_5" android:hint="Enter Last Name" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"> - + + + + + + + + + + + + + android:layout_height="@dimen/margin_48" + android:layout_margin="@dimen/margin_5" + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> + + + @@ -241,13 +302,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" + android:layout_margin="@dimen/margin_5" android:hint="Enter Occupation"> @@ -257,117 +320,176 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="5dp" + android:layout_margin="@dimen/margin_5" android:hint="Enter Qualification"> - - - + + + + + + + + + + + + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> - - + android:background="@drawable/rounded_corner_with_line" + android:hint="@string/selectMaritalStatus" + android:inputType="none" + android:labelFor="@+id/spInterestPayout" + android:textColorHint="#757575" + android:textSize="@dimen/text_size_14" /> + + + + + + + + + + + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> - - + android:background="@drawable/rounded_corner_with_line" + android:hint="@string/selectRelation" + android:inputType="none" + android:labelFor="@+id/tlRelation" + android:textColorHint="#757575" + android:textSize="@dimen/text_size_14" /> + + android:hint="Relation Name"> + android:hint="Enter Address 1"> + android:textSize="@dimen/text_size_14" + android:maxEms="100" /> + android:hint="Enter Address 2"> + android:textSize="@dimen/text_size_14" + android:maxEms="100" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -393,9 +517,11 @@ android:hint="City"> @@ -406,9 +532,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/margin_5" + android:textSize="@dimen/text_size_14" android:hint="PinCode"> @@ -438,6 +571,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:textSize="@dimen/text_size_14" android:layout_marginEnd="@dimen/margin_5"/> @@ -446,29 +580,56 @@ android:id="@+id/llNomineeDetail" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/margin_5" android:padding="@dimen/margin_10" android:orientation="vertical"> - + + + + + + + + + + android:layout_height="@dimen/margin_48" + android:layout_margin="@dimen/margin_5" + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> + + + + @@ -478,12 +639,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/margin_5" android:hint="@string/nominee_middle_name"> @@ -493,12 +657,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/margin_5" android:hint="Nominee Last Name"> @@ -508,29 +675,58 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/margin_5" android:hint="Nominee Date Of Birth"> - + + + + + + + + + + + android:layout_height="@dimen/margin_48" + android:layout_margin="@dimen/margin_5" + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> + + + + @@ -539,12 +735,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/margin_5" android:hint="@string/guardian_name_optional"> @@ -554,36 +753,68 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/margin_5" android:hint="@string/guardian_age_optional"> - + + + + + + + + + + + + android:layout_height="@dimen/margin_48" + android:layout_margin="@dimen/margin_5" + app:hintEnabled="false" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> + + + + @@ -593,12 +824,15 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="@dimen/margin_5" android:hint="@string/guardian_pinCode_optional"> @@ -610,10 +844,10 @@ style="@style/semiBoldStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="22dp" android:background="@color/grey_bg" android:padding="@dimen/margin_3" android:text="Bank Details" + android:textSize="@dimen/text_size_14" android:textColor="@color/black" app:drawableRightCompat="@drawable/svg_down_arrow" /> @@ -630,9 +864,9 @@ style="@style/regularStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="12dp" android:padding="@dimen/margin_3" android:text="Account type *" + android:textSize="@dimen/text_size_14" android:textColor="@color/black" app:layout_constraintTop_toBottomOf="@+id/tvFdRating" tools:layout_editor_absoluteX="5dp" /> @@ -660,13 +894,12 @@ style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_8" - android:layout_marginBottom="@dimen/margin_8" android:hint="Enter IFSC Code"> + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_14"/> @@ -696,7 +929,8 @@ + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_14"/> @@ -711,7 +945,8 @@ + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_14"/> @@ -721,7 +956,6 @@ @@ -745,6 +980,7 @@ android:layout_marginTop="12dp" android:padding="@dimen/margin_3" android:text="Eligible bank option" + android:textSize="@dimen/text_size_14" android:textColor="@color/blue_text_color" tools:layout_editor_absoluteX="5dp" /> @@ -775,6 +1011,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:padding="@dimen/margin_3" + android:textSize="@dimen/text_size_14" android:text="Upto Rs. 1 lakh only" android:layout_marginStart="@dimen/margin_15" android:layout_marginBottom="@dimen/margin_20" @@ -802,11 +1039,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginTop="20dp" - android:layout_marginBottom="15dp" + android:layout_marginTop="@dimen/margin_20" + android:layout_marginBottom="@dimen/margin_15" android:backgroundTint="@color/blue" android:text="@string/back" android:textColor="@color/white" + android:textSize="@dimen/text_size_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/btnNext" app:layout_constraintStart_toStartOf="parent" @@ -817,10 +1055,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginTop="20dp" - android:layout_marginBottom="15dp" + android:layout_marginTop="@dimen/margin_20" + android:layout_marginBottom="@dimen/margin_15" android:backgroundTint="@color/colorPrimary" android:text="@string/next" + android:textSize="@dimen/text_size_14" android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/spinner_dropdown.xml b/app/src/main/res/layout/spinner_dropdown.xml index 1fdd884..367d7ae 100644 --- a/app/src/main/res/layout/spinner_dropdown.xml +++ b/app/src/main/res/layout/spinner_dropdown.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index dc0501e..bd593a6 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -21,10 +21,8 @@ 13sp 14sp 15sp - 16sp 17sp - 18sp 19sp 20sp @@ -37,7 +35,9 @@ 4dp 5dp 6dp + 7dp 8dp + 9dp 10dp 11dp 12dp @@ -46,6 +46,7 @@ 16dp 18dp 20dp + 22dp 25dp 30dp 32dp @@ -58,80 +59,16 @@ 48dp 50dp 53dp - + 54dp 55dp 60dp 72dp 80dp - 12dp - 7dp - - 2dp - 3dp - 10dp - - 12dp - 5dp - 12sp - + 120dp 150dp 290dp - - 10dp - 25dp - - 130dp - 28dp - - 120dp - -12dp 300dp - 80dp - - 50dp - - 20dp - 16dp - - 45dp - - 5dp - - 1dp - - 10dp - - 1dp - - 14sp - - 70dp - 9dp - - 6 - - 25 - - - 0dp - 5dp - 10dp - 16dp - - 48dp - 16dp - - 72dp - 32dp - 16dp - 7.20dp - 18.00dp - 3.60dp - 36.00dp - 21.60dp - 25.20dp 16dp - 8dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b1dce77..70734a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -64,6 +64,11 @@ Regular Interest Payment: Maturity Amount: + Select Title + Select Gender + Select Marital Status + Select Relationship + On Maturity Monthly @@ -72,6 +77,14 @@ Yearly + + On Maturity + Monthly + Quarterly + Half Yearly + Yearly + + Aadhaar Card PAN