diff --git a/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt b/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
index f65057f..010bb76 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
@@ -17,6 +17,8 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
const val KEY_CLIENT_CODE = "ClientCode"
const val KEY_GET_TOKEN = "GetToken"
const val CLIENT_LANGUAGE = "LANGUAGE"
+
+ const val ISFIRST_TIME = "IS FIRST TIME"
}
@@ -86,6 +88,16 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
}
+ override fun setIsFirstTime(appName: Boolean) {
+ preferences[ISFIRST_TIME] = appName
+ }
+
+ override fun getFirstTime(): Boolean {
+ return preferences[ISFIRST_TIME] ?: false
+ }
+
+
+
override fun clearPrefs() {
preferences.edit().clear().apply()
}
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt b/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
index 5a98806..6b4ea1e 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
@@ -26,5 +26,8 @@ interface IPreferenceHelper {
fun setLanguage(appName: String)
fun getLanguage(): String
+ fun setIsFirstTime(appName: Boolean)
+ fun getFirstTime(): Boolean
+
fun clearPrefs()
}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/fd/util/Common.kt b/app/src/main/java/com/nivesh/production/niveshfd/fd/util/Common.kt
index bd7763a..9814f22 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/fd/util/Common.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/fd/util/Common.kt
@@ -2,7 +2,6 @@ package com.nivesh.production.niveshfd.fd.util
import android.Manifest
import android.annotation.SuppressLint
-import android.app.ActionBar
import android.app.Activity
import android.app.AlertDialog
import android.app.Dialog
@@ -29,6 +28,7 @@ import android.view.Window
import android.webkit.WebView
import android.webkit.WebViewClient
import android.widget.ImageView
+import androidx.appcompat.app.ActionBar
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat.getSystemService
import androidx.core.hardware.display.DisplayManagerCompat
@@ -152,23 +152,19 @@ class Common {
val dialog = Dialog(context)
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
dialog.setContentView(R.layout.web_view_bottom_dialog)
-
val webView: WebView = dialog.findViewById(R.id.webView)
val imageCross: ImageView = dialog.findViewById(R.id.imageCross)
imageCross.setOnClickListener {
dialog.dismiss()
}
-
webView.isScrollbarFadingEnabled = false
webView.isHorizontalScrollBarEnabled = false
webView.settings.javaScriptEnabled = true
webView.settings.userAgentString = "AndroidWebView"
webView.clearCache(true)
webView.loadUrl(url)
-
dialog.show()
-
val window: Window = dialog.window!!
window.setGravity(Gravity.BOTTOM)
window.setLayout(ActionBar.LayoutParams.MATCH_PARENT,(height-400))
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/BasActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/BasActivity.kt
new file mode 100644
index 0000000..d644182
--- /dev/null
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/BasActivity.kt
@@ -0,0 +1,13 @@
+package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1
+
+import android.app.Activity
+import android.os.Bundle
+
+class BasActivity : Activity() {
+
+ lateinit var mActivity : Activity
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ mActivity = this;
+ }
+}
\ 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 d7708fb..c4766a2 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
@@ -3,15 +3,12 @@ package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1
import android.content.Intent
import android.os.Build
import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
import android.util.DisplayMetrics
import android.view.Display
import androidx.core.hardware.display.DisplayManagerCompat
-import com.nivesh.production.niveshfd.databinding.ActivityLoginBinding
import com.nivesh.production.niveshfd.databinding.ActivityRegisterBinding
+import com.nivesh.production.niveshfd.fd.db.PreferenceManager
import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
-import com.nivesh.production.niveshfd.fd.util.Common
import com.nivesh.production.niveshfd.fd.util.Common.Companion.showWebViewDialogBottom
class RegisterActivity : BaseActivity() {
@@ -28,43 +25,57 @@ class RegisterActivity : BaseActivity() {
setContentView(this.root)
}
- binding.imgInfo.setOnClickListener{
+
+ binding.imgInfo.setOnClickListener {
}
- binding.btnInvestor.setOnClickListener{
- intent = Intent(this@RegisterActivity, RegisterActivity::class.java)
+ binding.btnInvestor.setOnClickListener {
+ intent = Intent(this@RegisterActivity, RegisterActivity::class.java)
startActivity(intent)
}
- binding.btnDistributor.setOnClickListener{
- intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
- startActivity(intent)
+ binding.btnDistributor.setOnClickListener {
+ if (!PreferenceManager(this@RegisterActivity).getFirstTime()){
+ intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
+ intent.putExtra("type", 4)
+ startActivity(intent)
+ }else{
+ intent = Intent(this@RegisterActivity, SignUpActivity::class.java)
+ intent.putExtra("type", 4)
+ startActivity(intent)
+ }
}
- binding.btnReferrer.setOnClickListener{
- intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
- startActivity(intent)
+ binding.btnReferrer.setOnClickListener {
+ if (!PreferenceManager(this@RegisterActivity).getFirstTime()){
+ intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java)
+ intent.putExtra("type", 3)
+ startActivity(intent)
+ }else{
+ intent = Intent(this@RegisterActivity, SignUpActivity::class.java)
+ intent.putExtra("type", 3)
+ startActivity(intent)
+ }
}
binding.imgInfo.setOnClickListener {
- showWebViewDialogBottom(this@RegisterActivity,"https://smallbusiness.chron.com/create-dummy-webpage-51199.html",getScreenHeight());
+ showWebViewDialogBottom(
+ this@RegisterActivity,
+ "https://smallbusiness.chron.com/create-dummy-webpage-51199.html",
+ getScreenHeight()
+ )
}
}
private fun getScreenHeight(): Int {
- var height = 0
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ val height: Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
val defaultDisplay =
DisplayManagerCompat.getInstance(this).getDisplay(Display.DEFAULT_DISPLAY)
val displayContext = createDisplayContext(defaultDisplay!!)
-
- height = displayContext.resources.displayMetrics.heightPixels
-
+ displayContext.resources.displayMetrics.heightPixels
} else {
-
val displayMetrics = DisplayMetrics()
@Suppress("DEPRECATION")
windowManager.defaultDisplay.getMetrics(displayMetrics)
-
- height = displayMetrics.heightPixels
+ displayMetrics.heightPixels
}
return height
}
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
index 53498e6..9ee5946 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
@@ -1,6 +1,9 @@
package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1
+import android.os.Build
import android.os.Bundle
+import android.window.OnBackInvokedDispatcher
+import androidx.activity.OnBackPressedCallback
import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.ActivitySignupBinding
import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
@@ -9,6 +12,7 @@ import com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.SignUpFrag
class SignUpActivity : BaseActivity() {
lateinit var binding: ActivitySignupBinding
+ var type : Int? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -16,6 +20,8 @@ class SignUpActivity : BaseActivity() {
}
private fun init() {
+ type = intent.getIntExtra("type", 0);
+
binding = ActivitySignupBinding.inflate(layoutInflater)
binding.apply {
setContentView(this.root)
@@ -25,6 +31,30 @@ class SignUpActivity : BaseActivity() {
.commit()
}
+ @Deprecated("Deprecated in Java")
+ override fun onBackPressed() {
+ if (Build.VERSION.SDK_INT >= 33) {
+ onBackInvokedDispatcher.registerOnBackInvokedCallback(
+ OnBackInvokedDispatcher.PRIORITY_DEFAULT
+ ) {
+ exitOnBackPressed()
+ }
+ } else {
+ onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+ override fun handleOnBackPressed() {
+ exitOnBackPressed()
+ }
+ })
+ }
+ }
+
+ private fun exitOnBackPressed() {
+ if (isTaskRoot) {
+ finish()
+ } else {
+
+ }
+ }
}
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 7669042..12bb248 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
@@ -5,6 +5,7 @@ import android.os.Bundle
import androidx.fragment.app.Fragment
import androidx.viewpager.widget.ViewPager
import com.nivesh.production.niveshfd.databinding.ActivityViewpagerBinding
+import com.nivesh.production.niveshfd.fd.db.PreferenceManager
import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.DisableAdapter1
import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.SectionsPagerAdapter1
@@ -19,6 +20,7 @@ class ViewPagerActivity : BaseActivity() {
private val stepOnePagerFragment = StepOnePagerFragment()
private val stepTwoPagerFragment = StepTwoPagerFragment()
private val stepThreePagerFragment = StepThreePagerFragment()
+ var type : Int? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
init()
@@ -33,6 +35,10 @@ class ViewPagerActivity : BaseActivity() {
}
private fun setViewPager() {
+
+ PreferenceManager(this@ViewPagerActivity).setIsFirstTime(true)
+ type = intent.getIntExtra("type", 0);
+
fragments = arrayOf(
stepOnePagerFragment,
stepTwoPagerFragment,
@@ -72,7 +78,8 @@ class ViewPagerActivity : BaseActivity() {
}
})
- binding.tvSkip.setOnClickListener {
+
+ binding.tvSkip.setOnClickListener{
stepFourApi()
}
}
@@ -95,6 +102,7 @@ class ViewPagerActivity : BaseActivity() {
// step 4 response
fun stepFourApi() {
intent = Intent(this@ViewPagerActivity, SignUpActivity::class.java)
+ intent.putExtra("type", type)
startActivity(intent)
}
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
new file mode 100644
index 0000000..3f479a3
--- /dev/null
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt
@@ -0,0 +1,192 @@
+package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.nivesh.production.niveshfd.databinding.FragmentAlmostThereBinding
+import com.nivesh.production.niveshfd.fd.util.Common
+
+class AlmostThereFragment : Fragment() {
+ private var _binding: FragmentAlmostThereBinding? = null
+ private val binding get() = _binding!!
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentAlmostThereBinding.inflate(inflater, container, false)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ init()
+ }
+
+ private fun init() {
+ binding.edtDay.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlDay)
+ }
+ })
+ binding.edtMonth.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlMonth)
+ }
+ })
+ binding.edtYear.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlYear)
+ }
+ })
+
+ binding.edtFullName.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlFullName)
+ }
+ })
+
+ binding.edtEmail.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlEmail)
+ }
+ })
+
+ binding.edtAddressLine1.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlAddressLine1)
+ }
+ })
+
+ binding.edtPinCode.addTextChangedListener(object : TextWatcher {
+ override fun afterTextChanged(s: Editable?) {}
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+ Common.removeError(binding.tlPinCode)
+ }
+ })
+
+ binding.spCity.setOnClickListener {
+
+ }
+
+ binding.spState.setOnClickListener {
+
+ }
+ binding.cbCheck.setOnClickListener {
+
+ }
+
+ binding.tvTermsAndCondition.setOnClickListener{
+
+ }
+ binding.tvPrivacyPolicy.setOnClickListener{
+
+ }
+ binding.tvAgreement.setOnClickListener{
+
+ }
+
+ binding.btnBack.setOnClickListener {
+
+ }
+
+ binding.btnNext.setOnClickListener {
+ if (validate()) {
+ // submit
+ }
+ }
+
+
+ }
+
+ private fun validate(): Boolean {
+ return if (binding.edtDay.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtDay,
+ binding.tlDay,
+ ""
+ )
+ } else if (binding.edtMonth.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtMonth,
+ binding.tlMonth,
+ ""
+ )
+ } else if (binding.edtYear.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtYear,
+ binding.tlYear,
+ ""
+ )
+ } else if (binding.edtFullName.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtFullName,
+ binding.tlFullName,
+ ""
+ )
+ } else if (binding.edtEmail.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtFullName,
+ binding.tlFullName,
+ ""
+ )
+ } else if (!Common.isValidEmail(binding.edtEmail.text.toString())) { // EditText
+ Common.commonErrorMethod(
+ binding.edtFullName,
+ binding.tlFullName,
+ ""
+ )
+ } else if (binding.edtAddressLine1.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtAddressLine1,
+ binding.tlAddressLine1,
+ ""
+ )
+ } else if (binding.edtPinCode.text.toString().isEmpty()) { // EditText
+ Common.commonErrorMethod(
+ binding.edtPinCode,
+ binding.tlPinCode,
+ ""
+ )
+ } else if (binding.edtPinCode.text.toString().length != 6) { // EditText
+ Common.commonErrorMethod(
+ binding.edtPinCode,
+ binding.tlPinCode,
+ ""
+ )
+ } else if (binding.spCity.text.toString().isEmpty()) { // EditText
+ Common.commonSpinnerErrorMethod(
+ binding.spCity,
+ binding.tlCity,
+ ""
+ )
+ } else if (binding.spState.text.toString().isEmpty()) { // EditText
+ Common.commonSpinnerErrorMethod(
+ binding.spState,
+ binding.tlState,
+ ""
+ )
+ }else if (!binding.cbCheck.isChecked) { // EditText
+ return false
+ } else {
+ return true
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
index 167d224..19c02d9 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
@@ -1,10 +1,12 @@
package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
+import android.os.Build.VERSION_CODES.R
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import com.nivesh.production.niveshfd.R
+import com.nivesh.production.niveshfd.databinding.FragmentGetStartedBinding
+import com.nivesh.production.niveshfd.databinding.FragmentOtpBinding
private const val ARG_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2"
@@ -13,6 +15,8 @@ class GetStartedFragment : BaseFragment() {
// TODO: Rename and change types of parameters
private var param1: String? = null
private var param2: String? = null
+ private var _binding: FragmentGetStartedBinding? = null
+ private val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -22,16 +26,19 @@ class GetStartedFragment : BaseFragment() {
}
}
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View? {
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
// Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_get_started, container, false)
+ _binding = FragmentGetStartedBinding.inflate(inflater, container, false)
+ return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ init()
+ }
+
+ private fun init() {
+
}
diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
index e3d34ba..037d684 100644
--- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
+++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
@@ -7,7 +7,6 @@ import android.text.TextWatcher
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.FragmentSignupBinding
import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity
import com.nivesh.production.niveshfd.fd.util.Common
@@ -65,17 +64,18 @@ class SignUpFragment : BaseFragment() {
Common.commonErrorMethod(
binding.edtMobileNumber,
binding.tlMobileNumber,
- getString(R.string.inValidIndianMobileNumber)
+ getString(com.nivesh.production.niveshfd.R.string.inValidMobileNumber)
)
- } else if (binding.edtMobileNumber.text?.length != 10) { // EditText
+ } else if (!Common.isIndianMobileNo(binding.edtMobileNumber.text.toString())) { // EditText
Common.commonErrorMethod(
binding.edtMobileNumber,
binding.tlMobileNumber,
- getString(R.string.inValidMobileNumber)
+ getString(com.nivesh.production.niveshfd.R.string.inValidIndianMobileNumber)
)
} else {
return true
}
}
+
}
\ 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
index 06ca6ef..713ba10 100644
--- a/app/src/main/res/drawable/default_pager_dot.xml
+++ b/app/src/main/res/drawable/default_pager_dot.xml
@@ -6,7 +6,8 @@
android:shape="ring"
android:thickness="10dp"
android:useLevel="false">
-
+
+
\ 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
index 9b26e0f..22ac7a6 100644
--- a/app/src/main/res/drawable/selected_pager_dot.xml
+++ b/app/src/main/res/drawable/selected_pager_dot.xml
@@ -4,9 +4,10 @@
-
+
+
-
+
\ 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
index 77f1f0f..9887a8c 100644
--- a/app/src/main/res/drawable/tab_pager_selector.xml
+++ b/app/src/main/res/drawable/tab_pager_selector.xml
@@ -1,3 +1,4 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_get_started.xml b/app/src/main/res/layout/fragment_get_started.xml
index f9659bc..de4de58 100644
--- a/app/src/main/res/layout/fragment_get_started.xml
+++ b/app/src/main/res/layout/fragment_get_started.xml
@@ -6,6 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
+
+
-
+
+
+
+ app:layout_constraintBottom_toBottomOf="parent">
Let’s get started
SAVE DRAFT
Format (.png or .jpg)
- Hello blank fragment
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4f369e9..53d724a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -70,10 +70,16 @@
90dp
95dp
100dp
+ 110dp
120dp
+ 130dp
+ 140dp
150dp
160dp
170dp
+ 180dp
+ 190dp
+ 200dp
290dp
300dp
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index bef7373..f4062d8 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -151,4 +151,9 @@
+
\ No newline at end of file