11 Commits

Author SHA1 Message Date
  Hemant Khadase 501152470d added code of HemantBranch 2 years ago
  Hemant Khadase 2a2756b9b2 added code for getstarted 2 years ago
  Hemant Khadase 8935fe3e26 added missing code of pankaj 2 years ago
  Hemant Khadase 8464196560 added getstarted screen 2 years ago
  Hemant Khadase e496b2da92 added flow upto otp 2 years ago
  Hemant Khadase 307701d89a added indicator code 2 years ago
  Hemant Khadase d34a651242 added code 2 years ago
  Hemant Khadase 1f05731c2e added otp and flow 2 years ago
  Hemant Khadase 4d0ccce126 indicator code added 2 years ago
  Hemant Khadase bd3bc4d07a working on almostthere screen 2 years ago
  Hemant Khadase c3efb29cdf added almost there screen 2 years ago
22 changed files with 743 additions and 48 deletions
Unified View
  1. +12
    -0
      app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
  2. +3
    -0
      app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
  3. +1
    -5
      app/src/main/java/com/nivesh/production/niveshfd/fd/util/Common.kt
  4. +13
    -0
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/BasActivity.kt
  5. +33
    -22
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt
  6. +30
    -0
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt
  7. +9
    -1
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt
  8. +192
    -0
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt
  9. +13
    -6
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
  10. +4
    -4
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt
  11. +2
    -1
      app/src/main/res/drawable/default_pager_dot.xml
  12. +4
    -3
      app/src/main/res/drawable/selected_pager_dot.xml
  13. +1
    -0
      app/src/main/res/drawable/tab_pager_selector.xml
  14. +1
    -1
      app/src/main/res/layout/activity_register.xml
  15. +398
    -0
      app/src/main/res/layout/fragment_almost_there.xml
  16. +1
    -0
      app/src/main/res/layout/fragment_get_started.xml
  17. +4
    -0
      app/src/main/res/layout/fragment_pager_step_one.xml
  18. +4
    -1
      app/src/main/res/layout/fragment_pager_step_three.xml
  19. +6
    -3
      app/src/main/res/layout/fragment_pager_step_two.xml
  20. +1
    -1
      app/src/main/res/values-hi-rIN/strings.xml
  21. +6
    -0
      app/src/main/res/values/dimens.xml
  22. +5
    -0
      app/src/main/res/values/style.xml

+ 12
- 0
app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt View File

@ -17,6 +17,8 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
const val KEY_CLIENT_CODE = "ClientCode" const val KEY_CLIENT_CODE = "ClientCode"
const val KEY_GET_TOKEN = "GetToken" const val KEY_GET_TOKEN = "GetToken"
const val CLIENT_LANGUAGE = "LANGUAGE" 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() { override fun clearPrefs() {
preferences.edit().clear().apply() preferences.edit().clear().apply()
} }


+ 3
- 0
app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt View File

@ -26,5 +26,8 @@ interface IPreferenceHelper {
fun setLanguage(appName: String) fun setLanguage(appName: String)
fun getLanguage(): String fun getLanguage(): String
fun setIsFirstTime(appName: Boolean)
fun getFirstTime(): Boolean
fun clearPrefs() fun clearPrefs()
} }

+ 1
- 5
app/src/main/java/com/nivesh/production/niveshfd/fd/util/Common.kt View File

