[UPD] MUS-107 Feature, updated home screens and some changes

.idea/misc.xml

@@ -18,6 +18,7 @@
         <entry key="app/src/main/res/drawable/ic_background.xml" value="0.2759259259259259" />
         <entry key="app/src/main/res/drawable/ic_baseline_account_box.xml" value="0.2796296296296296" />
         <entry key="app/src/main/res/drawable/ic_baseline_arrow_back.xml" value="0.2759259259259259" />
+        <entry key="app/src/main/res/drawable/ic_baseline_arrow_red.xml" value="0.25416666666666665" />
         <entry key="app/src/main/res/drawable/ic_baseline_ballot.xml" value="0.2796296296296296" />
         <entry key="app/src/main/res/drawable/ic_baseline_check_circle.xml" value="0.20694444444444443" />
         <entry key="app/src/main/res/drawable/ic_baseline_home.xml" value="0.2796296296296296" />
@@ -31,36 +32,56 @@
         <entry key="app/src/main/res/drawable/ic_russia.xml" value="0.2796296296296296" />
         <entry key="app/src/main/res/drawable/ic_safety.xml" value="0.2590277777777778" />
         <entry key="app/src/main/res/drawable/ic_vector_error.xml" value="0.20694444444444443" />
+        <entry key="app/src/main/res/drawable/radius_top.xml" value="0.25416666666666665" />
         <entry key="app/src/main/res/drawable/text_handle.xml" value="1.4214285714285715" />
         <entry key="app/src/main/res/layout/activity_auth.xml" value="0.3416666666666667" />
         <entry key="app/src/main/res/layout/activity_language.xml" value="0.25" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.22" />
         <entry key="app/src/main/res/layout/activity_pin.xml" value="0.3052536231884058" />
+        <entry key="app/src/main/res/layout/activity_services.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/activity_services2.xml" value="0.266796875" />
+        <entry key="app/src/main/res/layout/activity_settings.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/activity_splash.xml" value="0.29936594202898553" />
         <entry key="app/src/main/res/layout/activity_splash2.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/bottom_sheet_ussd.xml" value="0.266796875" />
         <entry key="app/src/main/res/layout/button_selector.xml" value="0.33242753623188404" />
+        <entry key="app/src/main/res/layout/fragment_action.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_base.xml" value="0.23497267759562843" />
         <entry key="app/src/main/res/layout/fragment_biometric.xml" value="0.23497267759562843" />
         <entry key="app/src/main/res/layout/fragment_blank.xml" value="0.18385416666666668" />
         <entry key="app/src/main/res/layout/fragment_check_phone.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/fragment_confirm_password.xml" value="0.245703125" />
+        <entry key="app/src/main/res/layout/fragment_current_password.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_enter_password.xml" value="0.22" />
         <entry key="app/src/main/res/layout/fragment_forget_password.xml" value="0.21174863387978143" />
         <entry key="app/src/main/res/layout/fragment_home.xml" value="0.18385416666666668" />
         <entry key="app/src/main/res/layout/fragment_home_content.xml" value="0.266796875" />
+        <entry key="app/src/main/res/layout/fragment_language.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_login.xml" value="0.2" />
+        <entry key="app/src/main/res/layout/fragment_main_ussd.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/fragment_minutes.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_my_verification.xml" value="0.1265625" />
+        <entry key="app/src/main/res/layout/fragment_new_password.xml" value="0.245703125" />
+        <entry key="app/src/main/res/layout/fragment_pakets.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_password.xml" value="0.2" />
         <entry key="app/src/main/res/layout/fragment_pin.xml" value="0.23497267759562843" />
         <entry key="app/src/main/res/layout/fragment_pin_dialog.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_pin_lock.xml" value="0.23497267759562843" />
+        <entry key="app/src/main/res/layout/fragment_profile.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_progress.xml" value="0.33242753623188404" />
         <entry key="app/src/main/res/layout/fragment_register.xml" value="0.25" />
+        <entry key="app/src/main/res/layout/fragment_safety.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/fragment_service.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/fragment_support.xml" value="0.25625" />
+        <entry key="app/src/main/res/layout/fragment_tarifs.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/fragment_verification.xml" value="0.2" />
         <entry key="app/src/main/res/layout/home_home.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/home_motion.xml" value="0.10951008645533142" />
+        <entry key="app/src/main/res/layout/item_action.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/item_confirm.xml" value="0.23497267759562843" />
         <entry key="app/src/main/res/layout/item_home.xml" value="0.29936594202898553" />
         <entry key="app/src/main/res/layout/item_pin.xml" value="0.23497267759562843" />
+        <entry key="app/src/main/res/layout/item_ussd.xml" value="0.22" />
         <entry key="app/src/main/res/layout/layout_ask_create_task.xml" value="0.22643442622950818" />
         <entry key="app/src/main/res/layout/layout_exit.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/layout_home_header.xml" value="0.25625" />

app/src/main/AndroidManifest.xml

@@ -19,6 +19,12 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
         <activity
