Skip to content

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

[UPD] MUS-288 Feature, updated sdk and some changes

parent 05a3f748
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 91 deletions
app/src/main/java/uz/mobiuz/mobiservice/dev/MainActivity.kt
View file @ 2b2592ce
......@@ -65,6 +65,7 @@ class MainActivity : AppCompatActivity() {
setContentView(bn.root)
pref.isShowPin = true
if (savedInstanceState == null) {
setupBottomNavigationBar()
}
......
app/src/main/java/uz/mobiuz/mobiservice/dev/SplashActivity.kt
View file @ 2b2592ce
......@@ -110,7 +110,7 @@ class SplashActivity : AppCompatActivity() {
}
else -> {
startActivity(Intent(this@SplashActivity, MainActivity::class.java))
startActivity(Intent(this@SplashActivity, LanguageActivity::class.java))
}
}
finish()
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/global/PinFragment.kt
View file @ 2b2592ce
......@@ -11,6 +11,7 @@ import androidx.biometric.BiometricManager.Authenticators.*
import androidx.biometric.BiometricPrompt
import androidx.core.os.bundleOf
import androidx.core.view.isVisible
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
......@@ -43,7 +44,7 @@ class PinFragment : BaseFragment(R.layout.fragment_pin) {
private val bn get() = _bn ?: throw NullPointerException("cannot inflate")
private val data = ArrayList<PinData>()
private val pinAdapter = InstallPinAdapter()
private lateinit var mainViewModel: MainViewModel
private val mainViewModel: MainViewModel by activityViewModels()
private var type = ""
private var errorCount = 3
private lateinit var biometricManager: BiometricManager
......@@ -55,7 +56,6 @@ class PinFragment : BaseFragment(R.layout.fragment_pin) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
type = arguments?.getString(CONSTANTS.TYPE_PIN, "") ?: ""
mainViewModel = ViewModelProvider(requireActivity())[MainViewModel::class.java]
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/home/HomeFragment.kt
View file @ 2b2592ce
......@@ -9,6 +9,7 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import androidx.core.view.isVisible
import androidx.fragment.app.activityViewModels
import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
......@@ -39,7 +40,7 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
private var _bn: FragmentHomeBinding? = null
private val bn get() = _bn ?: throw NullPointerException("cannot inflate")
private val viewModel: HomeViewModel by viewModels()
private lateinit var mainViewModel: MainViewModel
private val mainViewModel: MainViewModel by activityViewModels()
private var isProgressing = false
private var jobAutoSlide: Job? = null
......@@ -53,7 +54,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mainViewModel = ViewModelProvider(requireActivity())[MainViewModel::class.java]
viewModel.mainIndex()
viewModel.mainRoaming()
matchParam = FrameLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/service/SendUssdFragment.kt
View file @ 2b2592ce
......@@ -20,14 +20,12 @@ class SendUssdFragment : BaseFragment(R.layout.fragment_send_ussd) {
@Inject
lateinit var pref: SharedPref
private lateinit var mainViewModel: MainViewModel
private var _bn: FragmentSendUssdBinding? = null
private val bn get() = _bn ?: throw NullPointerException("cannot inflate")
private val adapter = UssdAdapter()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mainViewModel = ViewModelProvider(requireActivity())[MainViewModel::class.java]
arguments?.let {
val arg = it.getString(CONSTANTS.SERVICE) ?: ""
if (arg.isNotEmpty()){
......
app/src/main/java/uz/mobiuz/mobiservice/dev/ui/service/ServicesFragment.kt
View file @ 2b2592ce
......@@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.View
import androidx.core.os.bundleOf
import androidx.core.view.isVisible
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
......@@ -24,7 +25,7 @@ class ServicesFragment : BaseFragment(R.layout.fragment_services) {
@Inject
lateinit var pref: SharedPref
private lateinit var mainViewModel: MainViewModel
private val mainViewModel: MainViewModel by activityViewModels()
private var _bn: FragmentServicesBinding? = null
private val bn get() = _bn ?: throw NullPointerException("cannot inflate")
private val adapter = ServicesAdapter()
......@@ -33,7 +34,6 @@ class ServicesFragment : BaseFragment(R.layout.fragment_services) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mainViewModel = ViewModelProvider(requireActivity())[MainViewModel::class.java]
arguments?.let {
type = it.getString(CONSTANTS.TYPE_SERVICE) ?: ""
......
app/src/main/res/drawable/ic_mobiuz_language.xml 0 → 100644
View file @ 2b2592ce
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="161dp"
android:height="32dp"
android:viewportWidth="161"
android:viewportHeight="32">
<path
android:pathData="M0,9.575H6.463L6.695,11.979C7.382,11.146 8.258,10.453 9.319,9.898C10.38,9.344 11.627,9.066 13.065,9.066C13.939,9.066 14.72,9.158 15.406,9.344C16.092,9.528 16.694,9.768 17.208,10.059C17.724,10.354 18.176,10.677 18.567,11.031C18.957,11.386 19.277,11.732 19.525,12.072C20.432,11.115 21.531,10.376 22.827,9.852C24.124,9.328 25.475,9.066 26.878,9.066C29.689,9.066 31.834,9.852 33.317,11.424C34.8,12.997 35.541,15.14 35.541,17.851V31.26H28.799V18.915C28.799,17.621 28.509,16.619 27.932,15.91C27.355,15.2 26.486,14.846 25.333,14.846C24.022,14.846 22.976,15.294 22.195,16.186C21.416,17.081 21.026,18.222 21.026,19.608V31.26H14.516V18.915C14.516,17.621 14.228,16.619 13.65,15.91C13.072,15.2 12.207,14.846 11.051,14.846C9.77,14.846 8.734,15.294 7.937,16.186C7.14,17.081 6.743,18.222 6.743,19.608V31.26H0V9.575Z"
android:fillColor="#E62229"/>
<path
android:pathData="M53.146,26.22C53.989,26.22 54.74,26.058 55.393,25.734C56.05,25.41 56.603,24.971 57.057,24.417C57.508,23.861 57.844,23.238 58.062,22.544C58.281,21.85 58.391,21.134 58.391,20.393C58.391,19.655 58.281,18.937 58.062,18.244C57.844,17.55 57.508,16.934 57.057,16.395C56.603,15.855 56.05,15.423 55.393,15.1C54.74,14.776 53.989,14.615 53.146,14.615C52.303,14.615 51.547,14.776 50.875,15.1C50.204,15.423 49.649,15.855 49.213,16.395C48.776,16.934 48.442,17.55 48.206,18.244C47.971,18.937 47.855,19.655 47.855,20.393C47.855,21.134 47.971,21.85 48.206,22.544C48.442,23.238 48.776,23.861 49.213,24.417C49.649,24.971 50.204,25.41 50.875,25.734C51.547,26.058 52.303,26.22 53.146,26.22ZM41.346,20.393C41.346,18.791 41.634,17.288 42.212,15.885C42.789,14.483 43.594,13.258 44.623,12.209C45.654,11.162 46.894,10.336 48.347,9.735C49.799,9.134 51.398,8.834 53.146,8.834C54.895,8.834 56.486,9.134 57.924,9.735C59.359,10.336 60.593,11.162 61.622,12.209C62.653,13.258 63.456,14.483 64.033,15.885C64.611,17.288 64.9,18.791 64.9,20.393C64.9,21.997 64.611,23.5 64.033,24.902C63.456,26.305 62.653,27.532 61.622,28.577C60.593,29.628 59.359,30.459 57.924,31.075C56.486,31.692 54.895,32 53.146,32C51.398,32 49.799,31.692 48.347,31.075C46.894,30.459 45.654,29.628 44.623,28.577C43.594,27.532 42.789,26.305 42.212,24.902C41.634,23.5 41.346,21.997 41.346,20.393Z"
android:fillColor="#E62229"/>
<path
android:pathData="M77.59,25.569C77.965,25.725 78.377,25.84 78.831,25.917C79.283,25.993 79.915,26.032 80.728,26.032C82.507,26.032 83.888,25.462 84.872,24.322C85.854,23.181 86.346,21.686 86.346,19.836C86.346,19.159 86.26,18.495 86.09,17.849C85.918,17.2 85.66,16.622 85.317,16.115C84.973,15.606 84.528,15.19 83.982,14.865C83.436,14.542 82.772,14.381 81.992,14.381C80.494,14.381 79.385,14.789 78.666,15.606C77.948,16.422 77.59,17.51 77.59,18.864V25.569ZM70.848,0H77.59V10.773C78.216,10.126 79.065,9.617 80.143,9.248C81.22,8.878 82.289,8.692 83.35,8.692C84.911,8.692 86.299,8.985 87.517,9.571C88.736,10.157 89.757,10.951 90.585,11.953C91.412,12.955 92.043,14.11 92.481,15.42C92.918,16.731 93.137,18.125 93.137,19.606C93.137,21.362 92.848,22.98 92.27,24.46C91.692,25.939 90.858,27.204 89.767,28.251C88.673,29.3 87.33,30.118 85.738,30.703C84.147,31.287 82.335,31.58 80.307,31.58C78.434,31.58 76.662,31.41 74.991,31.073C73.322,30.733 71.94,30.378 70.848,30.009V0Z"
android:fillColor="#E62229"/>
<path
android:pathData="M99.27,9.574H106.013V31.261H99.27V9.574Z"
android:fillColor="#E62229"/>
<path
android:pathData="M112.992,9.574H119.736V22.058C119.736,23.292 120.04,24.264 120.648,24.97C121.257,25.681 122.155,26.035 123.342,26.035C124.028,26.035 124.637,25.905 125.168,25.642C125.697,25.381 126.151,25.033 126.525,24.601C126.9,24.17 127.182,23.661 127.368,23.076C127.554,22.491 127.648,21.89 127.648,21.272V9.574H134.345V31.26H127.884L127.697,28.948C126.978,29.779 126.033,30.467 124.863,31.006C123.692,31.544 122.467,31.815 121.187,31.815C118.659,31.815 116.66,31.075 115.194,29.596C113.726,28.116 112.992,25.927 112.992,23.03V9.574Z"
android:fillColor="#E62229"/>
<path
android:pathData="M140.664,26.775L151.434,14.939H141.133V9.574H159.955V14.153L149.14,26.035H160.004V31.261H140.664V26.775Z"
android:fillColor="#E62229"/>
<path
android:pathData="M102.518,6.118L98.914,0H106.124L102.518,6.118Z"
android:fillColor="#E62229"/>
</vector>
app/src/main/res/layout/activity_language.xml
View file @ 2b2592ce
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white100"
tools:context=".dev.LanguageActivity">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/language_bgn"
android:orientation="vertical">
<uz.mobiuz.mobiservice.dev.ui.global.SquareImageView
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_20sdp"
android:scaleType="fitXY"
android:src="@drawable/bg_original" />
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/_70sdp"
android:src="@drawable/ic_mobiuz_language" />
<LinearLayout
android:layout_marginTop="@dimen/_20sdp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/_48sdp"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="@dimen/_12sdp"
android:layout_marginBottom="@dimen/_12sdp"
android:layout_gravity="center"
android:layout_marginBottom="29dp"
android:text="Tilni tanlang"
android:textColor="@color/black100"
android:textSize="20sp"
android:textStyle="bold" />
android:textSize="22sp" />
<LinearLayout
<com.google.android.material.card.MaterialCardView
android:id="@+id/uzbek_lang"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/_12sdp"
android:background="@drawable/bgn_lang"
android:gravity="center"
android:paddingVertical="@dimen/_12sdp">
android:layout_width="180dp"
app:cardElevation="16dp"
android:translationZ="10dp"
android:layout_gravity="center"
app:cardCornerRadius="6dp"
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/ic_uzbekistan" />
android:gravity="center"
android:paddingVertical="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:text="@string/uzbek"
android:textStyle="bold"
android:textColor="@color/black100"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_uzbekistan" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:text="@string/uzbek"
android:textColor="@color/black100"
android:textSize="16sp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/russian_lang"
android:layout_width="match_parent"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/_12sdp"
android:layout_marginVertical="@dimen/_12sdp"
android:background="@drawable/bgn_lang"
android:gravity="center"
android:paddingVertical="@dimen/_12sdp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_russia" />
android:layout_marginVertical="12dp"
android:layout_gravity="center"
app:cardElevation="16dp"
android:translationZ="10dp"
app:cardCornerRadius="6dp">
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:text="@string/russian"
android:textStyle="bold"
android:textColor="@color/black100"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:gravity="center"
android:paddingVertical="@dimen/_12sdp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_russia" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:text="@string/russian"
android:textColor="@color/black100"
android:textSize="16sp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/english_lang"
android:layout_width="match_parent"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/_12sdp"
android:background="@drawable/bgn_lang"
android:gravity="center"
android:paddingVertical="@dimen/_12sdp">
android:layout_gravity="center"
android:translationZ="10dp"
app:cardElevation="16dp"
android:layout_marginBottom="62dp"
app:cardCornerRadius="6dp">
<ImageView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/ic_united_kingdom" />
android:gravity="center"
android:paddingVertical="@dimen/_12sdp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_united_kingdom" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:text="@string/english"
android:textColor="@color/black100"
android:textSize="16sp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:text="@string/english"
android:textStyle="bold"
android:textColor="@color/black100"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/layout_home_header.xml
View file @ 2b2592ce
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:padding="32dp"
android:id="@+id/header_layout"
......@@ -10,7 +11,7 @@
<TextView
android:layout_width="84dp"
android:layout_height="84dp"
android:text="Ю"
tools:text="Ю"
android:layout_marginTop="24dp"
android:id="@+id/txt_avatar"
android:gravity="center"
......@@ -24,14 +25,14 @@
android:textStyle="bold"
android:textSize="20sp"
android:layout_marginTop="12dp"
android:text="Юлия Шевченко "
tools:text="Юлия Шевченко "
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:id="@+id/txt_user_phone"
android:textSize="14sp"
android:layout_marginTop="4dp"
android:text="+998 97 999-99-99"
tools:text="+998 97 999-99-99"
android:layout_height="wrap_content"/>
<TextView
......
app/src/main/res/values-en/strings.xml
View file @ 2b2592ce
......@@ -120,7 +120,6 @@
<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>
<string name="my_mobi">My MOBI</string>
<string name="vvesti_pin">Enter PIN - code</string>
<string name="pin_code_error3">Login not possible \nYou entered the wrong PIN 3 times</string>
<string name="for_enter_app">Use to enter the application</string>
......
app/src/main/res/values-ru/strings.xml
View file @ 2b2592ce
......@@ -122,7 +122,6 @@
<string name="open_with_password">Войти по паролю</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>
<string name="pin_code_error3">Вход невозможен \nВы ввели неправильный PIN 3 раза</string>
<string name="change_passoword">Сменить пароль</string>
......
app/src/main/res/values-uz/strings.xml
View file @ 2b2592ce
......@@ -122,7 +122,6 @@
<string name="open_with_password">Parol bilan tizimga kirish</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>
<string name="pin_code_error3">Kirish mumkin emas \nSiz PIN-kodni 3 marta noto‘g‘ri kiritdingiz</string>
<string name="for_enter_app">Ilovaga kirish uchun foydalaning</string>
......
app/src/main/res/values/strings.xml
View file @ 2b2592ce
......@@ -147,7 +147,7 @@
<string name="open_with_password">Войти по паролю</string>
<string name="sum_month">%1$s Сум/мес</string>
<string name="misic_all_with_you">Musiqa har doim sen bilan</string>
<string name="my_mobi">My MOBI</string>
<string name="my_mobi" translatable="false">MOBIUZ</string>
<string name="vvesti_pin">Ввести PIN - код</string>
<string name="change_passoword">Сменить пароль</string>
<string name="change_pin_code">Изменение PIN для входа в приложение</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