@ -2,7 +2,6 @@ package com.nivesh.production.niveshfd.fd.util
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.ActionBar
import android.app.Activity import android.app.Activity
import android.app.AlertDialog import android.app.AlertDialog
import android.app.Dialog import android.app.Dialog
@ -29,6 +28,7 @@ import android.view.Window
import android.webkit.WebView import android.webkit.WebView
import android.webkit.WebViewClient import android.webkit.WebViewClient
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.app.ActionBar
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat.getSystemService import androidx.core.content.ContextCompat.getSystemService
import androidx.core.hardware.display.DisplayManagerCompat import androidx.core.hardware.display.DisplayManagerCompat
@ -152,23 +152,19 @@ class Common {
val dialog = Dialog(context) val dialog = Dialog(context)
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent) dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
dialog.setContentView(R.layout.web_view_bottom_dialog) dialog.setContentView(R.layout.web_view_bottom_dialog)
val webView: WebView = dialog.findViewById(R.id.webView) val webView: WebView = dialog.findViewById(R.id.webView)
val imageCross: ImageView = dialog.findViewById(R.id.imageCross) val imageCross: ImageView = dialog.findViewById(R.id.imageCross)
imageCross.setOnClickListener { imageCross.setOnClickListener {
dialog.dismiss() dialog.dismiss()
} }
webView.isScrollbarFadingEnabled = false webView.isScrollbarFadingEnabled = false
webView.isHorizontalScrollBarEnabled = false webView.isHorizontalScrollBarEnabled = false
webView.settings.javaScriptEnabled = true webView.settings.javaScriptEnabled = true
webView.settings.userAgentString = "AndroidWebView" webView.settings.userAgentString = "AndroidWebView"
webView.clearCache(true) webView.clearCache(true)
webView.loadUrl(url) webView.loadUrl(url)
dialog.show() dialog.show()
val window: Window = dialog.window!! val window: Window = dialog.window!!
window.setGravity(Gravity.BOTTOM) window.setGravity(Gravity.BOTTOM)
window.setLayout(ActionBar.LayoutParams.MATCH_PARENT,(height-400)) window.setLayout(ActionBar.LayoutParams.MATCH_PARENT,(height-400))


+ 13
- 0
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/BasActivity.kt View File

@ -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;
}
}

+ 33
- 22
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/RegisterActivity.kt View File

@ -3,15 +3,12 @@ package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
import android.util.DisplayMetrics import android.util.DisplayMetrics
import android.view.Display import android.view.Display
import androidx.core.hardware.display.DisplayManagerCompat 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.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.ui.activity.BaseActivity
import com.nivesh.production.niveshfd.fd.util.Common
import com.nivesh.production.niveshfd.fd.util.Common.Companion.showWebViewDialogBottom import com.nivesh.production.niveshfd.fd.util.Common.Companion.showWebViewDialogBottom
class RegisterActivity : BaseActivity() { class RegisterActivity : BaseActivity() {
@ -28,43 +25,57 @@ class RegisterActivity : BaseActivity() {
setContentView(this.root) 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) 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 { 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 { 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 = val defaultDisplay =
DisplayManagerCompat.getInstance(this).getDisplay(Display.DEFAULT_DISPLAY) DisplayManagerCompat.getInstance(this).getDisplay(Display.DEFAULT_DISPLAY)
val displayContext = createDisplayContext(defaultDisplay!!) val displayContext = createDisplayContext(defaultDisplay!!)
height = displayContext.resources.displayMetrics.heightPixels
displayContext.resources.displayMetrics.heightPixels
} else { } else {
val displayMetrics = DisplayMetrics() val displayMetrics = DisplayMetrics()
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
windowManager.defaultDisplay.getMetrics(displayMetrics) windowManager.defaultDisplay.getMetrics(displayMetrics)
height = displayMetrics.heightPixels
displayMetrics.heightPixels
} }
return height return height
} }

+ 30
- 0
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/SignUpActivity.kt View File

