ui changes

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]
 
 }

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
     }

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

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()
         }
 
     }

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()
         }
     }
 }

app/src/main/res/drawable/default_pager_dot.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="10dp"
+            android:useLevel="false">
+            <solid android:color="@android:color/darker_gray"/>
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/drawable/round_corner_button.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners  android:radius="50dp"/>
+    <solid android:color="@color/red"></solid>
+</shape>

app/src/main/res/drawable/selected_pager_dot.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thickness="10dp"
+            android:useLevel="false">
+            <solid android:color="@color/red"/>
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/drawable/svg_indicator_bg.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="75dp"
+    android:height="19dp"
+    android:viewportWidth="75"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.7"
+        android:pathData="M 9.5 0 L 65.5 0 Q 75 0 75 9.5 L 75 9.5 Q 75 19 65.5 19 L 9.5 19 Q 0 19 0 9.5 L 0 9.5 Q 0 0 9.5 0 Z" />
+</vector>

app/src/main/res/drawable/tab_pager_selector.xml

@@ -0,0 +1,6 @@
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/selected_pager_dot"
+        android:state_selected="true" />
+    <item android:drawable="@drawable/default_pager_dot"/>
+</selector>

app/src/main/res/layout/activity_viewpager.xml

@@ -1,68 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
+    <com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.DisableAdapter1
+        android:id="@+id/viewPager1"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:background="@color/greyColor4"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/red"
-            android:orientation="horizontal"
-            android:visibility="gone">
-
-            <ImageView
-                android:id="@+id/imgBack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/margin_15"
-                android:layout_marginEnd="@dimen/margin_15"
-                android:contentDescription="@string/back"
-                android:gravity="center"
-                android:padding="@dimen/margin_10"
-                android:src="@drawable/svg_back" />
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?actionBarSize"
-                android:padding="@dimen/margin_16"
-                android:text="@string/fd"
-                android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_14" />
-
-        </LinearLayout>
+        android:layout_height="match_parent"
+        android:contentDescription="@string/viewpager"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <RelativeLayout
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabDots"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="1.0"
-        android:paddingBottom="@dimen/margin_20">
-
-        <com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.DisableAdapter1
-            android:id="@+id/viewPager1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:contentDescription="@string/viewpager"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </RelativeLayout>
+        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" />
+
+    <TextView
+        android:id="@+id/tvSkip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/margin_20"
+        android:layout_marginEnd="@dimen/margin_20"
+        android:text="@string/skip"/>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

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">
 
-    <ImageView
-        android:id="@+id/logo"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="@dimen/margin_150"
-        android:layout_height="@dimen/margin_18"
-        android:layout_marginStart="@dimen/margin_20"
-        android:layout_marginTop="@dimen/margin_5"
-        android:contentDescription="@string/contentDescription"
-        android:src="@drawable/bajaj_logo" />
-
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
+        android:theme="@style/Theme.lightRed"
+        app:cornerRadius="@dimen/margin_15"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:layout_marginTop="@dimen/margin_10"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/colorPrimary"
+        android:layout_marginStart="@dimen/margin_50"
+        android:layout_marginEnd="@dimen/margin_50"
+        android:layout_marginBottom="@dimen/margin_10"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
         android:text="@string/next"
-        android:textColor="#FFFFFF"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_pager_step_three.xml

@@ -6,35 +6,52 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/NiveshColorAppBg"
+    android:background="@drawable/pager_3"
     tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepThreePagerFragment">
 
-    <ImageView
-        android:id="@+id/logo"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="@dimen/margin_150"
-        android:layout_height="@dimen/margin_18"
-        android:layout_marginStart="@dimen/margin_20"
-        android:layout_marginTop="@dimen/margin_5"
-        android:contentDescription="@string/contentDescription"
-        android:src="@drawable/bajaj_logo" />
-
-    <Button
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/llBottom"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="@dimen/margin_10"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/colorPrimary"
-        android:text="@string/next"
-        android:textColor="#FFFFFF"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginLeft="@dimen/margin_10"
+        android:layout_marginRight="@dimen/margin_10"
+        android:paddingBottom="@dimen/margin_10"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tool:ignore="TextContrastCheck" />
+        app:layout_constraintEnd_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnBack"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight=".5"
+            android:text="@string/back"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:layout_marginEnd="@dimen/margin_10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/btnNext"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnNext"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/margin_10"
+            android:text="@string/next"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_pager_step_two.xml

@@ -6,50 +6,52 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/NiveshColorAppBg"
+    android:background="@drawable/pager_2"
     tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepTwoPagerFragment">
 
-    <ImageView
-        android:id="@+id/logo"
-        app:layout_constraintBottom_toTopOf="@+id/btnNext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="@dimen/margin_150"
-        android:layout_height="@dimen/margin_18"
-        android:layout_marginStart="@dimen/margin_20"
-        android:layout_marginTop="@dimen/margin_5"
-        android:contentDescription="@string/contentDescription"
-        android:src="@drawable/bajaj_logo" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnBack"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/llBottom"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="@dimen/margin_15"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:backgroundTint="@color/blue"
-        android:text="@string/back"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_size_14"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginLeft="@dimen/margin_10"
+        android:layout_marginRight="@dimen/margin_10"
+        android:paddingBottom="@dimen/margin_10"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnNext"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintEnd_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnNext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginBottom="@dimen/margin_15"
-        android:layout_marginTop="@dimen/margin_10"
-        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"
-        app:layout_constraintStart_toEndOf="@+id/btnBack" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnBack"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight=".5"
+            android:text="@string/back"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:layout_marginEnd="@dimen/margin_10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/btnNext"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnNext"
+            android:theme="@style/Theme.lightRed"
+            app:cornerRadius="@dimen/margin_15"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/margin_10"
+            android:text="@string/next"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/btnBack" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -20,6 +20,8 @@
     <color name="greyColor4">#E6EBE0</color>
     <color name="greyColor5">#303030</color>
 
+    <color name="button_red">#E92629</color>
+
 
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>

app/src/main/res/values/strings.xml

@@ -283,6 +283,7 @@
     <string name="mobileNumber">Mobile Number</string>
     <string name="signUp">Sign Up</string>
     <string name="continueText">CONTINUE</string>
+    <string name="skip">Skip</string>
 
 
 </resources>

app/src/main/res/values/themes.xml

@@ -43,6 +43,12 @@
         <item name="android:solidColor">@color/white</item>
     </style>
 
+    <style name="Theme.lightRed" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="colorPrimary">@color/button_red</item>
+        <item name="elevation">@dimen/margin_8</item>
+        <item name="android:solidColor">@color/white</item>
+    </style>
+
     <style name="SCBSwitch1" parent="Theme.AppCompat.Light">
         <!-- active thumb & track color (30% transparency) -->
         <item name="colorControlActivated">@color/green</item>