+            android:name=".dev.ui.service.ServicesActivity"
+            android:exported="false" />
+        <activity
+            android:name=".dev.ui.settings.SettingsActivity"
+            android:exported="false" />
+        <activity
             android:name=".dev.SplashActivity"
             android:configChanges="orientation"
             android:exported="true"
@@ -43,7 +49,7 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".dev.AuthActivity"
+            android:name=".dev.ui.auth.AuthActivity"
             android:configChanges="orientation"
             android:exported="false"
             android:screenOrientation="portrait"

app/src/main/java/com/mobiuz/app/dev/MainActivity.kt

@@ -2,10 +2,10 @@ package com.mobiuz.app.dev
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
@@ -17,9 +17,11 @@ import com.mobiuz.app.R
 import com.mobiuz.app.databinding.ActivityMainBinding
 import com.mobiuz.app.dev.model.SharedPref
 import com.mobiuz.app.dev.network.model.UiStateObject
+import com.mobiuz.app.dev.ui.auth.AuthActivity
+import com.mobiuz.app.dev.ui.global.ButtonClick
 import com.mobiuz.app.dev.ui.global.CONSTANTS
 import com.mobiuz.app.dev.ui.global.FullScreenDialog
-import com.mobiuz.app.dev.utils.extensions.customLog
+import com.mobiuz.app.dev.ui.settings.SettingsActivity
 import com.mobiuz.app.dev.utils.extensions.setupWithNavController
 import com.mobiuz.app.dev.utils.extensions.showCustomExitDialog
 import dagger.hilt.android.AndroidEntryPoint
@@ -47,7 +49,6 @@ class MainActivity : AppCompatActivity() {
         _bn = ActivityMainBinding.inflate(layoutInflater)
         setContentView(bn.root)
 
-//        window.statusBarColor = Color.RED
         FirebaseApp.initializeApp(this)
         mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)
 
@@ -64,24 +65,24 @@ class MainActivity : AppCompatActivity() {
         setUpUI()
         collects()
 
+        showPinCode()
+    }
+
+    private fun showPinCode() {
         intent?.let {
             val arg = it.getStringExtra(CONSTANTS.FIRST) ?: ""
             if (arg.isEmpty()) {
                 val dialog = FullScreenDialog()
                 dialog.setOnPinDoneListener {
-                    pref.setUserToken("")
-                    pref.isRegistered = false
-                    pref.pin_code = ""
+                    finishAffinity()
+                    pref.clearUserData()
                     val intent = Intent(this, AuthActivity::class.java)
                     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
                     startActivity(intent)
-                    finish()
                 }
                 dialog.show(supportFragmentManager, "tag")
             }
         }
-        customLog("token: ${pref.getUserToken()}")
-
     }
 
     private fun setUpUI() {
@@ -89,28 +90,67 @@ class MainActivity : AppCompatActivity() {
         bn.apply {
 
             header.txtUserPhone.text = pref.userPhone
-            btnExit.setOnClickListener {
-                showCustomExitDialog {
-                    pref.setUserToken("")
-                    pref.isRegistered = false
-                    pref.pin_code = ""
-                    val intent = Intent(this@MainActivity, AuthActivity::class.java)
+            txtLanguage.text = pref.language
+            btnExit.setOnClickListener(object : ButtonClick(){
+                override fun onSingleClick(v: View?) {
+                    showCustomExitDialog {
+                        pref.clearUserData()
+                        val intent = Intent(this@MainActivity, AuthActivity::class.java)
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
+                        startActivity(intent)
+                        finish()
+                        bn.drawerLayout.closeDrawer(GravityCompat.START)
+                    }
+                }
+            })
+
+            btnLanguage.setOnClickListener(object :ButtonClick(){
+                override fun onSingleClick(v: View?) {
+                    val intent = Intent(this@MainActivity, SettingsActivity::class.java)
                     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
                     startActivity(intent)
-                    finish()
                     bn.drawerLayout.closeDrawer(GravityCompat.START)
                 }
-            }
+            })
+
+            btnSupport.setOnClickListener(object : ButtonClick(){
+                override fun onSingleClick(v: View?) {
+                    val intent = Intent(this@MainActivity, SettingsActivity::class.java)
+                    intent.putExtra(CONSTANTS.TYPE_SETTINGS, CONSTANTS.SUPPORT)
+                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
+                    startActivity(intent)
+                    bn.drawerLayout.closeDrawer(GravityCompat.START)
+                }
+            })
+
+            btnSafety.setOnClickListener(object : ButtonClick(){
+                override fun onSingleClick(v: View?) {
+                    val intent = Intent(this@MainActivity, SettingsActivity::class.java)
+                    intent.putExtra(CONSTANTS.TYPE_SETTINGS, CONSTANTS.SAFETY)
+                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
+                    startActivity(intent)
+                    bn.drawerLayout.closeDrawer(GravityCompat.START)
+                }
+            })
 
-            btnLanguage.setOnClickListener {
-                bn.drawerLayout.closeDrawer(GravityCompat.START)
+            header.headerLayout.setOnClickListener(object : ButtonClick(){
+                override fun onSingleClick(v: View?) {
+                    val intent = Intent(this@MainActivity, SettingsActivity::class.java)
+                    intent.putExtra(CONSTANTS.TYPE_SETTINGS, CONSTANTS.PROFILE)
+                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
+                    startActivity(intent)
+                    bn.drawerLayout.closeDrawer(GravityCompat.START)
+                }
+            })
+            txtRedactData.setOnClickListener {
+//                bn.drawerLayout.closeDrawer(GravityCompat.START)
             }
 
-            btnSafety.setOnClickListener {
-                bn.drawerLayout.closeDrawer(GravityCompat.START)
+            txtPublicOferta.setOnClickListener {
+//                bn.drawerLayout.closeDrawer(GravityCompat.START)
             }
-            btnSupport.setOnClickListener {
-                bn.drawerLayout.closeDrawer(GravityCompat.START)
+            txtConfidensialnost.setOnClickListener {
+//                bn.drawerLayout.closeDrawer(GravityCompat.START)
             }
         }
     }
@@ -138,21 +178,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        lifecycleScope.launchWhenStarted {
-            viewModel.swipeDrawerUiState.collect {
-                when (it) {
-                    is UiStateObject.SUCCESS -> {
-                        if (it.data) {
-                            bn.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
-                        } else {
-                            bn.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-                        }
-                    }
-
-                    else -> Unit
-                }
-            }
-        }
     }
 
     private fun setupBottomNavigationBar() {

app/src/main/java/com/mobiuz/app/dev/MainViewModel.kt

@@ -19,13 +19,6 @@ class MainViewModel @Inject constructor(
     private val repository: MainRepository
 ) : ViewModel() {
 
-    private val _swipeDrawerUiState = MutableStateFlow<UiStateObject<Boolean>>(UiStateObject.EMPTY)
-    val swipeDrawerUiState: StateFlow<UiStateObject<Boolean>> = _swipeDrawerUiState
-
-    fun isSwipeDrawer(swipe: Boolean){
-        _swipeDrawerUiState.value = UiStateObject.SUCCESS(swipe)
-    }
-
     private val _userNameUiState = MutableStateFlow<UiStateObject<String>>(UiStateObject.EMPTY)
     val userNameUiState: StateFlow<UiStateObject<String>> = _userNameUiState
 

app/src/main/java/com/mobiuz/app/dev/MotionFragment.kt

-package com.mobiuz.app.dev
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProvider
-import com.mobiuz.app.R
-import com.mobiuz.app.dev.network.model.Customer
-import com.mobiuz.app.dev.ui.base.BaseFragment
-
-class MotionFragment : BaseFragment(R.layout.home_motion) {
-    private lateinit var mainViewModel: MainViewModel
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mainViewModel = ViewModelProvider(requireActivity())[MainViewModel::class.java]
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        mainViewModel.isSwipeDrawer(false)
-    }
-
-
-    override fun setUpUI() {
-
-    }
-
-    override fun collects() {
-
-    }
-}
\ No newline at end of file

app/src/main/java/com/mobiuz/app/dev/SplashActivity.kt

@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.mobiuz.app.databinding.ActivitySplashBinding
 import com.mobiuz.app.dev.model.SharedPref
+import com.mobiuz.app.dev.ui.auth.AuthActivity
 import com.mobiuz.app.dev.ui.global.CONSTANTS
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay

app/src/main/java/com/mobiuz/app/dev/AuthActivity.kt → app/src/main/java/com/mobiuz/app/dev/ui/auth/AuthActivity.kt

-package com.mobiuz.app.dev
+package com.mobiuz.app.dev.ui.auth
 
 import android.os.Bundle
 import android.view.View

app/src/main/java/com/mobiuz/app/dev/ui/auth/biometric/BiometricFragment.kt

@@ -60,7 +60,7 @@ class BiometricFragment : BaseFragment(R.layout.fragment_biometric) {
 
             btnSwitch.setOnCheckedChangeListener { _, isChecked ->
                 val message = if(isChecked) "Biometric enabled" else "Biometric disabled"
-                showSnackMessage(message)
+                showToastMessage(message)
                 pref.isUseFingerPrint = isChecked
             }
         }

app/src/main/java/com/mobiuz/app/dev/ui/auth/check/CheckPhoneFragment.kt

@@ -87,7 +87,7 @@ class CheckPhoneFragment : BaseFragment(R.layout.fragment_check_phone) {
                     }
                     is UiStateObject.ERROR -> {
                         showProgressDialog(false)
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {

app/src/main/java/com/mobiuz/app/dev/ui/auth/login/LoginFragment.kt

@@ -84,7 +84,7 @@ class LoginFragment : BaseFragment(R.layout.fragment_login) {
                 override fun onSingleClick(v: View?) {
                     val password = inputPassword.text.toString().trim()
                     when {
-                        password.length < 6 -> {
+                        password.length < 4 -> {
                             inputPassword.startAnimation(
                                 android.view.animation.AnimationUtils.loadAnimation(
                                     requireContext(),
@@ -118,7 +118,7 @@ class LoginFragment : BaseFragment(R.layout.fragment_login) {
                     }
                     is UiStateObject.ERROR -> {
                         showProgressDialog(false)
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                         bn.helperPassword.isVisible = false
                         bn.helperPhone.isVisible = false
                     }
@@ -148,7 +148,7 @@ class LoginFragment : BaseFragment(R.layout.fragment_login) {
                     }
                     is UiStateObject.ERROR -> {
                         showProgressDialog(false)
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {

app/src/main/java/com/mobiuz/app/dev/ui/auth/register/RegisterFragment.kt

@@ -164,7 +164,7 @@ class RegisterFragment : BaseFragment(R.layout.fragment_register) {
                     }
                     is UiStateObject.ERROR -> {
                         showProgressDialog(false)
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {
@@ -179,14 +179,14 @@ class RegisterFragment : BaseFragment(R.layout.fragment_register) {
                 when (it) {
                     is UiStateObject.SUCCESS -> {
                         showProgressDialog(false)
-                        showSnackMessage(getString(R.string.password_successfully_updated))
+                        showToastMessage(getString(R.string.password_successfully_updated))
                         navController.popBackStack(R.id.loginFragment,false)
                         navController.navigate(R.id.pinFragment, null, Utils.navOptions())
 
                     }
                     is UiStateObject.ERROR -> {
                         showProgressDialog(false)
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {

app/src/main/java/com/mobiuz/app/dev/ui/auth/verification/MyVerificationFragment.kt

@@ -164,6 +164,7 @@ class MyVerificationFragment : BaseFragment(R.layout.fragment_my_verification) {
                     this.addTextChangedListener(object : TextWatcherWrapper() {
                         override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                             super.onTextChanged(s, start, before, count)
+                            bn.txtErrorCode.isVisible = false
                             if (s.toString().isNotEmpty()) {
                                 if (i == pinView.childCount - 1) {
                                     pin6.hideKeyboard()
@@ -204,8 +205,9 @@ class MyVerificationFragment : BaseFragment(R.layout.fragment_my_verification) {
                     is UiStateObject.ERROR -> {
                         showProgressDialog(false)
                         setColorPins(getColorCompat(R.color.primary100))
+                        bn.txtErrorCode.isVisible = true
                         bn.pinView.startAnimation(AnimationUtils.loadAnimation(requireContext(), R.anim.shake))
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {
@@ -235,7 +237,7 @@ class MyVerificationFragment : BaseFragment(R.layout.fragment_my_verification) {
                         showProgressDialog(false)
                         setColorPins(getColorCompat(R.color.primary100))
                         bn.pinView.startAnimation(AnimationUtils.loadAnimation(requireContext(), R.anim.shake))
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
                     is UiStateObject.LOADING -> {
                         showProgressDialog(true)

app/src/main/java/com/mobiuz/app/dev/ui/auth/verification/VerificationFragment.kt

@@ -123,7 +123,7 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
                         showProgressDialog(false)
                         bn.lineField.setTextColor(Color.RED)
                         bn.lineField.startAnimation(AnimationUtils.loadAnimation(requireContext(), R.anim.shake))
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {
@@ -153,7 +153,7 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
                         showProgressDialog(false)
                         bn.lineField.setTextColor(Color.RED)
                         bn.lineField.startAnimation(AnimationUtils.loadAnimation(requireContext(), R.anim.shake))
-                        showSnackMessage(it.message)
+                        showToastMessage(it.message)
                     }
 
                     is UiStateObject.LOADING -> {

app/src/main/java/com/mobiuz/app/dev/ui/base/BaseFragment.kt

@@ -8,6 +8,7 @@ import android.text.style.ForegroundColorSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import com.mobiuz.app.dev.ui.global.ProgressDialog
@@ -36,16 +37,20 @@ abstract class BaseFragment(private val layoutId: Int) : Fragment() {
         }
     }
 
-    protected fun showSnackMessage(message:String){
-        val ssb = SpannableStringBuilder().apply {
-            append(message)
-            setSpan(
-                ForegroundColorSpan(Color.WHITE),
-                0,
-                message.length,
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-        }
-        view?.let { Snackbar.make(it, ssb, Snackbar.LENGTH_LONG).show() }
+//    protected fun showSnackMessage(message:String){
+//        val ssb = SpannableStringBuilder().apply {
+//            append(message)
+//            setSpan(
+//                ForegroundColorSpan(Color.WHITE),
+//                0,
+//                message.length,
+//                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+//            )
+//        }
+//        view?.let { Snackbar.make(it, ssb, Snackbar.LENGTH_LONG).show() }
+//    }
+
+    protected fun showToastMessage(message:String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show()
     }
 }
\ No newline at end of file

app/src/main/java/com/mobiuz/app/dev/ui/global/CONSTANTS.kt

@@ -9,6 +9,15 @@ object CONSTANTS {
     const val PHONE = "phone"
     const val PIN_CODE = "pin_code"
     const val TYPE_AUTH = "type_auth"
+    const val TYPE_SETTINGS = "type_settings"
+    const val TYPE_SERVICE = "type_service"
+    const val SUPPORT = "support"
+    const val PROFILE = "profile"
+    const val SAFETY = "safety"
+    const val TARIFFS = "tariffs"
+    const val PACKETS = "packets"
+    const val PASSWORD = "password"
+    const val MINUTES = "minutes"
     const val TYPE_VERIFICATION = "type_verification"
     const val TYPE_FORGET = "type_forget"
     const val FIRST = "first"

app/src/main/java/com/mobiuz/app/dev/ui/global/FullScreenDialog.kt

@@ -111,6 +111,7 @@ class FullScreenDialog : DialogFragment(R.layout.fragment_pin_dialog) {
                         }
                         else -> {
                             val text = it as TextView
+                            txtNotPin.isVisible = false
                             pinAdapter.addItem(text.text.toString().toInt())
                         }
                     }

app/src/main/java/com/mobiuz/app/dev/ui/home/HomeFragment.kt

 package com.mobiuz.app.dev.ui.home
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
-import android.view.ScrollCaptureCallback
 import android.view.View
-import android.view.ViewTreeObserver
-import androidx.core.view.GravityCompat
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.viewModels
@@ -16,14 +11,14 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.mobiuz.app.R
 import com.mobiuz.app.databinding.FragmentHomeBinding
-import com.mobiuz.app.dev.AuthActivity
 import com.mobiuz.app.dev.MainViewModel
 import com.mobiuz.app.dev.model.SharedPref
 import com.mobiuz.app.dev.network.model.Customer
 import com.mobiuz.app.dev.network.model.UiStateObject
 import com.mobiuz.app.dev.ui.base.BaseFragment
-import com.mobiuz.app.dev.ui.global.ButtonClick
-import com.mobiuz.app.dev.utils.extensions.*
+import com.mobiuz.app.dev.utils.extensions.customLog
+import com.mobiuz.app.dev.utils.extensions.getColorCompat
+import com.mobiuz.app.dev.utils.extensions.toMoneyFormat
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collect
 import javax.inject.Inject
@@ -45,12 +40,13 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         mainViewModel = ViewModelProvider(requireActivity())[MainViewModel::class.java]
-        viewModel.mainIndex()
+//        viewModel.mainIndex()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         _bn = FragmentHomeBinding.bind(view)
-        mainViewModel.isSwipeDrawer(true)
+        val window = requireActivity().window.decorView
+        window.systemUiVisibility = View.VISIBLE
         setUpUI()
         collects()
 
@@ -64,21 +60,20 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
             }
 
             nestedScrollView.setOnScrollChangeListener(
-                NestedScrollView.OnScrollChangeListener {
-                        v, scrollX, scrollY, oldScrollX, oldScrollY ->
+                NestedScrollView.OnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
 
-                if(scrollY > 120){
-                    toolbarInsideLayout.isVisible = true
-                    //                        requireActivity().window.statusBarColor = Color.RED
-                    //                        toolbar.setBackgroundColor(resources.getColor(R.color.primary100))
-                }
+                    if (scrollY > 120) {
+                        toolbarInsideLayout.isVisible = true
+                        topDiv.setBackgroundColor(getColorCompat(R.color.primary100))
+                        toolbar.setBackgroundColor(getColorCompat(R.color.primary100))
+                    }
 
-                if(scrollY < 100){
-                    toolbarInsideLayout.isVisible = false
-                    //                        requireActivity().window.statusBarColor = Color.TRANSPARENT
-                    //                        toolbar.setBackgroundColor(Color.TRANSPARENT)
-                }
-            })
+                    if (scrollY < 100) {
+                        toolbarInsideLayout.isVisible = false
+                        topDiv.setBackgroundColor(Color.TRANSPARENT)
+                        toolbar.setBackgroundColor(Color.TRANSPARENT)
+                    }
+                })
         }
     }
 

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

@@ -3,14 +3,14 @@
 
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/grey80"/>
+            <solid android:color="@color/grey70"/>
             <corners android:radius="6dp"/>
         </shape>
     </item>
 
     <item android:state_pressed="false">
         <shape>
-            <solid android:color="@color/grey20"/>
+            <solid android:color="@color/grey10"/>
             <corners android:radius="6dp"/>
         </shape>
     </item>

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

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="@color/primary110">
+    android:tint="@color/grey30">
   <path
-      android:fillColor="@android:color/holo_red_dark"
+      android:fillColor="@android:color/white"
       android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
 </vector>

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

@@ -13,6 +13,6 @@
         android:layout_height="match_parent"
         app:defaultNavHost="true"
         app:navGraph="@navigation/nav_graph_auth"
-        tools:context=".dev.AuthActivity"/>
+        tools:context=".dev.ui.auth.AuthActivity"/>
 
 </LinearLayout>

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

@@ -52,7 +52,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:background="@color/grey30"
+                android:background="@color/grey20"
                 android:layout_marginTop="@dimen/_14sdp"
                 android:layout_height="1dp"/>
 
@@ -70,7 +70,7 @@
                         android:orientation="horizontal"
                         android:paddingVertical="16dp"
                         android:paddingStart="30dp"
-                        android:paddingEnd="10dp"
+                        android:paddingEnd="13dp"
                         android:background="?android:selectableItemBackground"
                         android:id="@+id/btn_safety"
                         android:layout_marginTop="@dimen/_24sdp"
@@ -81,11 +81,18 @@
                             android:src="@drawable/ic_safety"
                             android:layout_height="wrap_content"/>
                         <TextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:text="@string/bezopasnost"
                             android:textStyle="bold"
                             android:textSize="16sp"
-                            android:layout_marginStart="10dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_height="wrap_content"/>
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_baseline_keyboard_arrow_right"
                             android:layout_height="wrap_content"/>
 
                     </LinearLayout>
@@ -95,7 +102,7 @@
                         android:paddingVertical="10dp"
                         android:id="@+id/btn_language"
                         android:paddingStart="30dp"
-                        android:paddingEnd="10dp"
+                        android:paddingEnd="13dp"
                         android:background="?android:selectableItemBackground"
                         android:layout_marginTop="@dimen/_10sdp"
                         android:layout_height="match_parent">
@@ -107,7 +114,8 @@
                             android:layout_height="wrap_content"/>
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:orientation="vertical"
                             android:layout_gravity="center"
                             android:layout_height="wrap_content">
@@ -116,18 +124,23 @@
                                 android:text="@string/language_app"
                                 android:textStyle="bold"
                                 android:textSize="16sp"
-                                android:layout_marginStart="10dp"
+                                android:layout_marginStart="16dp"
                                 android:layout_height="wrap_content"/>
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:text="Русский"
+                                android:id="@+id/txt_language"
                                 android:textSize="12sp"
                                 android:textColor="@color/grey80"
-                                android:layout_marginStart="10dp"
+                                android:layout_marginStart="16dp"
                                 android:layout_height="wrap_content"/>
                         </LinearLayout>
 
-
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_baseline_keyboard_arrow_right"
+                            android:layout_height="wrap_content"/>
                     </LinearLayout>
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -145,15 +158,68 @@
                             android:src="@drawable/ic_image_support"
                             android:layout_height="wrap_content"/>
                         <TextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:text="@string/support"
                             android:textStyle="bold"
                             android:textSize="16sp"
-                            android:layout_marginStart="10dp"
+                            android:layout_marginStart="16dp"
                             android:layout_height="wrap_content"/>
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center"
+                            android:src="@drawable/ic_baseline_keyboard_arrow_right"
+                            android:layout_height="wrap_content"/>
+
 
                     </LinearLayout>
 
+                    <View
+                        android:layout_width="match_parent"
+                        android:background="@color/grey20"
+                        android:layout_marginTop="@dimen/_14sdp"
+                        android:layout_height="1dp"/>
+
+                    <TextView
+                        android:id="@+id/txt_redact_data"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:background="?android:selectableItemBackground"
+                        android:layout_marginTop="30dp"
+                        android:layout_width="wrap_content"
+                        android:layout_marginStart="32dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/redact_data"
+                        android:textColor="@color/link"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/txt_public_oferta"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:layout_marginTop="12dp"
+                        android:layout_width="wrap_content"
+                        android:layout_marginStart="32dp"
+                        android:background="?android:selectableItemBackground"
+                        android:layout_height="wrap_content"
+                        android:text="@string/public_oferta"
+                        android:textColor="@color/link"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/txt_confidensialnost"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:layout_marginTop="12dp"
+                        android:layout_width="wrap_content"
+                        android:layout_marginStart="32dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="20dp"
+                        android:background="?android:selectableItemBackground"
+                        android:text="@string/txt_confidensialnost"
+                        android:textColor="@color/link"
+                        android:textSize="14sp" />
+
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
 

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

@@ -17,11 +17,16 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <View
+            android:layout_width="match_parent"
+            android:id="@+id/top_div"
+            android:background="@android:color/transparent"
+            android:layout_height="24dp"/>
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
             app:navigationIcon="@drawable/ic_menu">
 
             <LinearLayout

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

@@ -328,7 +328,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="end"
-                                tools:text="22 Декабря" />
+                                android:text="22 Декабря" />
                         </FrameLayout>
                     </LinearLayout>
                 </com.google.android.material.card.MaterialCardView>

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

@@ -35,7 +35,7 @@
         android:layout_marginStart="@dimen/_12sdp"
         android:layout_marginTop="24dp"
         android:text="@string/phone"
-        android:textSize="14sp"
+        android:textSize="15sp"
         android:textColor="@color/black75"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@id/layout_input_password"
@@ -88,7 +88,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:text="@string/password"
-        android:textSize="14sp"
+        android:textSize="16sp"
         android:textColor="@color/black75"
         app:layout_constraintStart_toStartOf="@id/layout_input_confirm"
         app:layout_constraintTop_toBottomOf="@id/layout_input_password" />

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

@@ -27,34 +27,35 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:gravity="center">
+        android:layout_weight="1">
 
         <TextView
             android:id="@+id/txt_not_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|center"
-            android:layout_marginTop="@dimen/_20sdp"
-            android:layout_marginBottom="@dimen/_20sdp"
+            android:layout_marginTop="@dimen/_10sdp"
+            android:layout_marginBottom="@dimen/_30sdp"
             android:text="@string/pin_not_same"
             android:textColor="@color/primary100"
-            android:textSize="@dimen/_10sdp"
+            android:textSize="16sp"
             android:textStyle="bold"
             android:visibility="gone" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/_100sdp"
             android:layout_gravity="center"
             android:orientation="vertical"
+            android:gravity="center"
             android:layout_height="wrap_content">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/card_pin"
                 android:layout_width="wrap_content"
+                android:layout_gravity="center"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="0dp"
-                android:minWidth="@dimen/_120sdp"
+                android:minWidth="@dimen/_100sdp"
                 android:minHeight="@dimen/_32sdp">
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -63,7 +64,6 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="18dp"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:itemCount="4"
                     tools:listitem="@layout/item_pin" />

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

@@ -5,10 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
-    android:fitsSystemWindows="true"
+    android:fitsSystemWindows="false"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/txt_enter_pin"
         android:layout_width="wrap_content"

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

@@ -21,7 +21,7 @@
         android:layout_marginStart="@dimen/_12sdp"
         android:layout_marginTop="@dimen/_14sdp"
         android:text="@string/register"
-        android:textSize="30sp"
+        android:textSize="29sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@id/txt_hint_password"
         app:layout_constraintStart_toStartOf="parent"
@@ -70,7 +70,7 @@
         android:layout_marginTop="6dp"
         android:text="@string/min_6"
         android:textColor="@color/grey110"
-        android:textSize="14sp"
+        android:textSize="13sp"
         android:visibility="visible"
         app:layout_constraintStart_toStartOf="@id/layout_input_confirm"
         app:layout_constraintTop_toBottomOf="@id/layout_input_password" />
@@ -82,7 +82,7 @@
         android:layout_marginTop="46dp"
         android:text="@string/confirm_parol"
         android:textColor="@color/black75"
-        android:textSize="16sp"
+        android:textSize="15sp"
         app:layout_constraintStart_toStartOf="@id/layout_input_confirm"
         app:layout_constraintTop_toBottomOf="@id/layout_input_password" />
 
@@ -112,9 +112,10 @@
         android:id="@+id/image_check"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/_6sdp"
+        android:paddingEnd="6dp"
         android:src="@drawable/ic_vector_error"
-        android:visibility="gone"
+        android:visibility="visible"
+        app:layout_constraintEnd_toStartOf="@id/txt_check_confirm"
         app:layout_constraintBottom_toBottomOf="@id/txt_check_confirm"
         app:layout_constraintStart_toStartOf="@id/layout_input_confirm"
         app:layout_constraintTop_toTopOf="@id/txt_check_confirm" />
@@ -127,7 +128,7 @@
         android:text="@string/must_same"
         android:textColor="@color/grey110"
         android:visibility="visible"
-        android:textSize="14sp"
+        android:textSize="13sp"
         app:layout_constraintStart_toEndOf="@id/image_check"
         app:layout_constraintTop_toBottomOf="@id/layout_input_confirm" />
 

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="false">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="fitXY"
-        android:src="@drawable/bgn_home" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:text="This page is empty"
-        android:layout_gravity="center"
-        android:layout_marginTop="@dimen/_100sdp"
-        android:textSize="@dimen/_16sdp"
-        android:layout_height="wrap_content"/>
-
-
-</LinearLayout>
\ No newline at end of file

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

@@ -8,10 +8,10 @@
     android:background="@drawable/banner"
     android:layout_height="@dimen/_140sdp">
 
-    <TextView
+    <ImageView
         android:layout_width="wrap_content"
         android:textColor="@color/primary100"
-        android:text="mobiuz"
+        android:src="@drawable/ic_mobiuz_logo_red"
         android:textStyle="bold"
         android:textSize="24sp"
         android:layout_height="wrap_content"/>
@@ -44,6 +44,7 @@
                 android:text="Узнать больше"
                 android:textStyle="bold"
                 android:textSize="12sp"
+                android:layout_gravity="center"
                 android:layout_height="wrap_content"/>
 
             <ImageView

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

@@ -8,7 +8,7 @@
     app:cardCornerRadius="12dp">
 
     <LinearLayout
-        android:layout_width="@dimen/_200sdp"
+        android:layout_width="@dimen/_230sdp"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 

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

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="32dp"
+    android:id="@+id/header_layout"
     android:paddingHorizontal="@dimen/_12sdp"
     android:layout_height="wrap_content">
 

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

@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:clickable="true"
-        android:minWidth="@dimen/_200sdp"
+        android:minWidth="@dimen/_230sdp"
         android:focusable="true"
         android:layout_height="wrap_content">
 

app/src/main/res/navigation/nav_graph_main.xml

-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_graph_main"
-    app:startDestination="@id/homeFragment">
-
-    <fragment
-        android:id="@+id/homeFragment"
-        android:name="com.mobiuz.app.dev.ui.home.HomeFragment"
-        android:label="fragment_home"
-        tools:layout="@layout/fragment_home" />
-
-</navigation>
\ No newline at end of file

app/src/main/res/navigation/nav_graph_red.xml

-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    app:startDestination="@id/blankFragment"
-    android:id="@+id/nav_graph_red">
-
-
-    <fragment
-        android:id="@+id/homeFragment"
-        android:name="com.mobiuz.app.dev.ui.home.HomeFragment"
-        android:label="fragment_home"
-        tools:layout="@layout/fragment_home" />
-    <fragment
-        android:id="@+id/blankFragment"
-        android:name="com.mobiuz.app.BlankFragment"
-        android:label="fragment_blank"
-        tools:layout="@layout/fragment_blank" />
-
-</navigation>
\ No newline at end of file

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

@@ -8,6 +8,8 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 
+    <color name="link">#007AFF</color>
+
     <color name="green100">#23B91B</color>
     <color name="white100">#FFFFFF</color>
 
@@ -21,6 +23,7 @@
     <color name="grey70">#C6BFBA</color>
     <color name="grey30">#E7E1DD</color>
     <color name="grey20">#F1F1F1</color>
+    <color name="grey10">#FBFBFB</color>
 
     <color name="primary100">#E62229</color>
     <color name="primary110">#D0151C</color>

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

@@ -87,5 +87,21 @@
     <string name="tx1">Согласие на обработку данных</string>
     <string name="tx2">Публичная оферта</string>
     <string name="tx3">Политика конфиденциальности</string>
+    <string name="error_code">Неверный код</string>
+    <string name="redact_data"><u>Согласие на обработку данных</u></string>
+    <string name="public_oferta"><u>Публичная оферта</u></string>
+    <string name="txt_confidensialnost"><u>Политика конфиденциальности</u></string>
+    <string name="safety">Безопасность</string>
+    <string name="profile">Профиль</string>
+    <string name="services">Услуги</string>
+    <string name="main_ussd_command">Основные ussd команды</string>
+    <string name="tariffs">Тарифы</string>
+    <string name="packets">Интернет-пакеты</string>
+    <string name="minutes_and_sms">Минуты и SMS</string>
+    <string name="enter_current_password">Введите текущий пароль</string>
+    <string name="enter_password">Введите пароль:</string>
+    <string name="enter_new_password">Введите новый пароль</string>
+    <string name="enter_confirm_new_password">Для подтверждения введите новый пароль ещё раз</string>
+    <string name="password_changed">Пароль изменен</string>
 
 </resources>
\ No newline at end of file

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

@@ -7,15 +7,11 @@
         <item name="colorOnPrimary">@color/white</item>
 
 
-        <!--        <item name="windowActionBar">false</item>-->
-        <!--        <item name="windowNoTitle">false</item>-->
         <item name="android:fitsSystemWindows">false</item>
         <item name="colorPrimaryDark">@android:color/transparent</item>
-        <!--        <item name="android:windowDrawsSystemBarBackgrounds">true</item>-->
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowTranslucentStatus">true</item>
 
-
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
@@ -24,9 +20,19 @@
         <item name="android:textSize">13sp</item>
         <item name="android:textColor">@color/black</item>
         <item name="buttonStyle">@style/ButtonPrimary</item>
+        <item name="bottomSheetDialogTheme">@style/AppModalBottomSheetStyle</item>
         <!-- Customize your theme here. -->
     </style>
 
+    <style name="AppModalBottomSheetStyle" parent="Theme.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/AppModalStyle</item>
+        <item name="buttonStyle">@style/ButtonPrimary</item>
+    </style>
+
+    <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/radius_top</item>
+    </style>
+
     <style name="ProgressDialogTheme" parent="ThemeOverlay.AppCompat.Dialog">
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
@@ -85,6 +91,25 @@
         <item name="android:maxLength">1</item>
     </style>
 
+    <style name="TitleTextStyle" parent="TextAppearance.AppCompat">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">29sp</item>
+        <item name="android:textColor">@color/black100</item>
+
+    </style>
+
+    <style name="ServicesTextStyle" parent="TextAppearance.AppCompat">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">17sp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/black100</item>
+
+    </style>
+
     <style name="CustomDialog" parent="Theme.MaterialComponents.DayNight.Dialog">
         <item name="android:windowAnimationStyle">@style/MaterialDialogAnimation</item>
         <item name="android:windowBackground">@android:color/transparent</item>