@ -1,6 +1,9 @@
package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1 package com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.window.OnBackInvokedDispatcher
import androidx.activity.OnBackPressedCallback
import com.nivesh.production.niveshfd.R import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.ActivitySignupBinding import com.nivesh.production.niveshfd.databinding.ActivitySignupBinding
import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity 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() { class SignUpActivity : BaseActivity() {
lateinit var binding: ActivitySignupBinding lateinit var binding: ActivitySignupBinding
var type : Int? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -16,6 +20,8 @@ class SignUpActivity : BaseActivity() {
} }
private fun init() { private fun init() {
type = intent.getIntExtra("type", 0);
binding = ActivitySignupBinding.inflate(layoutInflater) binding = ActivitySignupBinding.inflate(layoutInflater)
binding.apply { binding.apply {
setContentView(this.root) setContentView(this.root)
@ -25,6 +31,30 @@ class SignUpActivity : BaseActivity() {
.commit() .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 {
}
}
} }

+ 9
- 1
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/activities1/ViewPagerActivity.kt View File

@ -5,6 +5,7 @@ import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.nivesh.production.niveshfd.databinding.ActivityViewpagerBinding 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.fd.ui.activity.BaseActivity
import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.DisableAdapter1 import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.DisableAdapter1
import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.SectionsPagerAdapter1 import com.nivesh.production.niveshfd.partnerOnBoarding.adapters1.SectionsPagerAdapter1
@ -19,6 +20,7 @@ class ViewPagerActivity : BaseActivity() {
private val stepOnePagerFragment = StepOnePagerFragment() private val stepOnePagerFragment = StepOnePagerFragment()
private val stepTwoPagerFragment = StepTwoPagerFragment() private val stepTwoPagerFragment = StepTwoPagerFragment()
private val stepThreePagerFragment = StepThreePagerFragment() private val stepThreePagerFragment = StepThreePagerFragment()
var type : Int? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
init() init()
@ -33,6 +35,10 @@ class ViewPagerActivity : BaseActivity() {
} }
private fun setViewPager() { private fun setViewPager() {
PreferenceManager(this@ViewPagerActivity).setIsFirstTime(true)
type = intent.getIntExtra("type", 0);
fragments = arrayOf( fragments = arrayOf(
stepOnePagerFragment, stepOnePagerFragment,
stepTwoPagerFragment, stepTwoPagerFragment,
@ -72,7 +78,8 @@ class ViewPagerActivity : BaseActivity() {
} }
}) })
binding.tvSkip.setOnClickListener {
binding.tvSkip.setOnClickListener{
stepFourApi() stepFourApi()
} }
} }
@ -95,6 +102,7 @@ class ViewPagerActivity : BaseActivity() {
// step 4 response // step 4 response
fun stepFourApi() { fun stepFourApi() {
intent = Intent(this@ViewPagerActivity, SignUpActivity::class.java) intent = Intent(this@ViewPagerActivity, SignUpActivity::class.java)
intent.putExtra("type", type)
startActivity(intent) startActivity(intent)
} }

+ 192
- 0
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/AlmostThereFragment.kt View File

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

+ 13
- 6
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt View File

@ -1,10 +1,12 @@
package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1 package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
import android.os.Build.VERSION_CODES.R
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup 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_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2" private const val ARG_PARAM2 = "param2"
@ -13,6 +15,8 @@ class GetStartedFragment : BaseFragment() {
// TODO: Rename and change types of parameters // TODO: Rename and change types of parameters
private var param1: String? = null private var param1: String? = null
private var param2: String? = null private var param2: String? = null
private var _binding: FragmentGetStartedBinding? = null
private val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) 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 // 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?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
init()
}
private fun init() {
} }


+ 4
- 4
app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/SignUpFragment.kt View File

@ -7,7 +7,6 @@ import android.text.TextWatcher
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.FragmentSignupBinding import com.nivesh.production.niveshfd.databinding.FragmentSignupBinding
import com.nivesh.production.niveshfd.fd.ui.activity.BaseActivity 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
@ -65,17 +64,18 @@ class SignUpFragment : BaseFragment() {
Common.commonErrorMethod( Common.commonErrorMethod(
binding.edtMobileNumber, binding.edtMobileNumber,
binding.tlMobileNumber, 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( Common.commonErrorMethod(
binding.edtMobileNumber, binding.edtMobileNumber,
binding.tlMobileNumber, binding.tlMobileNumber,
getString(R.string.inValidMobileNumber)
getString(com.nivesh.production.niveshfd.R.string.inValidIndianMobileNumber)
) )
} else { } else {
return true return true
} }
} }
} }

+ 2
- 1
app/src/main/res/drawable/default_pager_dot.xml View File

@ -6,7 +6,8 @@
android:shape="ring" android:shape="ring"
android:thickness="10dp" android:thickness="10dp"
android:useLevel="false"> android:useLevel="false">
<solid android:color="@android:color/darker_gray"/>
<stroke android:width="@dimen/margin_2" android:color="@color/red"/>
<solid android:color="@android:color/white"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

+ 4
- 3
app/src/main/res/drawable/selected_pager_dot.xml View File

@ -4,9 +4,10 @@
<shape <shape
android:innerRadius="0dp" android:innerRadius="0dp"
android:shape="ring" android:shape="ring"
android:thickness="10dp"
android:thickness="@dimen/margin_10"
android:useLevel="false"> android:useLevel="false">
<solid android:color="@color/red"/>
<solid android:color="@color/red" />
</shape> </shape>
</item> </item>
</layer-list>
</layer-list>

