Commit 789ed938 authored by shohboz's avatar shohboz

[UPD] MUS-244 Feature, updated string and fixed some bugs

parent 7bff5007
...@@ -106,7 +106,6 @@ class MainActivity : AppCompatActivity() { ...@@ -106,7 +106,6 @@ class MainActivity : AppCompatActivity() {
intentFilter.addAction(CONSTANTS.CONNECTIVITY_CHANGE) intentFilter.addAction(CONSTANTS.CONNECTIVITY_CHANGE)
intentFilter.addAction(CONSTANTS.MY_CONNECTIVITY_CHANGE) intentFilter.addAction(CONSTANTS.MY_CONNECTIVITY_CHANGE)
registerReceiver(receiver, intentFilter) registerReceiver(receiver, intentFilter)
registerReceiver(receiver, intentFilter)
} }
......
...@@ -69,10 +69,6 @@ class OfflineActivity : AppCompatActivity() { ...@@ -69,10 +69,6 @@ class OfflineActivity : AppCompatActivity() {
receiver = object : BroadcastReceiver() { receiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) { override fun onReceive(context: Context?, intent: Intent?) {
if (intent?.action == CONSTANTS.USSD_ACTION_REFRESH) {
pref.blockedTime = System.currentTimeMillis()
customLog("USSD_ACTION_REFRESH")
}
if (intent?.action == CONSTANTS.CONNECTIVITY_CHANGE) { if (intent?.action == CONSTANTS.CONNECTIVITY_CHANGE) {
sendBroadcast(Intent(CONSTANTS.MY_CONNECTIVITY_CHANGE)) sendBroadcast(Intent(CONSTANTS.MY_CONNECTIVITY_CHANGE))
} }
...@@ -89,7 +85,6 @@ class OfflineActivity : AppCompatActivity() { ...@@ -89,7 +85,6 @@ class OfflineActivity : AppCompatActivity() {
intentFilter.addAction(CONSTANTS.CONNECTIVITY_CHANGE) intentFilter.addAction(CONSTANTS.CONNECTIVITY_CHANGE)
intentFilter.addAction(CONSTANTS.MY_CONNECTIVITY_CHANGE) intentFilter.addAction(CONSTANTS.MY_CONNECTIVITY_CHANGE)
intentFilter.addAction(CONSTANTS.USSD_ACTION_REFRESH)
registerReceiver(receiver, intentFilter) registerReceiver(receiver, intentFilter)
bn.btnTryAgain.setOnClickListener { bn.btnTryAgain.setOnClickListener {
......
...@@ -55,6 +55,7 @@ class BiometricFragment : BaseFragment(R.layout.fragment_biometric) { ...@@ -55,6 +55,7 @@ class BiometricFragment : BaseFragment(R.layout.fragment_biometric) {
btnNext.setOnClickListener(object : ButtonClick() { btnNext.setOnClickListener(object : ButtonClick() {
override fun onSingleClick(v: View?) { override fun onSingleClick(v: View?) {
pref.isUseFingerPrint = true
navigate() navigate()
} }
}) })
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
style="@style/BtnStyle" style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn" android:background="@drawable/bgn_pin_btn"
android:text="@string/_8" android:text="@string/_8"
android:layout_marginHorizontal="@dimen/_30sdp" android:layout_marginHorizontal="@dimen/_26sdp"
app:layout_constraintEnd_toStartOf="@id/btn_9" app:layout_constraintEnd_toStartOf="@id/btn_9"
app:layout_constraintStart_toEndOf="@id/btn_7" app:layout_constraintStart_toEndOf="@id/btn_7"
app:layout_constraintTop_toTopOf="@id/btn_7" /> app:layout_constraintTop_toTopOf="@id/btn_7" />
......
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
<string name="save_cards">Saved cards</string> <string name="save_cards">Saved cards</string>
<string name="history_pay">History paid</string> <string name="history_pay">History paid</string>
<string name="pay_balance">Update balance</string> <string name="pay_balance">Update balance</string>
<string name="powered_by">Powered by</string>
<string name="more_know">To learn more</string> <string name="more_know">To learn more</string>
<string name="check_internet_and_try_again">Check your internet connection and try again</string> <string name="check_internet_and_try_again">Check your internet connection and try again</string>
......
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
<string name="save_cards">Сохраненные\nкарты</string> <string name="save_cards">Сохраненные\nкарты</string>
<string name="history_pay">История пополнений</string> <string name="history_pay">История пополнений</string>
<string name="pay_balance">Пополнить баланс</string> <string name="pay_balance">Пополнить баланс</string>
<string name="powered_by">Питаться от</string>
<string name="more_know">Узнать больше</string> <string name="more_know">Узнать больше</string>
<string name="check_internet_and_try_again">Проверьте подключение к Интернету и попробуйте еще раз</string> <string name="check_internet_and_try_again">Проверьте подключение к Интернету и попробуйте еще раз</string>
......
...@@ -135,8 +135,7 @@ ...@@ -135,8 +135,7 @@
<string name="birthday">Tug\'ilgan kun</string> <string name="birthday">Tug\'ilgan kun</string>
<string name="save_cards">Saqlangan \nkartalar</string> <string name="save_cards">Saqlangan \nkartalar</string>
<string name="history_pay">To\'langanlar \ntarixi</string> <string name="history_pay">To\'langanlar \ntarixi</string>
<string name="pay_balance">Hisobni \nto\'ldirish</string> <string name="pay_balance">Hisobni to\'ldirish</string>
<string name="powered_by">Tomonidan qo\'llab-quvvatlanadi</string>
<string name="more_know">Ko\'proq bilish</string> <string name="more_know">Ko\'proq bilish</string>
<string name="check_internet_and_try_again">Internet ulanishini tekshirib qayta urinib ko\'ring</string> <string name="check_internet_and_try_again">Internet ulanishini tekshirib qayta urinib ko\'ring</string>
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<string name="save_cards">Сохраненные\nкарты</string> <string name="save_cards">Сохраненные\nкарты</string>
<string name="history_pay">История\nпополнений</string> <string name="history_pay">История\nпополнений</string>
<string name="pay_balance">Пополнить\nбаланс</string> <string name="pay_balance">Пополнить\nбаланс</string>
<string name="powered_by">Powered by</string> <string name="powered_by" translatable="false">Powered by</string>
<string name="more_know">Узнать больше</string> <string name="more_know">Узнать больше</string>
<string name="check_internet_and_try_again">Internet ulanishini tekshirib qayta urinib ko\'ring</string> <string name="check_internet_and_try_again">Internet ulanishini tekshirib qayta urinib ko\'ring</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