hemant.khadase
/
BajajFDLib
0
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 1 Wiki Activity
Browse Source

GetStartedFragment ui changes

master
Manoj 2 years ago
parent
dd4dd560b1
commit
cce8c77ca9
7 changed files with 258 additions and 136 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -1
      app/src/main/java/com/nivesh/production/niveshfd/fd/db/PreferenceManager.kt
  2. +1
    -0
      app/src/main/java/com/nivesh/production/niveshfd/fd/interfaces/IPreferenceHelper.kt
  3. +84
    -17
      app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/GetStartedFragment.kt
  4. +14
    -0
      app/src/main/res/drawable/svg_info.xml
  5. +13
    -0
      app/src/main/res/layout/fragment_almost_there.xml
  6. +133
    -118
      app/src/main/res/layout/fragment_get_started.xml
  7. +8
    -0
      app/src/main/res/values/strings.xml

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

@ -2,6 +2,7 @@ package com.nivesh.production.niveshfd.fd.db
import android.content.Context
import android.content.SharedPreferences
import android.provider.UserDictionary.Words.APP_ID
import com.nivesh.production.niveshfd.fd.interfaces.IPreferenceHelper
open class PreferenceManager(context: Context) : IPreferenceHelper {
@ -19,6 +20,7 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
const val CLIENT_LANGUAGE = "LANGUAGE"
const val ISFIRST_TIME = "IS FIRST TIME"
const val APP_ID = "AppId"
}
@ -96,7 +98,9 @@ open class PreferenceManager(context: Context) : IPreferenceHelper {
return preferences[ISFIRST_TIME] ?: false
}
override fun getAppId(): String {
return preferences[APP_ID] ?: ""
}
override fun clearPrefs() {
preferences.edit().clear().apply()


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

@ -30,4 +30,5 @@ interface IPreferenceHelper {
fun getFirstTime(): Boolean
fun clearPrefs()
fun getAppId(): String
}

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

@ -1,12 +1,25 @@
package com.nivesh.production.niveshfd.partnerOnBoarding.ui.fragments1
import android.net.Uri
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.Switch
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.content.FileProvider
import androidx.lifecycle.lifecycleScope
import com.google.android.material.button.MaterialButton
import com.nivesh.production.niveshfd.R
import com.nivesh.production.niveshfd.databinding.FragmentGetStartedBinding
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.Companion.showDialogWithTwoButtons
import com.nivesh.production.niveshfd.partnerOnBoarding.ui.activities1.SignUpActivity
import java.io.File
private const val ARG_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2"
@ -17,6 +30,28 @@ class GetStartedFragment : BaseFragment() {
private var param2: String? = null
private var _binding: FragmentGetStartedBinding? = null
private val binding get() = _binding!!
private var latestTmpUri: Uri? = null
private var takeImageResult: ActivityResultLauncher<Uri>? = null
private val mainPANUpload: Int = 1
private val mainPhotoUpload: Int = 2
private val firstDocUpload: Int = 3
private val secondDocUpload: Int = 4
private val listArray = ArrayList<String>()
private val requestCameraPermission = registerForActivityResult(
ActivityResultContracts.RequestPermission()
) { isGranted: Boolean ->
if (isGranted) {
takeImage()
} else {
showDialogWithTwoButtons(
(activity as SignUpActivity), getString(R.string.cameraPermission), getString(
R.string.permissionRequired
)
)
}
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -48,25 +83,57 @@ class GetStartedFragment : BaseFragment() {
true
)
}
listArray.add("Aadhaar Front")
listArray.add("Aadhaar Back")
listArray.add("Passport")
listArray.add("Driving Licenses")
listArray.add("Voter Id")
val arrayAdapter = ArrayAdapter(activity as SignUpActivity, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item,listArray)
binding.spDocType.setAdapter(arrayAdapter)
binding.spDocType.setOnItemClickListener{ _, _, position, _ ->
setVisibility(listArray[position])
}
binding.uploadFront
binding.uploadFront.setOnClickListener {
}
}
private fun setVisibility(s: String) {
if(s.contains("Aadhaar")){
binding.txtFront.visibility = View.VISIBLE
binding.uploadFront.visibility = View.VISIBLE
binding.txtBack.visibility = View.VISIBLE
binding.uploadViewBack.visibility = View.VISIBLE
}else{
binding.txtFront.visibility = View.VISIBLE
binding.uploadFront.visibility = View.VISIBLE
binding.txtBack.visibility = View.GONE
binding.uploadViewBack.visibility = View.GONE
}
}
companion object {
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment GetStarted.
*/
// TODO: Rename and change types and number of parameters
@JvmStatic
fun newInstance(param1: String, param2: String) =
GetStartedFragment().apply {
arguments = Bundle().apply {
putString(ARG_PARAM1, param1)
putString(ARG_PARAM2, param2)
}
private fun takeImage() {
lifecycleScope.launchWhenStarted {
getTmpFileUri().let { uri ->
latestTmpUri = uri
takeImageResult?.launch(uri)
}
}
}
private fun getTmpFileUri(): Uri {
val tmpFile =
File.createTempFile("tmp_image_file", ".png", requireActivity().cacheDir).apply {
createNewFile()
deleteOnExit()
}
return FileProvider.getUriForFile(
requireActivity(), PreferenceManager(activity as SignUpActivity).getAppId().plus(".provider"), tmpFile)
}
}

+ 14
- 0
app/src/main/res/drawable/svg_info.xml View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:pathData="M12.01 22C17.53 22 22 17.52 22 12C22 6.48 17.53 2 12.01 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12.01 22ZM12 4C16.42 4 20 7.58 20 12C20 16.42 16.42 20 12 20C7.58 20 4 16.42 4 12C4 7.58 7.58 4 12 4Z" />
<path
android:fillColor="#000000"
android:pathData="M11.27 14.17H13.175C13.175 12.4 15.74 12.175 15.74 9.73C15.74 8.005 14.27 7 12.065 7C10.19 7 8.84 7.69 8 8.83L9.455 9.775C9.98 9.04 10.79 8.62 11.9 8.62C13.055 8.62 13.775 9.19 13.775 10.03C13.775 11.53 11.27 11.95 11.27 14.17ZM12.23 17.755C12.92 17.755 13.415 17.23 13.415 16.585C13.415 15.94 12.92 15.43 12.23 15.43C11.525 15.43 11.03 15.94 11.03 16.585C11.03 17.23 11.525 17.755 12.23 17.755Z" />
</vector>

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

@ -22,6 +22,19 @@
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
<ImageView
android:id="@+id/ivInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/svg_info"
app:layout_constraintBottom_toTopOf="@+id/btnReferrer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/txtSignUp"
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="@string/next"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/txtSignUp"
android:layout_width="wrap_content"


+ 133
- 118
app/src/main/res/layout/fragment_get_started.xml View File

@ -6,16 +6,16 @@
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_90"
android:fillViewport="true"
android:padding="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/signUp"
android:layout_width="match_parent"
@ -24,6 +24,20 @@
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
<ImageView
android:id="@+id/ivInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/next"
android:src="@drawable/svg_info"
app:layout_constraintBottom_toTopOf="@+id/subHeader"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.995"
app:layout_constraintStart_toEndOf="@+id/txtGetStart"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/txtGetStart"
android:layout_width="wrap_content"
@ -49,7 +63,6 @@
app:layout_constraintTop_toBottomOf="@id/txtGetStart" />
<!--Full Name -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tlArnNumber"
@ -121,8 +134,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_16"
android:background="@drawable/rounded_view"
android:layout_marginBottom="@dimen/margin_16"
android:background="@drawable/rounded_view"
app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
>
@ -133,60 +146,57 @@
android:id="@+id/addAddressProof"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_4"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_25"
android:padding="@dimen/margin_4"
android:text="Add ADDRESS PROOF"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold"
android:layout_marginTop="@dimen/margin_25"
app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
app:layout_constraintStart_toStartOf= "parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
/>
/>
<TextView
android:id="@+id/format"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_25"
android:padding="@dimen/margin_4"
android:text="@string/format_png_or_jpg"
android:textColor="#909090"
android:textSize="@dimen/text_size_14"
android:layout_marginTop="@dimen/margin_25"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard"
/>
app:layout_constraintTop_toBottomOf="@+id/tlFullNamePanCard" />
<TextView
android:id="@+id/docTypeHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_3"
android:padding="@dimen/margin_4"
android:text="Choose the document type"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_3"
app:layout_constraintTop_toBottomOf="@+id/addAddressProof"
app:layout_constraintStart_toStartOf= "parent"
/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/addAddressProof" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/spAddressType"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_48"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginBottom="@dimen/margin_5"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_15"
android:layout_marginEnd="@dimen/margin_15"
android:layout_marginBottom="@dimen/margin_5"
app:hintEnabled="false"
app:layout_constraintTop_toBottomOf="@+id/docTypeHeader">
@ -197,113 +207,118 @@
android:background="@drawable/rounded_corner_with_line1"
android:hint="@string/addressProofType"
android:inputType="none"
android:padding="@dimen/margin_5"
android:labelFor="@+id/spInterestPayout"
android:padding="@dimen/margin_5"
android:textColorHint="@color/greyColor2"
android:textSize="@dimen/text_size_14"
/>
android:textSize="@dimen/text_size_14" />
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/txtFront"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_4"
android:text="Front"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_30"
app:layout_constraintTop_toBottomOf="@+id/spAddressType"
app:layout_constraintStart_toStartOf= "parent"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/uploadViewFront"
android:layout_width="wrap_content"
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/txtFront"
android:orientation="vertical"
android:layout_marginTop="@dimen/margin_10"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_4"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintHorizontal_bias="0.5"
android:background="@drawable/upload_background">
app:layout_constraintTop_toBottomOf="@+id/spAddressType">
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadFront"
<TextView
android:id="@+id/txtFront"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Upload"
android:backgroundTint="@color/white"
android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintTop_toTopOf="@+id/uploadViewFront"
app:layout_constraintBottom_toBottomOf="@+id/uploadViewFront"
app:layout_constraintStart_toStartOf="@+id/uploadViewFront"
app:layout_constraintEnd_toEndOf="@+id/uploadViewFront"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/txtBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_4"
android:text="Back"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold"
android:layout_marginTop="@dimen/margin_30"
app:layout_constraintTop_toBottomOf="@+id/spAddressType"
app:layout_constraintStart_toStartOf="@+id/uploadViewBack"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/uploadViewBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/txtBack"
android:layout_marginStart="@dimen/margin_25"
android:layout_marginTop="@dimen/margin_4"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toEndOf="@+id/uploadViewFront"
app:layout_constraintHorizontal_bias="0.5"
android:background="@drawable/upload_background">
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadBack"
android:padding="@dimen/margin_4"
android:text="Front"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/uploadViewFront"
app:layout_constraintEnd_toStartOf="@+id/txtBack"
app:layout_constraintHorizontal_bias="0.129"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/uploadViewFront"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_15"
android:layout_marginEnd="@dimen/margin_5"
android:text="Upload"
android:backgroundTint="@color/white"
android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintTop_toTopOf="@+id/uploadViewBack"
app:layout_constraintBottom_toBottomOf="@+id/uploadViewBack"
android:layout_marginStart="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_4"
android:background="@drawable/upload_background"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtFront">
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadFront"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/white"
android:text="Upload"
android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="@+id/uploadViewFront"
app:layout_constraintEnd_toEndOf="@+id/uploadViewFront"
app:layout_constraintStart_toStartOf="@+id/uploadViewFront"
app:layout_constraintTop_toTopOf="@+id/uploadViewFront" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/txtBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_4"
android:text="Back"
android:textColor="@color/black"
android:textSize="@dimen/text_size_14"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/uploadViewBack"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.028"
app:layout_constraintStart_toStartOf="@+id/uploadViewBack"
app:layout_constraintEnd_toEndOf="@+id/uploadViewBack"
/>
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/uploadViewBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_25"
android:layout_marginTop="@dimen/margin_4"
android:background="@drawable/upload_background"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toEndOf="@+id/uploadViewFront"
app:layout_constraintTop_toBottomOf="@+id/txtBack">
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_15"
android:layout_marginEnd="@dimen/margin_5"
android:backgroundTint="@color/white"
android:text="Upload"
android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintBottom_toBottomOf="@+id/uploadViewBack"
app:layout_constraintEnd_toEndOf="@+id/uploadViewBack"
app:layout_constraintStart_toStartOf="@+id/uploadViewBack"
app:layout_constraintTop_toTopOf="@+id/uploadViewBack" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
`
`
</androidx.core.widget.NestedScrollView>
@ -315,17 +330,17 @@
android:layout_marginStart="@dimen/margin_15"
android:layout_marginEnd="@dimen/margin_5"
android:layout_marginBottom="@dimen/margin_20"
android:text="@string/save_draft"
android:backgroundTint="@color/white"
android:text="@string/save_draft"
android:textColor="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btnNext"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/btnNext"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
@ -334,18 +349,18 @@
android:id="@+id/btnNext"
android:layout_width="170dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_20"
android:layout_marginStart="@dimen/margin_5"
android:layout_marginEnd="@dimen/margin_15"
android:layout_marginBottom="@dimen/margin_20"
android:backgroundTint="@color/red"
android:text="@string/continueText"
android:textColor="@color/white"
android:backgroundTint="@color/red"
app:cornerRadius="@dimen/margin_15"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/saveDraft"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintLeft_toRightOf="@+id/saveDraft"
app:layout_constraintRight_toRightOf="parent"/>
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toEndOf="@+id/saveDraft" />
</androidx.constraintlayout.widget.ConstraintLayout>

+ 8
- 0
app/src/main/res/values/strings.xml View File

@ -318,4 +318,12 @@
<string name="save_draft">SAVE DRAFT</string>
<string name="format_png_or_jpg">Format (.png or .jpg)</string>
<array name="idProof">
<item>Aadhar Front</item>
<item>Aadhar Back</item>
<item>Passport</item>
<item>Driving Licenses</item>
<item>Voter Id</item>
</array>
</resources>

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.