+ 1
- 0
app/src/main/res/drawable/tab_pager_selector.xml View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector <selector
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/selected_pager_dot" <item android:drawable="@drawable/selected_pager_dot"


+ 1
- 1
app/src/main/res/layout/activity_register.xml View File

@ -49,7 +49,7 @@
android:id="@+id/txtAccount" android:id="@+id/txtAccount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:layout_marginTop="@dimen/margin_15"
android:maxLines="2" android:maxLines="2"
android:padding="@dimen/margin_5" android:padding="@dimen/margin_5"


+ 398
- 0
app/src/main/res/layout/fragment_almost_there.xml View File

@ -0,0 +1,398 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/margin_100"
android:fillViewport="true"
android:padding="@dimen/margin_15"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/signUp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/margin_10"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:id="@+id/txtSignUp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="2"
android:padding="@dimen/margin_5"
android:text="@string/almostThere"
android:textColor="@color/black"
android:textSize="@dimen/text_size_20"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/btnReferrer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_15"
android:text="@string/moreInfo"
android:textColor="@color/black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/txtSignUp" />
<!-- Day -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlDay"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="@dimen/margin_100"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_15"
android:hint="@string/day"
android:padding="@dimen/margin_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnReferrer">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:digits="@string/number"
android:inputType="number"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!-- Month -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlMonth"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="@dimen/margin_100"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_5"
android:layout_marginTop="@dimen/margin_15"
android:hint="@string/month"
android:padding="@dimen/margin_3"
app:layout_constraintStart_toEndOf="@+id/tlDay"
app:layout_constraintTop_toBottomOf="@+id/btnReferrer">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtMonth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:digits="@string/number"
android:inputType="number"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!-- Year -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlYear"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="@dimen/margin_150"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_5"
android:layout_marginTop="@dimen/margin_15"
android:hint="@string/year"
android:padding="@dimen/margin_3"
app:layout_constraintStart_toEndOf="@+id/tlMonth"
app:layout_constraintTop_toBottomOf="@+id/btnReferrer">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtYear"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:digits="@string/number"
android:inputType="number"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--Full Name -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlFullName"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/fullName"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlDay">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtFullName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:digits="@string/onlyAlphabets"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--Email -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlEmail"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/Email"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlFullName">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtEmail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--Address Line 1 -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlAddressLine1"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/AddressLine1"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlEmail">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtAddressLine1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--Address Line 2 -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlAddressLine2"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/addressLine2"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlAddressLine1">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtAddressLine2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--PinCode -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlPinCode"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/pinCode"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlAddressLine2">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edtPinCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="number"
android:digits="@string/number"
android:maxLength="6"
android:maxLines="1"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--City -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlCity"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/city"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlPinCode">
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/spCity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<!--State -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlState"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:hint="@string/state"
android:padding="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/tlCity">
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/spState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
tool:ignore="TextContrastCheck" />
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cbCheck"
android:layout_width="@dimen/margin_48"
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" />
<TextView
android:id="@+id/byClicking"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_45"
android:layout_marginTop="@dimen/margin_25"
android:text="@string/byClicking"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/cbCheck"
app:layout_constraintTop_toBottomOf="@id/tlState" />
<TextView
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/tvPrivacyPolicy"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/byClicking" />
<TextView
android:id="@+id/tvPrivacyPolicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_5"
android:layout_marginStart="@dimen/margin_5"
android:text="@string/privacyPolicy"
android:textColor="@color/blue1"
app:layout_constraintStart_toEndOf="@+id/tvTermsAndCondition"
app:layout_constraintTop_toBottomOf="@id/byClicking" />
<TextView
android:id="@+id/tvAnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_5"
android:layout_marginTop="@dimen/margin_5"
android:text="@string/and"
app:layout_constraintStart_toEndOf="@+id/tvPrivacyPolicy"
app:layout_constraintTop_toBottomOf="@id/byClicking"/>
<TextView
android:id="@+id/tvAgreement"
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/agreement"
android:textColor="@color/blue1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvTermsAndCondition"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnBack"
android:layout_width="@dimen/margin_120"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_20"
android:layout_marginBottom="@dimen/margin_35"
android:backgroundTint="@color/white"
android:text="@string/back"
android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnNext"
android:layout_width="@dimen/margin_200"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_30"
android:layout_marginEnd="@dimen/margin_20"
android:layout_marginBottom="@dimen/margin_35"
android:backgroundTint="@color/red"
android:text="@string/next"
android:textColor="@color/white"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btnBack" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_150"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="@dimen/margin_20"
app:layout_constraintTop_toBottomOf="@+id/btnNext"
android:text="@string/upNextHome"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

