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 609b3d1..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 @@ -4,11 +4,13 @@ import android.Manifest import android.annotation.SuppressLint import android.app.Activity import android.app.AlertDialog +import android.app.Dialog import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.graphics.Color import android.graphics.drawable.GradientDrawable +import android.hardware.display.DisplayManager import android.net.ConnectivityManager import android.net.NetworkCapabilities import android.net.Uri @@ -17,9 +19,19 @@ import android.provider.Settings import android.telephony.TelephonyManager import android.text.TextUtils import android.text.format.DateFormat +import android.util.DisplayMetrics import android.util.Log import android.util.Patterns +import android.view.Display +import android.view.Gravity +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 import com.google.android.material.textfield.MaterialAutoCompleteTextView import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout @@ -136,6 +148,29 @@ class Common { builder.show() } + fun showWebViewDialogBottom(context: Context, url: String,height: Int){ + 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)) + window.setWindowAnimations(R.style.DialogBottomAnimation) + } + fun showDialogWithTwoButtons(activity: Activity?, message: CharSequence?, title: String) { val builder = AlertDialog.Builder(activity) builder.setTitle(title) @@ -371,6 +406,5 @@ class Common { } return deviceInfo } - } } \ 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 7d8b151..dcc8ff6 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 @@ -1,13 +1,14 @@ 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 com.nivesh.production.niveshfd.databinding.ActivityLoginBinding +import android.util.DisplayMetrics +import android.view.Display +import androidx.core.hardware.display.DisplayManagerCompat import com.nivesh.production.niveshfd.databinding.ActivityRegisterBinding 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() { lateinit var binding: ActivityRegisterBinding @@ -23,22 +24,44 @@ 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) + binding.btnDistributor.setOnClickListener { + intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java) startActivity(intent) } - binding.btnReferrer.setOnClickListener{ - intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java) + binding.btnReferrer.setOnClickListener { + intent = Intent(this@RegisterActivity, ViewPagerActivity::class.java) startActivity(intent) } + binding.imgInfo.setOnClickListener { + showWebViewDialogBottom( + this@RegisterActivity, + "https://smallbusiness.chron.com/create-dummy-webpage-51199.html", + getScreenHeight() + ) + } + } + private fun getScreenHeight(): Int { + 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!!) + displayContext.resources.displayMetrics.heightPixels + } else { + val displayMetrics = DisplayMetrics() + @Suppress("DEPRECATION") + windowManager.defaultDisplay.getMetrics(displayMetrics) + displayMetrics.heightPixels + } + return height } } \ No newline at end of file diff --git a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt index 48a9cd8..d1be938 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/partnerOnBoarding/ui/fragments1/OTPFragment.kt @@ -44,6 +44,9 @@ class OTPFragment : Fragment() { binding.edtOTP5.setOnKeyListener(GenericKeyEvent(binding.edtOTP5, binding.edtOTP4)) binding.edtOTP6.setOnKeyListener(GenericKeyEvent(binding.edtOTP6, binding.edtOTP5)) + + binding.txtDigit.text = getString(R.string.sixDigitOTP).plus(" ").plus("0000000000") + binding.btnContinue.setOnClickListener { if (validate()) { diff --git a/app/src/main/res/drawable/round_corner_top.xml b/app/src/main/res/drawable/round_corner_top.xml new file mode 100644 index 0000000..8d7cdeb --- /dev/null +++ b/app/src/main/res/drawable/round_corner_top.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_otp.xml b/app/src/main/res/layout/fragment_otp.xml index 94bc116..cc85970 100644 --- a/app/src/main/res/layout/fragment_otp.xml +++ b/app/src/main/res/layout/fragment_otp.xml @@ -33,8 +33,9 @@ android:id="@+id/txtDigit" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/margin_10" android:layout_marginTop="@dimen/margin_5" - android:text="Enter the 6-digit verification code sent to +91-00000-00000" + android:text="@string/sixDigitOTP" android:textColor="@color/black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/web_view_bottom_dialog.xml b/app/src/main/res/layout/web_view_bottom_dialog.xml new file mode 100644 index 0000000..5a18688 --- /dev/null +++ b/app/src/main/res/layout/web_view_bottom_dialog.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 5e808f6..1d70ac7 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -294,6 +294,7 @@ Up Next: Home abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ Please enter valid OTP + Enter the 6-digit verification code sent to \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89ac75b..d1d3871 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -301,6 +301,7 @@ Up Next: Home abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ Please enter valid OTP + Enter the 6-digit verification code sent to \ No newline at end of file diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml index 52c48e8..bef7373 100644 --- a/app/src/main/res/values/style.xml +++ b/app/src/main/res/values/style.xml @@ -99,4 +99,56 @@ @dimen/margin_10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file