From 4d0ccce126a6790ed6579722254744736464f202 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Mon, 13 Mar 2023 11:38:17 +0530 Subject: [PATCH] indicator code added --- .../adapters1/SectionsPagerAdapter1.kt | 2 +- .../ui/activities1/RegisterActivity.kt | 4 +- .../ui/activities1/ViewPagerActivity.kt | 2 +- .../ui/fragments1/AlmostThereFragment.kt | 7 ++- .../main/res/drawable/default_pager_dot.xml | 13 ++++ .../main/res/drawable/selected_pager_dot.xml | 13 ++++ .../main/res/drawable/tab_pager_selector.xml | 7 +++ app/src/main/res/layout/activity_register.xml | 2 +- .../main/res/layout/activity_viewpager.xml | 62 +++++-------------- .../main/res/layout/fragment_almost_there.xml | 53 ++++++++++++---- app/src/main/res/values-hi-rIN/strings.xml | 7 ++- app/src/main/res/values/strings.xml | 7 ++- 12 files changed, 111 insertions(+), 68 deletions(-) create mode 100644 app/src/main/res/drawable/default_pager_dot.xml create mode 100644 app/src/main/res/drawable/selected_pager_dot.xml create mode 100644 app/src/main/res/drawable/tab_pager_selector.xml diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/adapters1/SectionsPagerAdapter1.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/adapters1/SectionsPagerAdapter1.kt index 0320d69..3ad3d47 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/adapters1/SectionsPagerAdapter1.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/adapters1/SectionsPagerAdapter1.kt @@ -13,6 +13,6 @@ class SectionsPagerAdapter1(manager: FragmentManager, private val fragments: Arr override fun getCount(): Int = fragments.size - override fun getPageTitle(position: Int): CharSequence = titles[position] + // override fun getPageTitle(position: Int): CharSequence = titles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt index 73558a1..7d8b151 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt @@ -32,11 +32,11 @@ class RegisterActivity : BaseActivity() { startActivity(intent) } binding.btnDistributor.setOnClickListener{ - intent = Intent(this@RegisterActivity, RegisterActivity::class.java) + intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java) startActivity(intent) } binding.btnReferrer.setOnClickListener{ - intent = Intent(this@RegisterActivity, RegisterActivity::class.java) + intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java) startActivity(intent) } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt index 6cfe980..67812a8 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt @@ -44,6 +44,7 @@ class ViewPagerActivity : BaseActivity() { viewPager.adapter = sectionsPagerAdapter viewPager.setPagingEnabled(false) viewPager.offscreenPageLimit = 3 + binding.tabDots.setupWithViewPager(viewPager) viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( position: Int, @@ -70,7 +71,6 @@ class ViewPagerActivity : BaseActivity() { } }) - } // step 1 response 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 b1e6a48..3f479a3 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 @@ -97,6 +97,9 @@ class AlmostThereFragment : Fragment() { } binding.tvPrivacyPolicy.setOnClickListener{ + } + binding.tvAgreement.setOnClickListener{ + } binding.btnBack.setOnClickListener { @@ -105,7 +108,7 @@ class AlmostThereFragment : Fragment() { binding.btnNext.setOnClickListener { if (validate()) { - + // submit } } @@ -180,7 +183,7 @@ class AlmostThereFragment : Fragment() { "" ) }else if (!binding.cbCheck.isChecked) { // EditText - return false; + return false } else { return true } diff --git a/app/src/main/res/drawable/default_pager_dot.xml b/app/src/main/res/drawable/default_pager_dot.xml new file mode 100644 index 0000000..82c112a --- /dev/null +++ b/app/src/main/res/drawable/default_pager_dot.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selected_pager_dot.xml b/app/src/main/res/drawable/selected_pager_dot.xml new file mode 100644 index 0000000..784b1a8 --- /dev/null +++ b/app/src/main/res/drawable/selected_pager_dot.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_pager_selector.xml b/app/src/main/res/drawable/tab_pager_selector.xml new file mode 100644 index 0000000..2557aff --- /dev/null +++ b/app/src/main/res/drawable/tab_pager_selector.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 14cd15f..ffef1a3 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -50,7 +50,7 @@ android:id="@+id/txtAccount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/margin_20" + android:layout_marginStart="@dimen/margin_15" android:layout_marginTop="@dimen/margin_15" android:maxLines="2" android:padding="@dimen/margin_5" diff --git a/app/src/main/res/layout/activity_viewpager.xml b/app/src/main/res/layout/activity_viewpager.xml index d4e6fa9..0a81029 100644 --- a/app/src/main/res/layout/activity_viewpager.xml +++ b/app/src/main/res/layout/activity_viewpager.xml @@ -1,49 +1,9 @@ - - - - - - - - - - - - - + android:layout_height="match_parent" + android:orientation="vertical"> - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_almost_there.xml b/app/src/main/res/layout/fragment_almost_there.xml index fd1a9d8..bc264f2 100644 --- a/app/src/main/res/layout/fragment_almost_there.xml +++ b/app/src/main/res/layout/fragment_almost_there.xml @@ -9,7 +9,7 @@ @@ -140,7 +140,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" - android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" + android:digits="@string/onlyAlphabets" android:textColorHint="@color/greyColor2" android:textSize="@dimen/text_size_14" tool:ignore="TextContrastCheck" /> @@ -289,6 +289,7 @@ android:layout_height="@dimen/margin_48" android:layout_marginTop="@dimen/margin_20" android:layout_marginEnd="@dimen/margin_25" + android:buttonTint="@color/black" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tlState" /> @@ -307,31 +308,46 @@ android:id="@+id/tvTermsAndCondition" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_5" 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_toEndOf="@+id/tvPrivacyPolicy" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/byClicking" /> + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tvTermsAndCondition"/> @@ -342,7 +358,7 @@ android:layout_width="@dimen/margin_120" android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_20" - android:layout_marginBottom="@dimen/margin_20" + android:layout_marginBottom="@dimen/margin_35" android:backgroundTint="@color/white" android:text="@string/back" android:textColor="@color/red" @@ -356,7 +372,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_30" android:layout_marginEnd="@dimen/margin_20" - android:layout_marginBottom="@dimen/margin_20" + android:layout_marginBottom="@dimen/margin_35" android:backgroundTint="@color/red" android:text="@string/next" android:textColor="@color/white" @@ -365,5 +381,18 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/btnBack" /> + + + \ No newline at end of file diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index c4e750e..6e4f6cf 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -286,10 +286,13 @@ MM YYYY By clicking on next, you agree to accept our - terms and conditions + terms and conditions, and - privacy policy. + privacy policy 0123456789 + Agreement + Up Next: Home + abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c342c07..b374f65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -293,10 +293,13 @@ MM YYYY By clicking on next, you agree to accept our - terms and conditions + terms and conditions, and - privacy policy. + privacy policy 0123456789 + Agreement + Up Next: Home + abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ \ No newline at end of file