+ 1
- 0
app/src/main/res/layout/fragment_get_started.xml View File

@ -6,6 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"


+ 4
- 0
app/src/main/res/layout/fragment_pager_step_one.xml View File

@ -9,6 +9,10 @@
android:background="@drawable/pager_1" android:background="@drawable/pager_1"
tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepOnePagerFragment"> tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepOnePagerFragment">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#66ffffff"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnNext" android:id="@+id/btnNext"
android:theme="@style/Theme.lightRed" android:theme="@style/Theme.lightRed"


+ 4
- 1
app/src/main/res/layout/fragment_pager_step_three.xml View File

@ -8,7 +8,10 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@drawable/pager_3" android:background="@drawable/pager_3"
tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepThreePagerFragment"> tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepThreePagerFragment">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#66ffffff"/>
<LinearLayout <LinearLayout
android:id="@+id/llBottom" android:id="@+id/llBottom"
android:layout_width="match_parent" android:layout_width="match_parent"


+ 6
- 3
app/src/main/res/layout/fragment_pager_step_two.xml View File

@ -9,6 +9,11 @@
android:background="@drawable/pager_2" android:background="@drawable/pager_2"
tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepTwoPagerFragment"> tool:context="com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1.StepTwoPagerFragment">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#66ffffff"/>
<LinearLayout <LinearLayout
android:id="@+id/llBottom" android:id="@+id/llBottom"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,9 +23,7 @@
android:layout_marginLeft="@dimen/margin_10" android:layout_marginLeft="@dimen/margin_10"
android:layout_marginRight="@dimen/margin_10" android:layout_marginRight="@dimen/margin_10"
android:paddingBottom="@dimen/margin_10" android:paddingBottom="@dimen/margin_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintBottom_toBottomOf="parent">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnBack" android:id="@+id/btnBack"


+ 1
- 1
app/src/main/res/values-hi-rIN/strings.xml View File

@ -309,6 +309,6 @@
<string name="let_s_get_started">Let’s get started</string> <string name="let_s_get_started">Let’s get started</string>
<string name="save_draft">SAVE DRAFT</string> <string name="save_draft">SAVE DRAFT</string>
<string name="format_png_or_jpg">Format (.png or .jpg)</string> <string name="format_png_or_jpg">Format (.png or .jpg)</string>
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources> </resources>

+ 6
- 0
app/src/main/res/values/dimens.xml View File

@ -70,10 +70,16 @@
<dimen name="margin_90">90dp</dimen> <dimen name="margin_90">90dp</dimen>
<dimen name="margin_95">95dp</dimen> <dimen name="margin_95">95dp</dimen>
<dimen name="margin_100">100dp</dimen> <dimen name="margin_100">100dp</dimen>
<dimen name="margin_110">110dp</dimen>
<dimen name="margin_120">120dp</dimen> <dimen name="margin_120">120dp</dimen>
<dimen name="margin_130">130dp</dimen>
<dimen name="margin_140">140dp</dimen>
<dimen name="margin_150">150dp</dimen> <dimen name="margin_150">150dp</dimen>
<dimen name="margin_160">160dp</dimen> <dimen name="margin_160">160dp</dimen>
<dimen name="margin_170">170dp</dimen> <dimen name="margin_170">170dp</dimen>
<dimen name="margin_180">180dp</dimen>
<dimen name="margin_190">190dp</dimen>
<dimen name="margin_200">200dp</dimen>
<dimen name="margin_290">290dp</dimen> <dimen name="margin_290">290dp</dimen>
<dimen name="margin_300">300dp</dimen> <dimen name="margin_300">300dp</dimen>


+ 5
- 0
app/src/main/res/values/style.xml View File

@ -151,4 +151,9 @@
<attr name="dotsClickable" /> <attr name="dotsClickable" />
</declare-styleable> </declare-styleable>
<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>
</resources> </resources>

Loading…
Cancel
Save

Powered by TurnKey Linux.