[UPD] MUS-376 Feature, updated localization texts

app/src/main/java/uz/mobiuz/mobiservice/dev/OfflineActivity.kt

@@ -78,12 +78,11 @@ class OfflineActivity : AppCompatActivity() {
             }
 
             pref.pinCode.isEmpty() -> {
-                startActivity(Intent(this, AuthActivity::class.java).putExtra(CONSTANTS.TYPE_AUTH, CONSTANTS.PIN_CODE))
+                startActivity(Intent(this, AuthActivity::class.java).putExtra(CONSTANTS.TYPE_AUTH, CONSTANTS.LOGIN))
             }
 
             else -> {
                 val intent = Intent(this, MainActivity::class.java)
-//                intent.putExtra(CONSTANTS.FIRST, CONSTANTS.FIRST)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
                 startActivity(intent)
             }

app/src/main/java/uz/mobiuz/mobiservice/dev/SplashActivity.kt

@@ -96,6 +96,7 @@ class SplashActivity : AppCompatActivity() {
 
     fun navigate() {
         when {
+
             pref.language.isEmpty() -> {
                 startActivity(Intent(this@SplashActivity, LanguageActivity::class.java))
             }

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/auth/AuthActivity.kt

@@ -90,7 +90,7 @@ class AuthActivity : AppCompatActivity() {
 
                 if (intent?.action == CONSTANTS.CONNECTIVITY_CHANGE){
                     type = NetworkUtil.getConnectivityStatus(this@AuthActivity)
-                    if((type == 0) && (navController.currentDestination?.id != R.id.pinFragment)
+                    if((type == 0) && (navController.currentDestination?.id != R.id.installPinFragment)
                         && (navController.currentDestination?.id != R.id.biometricFragment))
                         showOfflineBottomSheetDialog()
                 }

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/auth/pin/InstallPinFragment.kt

@@ -65,15 +65,18 @@ class InstallPinFragment : BaseFragment(R.layout.fragment_install_pin) {
         bn.apply {
             loadData()
             toolbar.setNavigationOnClickListener {
-                when {
-                    navController.popBackStack(R.id.registerFragment,false) -> {
+                if (type == CONSTANTS.NEW_PIN){
+                    when {
+                        navController.popBackStack(R.id.registerFragment,false) -> {
 
-                    }
-                    navController.popBackStack(R.id.loginFragment,false) -> {
+                        }
+                        navController.popBackStack(R.id.loginFragment,false) -> {
 
+                        }
+                        else -> navController.navigateUp()
                     }
-                    else -> navController.navigateUp()
-                }
+                }else navController.navigateUp()
+
             }
             rvPin.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
             rvPin.setHasFixedSize(true)

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

@@ -85,7 +85,7 @@ class RegisterFragment : BaseFragment(R.layout.fragment_register) {
             )
 
             txtAgree.makeLinks(
-                Pair(CONSTANTS.TERMS_OF_USE, View.OnClickListener {
+                Pair(getString(R.string.terms_of_use), View.OnClickListener {
 
                     val uri = Uri.parse(
                         when (pref.language) {
@@ -99,7 +99,7 @@ class RegisterFragment : BaseFragment(R.layout.fragment_register) {
                     startActivity(intent)
                 }),
 
-                Pair(CONSTANTS.PRIVACY_POLICY, View.OnClickListener {
+                Pair(getString(R.string.privacy_policy), View.OnClickListener {
                     val uri = Uri.parse(
                         when (pref.language) {
                             CONSTANTS.UZ -> CONSTANTS.PRIVACY_POLICY_UZ

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

@@ -15,13 +15,10 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.recyclerview.widget.RecyclerView
-import com.facebook.shimmer.ShimmerFrameLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
-import uz.agr.sdk.coreui.extension.fadeIn
 import uz.mobiuz.mobiservice.dev.MainViewModel
 import uz.mobiuz.mobiservice.dev.R
 import uz.mobiuz.mobiservice.dev.databinding.FragmentHomeBinding
@@ -74,7 +71,7 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
 
     override fun setUpUI() {
 
-        bn.apply {
+        with(bn) {
             slider.adapter = sliderAdapter
 
             sliderAdapter.setOnClickListener {
@@ -101,7 +98,7 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
             val number = pref.userPhone.customMasketHome().replace("-", " ")
             txtMyNumber.text = number
             toolbarMyNumber.text = number
-
+            txtBalance.text = getString(R.string._0_uzs,"0")
             toolbar.setNavigationOnClickListener {
                 mainViewModel.openDrawer(System.currentTimeMillis())
             }
@@ -127,11 +124,8 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
                     changedParam.width = homeImage.width - (overScroll - overScrolledDistance)
                     changedParam.height = homeImage.height - (overScroll - overScrolledDistance)
                     homeImage.layoutParams = matchParam
-//                    changeToParam()
                 }
                 overScroll = overScrolledDistance
-
-
             }
 
             bounceScrollView.setOnScrollListener { _, scrollY ->
@@ -149,8 +143,8 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
                 }
             }
         }
-    }
 
+    }
 
 
     override fun collects() {
@@ -158,36 +152,43 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
             viewModel.mainIndexUiState.collect {
                 when (it) {
                     is UiStateObject.SUCCESS -> {
-                        bn.shimmer.isVisible = false
-                        bn.shimmer.stopShimmer()
-                        bn.slider.isVisible = true
-                        bn.tabIndicator.isVisible = true
-                        bn.lottie.isVisible = false
-                        isProgressing = false
-                        customer = it.data
-                        loadData()
-                        showProgressDialog(false)
+                        with(bn) {
+                            shimmer.isVisible = false
+                            shimmer.stopShimmer()
+                            slider.isVisible = true
+                            tabIndicator.isVisible = true
+                            lottie.isVisible = false
+                            isProgressing = false
+                            customer = it.data
+                            loadData()
+                            showProgressDialog(false)
+                        }
+
                     }
                     is UiStateObject.ERROR -> {
+                        with(bn) {
+                            shimmer.isVisible = false
+                            shimmer.stopShimmer()
+                            slider.isVisible = false
+                            tabIndicator.isVisible = false
+                            isProgressing = false
+                            showProgressDialog(false)
+                            lottie.isVisible = false
+                        }
 
-                        bn.shimmer.isVisible = false
-                        bn.shimmer.stopShimmer()
-                        bn.slider.isVisible = false
-                        bn.tabIndicator.isVisible = false
-
-                        isProgressing = false
-                        showProgressDialog(false)
-                        bn.lottie.isVisible = false
                     }
                     is UiStateObject.LOADING -> {
-                        if (sliderAdapter.itemCount == 0){
-                            bn.shimmer.isVisible = true
-                            bn.shimmer.startShimmer()
-                            bn.slider.isVisible = false
-                            bn.tabIndicator.isVisible = false
+                        with(bn) {
+                            if (sliderAdapter.itemCount == 0) {
+                                shimmer.isVisible = true
+                                shimmer.startShimmer()
+                                slider.isVisible = false
+                                tabIndicator.isVisible = false
+                            }
+                            lottie.isVisible = true
+                            isProgressing = true
                         }
-                        bn.lottie.isVisible = true
-                        isProgressing = true
+
                     }
                     else -> Unit
                 }
@@ -223,15 +224,13 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
             customer?.customer?.info?.let {
                 bn.apply {
 
-                    txtBalance.text = "${it.balance?.amount?.toMoneyFormat()} ${it.balance?.currency}"
+                    txtBalance.text = getString(R.string._0_uzs,it.balance?.amount?.toMoneyFormat() ?: "0")
                     pref.userBirthday = customer?.customer?.date_of_birth ?: ""
                     it.counters?.let {
 
                         txtCountMb.text = it.BYTE?.value?.toMoneyFormat() ?: "0"
-                        txtTypeMb.text = it.BYTE?.unit ?: "mb"
-
                         txtCountMinut.text = it.SECOND?.value?.toMoneyFormat() ?: "0"
-                        txtTypeMinut.text = it.SECOND?.unit ?: "min"
+                        txtCountSms.text = it.ITEM?.value?.toMoneyFormat() ?: "0"
 
                         txtTarif.text = customer?.customer?.tariff?.name
                         val priceTariff = customer?.customer?.tariff?.total_price ?: 0
@@ -241,8 +240,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
 
                         txtTarifTo.text = customer?.customer?.tariff?.next_tariffication_date
 
-                        txtCountSms.text = it.ITEM?.value?.toMoneyFormat() ?: "0"
-                        txtTypeSms.text = it.ITEM?.unit ?: "sms"
                     }
                     mainViewModel.setUserName(customer?.customer?.name ?: "Unnamed User")
                 }

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/home/SliderAdapter.kt

@@ -32,7 +32,6 @@ class SliderAdapter : RecyclerView.Adapter<SliderAdapter.SliderViewHolder>() {
             val d = sliderItems[position]
             view.apply {
                 imageSlider.load(d.image) {
-                    placeholder(R.drawable.ic_placeholder)
                     error(R.drawable.ic_placeholder)
                 }
                 btnSeeMore.setOnClickListener(object : ButtonClick() {

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/settings/security/ChangePasswordFragment.kt

@@ -103,17 +103,17 @@ class ChangePasswordFragment : BaseFragment(R.layout.fragment_change_password) {
                             imageCheck.setImageResource(R.drawable.ic_baseline_check_circle)
                             txtCheckConfirm.text = getString(R.string.password_same)
                             txtCheckConfirm.setTextColor(getColorCompat(R.color.green100))
-                            btnLogin.isEnabled = true
+                            btnNext.isEnabled = true
                         } else {
                             imageCheck.setImageResource(R.drawable.ic_vector_error)
                             txtCheckConfirm.text = getString(R.string.password_not_same)
-                            btnLogin.isEnabled = false
+                            btnNext.isEnabled = false
                             txtCheckConfirm.setTextColor(getColorCompat(R.color.primary100))
                         }
                         imageCheck.isVisible = true
                         txtCheckConfirm.isVisible = true
                     } else {
-                        btnLogin.isEnabled = s.toString().length > 3
+                        btnNext.isEnabled = s.toString().length > 3
                         imageCheck.isVisible = false
                         txtCheckConfirm.isVisible = false
                     }
@@ -123,7 +123,7 @@ class ChangePasswordFragment : BaseFragment(R.layout.fragment_change_password) {
 
 
 
-            btnLogin.setOnClickListener(object : ButtonClick() {
+            btnNext.setOnClickListener(object : ButtonClick() {
                 override fun onSingleClick(v: View?) {
                     val password = inputPassword.text.toString().trim()
                     when {
@@ -136,7 +136,7 @@ class ChangePasswordFragment : BaseFragment(R.layout.fragment_change_password) {
                             )
                         }
                         else -> {
-                            bn.btnLogin.hideKeyboard()
+                            bn.btnNext.hideKeyboard()
                             if(checkInternet()){
                                 when (type) {
                                     CONSTANTS.CURRENT_PASSWORD -> {

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

@@ -139,14 +139,14 @@
 
 
     <Button
-        android:id="@+id/btn_login"
+        android:id="@+id/btn_next"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_marginHorizontal="@dimen/_12sdp"
         android:layout_marginTop="@dimen/_34sdp"
         android:enabled="false"
-        android:text="@string/enter"
+        android:text="@string/continuoue"
         android:textSize="@dimen/_12sdp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/layout_input_password" />

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

@@ -164,7 +164,7 @@
                                 android:id="@+id/txt_balance"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="0 UZS"
+                                android:text="@string/_0_uzs"
                                 android:textColor="@color/white"
                                 android:textSize="20sp"
                                 android:textStyle="bold" />
@@ -266,7 +266,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
-                                        android:text="mb"
+                                        android:text="@string/mb"
                                         android:textColor="@color/black80" />
                                 </LinearLayout>
 
@@ -302,7 +302,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
-                                        android:text="min"
+                                        android:text="@string/min"
                                         android:textColor="@color/black80" />
                                 </LinearLayout>
 
@@ -338,7 +338,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center"
-                                        android:text="SMS"
+                                        android:text="@string/sms"
                                         android:textColor="@color/black80" />
                                 </LinearLayout>
                             </LinearLayout>
@@ -420,7 +420,7 @@
                         <com.makeramen.roundedimageview.RoundedImageView
                             android:layout_width="match_parent"
                             app:riv_corner_radius="6dp"
-                            android:background="@color/grey100"
+                            android:background="@color/grey30"
                             android:layout_height="200dp"/>
                     </com.facebook.shimmer.ShimmerFrameLayout>
 

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

@@ -163,6 +163,7 @@
         android:layout_marginHorizontal="@dimen/_10sdp"
         android:layout_marginTop="29dp"
         android:textSize="13sp"
+        android:gravity="center"
         android:textColorLink="@color/primary100"
         android:text="@string/by_signing_up_you_re_agree_to_our_nterms_of_use_and_privacy_policy"
         android:textColor="@color/grey80"

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

@@ -77,9 +77,7 @@
     <string name="open">Available</string>
     <string name="yes_internet_connect">Internet connection is restored</string>
     <string name="not_internet_connect">No active connection</string>
-    <string name="btn_try_again">Try again</string>
     <string name="not_internet_try_again">Check Internet connection and try again</string>
-    <string name="cannot_change_pin">You can not change new PIN-code to current PIN-code</string>
     <string name="cannot_change_password">You can not change new password to current password</string>
     <string name="password_updated">Password is successfully updated</string>
     <string name="not_internet">No Internet connection</string>
@@ -139,6 +137,16 @@
     <string name="to_settings">To use the biometric data, you need to configure it from the settings section</string>
     <string name="rouming">Roaming</string>
     <string name="helper_mobiuz_login">To enter, you can use the password from the Internet assistant www.mobi.uz</string>
+    <string name="cannot_change_pin">You cannot change new pin to current pin</string>
+    <string name="btn_try_again">Try again</string>
+    <string name="by_signing_up_you_re_agree_to_our_nterms_of_use_and_privacy_policy">By signing up, you\'re agree to our \nTerms of Use and Privacy
+        Policy</string>
+    <string name="terms_of_use">Terms of Use</string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="_0_uzs">%1$s  UZS</string>
+    <string name="mb">МB</string>
+    <string name="sms">SMS</string>
+    <string name="min">Minutes</string>
 
 
 </resources>
\ No newline at end of file

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

@@ -120,7 +120,7 @@
     <string name="txt_license_agreement"><u>Лицензионное соглашение</u></string>
     <string name="public_oferta"><u>Политика конфиденциальности</u></string>
     <string name="open_with_password">Войти по паролю</string>
-    <string name="sum_month">%1$s Сум/мес</string>
+    <string name="sum_month">%1$s СУМ/мес</string>
     <string name="misic_all_with_you">Музыка всегда с тобой</string>
     <string name="my_mobi">Мой MOBI</string>
     <string name="vvesti_pin">Ввести PIN - код</string>
@@ -139,6 +139,14 @@
     <string name="to_settings">Чтобы использовать биометрические данные, вам необходимо настроить их в разделе настроек.</string>
     <string name="rouming">Роуминг</string>
     <string name="helper_mobiuz_login">Для входа вы можете использовать пароль от интернет-помощника www.mobi.uz</string>
+    <string name="by_signing_up_you_re_agree_to_our_nterms_of_use_and_privacy_policy">Регистрируясь, вы соглашаетесь с нашим \nЛицензионным соглашением и
+        Политикой конфиденциальности.</string>
+    <string name="terms_of_use">Лицензионным соглашением</string>
+    <string name="privacy_policy">Политикой конфиденциальности</string>
+    <string name="_0_uzs">%1$s СУМ</string>
+    <string name="mb">МБ</string>
+    <string name="min">Минуты</string>
+    <string name="sms">SMS</string>
 
 
 </resources>
\ No newline at end of file

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

@@ -44,7 +44,7 @@
     <string name="my_number">Mening raqamim</string>
     <string name="balance">Balans</string>
     <string name="oatatok_tarifu">Tarif bo\'yicha qoldiq</string>
-    <string name="next_spisanie">Keyingi hisobdan chiqarish:</string>
+    <string name="next_spisanie">Keyingi hisobdan yechish:</string>
     <string name="forget_password">Parolni unutdingizmi?</string>
     <string name="pin_not_same">Qiymatlar mos emas</string>
     <string name="remove">Olib tashlash</string>
@@ -120,7 +120,7 @@
     <string name="txt_license_agreement"><u>Litsenziya kelishuvi</u></string>
     <string name="public_oferta"><u>Maxfiylik siyosati</u></string>
     <string name="open_with_password">Parol bilan tizimga kirish</string>
-    <string name="sum_month">%1$s So\'m/oy</string>
+    <string name="sum_month">%1$s UZS/oy</string>
     <string name="misic_all_with_you">Musiqa har doim siz bilan</string>
     <string name="my_mobi">My MOBI</string>
     <string name="vvesti_pin">PIN-kodni kiriting</string>
@@ -139,5 +139,13 @@
     <string name="to_settings">Biometric ma\'lumotlardan foydalanish uchun sozlanmalar bo\'limidan sozlashingiz kerak</string>
     <string name="rouming">Rouming</string>
     <string name="helper_mobiuz_login">Kirish uchun www.mobi.uz internet yordamchisi parolidan foydalanishingiz mumkin</string>
+    <string name="by_signing_up_you_re_agree_to_our_nterms_of_use_and_privacy_policy">Roʻyxatdan oʻtish orqali siz \nFoydalanish shartlari va Maxfiylik
+        siyosatimizga \nrozilik bildirasiz</string>
+    <string name="terms_of_use">Foydalanish shartlari</string>
+    <string name="privacy_policy">Maxfiylik siyosatimizga</string>
+    <string name="_0_uzs">%1$s UZS</string>
+    <string name="min">Daqiqa</string>
+    <string name="mb">МB</string>
+    <string name="sms">SMS</string>
 
 </resources>
\ No newline at end of file

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

@@ -139,7 +139,7 @@
     <string name="to_offline">Перейти в офлайн режим</string>
     <string name="not_internet_connect">Отсутствует активное подключение</string>
     <string name="yes_internet_connect">Интернет соединение восстановлено</string>
-    <string name="by_signing_up_you_re_agree_to_our_nterms_of_use_and_privacy_policy" translatable="false">By signing up, you\'re agree to our \nTerms of Use and Privacy
+    <string name="by_signing_up_you_re_agree_to_our_nterms_of_use_and_privacy_policy">By signing up, you\'re agree to our \nTerms of Use and Privacy
         Policy</string>
     <string name="btn_try_again">Попробуй снова</string>
     <string name="cannot_change_pin">You cannot change new pin to current pin</string>
@@ -164,5 +164,11 @@
     <string name="to_settings">Biometric ma\'lumotlardan foydalanish uchun sozlanmalar bo\'limidan sozlashingiz kerak</string>
     <string name="rouming">Роуминг</string>
     <string name="helper_mobiuz_login">Для входа вы можете использовать пароль от интернет-помощника www.mobi.uz</string>
+    <string name="terms_of_use">Terms of Use</string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="_0_uzs">%1$s UZS</string>
+    <string name="mb">mb</string>
+    <string name="min">min</string>
+    <string name="sms">SMS</string>
 
 </resources>
\ No newline at end of file