From 8f38a32a8e47517a9c9893aa3140a5d3a92c7991 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Tue, 20 Dec 2022 12:12:56 +0530 Subject: [PATCH] working on stepone --- .../ui/fragment/StepOneBajajFDFragment.kt | 7 +- .../production/bajajfd/util/Constants.kt | 23 +++++ app/src/main/res/drawable/svg_rs.xml | 4 +- .../res/layout/fragment_bajajfd_step_one.xml | 94 ++++++++----------- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/dimens.xml | 3 + 6 files changed, 74 insertions(+), 59 deletions(-) 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 fe23d4d..64d450d 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,6 +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.Resource import com.nivesh.production.bajajfd.viewModel.StepOneBajajFDViewModel @@ -70,7 +71,7 @@ class StepOneBajajFDFragment : Fragment() { ) binding.tvInterestPayout.setAdapter(adapter) binding.tvInterestPayout.setOnItemClickListener { parent, view, position, id -> - + binding.tvFrequency.text = binding.tvInterestPayout.text } // Tenure @@ -97,7 +98,6 @@ class StepOneBajajFDFragment : Fragment() { binding.tvROI.text = "" - binding.tvFrequency.text = "" binding.tvMaturityAmount.text = "" // Next Button @@ -112,10 +112,13 @@ class StepOneBajajFDFragment : Fragment() { private fun validation(): Boolean { if (binding.edtAmount.text?.isEmpty()!!){ return false + showDialogValidation(activity, "") }else if (binding.tvInterestPayout.text.isEmpty()){ return false + showDialogValidation(activity, "") }else if (binding.tvTenure.text.isEmpty()){ return false + showDialogValidation(activity, "") }else{ return true } 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 e2677cf..bb4e3be 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,5 +1,7 @@ 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 @@ -104,5 +106,26 @@ class Constants() { 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/res/drawable/svg_rs.xml b/app/src/main/res/drawable/svg_rs.xml index 887ca0c..83c522d 100644 --- a/app/src/main/res/drawable/svg_rs.xml +++ b/app/src/main/res/drawable/svg_rs.xml @@ -1,7 +1,7 @@ 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 5214979..f945ab8 100644 --- a/app/src/main/res/layout/fragment_bajajfd_step_one.xml +++ b/app/src/main/res/layout/fragment_bajajfd_step_one.xml @@ -12,9 +12,8 @@ android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/_5sdp" - android:layout_marginRight="@dimen/_5sdp" android:fillViewport="true" + android:padding="@dimen/margin_10" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -50,6 +49,7 @@ android:id="@+id/logo" android:layout_width="@dimen/margin_150" android:layout_height="18dp" + android:layout_marginStart="@dimen/margin_5" android:layout_marginTop="@dimen/_2sdp" android:contentDescription="@string/content_description" android:src="@drawable/bajaj_logo" @@ -65,6 +65,7 @@ style="@style/regularStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/margin_5" android:text="@string/schemeRating" android:textColor="@color/light_text" app:layout_constraintEnd_toEndOf="parent" @@ -77,13 +78,12 @@ android:id="@+id/tlDepositAmount" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/_2sdp" + android:layout_height="@dimen/margin_53" + android:layout_margin="5dp" android:hint="@string/investmentAmount" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tvFdRating" - app:layout_constraintVertical_bias="0.02"> + app:layout_constraintTop_toBottomOf="@+id/tvFdRating"> + android:maxLength="12" + android:textColorHint="@color/light_text" + android:textSize="@dimen/text_size_14" + tool:ignore="TextContrastCheck" /> - - + app:layout_constraintTop_toBottomOf="@+id/tlDepositAmount"> + android:textColorHint="#757575" + android:textSize="@dimen/text_size_14" + tool:ignore="DuplicateSpeakableTextCheck,LabelFor,TextContrastCheck" /> - - + app:layout_constraintTop_toBottomOf="@+id/spInterestPayout"> + android:textColorHint="@color/light_text" + android:textSize="@dimen/text_size_14" + tool:ignore="LabelFor,TextContrastCheck" /> + android:textSize="@dimen/text_size_12" /> @@ -280,8 +265,8 @@ android:id="@+id/rbDeductTax" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:checked="true" android:buttonTint="@color/black" + android:checked="true" android:orientation="horizontal" android:text="@string/deduct_tds" android:textSize="@dimen/text_size_12" @@ -291,9 +276,9 @@ + app:layout_constraintTop_toBottomOf="@+id/cardViewTwo" + tool:ignore="TextContrastCheck" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 670d2e0..9d4322f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1190,7 +1190,7 @@ #323131 #F0EBEF #E9161E - #A2A2A2 + #757575 #D9D9D9 #E2DEDE #0B0B0B diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c9c2124..fcead0e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -53,7 +53,10 @@ 40dp 44dp 45dp + 48dp 50dp + 53dp + 55dp 60dp 72dp