Skip to content

S
shunchaki
Commit 64867620 authored by shohboz's avatar shohboz
Browse files
Options

[UPD] MUS-373 Feature, updated texts

parent c9b38e0f
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 298 deletions
app/google-services.json
View file @ 64867620
......@@ -7,21 +7,13 @@
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:453497477762:android:57da19692a77341ae9b29b",
"mobilesdk_app_id": "1:453497477762:android:6174a87902bb0906e9b29b",
"android_client_info": {
"package_name": "uz.mobiuz.mobiservice"
"package_name": "uz.mobiuz.mobiservice.dev"
}
},
"oauth_client": [
{
"client_id": "453497477762-t0b1iqi4k3t8s49mm7eco951kpdr4eta.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "uz.mobiuz.mobiservice",
"certificate_hash": "0259d09452724d02cca3c034973f523c2485a232"
}
},
{
"client_id": "453497477762-1080ucujet6ca5dop6qc2f0k6vornqj6.apps.googleusercontent.com",
"client_type": 3
}
......@@ -37,43 +29,14 @@
{
"client_id": "453497477762-1080ucujet6ca5dop6qc2f0k6vornqj6.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:453497477762:android:4e22d841473f89a3e9b29b",
"android_client_info": {
"package_name": "uz.mobiuz.mobiservice.dev"
}
},
"oauth_client": [
{
"client_id": "453497477762-okn4u5uhp9mq1j85ckqds7bhieo4sbu6.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "uz.mobiuz.mobiservice.dev",
"certificate_hash": "0259d09452724d02cca3c034973f523c2485a232"
}
},
{
"client_id": "453497477762-1080ucujet6ca5dop6qc2f0k6vornqj6.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCpGAiOAd5TBCiDI_ZyVMZSkK-OH00LP5w"
"client_id": "453497477762-bqsq9cun4649jkqrq3viobphh81vtcld.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "uz.mobiuz.mobiservice",
"app_store_id": "1599071295"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "453497477762-1080ucujet6ca5dop6qc2f0k6vornqj6.apps.googleusercontent.com",
"client_type": 3
}
]
}
......
app/src/main/java/uz/mobiuz/mobiservice/dev/MainActivity.kt
View file @ 64867620
......@@ -161,7 +161,7 @@ class MainActivity : AppCompatActivity() {
navigateToSettingsScreen(R.id.profileFragment)
}
})
txtRedactData.setOnClickListener {
txtLicenseAgreement.setOnClickListener {
navigateUri(
when (pref.language) {
CONSTANTS.UZ -> CONSTANTS.LICENSE_UZ
......@@ -171,7 +171,7 @@ class MainActivity : AppCompatActivity() {
)
}
txtPublicOferta.setOnClickListener {
txtPrivacyPolicy.setOnClickListener {
navigateUri(
when (pref.language) {
CONSTANTS.UZ -> CONSTANTS.PRIVACY_POLICY_UZ
......@@ -200,6 +200,8 @@ class MainActivity : AppCompatActivity() {
override fun onResume() {
super.onResume()
customLog("main activity onResume")
if (!isFirstRunning) {
if (pref.isShowPin) {
showPinCode()
......@@ -308,6 +310,7 @@ class MainActivity : AppCompatActivity() {
return currentNavController?.value?.navigateUp() ?: false
}
override fun onDestroy() {
_bn = null
pref.blockedTime = 0
......
app/src/main/java/uz/mobiuz/mobiservice/dev/MainFragment.kt
View file @ 64867620
......@@ -156,7 +156,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
navigateToSettingsScreen(R.id.profileFragment)
}
})
txtRedactData.setOnClickListener {
txtLicenseAgreement.setOnClickListener {
navigateUri(
when (pref.language) {
CONSTANTS.UZ -> CONSTANTS.LICENSE_UZ
......@@ -166,7 +166,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
)
}
txtPublicOferta.setOnClickListener {
txtPrivacyPolicy.setOnClickListener {
navigateUri(
when (pref.language) {
CONSTANTS.UZ -> CONSTANTS.PRIVACY_POLICY_UZ
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/global/PinFragment.kt
View file @ 64867620
......@@ -79,7 +79,6 @@ class PinFragment : BaseFragment(R.layout.fragment_pin) {
when (biometricManager.canAuthenticate(BIOMETRIC_STRONG or BIOMETRIC_WEAK)) {
BiometricManager.BIOMETRIC_SUCCESS -> {
bn.btnFingerPrint.isVisible = true
customLog("BIOMETRIC_SUCCESS")
if (pref.isUseFingerPrint){
lifecycleScope.launchWhenCreated {
delay(300)
......@@ -88,7 +87,6 @@ class PinFragment : BaseFragment(R.layout.fragment_pin) {
}
}
else -> {
customLog("ERROR BiometricManager")
bn.btnFingerPrint.isVisible = false
}
}
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/home/HomeFragment.kt
View file @ 64867620
......@@ -45,7 +45,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
private lateinit var mainViewModel: MainViewModel
private var isProgressing = false
private var jobAutoSlide: Job? = null
private var jobToMatch: Job? = null
private var customer: Customer? = null
private var overScroll = 0
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/service/UssdBottomSheetDialog.kt
View file @ 64867620
......@@ -16,6 +16,7 @@ import uz.mobiuz.mobiservice.dev.ui.global.ButtonClick
import uz.mobiuz.mobiservice.dev.utils.extensions.checkPermission
import uz.mobiuz.mobiservice.dev.utils.extensions.getCurrentName
import dagger.hilt.android.AndroidEntryPoint
import uz.mobiuz.mobiservice.dev.utils.extensions.customLog
import javax.inject.Inject
@AndroidEntryPoint
......@@ -60,7 +61,7 @@ class UssdBottomSheetDialog(val data: UssdData) : BottomSheetDialogFragment() {
else ussd += it
}
val intent = Intent(Intent.ACTION_CALL, Uri.parse("tel:$ussd"))
startActivity(intent)
startActivityForResult(intent, 100)
} catch (e: Exception) {
pref.isShowPin = false
......@@ -72,6 +73,26 @@ class UssdBottomSheetDialog(val data: UssdData) : BottomSheetDialogFragment() {
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
customLog("onActivityResult requestCode:$requestCode")
}
override fun onStart() {
customLog("bottom sheet onStart")
super.onStart()
}
override fun onStop() {
customLog("bottom sheet onStop")
super.onStop()
}
override fun onResume() {
customLog("bottom sheet onResume")
super.onResume()
}
override fun onDestroy() {
super.onDestroy()
_bn = null
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/service/UssdFragment.kt
View file @ 64867620
......@@ -16,6 +16,7 @@ import uz.mobiuz.mobiservice.dev.ui.base.BaseFragment
import uz.mobiuz.mobiservice.dev.ui.global.CONSTANTS
import uz.mobiuz.mobiservice.dev.utils.extensions.getCurrentName
import dagger.hilt.android.AndroidEntryPoint
import uz.mobiuz.mobiservice.dev.utils.extensions.customLog
import javax.inject.Inject
@AndroidEntryPoint
......@@ -75,10 +76,22 @@ class UssdFragment : BaseFragment(R.layout.fragment_ussd) {
}
}
override fun collects() {
override fun onStart() {
customLog("ussd fragment onStart")
super.onStart()
}
override fun onStop() {
customLog("ussd fragment onStop")
super.onStop()
}
override fun onResume() {
customLog("ussd fragment onResume")
super.onResume()
}
override fun collects() {}
override fun onDestroy() {
_bn = null
......
app/src/main/res/layout-large/fragment_pin.xml deleted 100644 → 0
View file @ c9b38e0f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:fitsSystemWindows="false"
android:orientation="vertical">
<TextView
style="@style/TitleTextStyle"
android:id="@+id/txt_enter_pin"
android:layout_marginTop="@dimen/_44sdp"
android:text="@string/enter_pin_code" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:id="@+id/frame"
android:layout_weight="0.9">
<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:text="@string/pin_not_same"
android:textColor="@color/primary100"
android:textSize="@dimen/_10sdp"
android:textStyle="bold"
android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
android:layout_height="wrap_content">
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_pin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="0dp"
android:minWidth="@dimen/_110sdp"
android:minHeight="@dimen/_32sdp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_pin"
android:layout_width="match_parent"
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" />
</com.google.android.material.card.MaterialCardView>
<View
android:layout_width="@dimen/_110sdp"
android:background="@color/grey30"
android:layout_height="2dp"/>
</LinearLayout>
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/btn_view_group"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2.0"
>
<TextView
android:id="@+id/btn_1"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintEnd_toStartOf="@id/btn_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/btn_2"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_2"
android:layout_marginHorizontal="@dimen/_26sdp"
app:layout_constraintEnd_toStartOf="@id/btn_3"
app:layout_constraintStart_toEndOf="@id/btn_1"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/btn_3"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_2"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/btn_4"
style="@style/BtnStyle"
android:layout_marginTop="@dimen/_16sdp"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_4"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintEnd_toStartOf="@id/btn_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_1" />
<TextView
android:id="@+id/btn_5"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_5"
android:layout_marginHorizontal="@dimen/_26sdp"
app:layout_constraintEnd_toStartOf="@id/btn_6"
app:layout_constraintStart_toEndOf="@id/btn_4"
app:layout_constraintTop_toTopOf="@id/btn_4" />
<TextView
android:id="@+id/btn_6"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_6"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_5"
app:layout_constraintTop_toTopOf="@id/btn_4" />
<TextView
android:id="@+id/btn_7"
style="@style/BtnStyle"
android:layout_marginTop="@dimen/_16sdp"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_7"
app:layout_constraintEnd_toStartOf="@id/btn_8"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_4" />
<TextView
android:id="@+id/btn_8"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_8"
android:layout_marginHorizontal="@dimen/_26sdp"
app:layout_constraintEnd_toStartOf="@id/btn_9"
app:layout_constraintStart_toEndOf="@id/btn_7"
app:layout_constraintTop_toTopOf="@id/btn_7" />
<TextView
android:id="@+id/btn_9"
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_9"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_8"
app:layout_constraintTop_toTopOf="@id/btn_7" />
<ImageView
android:id="@+id/btn_finger_print"
android:layout_width="56dp"
android:layout_height="56dp"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/remove"
android:src="@drawable/ic_finger_print"
app:layout_constraintBottom_toBottomOf="@id/btn_0"
app:layout_constraintStart_toStartOf="@id/btn_7"
app:layout_constraintTop_toTopOf="@id/btn_0" />
<TextView
android:id="@+id/btn_0"
style="@style/BtnStyle"
android:layout_marginTop="@dimen/_16sdp"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_0"
app:layout_constraintStart_toStartOf="@id/btn_8"
app:layout_constraintTop_toBottomOf="@id/btn_8" />
<ImageView
android:id="@+id/btn_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/remove"
android:padding="@dimen/_12sdp"
android:src="@drawable/ic_vector_remove"
app:layout_constraintBottom_toBottomOf="@id/btn_0"
app:layout_constraintStart_toStartOf="@id/btn_9"
app:layout_constraintTop_toTopOf="@id/btn_0" />
<TextView
android:id="@+id/with_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/_20sdp"
android:background="?android:selectableItemBackground"
android:text="@string/open_with_password"
android:textColor="@color/primary100"
android:textSize="14sp"
android:textStyle="bold"
android:paddingHorizontal="@dimen/_20sdp"
android:paddingVertical="@dimen/_12sdp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_0" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ 64867620
......@@ -195,18 +195,18 @@
android:background="@color/grey20" />
<TextView
android:id="@+id/txt_redact_data"
android:id="@+id/txt_license_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="20dp"
android:background="?android:selectableItemBackground"
android:text="@string/oferta_finans"
android:text="@string/txt_license_agreement"
android:textColor="@color/link"
android:textSize="14sp" />
<TextView
android:id="@+id/txt_public_oferta"
android:id="@+id/txt_privacy_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
......
app/src/main/res/layout/fragment_main.xml
View file @ 64867620
......@@ -204,18 +204,18 @@
android:background="@color/grey20" />
<TextView
android:id="@+id/txt_redact_data"
android:id="@+id/txt_license_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="20dp"
android:background="?android:selectableItemBackground"
android:text="@string/oferta_finans"
android:text="@string/txt_license_agreement"
android:textColor="@color/link"
android:textSize="14sp" />
<TextView
android:id="@+id/txt_public_oferta"
android:id="@+id/txt_privacy_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
......
app/src/main/res/values-en/strings.xml
View file @ 64867620
......@@ -117,10 +117,8 @@
<string name="profile">Profile</string>
<string name="safety">Security</string>
<string name="error_code">Incorrect code</string>
<string name="redact_data"><u>Terms of Use</u></string>
<string name="public_oferta"><u>Public Offer</u></string>
<string name="txt_confidensialnost"><u>Privacy Policy</u></string>
<string name="oferta_finans"><u>Public offer</u></string>
<string name="txt_license_agreement"><u>License Agreement</u></string>
<string name="public_oferta"><u>Privacy Policy</u></string>
<string name="open_with_password">Enter with password</string>
<string name="sum_month">%1$s UZS/month</string>
<string name="misic_all_with_you">Music is always with you</string>
......
app/src/main/res/values-ru/strings.xml
View file @ 64867620
......@@ -117,10 +117,8 @@
<string name="profile">Профиль</string>
<string name="safety">Безопасность</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="oferta_finans"><u>Оферта на предоставление финансовых услуг</u></string>
<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="misic_all_with_you">Музыка всегда с тобой</string>
......
app/src/main/res/values-uz/strings.xml
View file @ 64867620
......@@ -117,10 +117,8 @@
<string name="profile">Profil</string>
<string name="safety">Xavfsizlik</string>
<string name="error_code">Noto\'g\'ri kod</string>
<string name="redact_data"><u>Ma\'lumotlarni qayta ishlashga rozilik</u></string>
<string name="public_oferta"><u>Shaxsiy ma\'lumotlarni qayta ishlash bo\'yicha oferta</u></string>
<string name="txt_confidensialnost"><u>Maxfiylik siyosati</u></string>
<string name="oferta_finans"><u>Moliyaviy xizmatlar ko\'rsatish bo\'yicha oferta</u></string>
<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="misic_all_with_you">Musiqa har doim siz bilan</string>
......
app/src/main/res/values/strings.xml
View file @ 64867620
......@@ -88,9 +88,8 @@
<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="txt_license_agreement"><u>Лицензионное соглашение</u></string>
<string name="public_oferta"><u>Политика конфиденциальности</u></string>
<string name="safety">Безопасность</string>
<string name="profile">Профиль</string>
<string name="services">Услуги</string>
......@@ -140,7 +139,6 @@
<string name="to_offline">Перейти в офлайн режим</string>
<string name="not_internet_connect">Отсутствует активное подключение</string>
<string name="yes_internet_connect">Интернет соединение восстановлено</string>
<string name="oferta_finans"><u>Оферта на предоставление финансовых услуг</u></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
Policy</string>
<string name="btn_try_again">Попробуй снова</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