Commit c848c636 authored by shohboz's avatar shohboz

[UPD] MUS-155 Feature, updated clickabel text and offline

parent 5101f34d
......@@ -94,9 +94,9 @@ class MainActivity : AppCompatActivity() {
}
if (intent?.action == CONSTANTS.MY_CONNECTIVITY_CHANGE){
type = NetworkUtil.getConnectivityStatus(this@MainActivity)
bn.btnTryAgain.isVisible = (type == 0) && (currentNavController?.value?.currentDestination?.id != R.id.pinFragment)
if (type == 0) {
showMessage(getString(R.string.not_internet_connect))
// bn.btnTryAgain.isVisible =
if ((type == 0) && (currentNavController?.value?.currentDestination?.id != R.id.pinFragment)) {
showOfflineBottomSheetDialog()
}
}
}
......
......@@ -63,7 +63,7 @@ class LoginFragment : BaseFragment(R.layout.fragment_login) {
bn.viewGroup.hideKeyboard()
}
})
txtHelperMobiuz.makeLinks(Pair("www.mobi.uz", View.OnClickListener {
txtHelperMobiuz.makeLinks(Pair(CONSTANTS.HTTP_MOBI_UZ, View.OnClickListener {
val uri = Uri.parse(CONSTANTS.HTTP_MOBI_UZ)
val intent = Intent(Intent.ACTION_VIEW)
intent.data = uri
......
......@@ -11,7 +11,7 @@ object CONSTANTS {
// safety data
const val HELP_BOT = "@MobiuzHelpBot"
const val HTTP_MOBI_UZ = "https://mobi.uz/"
const val HTTP_MOBI_UZ = "https://mobi.uz"
const val FEEDBACK = "https://company.mobi.uz/ru/feedback/"
const val LICENSE_UZ = "http://10.160.45.60/uploads/licenses/license_uz.html"
......
......@@ -26,6 +26,7 @@ import com.mobiuz.app.dev.ui.base.BaseFragment
import com.mobiuz.app.dev.utils.extensions.*
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collect
import javax.inject.Inject
......@@ -157,11 +158,11 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
viewModel.mainIndexUiState.collect {
when (it) {
is UiStateObject.SUCCESS -> {
showProgressDialog(false)
bn.lottie.isVisible = false
isFirstProgressing = false
customer = it.data
loadData()
showProgressDialog(false)
}
is UiStateObject.ERROR -> {
isFirstProgressing = false
......@@ -206,6 +207,8 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
try {
customer?.customer?.info?.let {
bn.apply {
// loadSum(it.balance?.amount?.toDouble(),it.balance?.currency)
txtBalance.text = "${it.balance?.amount?.toMoneyFormat()} ${it.balance?.currency}"
pref.userBirthday = customer?.customer?.date_of_birth ?: ""
it.counters?.let {
......@@ -218,7 +221,11 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
txtTypeMinut.text = it.SECOND?.unit ?: "min"
txtTarif.text = customer?.customer?.tariff?.name
txtSumTariff.text = getString(R.string.sum_month, customer?.customer?.tariff?.total_price?.toMoneyFormat() ?: "0")
val total_price = customer?.customer?.tariff?.total_price ?: 0
if(total_price > 0){
txtSumTariff.text = getString(R.string.sum_month, total_price.toMoneyFormat())
}
txtTarifTo.text = customer?.customer?.tariff?.next_tariffication_date
txtCountSms.text = it.ITEM?.value?.toMoneyFormat() ?: "0"
......@@ -232,6 +239,18 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
}
}
private fun loadSum(amount:Double?, currency:String?){
lifecycleScope.launchWhenCreated {
var i = 0.0
while (i < amount ?: 0.0){
delay(50)
i += 10000
bn.txtBalance.text = "${i.toMoneyFormat()} $currency"
}
}
}
override fun onResume() {
super.onResume()
mainViewModel.bottomSheet(true)
......
......@@ -240,7 +240,7 @@
android:orientation="horizontal"
android:paddingVertical="16dp"
android:paddingStart="30dp"
android:paddingEnd="10dp">
android:paddingEnd="16dp">
<ImageView
android:layout_width="wrap_content"
......
......@@ -37,7 +37,7 @@
<TextView
android:layout_width="wrap_content"
android:id="@+id/txt_profile"
android:text="Профиль"
android:text="@string/profile"
android:layout_marginTop="8dp"
android:textSize="14sp"
android:textColor="@color/primary100"
......
......@@ -43,7 +43,7 @@
android:layout_gravity="center"
android:gravity="center"
android:textStyle="bold"
android:background="?android:selectableItemBackground"
android:background="@drawable/edit_text_bgn"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="@dimen/_16sdp"
android:paddingVertical="12dp"
......
......@@ -57,7 +57,7 @@
<string name="yes">Yes</string>
<string name="successfully">Successfully</string>
<string name="ok">Ok</string>
<string name="helper_mobiuz">To enter, you can use the password from the Internet assistant www.mobi.uz</string>
<string name="helper_mobiuz">The set password will also be applicable in the Internet assistant https://mobi.uz</string>
<string name="error_data">Error</string>
<string name="password_successfully_updated">Password successfully updated</string>
<string name="enter_from_finger_or_face">Fingerprint or Face ID login</string>
......
......@@ -57,7 +57,7 @@
<string name="yes">Да</string>
<string name="successfully">Успешно</string>
<string name="ok">Ok</string>
<string name="helper_mobiuz">Для входа вы можете использовать пароль от интернет-помощника www.mobi.uz</string>
<string name="helper_mobiuz">Установленный пароль так же будет применим в интернет-помощнике https://mobi.uz</string>
<string name="error_data">Ошибка</string>
<string name="password_successfully_updated">Пароль успешно обновлен</string>
<string name="enter_from_finger_or_face">Вход в приложение по отпечатку пальца или лицу</string>
......
......@@ -57,7 +57,7 @@
<string name="yes">Ha</string>
<string name="successfully">Muvaffaqiyatli bajarildi</string>
<string name="ok">Ok</string>
<string name="helper_mobiuz">Kirish uchun www.mobi.uz internet yordamchisi parolidan foydalanishingiz mumkin</string>
<string name="helper_mobiuz">Belgilangan parol https://mobi.uz Internet-assistentida ham amal qiladi</string>
<string name="error_data">Xato</string>
<string name="password_successfully_updated">Parol muvaffaqiyatli yangilandi</string>
<string name="enter_from_finger_or_face">Barmoq izi yoki Face ID orqali ilovaga kirish</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment