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 f529339..d7708fb 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 @@ -6,10 +6,8 @@ import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.DisplayMetrics -import android.util.Log import android.view.Display import androidx.core.hardware.display.DisplayManagerCompat -import com.google.android.material.bottomsheet.BottomSheetBehavior import com.nivesh.production.niveshfd.databinding.ActivityLoginBinding import com.nivesh.production.niveshfd.databinding.ActivityRegisterBinding import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity @@ -43,7 +41,7 @@ class RegisterActivity : BaseActivity() { startActivity(intent) } binding.btnReferrer.setOnClickListener{ - intent = Intent(this@RegisterActivity, RegisterActivity::class.java) + intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java) startActivity(intent) } binding.imgInfo.setOnClickListener { @@ -66,8 +64,7 @@ class RegisterActivity : BaseActivity() { @Suppress("DEPRECATION") windowManager.defaultDisplay.getMetrics(displayMetrics) - val height = displayMetrics.heightPixels - val width = displayMetrics.widthPixels + height = displayMetrics.heightPixels } return height } 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 727537e..e8c9da7 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,7 +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, @@ -72,6 +72,10 @@ class ViewPagerActivity : BaseActivity() { } }) + binding.tvSkip.setOnClickListener { + intent = Intent(this@ViewPagerActivity, LoginActivity::class.java) + startActivity(intent) + } } // step 1 response diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt index 9a23cf3..447f122 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepThreePagerFragment.kt @@ -30,8 +30,8 @@ class StepThreePagerFragment : Fragment() { (activity as ViewPagerActivity).stepFourApi() } - binding.btnNext.setOnClickListener { - (activity as ViewPagerActivity).stepThreeApi() + binding.btnBack.setOnClickListener { + (activity as ViewPagerActivity).stepTwoApi() } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt index a60752e..4691a08 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/StepTwoPagerFragment.kt @@ -30,7 +30,7 @@ class StepTwoPagerFragment : Fragment() { (activity as ViewPagerActivity).stepThreeApi() } binding.btnBack.setOnClickListener { - (activity as ViewPagerActivity).stepTwoApi() + (activity as ViewPagerActivity).stepOneApi() } } } \ No newline at end of file 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..06ca6ef --- /dev/null +++ b/app/src/main/res/drawable/default_pager_dot.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/pager_1.png b/app/src/main/res/drawable/pager_1.png new file mode 100644 index 0000000..8b1da12 Binary files /dev/null and b/app/src/main/res/drawable/pager_1.png differ diff --git a/app/src/main/res/drawable/pager_2.png b/app/src/main/res/drawable/pager_2.png new file mode 100644 index 0000000..9987985 Binary files /dev/null and b/app/src/main/res/drawable/pager_2.png differ diff --git a/app/src/main/res/drawable/pager_3.png b/app/src/main/res/drawable/pager_3.png new file mode 100644 index 0000000..e736d49 Binary files /dev/null and b/app/src/main/res/drawable/pager_3.png differ diff --git a/app/src/main/res/drawable/round_corner_button.xml b/app/src/main/res/drawable/round_corner_button.xml new file mode 100644 index 0000000..5cb1b17 --- /dev/null +++ b/app/src/main/res/drawable/round_corner_button.xml @@ -0,0 +1,5 @@ + + + + + \ 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..9b26e0f --- /dev/null +++ b/app/src/main/res/drawable/selected_pager_dot.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/svg_indicator_bg.xml b/app/src/main/res/drawable/svg_indicator_bg.xml new file mode 100644 index 0000000..4bd629e --- /dev/null +++ b/app/src/main/res/drawable/svg_indicator_bg.xml @@ -0,0 +1,12 @@ + + + + + \ 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..77f1f0f --- /dev/null +++ b/app/src/main/res/drawable/tab_pager_selector.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_viewpager.xml b/app/src/main/res/layout/activity_viewpager.xml index 74df13b..babf141 100644 --- a/app/src/main/res/layout/activity_viewpager.xml +++ b/app/src/main/res/layout/activity_viewpager.xml @@ -1,68 +1,41 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - - - - + android:layout_height="match_parent" + android:contentDescription="@string/viewpager" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - - - - - - + android:background="@drawable/svg_indicator_bg" + app:tabBackground="@drawable/tab_pager_selector" + app:tabGravity="center" + app:tabMinWidth="@dimen/margin_50" + android:clipToPadding="false" + android:paddingLeft="@dimen/margin_20" + android:paddingRight="@dimen/margin_20" + app:tabIndicator="@null" + android:layout_centerHorizontal="true" + android:layout_marginBottom="@dimen/margin_70" + android:layout_alignParentBottom="true" /> + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_pager_step_one.xml b/app/src/main/res/layout/fragment_pager_step_one.xml index edfd79e..58f20a5 100644 --- a/app/src/main/res/layout/fragment_pager_step_one.xml +++ b/app/src/main/res/layout/fragment_pager_step_one.xml @@ -6,32 +6,22 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical" - android:background="@color/NiveshColorAppBg" + android:background="@drawable/pager_1" tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepOnePagerFragment"> - - -