From af49f907104db833273842f8f267c8040a6e0250 Mon Sep 17 00:00:00 2001 From: Manoj Date: Thu, 15 Dec 2022 13:46:40 +0530 Subject: [PATCH] push bajaj ui --- app/build.gradle | 4 +- .../bajajfd/ui/fragment/StepStartFragment.kt | 6 +- app/src/main/res/drawable/bajaj_logo.png | Bin 0 -> 8296 bytes .../layout/fragment_bajaj_f_d_step_one.xml | 286 +++--- .../main/res/layout/fragment_step_four.xml | 275 +++--- app/src/main/res/layout/fragment_step_one.xml | 110 ++- .../main/res/layout/fragment_step_start.xml | 615 ++++++------ .../main/res/layout/fragment_step_three.xml | 71 +- app/src/main/res/layout/fragment_step_two.xml | 431 +++++---- .../main/res/layout/fragmnet_step_fail.xml | 136 +++ .../res/layout/header_progress_layout.xml | 12 +- app/src/main/res/layout/test_layout.xml | 906 +++++------------- app/src/main/res/values/colors.xml | 3 +- app/src/main/res/values/strings.xml | 23 + app/src/main/res/values/style.xml | 17 +- app/src/main/res/values/themes.xml | 12 + 16 files changed, 1410 insertions(+), 1497 deletions(-) create mode 100644 app/src/main/res/drawable/bajaj_logo.png create mode 100644 app/src/main/res/layout/fragmnet_step_fail.xml diff --git a/app/build.gradle b/app/build.gradle index 790a929..7cb9e11 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ plugins { android { namespace 'com.nivesh.production.bajajfd' - compileSdk 32 + compileSdk 33 defaultConfig { applicationId "com.nivesh.production.bajajfd" minSdk 21 - targetSdk 32 + targetSdk 33 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt index 45271bb..b37e4bc 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepStartFragment.kt @@ -46,9 +46,9 @@ class StepStartFragment : Fragment() { _binding = FragmentStepStartBinding.inflate(inflater,container,false) val root = binding.root - binding.txtInterestTenure.setOnClickListener { - - } +// binding.txtInterestTenure.setOnClickListener { +// +// } binding.btnNext.setOnClickListener { bajajFDInterface.stepOneApi("stepOneResponse") diff --git a/app/src/main/res/drawable/bajaj_logo.png b/app/src/main/res/drawable/bajaj_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..906f1fc5b718d08a73ebea70ccbc279947751a66 GIT binary patch literal 8296 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 - - - - - - - + + android:text="Rating: FAAA by CRISIL" + android:textColor="@color/light_text" /> - + android:textSize="@dimen/text_size_12" /> - - - - - + - + + + + + - + - + + android:layout_marginTop="@dimen/_7sdp" + android:text="@string/select_interest_tenure" + android:textColor="@color/text_default" + android:textSize="@dimen/text_size_12" /> + + - + android:gravity="center_vertical" + android:layout_marginTop="@dimen/_10sdp" + android:orientation="horizontal"> - + + + + + @@ -171,16 +171,16 @@ android:layout_marginTop="@dimen/margin_15" android:orientation="vertical"> - + - + - + diff --git a/app/src/main/res/layout/fragment_step_four.xml b/app/src/main/res/layout/fragment_step_four.xml index 20bf056..9591533 100644 --- a/app/src/main/res/layout/fragment_step_four.xml +++ b/app/src/main/res/layout/fragment_step_four.xml @@ -5,142 +5,197 @@ android:id="@+id/constraintLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/color_EFEFEF" android:layout_margin="@dimen/margin_10" + android:background="@color/color_EFEFEF" tools:context="com.nivesh.production.bajajfd.ui.fragment.StepFourFragment"> - - + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/margin_5" + android:layout_marginTop="@dimen/margin_5" + android:layout_marginRight="@dimen/margin_5" + android:padding="@dimen/margin_10"> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0"> - + - + - + - + - + app:cardBackgroundColor="@color/bg_color" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/card_view_1" + app:layout_constraintVertical_bias="0.0"> - + android:padding="@dimen/margin_10" + app:layout_constraintBottom_toBottomOf="parent"> - + - + + + + + + + + + - + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_step_one.xml b/app/src/main/res/layout/fragment_step_one.xml index 12c48a6..cb6aef8 100644 --- a/app/src/main/res/layout/fragment_step_one.xml +++ b/app/src/main/res/layout/fragment_step_one.xml @@ -41,13 +41,26 @@ android:orientation="vertical" android:padding="10dp"> - + + + + + + + + + @@ -64,9 +77,9 @@ style="@style/tv_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_10" + android:layout_marginTop="@dimen/margin_20" android:layout_marginBottom="1dp" - android:text="* Text" + android:text="All fields are mandatory other then optional" android:textColor="@color/light_text" android:textSize="@dimen/margin_14" /> @@ -150,7 +163,9 @@ android:layout_marginTop="5dp" android:background="@drawable/rounded_corner_with_line" android:minHeight="48dp" - android:entries="@array/interestPayoutList"/> + android:paddingStart="@dimen/margin_10" + android:paddingEnd="0dp" + android:entries="@array/title"/> + android:paddingStart="@dimen/margin_10" + android:paddingEnd="0dp" + android:entries="@array/gender" /> + android:paddingStart="@dimen/margin_10" + android:paddingEnd="0dp" + android:entries="@array/maritalStatus"/> + + + + + + - + android:background="@color/grey_bg"> + + + + + + @@ -706,8 +753,8 @@ android:layout_centerVertical="true" android:layout_marginTop="12dp" android:padding="@dimen/margin_3" - android:text="View available payment modes" - android:textColor="@color/text_color_blue" + android:text="Eligible bank option" + android:textColor="@color/blue_text_color" tools:layout_editor_absoluteX="5dp" /> @@ -715,6 +762,7 @@ + + diff --git a/app/src/main/res/layout/fragment_step_start.xml b/app/src/main/res/layout/fragment_step_start.xml index 837d362..12e64c8 100644 --- a/app/src/main/res/layout/fragment_step_start.xml +++ b/app/src/main/res/layout/fragment_step_start.xml @@ -5,306 +5,364 @@ android:id="@+id/constraintLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:background="@color/Nivesh_color_AppBg" + android:background="@color/color_EFEFEF" tool:context="com.nivesh.production.bajajfd.ui.fragment.StepOneFragment"> + android:layout_marginLeft="@dimen/margin_5" + android:layout_marginRight="@dimen/margin_5" + android:layout_marginTop="@dimen/margin_10" + app:layout_constraintTop_toTopOf="parent"> - - - + android:orientation="vertical"> + + - + android:padding="@dimen/margin_10"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:hint="Select Investment Amount" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_fd_rating" + app:layout_constraintVertical_bias="0.02"> + android:maxLength="12" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + - + + android:layout_marginTop="@dimen/margin_15" + android:text="@string/upto_0.25" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvInterestTenure" + app:layout_constraintVertical_bias="0.018" /> + + + + + + - + android:background="@color/grey_bg" + android:padding="@dimen/margin_10" + android:text="@string/maturity_instructions" + android:textColor="@color/text_color_dark" + android:textSize="@dimen/text_size_12" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.02" /> - + - + - + - + - - - - - - - + - - - - - + + + + + + + + + + android:padding="@dimen/margin_20"> style="@style/tv_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_dark" - android:textSize="@dimen/margin_16" android:drawablePadding="@dimen/margin_10" - android:text="Non- Cumulative ROI:"/> + android:text="Non- Cumulative ROI:" + android:textColor="@color/text_color_dark" + android:textSize="@dimen/margin_16" /> + android:textSize="@dimen/margin_16" /> @@ -342,19 +400,19 @@ Company for the same"/> style="@style/tv_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_dark" - android:textSize="@dimen/margin_16" android:drawablePadding="@dimen/margin_10" - android:text="Regular Interest Payment:"/> + android:text="Regular Interest Payment:" + android:textColor="@color/text_color_dark" + android:textSize="@dimen/margin_16" /> + android:textSize="@dimen/margin_16" /> @@ -368,41 +426,42 @@ Company for the same"/> style="@style/tv_regular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_dark" - android:textSize="@dimen/margin_16" android:drawablePadding="@dimen/margin_10" - android:text="Maturity Amount:"/> + android:text="Maturity Amount:" + android:textColor="@color/text_color_dark" + android:textSize="@dimen/margin_16" /> + android:textSize="@dimen/margin_16" /> - - + - +