Skip to content

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

[UPD] MUS-269 Feature, updated pin screen large layout add

parent 5affa44d
Hide whitespace changes
Inline Side-by-side
Showing with 449 additions and 503 deletions
.idea/deploymentTargetDropDown.xml 0 → 100644
View file @ 82d68906
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="7d42ee97d740" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2021-12-21T15:02:32.661360Z" />
</component>
</project>
\ No newline at end of file
.idea/misc.xml
View file @ 82d68906
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<entry key="app/src/main/res/layout/item_pin.xml" value="0.23497267759562843" /> <entry key="app/src/main/res/layout/item_pin.xml" value="0.23497267759562843" />
<entry key="app/src/main/res/layout/item_service.xml" value="0.25625" /> <entry key="app/src/main/res/layout/item_service.xml" value="0.25625" />
<entry key="app/src/main/res/layout/item_ussd.xml" value="0.22" /> <entry key="app/src/main/res/layout/item_ussd.xml" value="0.22" />
<entry key="app/src/main/res/layout/large.xml" value="0.25625" />
<entry key="app/src/main/res/layout/layout_ask_create_task.xml" value="0.22643442622950818" /> <entry key="app/src/main/res/layout/layout_ask_create_task.xml" value="0.22643442622950818" />
<entry key="app/src/main/res/layout/layout_exit.xml" value="0.25625" /> <entry key="app/src/main/res/layout/layout_exit.xml" value="0.25625" />
<entry key="app/src/main/res/layout/layout_home_header.xml" value="0.25625" /> <entry key="app/src/main/res/layout/layout_home_header.xml" value="0.25625" />
......
app/src/main/AndroidManifest.xml
View file @ 82d68906
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".dev.LanguageActivity" android:name=".dev.LanguageActivity"
android:configChanges="orientation" android:configChanges="orientation"
......
app/src/main/java/com/mobiuz/app/dev/ui/global/CONSTANTS.kt
View file @ 82d68906
...@@ -22,7 +22,7 @@ object CONSTANTS { ...@@ -22,7 +22,7 @@ object CONSTANTS {
const val PHONE3 = "+998 97 203 10 10" const val PHONE3 = "+998 97 203 10 10"
const val DEFAULT_PHONE = "+998 97 999-99-99" const val DEFAULT_PHONE = "+998 97 999-99-99"
const val RESEND_CODE_TIME = 60000L const val RESEND_CODE_TIME = 60000L
const val BLOCKED_TIME = 600 const val BLOCKED_TIME = 6000
const val PHONE = "phone" const val PHONE = "phone"
......
app/src/main/java/com/mobiuz/app/dev/ui/global/FullScreenFragment.kt
View file @ 82d68906
...@@ -28,6 +28,10 @@ import com.mobiuz.app.dev.utils.extensions.vibrate ...@@ -28,6 +28,10 @@ import com.mobiuz.app.dev.utils.extensions.vibrate
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import javax.inject.Inject import javax.inject.Inject
import android.widget.LinearLayout
@AndroidEntryPoint @AndroidEntryPoint
class FullScreenFragment : BaseFragment(R.layout.fragment_pin_dialog) { class FullScreenFragment : BaseFragment(R.layout.fragment_pin_dialog) {
...@@ -88,6 +92,18 @@ class FullScreenFragment : BaseFragment(R.layout.fragment_pin_dialog) { ...@@ -88,6 +92,18 @@ class FullScreenFragment : BaseFragment(R.layout.fragment_pin_dialog) {
override fun setUpUI() { override fun setUpUI() {
bn.apply { bn.apply {
loadData() loadData()
val param1 = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT
)
val param2 = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT
)
param2.weight = 3f
// frame.layoutParams = param1
// btnViewGroup.layoutParams = param2
rvPin.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) rvPin.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
rvPin.adapter = pinAdapter rvPin.adapter = pinAdapter
......
app/src/main/java/com/mobiuz/app/dev/ui/home/HomeFragment.kt
View file @ 82d68906
...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint ...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.os.Handler
import android.view.View import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout
import android.widget.LinearLayout import android.widget.LinearLayout
...@@ -11,6 +12,7 @@ import androidx.core.view.isVisible ...@@ -11,6 +12,7 @@ import androidx.core.view.isVisible
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.NavController import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.NavHostFragment
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
...@@ -96,8 +98,9 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -96,8 +98,9 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
startActivity(Intent(requireContext(), BillingActivity::class.java)) startActivity(Intent(requireContext(), BillingActivity::class.java))
} }
txtMyNumber.text = pref.userPhone.customMasketHome().replace("-", " ") val number = pref.userPhone.customMasketHome().replace("-", " ")
toolbarMyNumber.text = pref.userPhone.customMasketHome().replace("-", " ") txtMyNumber.text = number
toolbarMyNumber.text = number
toolbar.setNavigationOnClickListener { toolbar.setNavigationOnClickListener {
mainViewModel.openDrawer(System.currentTimeMillis()) mainViewModel.openDrawer(System.currentTimeMillis())
...@@ -107,9 +110,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -107,9 +110,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
val params = FrameLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT) val params = FrameLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
bounceScrollView.setOnOverScrollListener { fromStart, overScrolledDistance -> bounceScrollView.setOnOverScrollListener { fromStart, overScrolledDistance ->
// customLog("fromStart:$fromStart, overScrolledDistance:$overScrolledDistance")
if (fromStart && overScrolledDistance > 140.52632 && (lastUpdateTime < System.currentTimeMillis() - 3000)) { if (fromStart && overScrolledDistance > 140.52632 && (lastUpdateTime < System.currentTimeMillis() - 3000)) {
vibrate(requireContext()) vibrate(requireContext())
viewModel.mainIndex() viewModel.mainIndex()
......
app/src/main/java/com/mobiuz/app/dev/ui/service/ServiceFragment.kt
View file @ 82d68906
...@@ -30,7 +30,7 @@ class ServiceFragment : BaseFragment(R.layout.fragment_service) { ...@@ -30,7 +30,7 @@ class ServiceFragment : BaseFragment(R.layout.fragment_service) {
private val bn get() = _bn ?: throw NullPointerException("cannot inflate") private val bn get() = _bn ?: throw NullPointerException("cannot inflate")
private lateinit var adapter: ServiceAdapter private lateinit var adapter: ServiceAdapter
private val navController: NavController by lazy(LazyThreadSafetyMode.NONE) { NavHostFragment.findNavController(this) } private val navController: NavController by lazy(LazyThreadSafetyMode.NONE) { NavHostFragment.findNavController(this) }
var type = "" private var type = ""
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
......
app/src/main/java/com/mobiuz/app/dev/ui/settings/safety/ChangePasswordFragment.kt
View file @ 82d68906
...@@ -209,7 +209,7 @@ class ChangePasswordFragment : BaseFragment(R.layout.fragment_change_password) { ...@@ -209,7 +209,7 @@ class ChangePasswordFragment : BaseFragment(R.layout.fragment_change_password) {
if(it.message == "Invalid password"){ if(it.message == "Invalid password"){
count-- count--
if(count == 0){ if(count == 0){
showCustomDialog(getString(R.string.impossible_change_password), false){ showCustomDialog(getString(R.string.popitok_error_password), false){
pref.clearUserData() pref.clearUserData()
val intent = Intent(requireContext(), AuthActivity::class.java) val intent = Intent(requireContext(), AuthActivity::class.java)
intent.putExtra(CONSTANTS.TYPE_AUTH, CONSTANTS.LOGIN) intent.putExtra(CONSTANTS.TYPE_AUTH, CONSTANTS.LOGIN)
......
app/src/main/java/com/mobiuz/app/dev/utils/extensions/StringExtension.kt
View file @ 82d68906
...@@ -102,10 +102,8 @@ fun Throwable.userMessage(context: Context) = when (this) { ...@@ -102,10 +102,8 @@ fun Throwable.userMessage(context: Context) = when (this) {
408 -> context.getString(R.string.ex408) 408 -> context.getString(R.string.ex408)
409 -> context.getString(R.string.ex409) 409 -> context.getString(R.string.ex409)
413 -> context.getString(R.string.ex413) 413 -> context.getString(R.string.ex413)
422 -> context.getString(R.string.ex422)
429 -> context.getString(R.string.ex429) 429 -> context.getString(R.string.ex429)
500 -> context.getString(R.string.ex500) 500 -> context.getString(R.string.ex500)
502 -> context.getString(R.string.ex502)
else -> context.getString(R.string.exelse) else -> context.getString(R.string.exelse)
} }
is IOException -> context.getString(R.string.ioexception) is IOException -> context.getString(R.string.ioexception)
......
app/src/main/res/layout-large/fragment_pin_dialog.xml 0 → 100644
View file @ 82d68906
<?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/fragment_home.xml
View file @ 82d68906
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/_10sdp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="@dimen/_12sdp" android:layout_marginTop="@dimen/_12sdp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:cardElevation="4dp"> app:cardElevation="4dp">
...@@ -362,9 +362,9 @@ ...@@ -362,9 +362,9 @@
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/slider" android:id="@+id/slider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginHorizontal="12dp" android:layout_marginStart="16dp"
android:layout_marginTop="@dimen/_16sdp" android:layout_marginTop="@dimen/_16sdp"
android:layout_height="@dimen/_150sdp" /> android:layout_height="180dp" />
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tabIndicator" android:id="@+id/tabIndicator"
...@@ -373,7 +373,8 @@ ...@@ -373,7 +373,8 @@
android:layout_height="24dp" android:layout_height="24dp"
app:tabPaddingStart="8dp" app:tabPaddingStart="8dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginHorizontal="12dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="@dimen/_20sdp" android:layout_marginBottom="@dimen/_20sdp"
app:tabPaddingEnd="8dp" app:tabPaddingEnd="8dp"
app:tabIndicatorHeight="0dp" app:tabIndicatorHeight="0dp"
......
app/src/main/res/layout/fragment_pin.xml
View file @ 82d68906
...@@ -12,20 +12,18 @@ ...@@ -12,20 +12,18 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:navigationIcon="@drawable/ic_baseline_arrow_back" /> app:navigationIcon="@drawable/ic_baseline_arrow_back" />
<TextView <TextView
android:id="@+id/txt_enter_pin" android:id="@+id/txt_enter_pin"
style="@style/TitleTextStyle" style="@style/TitleTextStyle"
android:layout_marginTop="@dimen/_14sdp"
android:text="@string/install_pin" /> android:text="@string/install_pin" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="0.8"> android:layout_weight="1">
<TextView <TextView
android:id="@+id/txt_not_pin" android:id="@+id/txt_not_pin"
...@@ -84,6 +82,7 @@ ...@@ -84,6 +82,7 @@
<TextView <TextView
android:id="@+id/btn_1" android:id="@+id/btn_1"
style="@style/BtnStyle" style="@style/BtnStyle"
app:layout_constraintHorizontal_chainStyle="packed"
android:background="@drawable/bgn_pin_btn" android:background="@drawable/bgn_pin_btn"
android:text="@string/_1" android:text="@string/_1"
app:layout_constraintEnd_toStartOf="@id/btn_2" app:layout_constraintEnd_toStartOf="@id/btn_2"
...@@ -93,9 +92,11 @@ ...@@ -93,9 +92,11 @@
<TextView <TextView
android:id="@+id/btn_2" android:id="@+id/btn_2"
style="@style/BtnStyle" style="@style/BtnStyle"
android:layout_marginHorizontal="@dimen/_26sdp"
android:background="@drawable/bgn_pin_btn" android:background="@drawable/bgn_pin_btn"
android:text="@string/_2" android:text="@string/_2"
app:layout_constraintEnd_toStartOf="@id/btn_3" app:layout_constraintEnd_toStartOf="@id/btn_3"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/btn_1" app:layout_constraintStart_toEndOf="@id/btn_1"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -114,17 +115,20 @@ ...@@ -114,17 +115,20 @@
android:layout_marginTop="@dimen/_16sdp" android:layout_marginTop="@dimen/_16sdp"
android:background="@drawable/bgn_pin_btn" android:background="@drawable/bgn_pin_btn"
android:text="@string/_4" android:text="@string/_4"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintEnd_toStartOf="@id/btn_5" app:layout_constraintEnd_toStartOf="@id/btn_5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_1" /> app:layout_constraintTop_toBottomOf="@id/btn_1"
app:layout_constraintVertical_chainStyle="packed" />
<TextView <TextView
android:id="@+id/btn_5" android:id="@+id/btn_5"
style="@style/BtnStyle" style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn" android:background="@drawable/bgn_pin_btn"
android:text="@string/_5" android:text="@string/_5"
app:layout_constraintEnd_toStartOf="@id/btn_3" android:layout_marginHorizontal="@dimen/_26sdp"
app:layout_constraintStart_toEndOf="@id/btn_1" app:layout_constraintEnd_toStartOf="@id/btn_6"
app:layout_constraintStart_toEndOf="@id/btn_4"
app:layout_constraintTop_toTopOf="@id/btn_4" /> app:layout_constraintTop_toTopOf="@id/btn_4" />
<TextView <TextView
...@@ -142,6 +146,7 @@ ...@@ -142,6 +146,7 @@
android:layout_marginTop="@dimen/_16sdp" android:layout_marginTop="@dimen/_16sdp"
android:background="@drawable/bgn_pin_btn" android:background="@drawable/bgn_pin_btn"
android:text="@string/_7" android:text="@string/_7"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintEnd_toStartOf="@id/btn_8" app:layout_constraintEnd_toStartOf="@id/btn_8"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_4" /> app:layout_constraintTop_toBottomOf="@id/btn_4" />
...@@ -151,8 +156,9 @@ ...@@ -151,8 +156,9 @@
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"
app:layout_constraintEnd_toStartOf="@id/btn_3" android:layout_marginHorizontal="@dimen/_30sdp"
app:layout_constraintStart_toEndOf="@id/btn_1" app:layout_constraintEnd_toStartOf="@id/btn_9"
app:layout_constraintStart_toEndOf="@id/btn_7"
app:layout_constraintTop_toTopOf="@id/btn_7" /> app:layout_constraintTop_toTopOf="@id/btn_7" />
<TextView <TextView
......
app/src/main/res/layout/fragment_pin_dialog.xml
View file @ 82d68906
...@@ -10,14 +10,16 @@ ...@@ -10,14 +10,16 @@
<TextView <TextView
style="@style/TitleTextStyle" style="@style/TitleTextStyle"
android:textSize="@dimen/_20sdp"
android:id="@+id/txt_enter_pin" android:id="@+id/txt_enter_pin"
android:layout_marginTop="@dimen/_54sdp" android:layout_marginTop="@dimen/_44sdp"
android:text="@string/enter_pin_code" /> android:text="@string/enter_pin_code" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="0.8"> android:id="@+id/frame"
android:layout_weight="0.9">
<TextView <TextView
android:id="@+id/txt_not_pin" android:id="@+id/txt_not_pin"
...@@ -66,154 +68,155 @@ ...@@ -66,154 +68,155 @@
</FrameLayout> </FrameLayout>
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/btn_view_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:gravity="center" android:layout_weight="2.8"
android:layout_weight="2.5"> >
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/btn_view_group" <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="24dp"
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_width="match_parent"
android:layout_height="wrap_content"> 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" />
<TextView
android:id="@+id/btn_1" </androidx.constraintlayout.widget.ConstraintLayout>
style="@style/BtnStyle"
android:background="@drawable/bgn_pin_btn"
android:text="@string/_1"
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"
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_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"
app:layout_constraintEnd_toStartOf="@id/btn_3"
app:layout_constraintStart_toEndOf="@id/btn_1"
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_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"
app:layout_constraintEnd_toStartOf="@id/btn_3"
app:layout_constraintStart_toEndOf="@id/btn_1"
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="@dimen/_52sdp"
android:layout_height="@dimen/_52sdp"
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_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_0"
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/_30sdp"
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>
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_home.xml
View file @ 82d68906
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
...@@ -8,7 +9,8 @@ ...@@ -8,7 +9,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingVertical="@dimen/_16sdp" android:paddingVertical="@dimen/_16sdp"
android:layout_height="@dimen/_140sdp" android:layout_height="180dp"
android:layout_marginEnd="16dp"
android:paddingHorizontal="12dp" android:paddingHorizontal="12dp"
android:background="@drawable/banner" android:background="@drawable/banner"
android:orientation="vertical"> android:orientation="vertical">
...@@ -29,12 +31,13 @@ ...@@ -29,12 +31,13 @@
android:maxWidth="@dimen/_120sdp" android:maxWidth="@dimen/_120sdp"
android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Dui, risus" android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Dui, risus"
android:textColor="@color/black80" android:textColor="@color/black80"
android:textSize="10sp" /> android:textSize="10sp"
tools:ignore="SmallSp" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="16dp"
app:cardCornerRadius="4dp"> app:cardCornerRadius="4dp">
<LinearLayout <LinearLayout
......
app/src/main/res/raw/rifki_loading.json
View file @ 82d68906
{ {"v":"5.7.11","fr":25,"ip":0,"op":110,"w":800,"h":800,"nm":"Comp 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"t":0,"s":[0],"h":1},{"t":1,"s":[36],"h":1},{"t":2,"s":[72],"h":1},{"t":3,"s":[108],"h":1},{"t":4,"s":[144],"h":1},{"t":5,"s":[180],"h":1},{"t":6,"s":[216],"h":1},{"t":7,"s":[252],"h":1},{"t":8,"s":[288],"h":1},{"t":9,"s":[324],"h":1},{"t":10,"s":[360],"h":1}],"ix":10,"x":"var $bm_rt;\n$bm_rt = loopOut();"},"p":{"a":0,"k":[400,400,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[800,800],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.781960880055,0.1576186685,0.1576186685,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,-130],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[7,7],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"rp","c":{"a":0,"k":10,"ix":1},"o":{"a":0,"k":0,"ix":2},"m":1,"ix":2,"tr":{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":36,"ix":4},"so":{"a":0,"k":5,"ix":5},"eo":{"a":0,"k":100,"ix":6},"nm":"Transform"},"nm":"Repeater 1","mn":"ADBE Vector Filter - Repeater","hd":false}],"ip":0,"op":110,"st":0,"bm":0}],"markers":[]}
"v": "5.7.11", \ No newline at end of file
"fr": 25,
"ip": 0,
"op": 110,
"w": 800,
"h": 800,
"nm": "Comp 2",
"ddd": 0,
"assets": [],
"layers": [
{
"ddd": 0,
"ind": 1,
"ty": 4,
"nm": "Shape Layer 1",
"sr": 1,
"ks": {
"o": {
"a": 0,
"k": 100,
"ix": 11
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
],
"h": 1
},
{
"t": 1,
"s": [
36
],
"h": 1
},
{
"t": 2,
"s": [
72
],
"h": 1
},
{
"t": 3,
"s": [
108
],
"h": 1
},
{
"t": 4,
"s": [
144
],
"h": 1
},
{
"t": 5,
"s": [
180
],
"h": 1
},
{
"t": 6,
"s": [
216
],
"h": 1
},
{
"t": 7,
"s": [
252
],
"h": 1
},
{
"t": 8,
"s": [
288
],
"h": 1
},
{
"t": 9,
"s": [
324
],
"h": 1
},
{
"t": 10,
"s": [
360
],
"h": 1
}
],
"ix": 10,
"x": "var $bm_rt;\n$bm_rt = loopOut();"
},
"p": {
"a": 0,
"k": [
400,
400,
0
],
"ix": 2,
"l": 2
},
"a": {
"a": 0,
"k": [
0,
0,
0
],
"ix": 1,
"l": 2
},
"s": {
"a": 0,
"k": [
100,
100,
100
],
"ix": 6,
"l": 2
}
},
"ao": 0,
"shapes": [
{
"ty": "gr",
"it": [
{
"d": 1,
"ty": "el",
"s": {
"a": 0,
"k": [
800,
800
],
"ix": 2
},
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 3
},
"nm": "Ellipse Path 1",
"mn": "ADBE Vector Shape - Ellipse",
"hd": false
},
{
"ty": "fl",
"c": {
"a": 0,
"k": [
0.781960880055,
0.1576186685,
0.1576186685,
1
],
"ix": 4
},
"o": {
"a": 0,
"k": 100,
"ix": 5
},
"r": 1,
"bm": 0,
"nm": "Fill 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
0,
-130
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
7,
7
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "Transform"
}
],
"nm": "Ellipse 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
},
{
"ty": "rp",
"c": {
"a": 0,
"k": 10,
"ix": 1
},
"o": {
"a": 0,
"k": 0,
"ix": 2
},
"m": 1,
"ix": 2,
"tr": {
"ty": "tr",
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100
],
"ix": 3
},
"r": {
"a": 0,
"k": 36,
"ix": 4
},
"so": {
"a": 0,
"k": 5,
"ix": 5
},
"eo": {
"a": 0,
"k": 100,
"ix": 6
},
"nm": "Transform"
},
"nm": "Repeater 1",
"mn": "ADBE Vector Filter - Repeater",
"hd": false
}
],
"ip": 0,
"op": 110,
"st": 0,
"bm": 0
}
],
"markers": []
}
\ No newline at end of file
app/src/main/res/values-en/strings.xml
View file @ 82d68906
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
<string name="ex408">Тайм-аут запроса</string> <string name="ex408">Тайм-аут запроса</string>
<string name="ex409">Конфликт</string> <string name="ex409">Конфликт</string>
<string name="ex413">Тайм-аут запроса</string> <string name="ex413">Тайм-аут запроса</string>
<string name="ex422">Необработанный</string>
<string name="ex429">Необработанный</string> <string name="ex429">Необработанный</string>
<string name="ex500">Ошибка сервера</string> <string name="ex500">Ошибка сервера</string>
<string name="ex502">Неверный шлюз</string>
<string name="exelse">Непредвиденная ошибка, повторите попытку позже</string> <string name="exelse">Непредвиденная ошибка, повторите попытку позже</string>
<string name="ioexception">Ошибка сетевого подключения</string> <string name="ioexception">Ошибка сетевого подключения</string>
<string name="jsonsyntaxexception">Ma\'lumot olishda xatolik</string> <string name="jsonsyntaxexception">Ma\'lumot olishda xatolik</string>
...@@ -86,7 +84,7 @@ ...@@ -86,7 +84,7 @@
<string name="password_updated">Password Successfully Updated</string> <string name="password_updated">Password Successfully Updated</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="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="not_internet">Нет интернет соединения</string> <string name="not_internet">Нет интернет соединения</string>
<string name="settings_safety">Настройки безопасности действуют только для основного номера +998 97 999-99-99</string> <string name="settings_safety">Настройки безопасности действуют только для основного номера +998 97 999–99-99</string>
<string name="popitok_error_password">"Замена пароля невозможна "</string> <string name="popitok_error_password">"Замена пароля невозможна "</string>
<string name="close_process">Закрыть</string> <string name="close_process">Закрыть</string>
<string name="login_register">Авторизация/Регистрация</string> <string name="login_register">Авторизация/Регистрация</string>
...@@ -99,8 +97,8 @@ ...@@ -99,8 +97,8 @@
<string name="contact_us">Связь с нами</string> <string name="contact_us">Связь с нами</string>
<string name="all_nomer">Со всех номеров</string> <string name="all_nomer">Со всех номеров</string>
<string name="for_abonent">Для абонентов</string> <string name="for_abonent">Для абонентов</string>
<string name="pin_code_updated">Вы ввели неправильный PIN код 3 раза</string> <string name="pin_code_updated">Пин-код успешно обновлен</string>
<string name="popitok_error">"Смена ПИН кода невозможна "</string> <string name="popitok_error">"Смена ПИН кода невозможна \nВы ввели неправильный PIN код 3 раза"</string>
<string name="popitok">Неверный PIN-код \nОсталось %1$s попытки</string> <string name="popitok">Неверный PIN-код \nОсталось %1$s попытки</string>
<string name="popitok_password">Неверный Пароль \nОсталось %1$s попытки</string> <string name="popitok_password">Неверный Пароль \nОсталось %1$s попытки</string>
<string name="confirm_new_pin">Подтвердите PIN-код</string> <string name="confirm_new_pin">Подтвердите PIN-код</string>
......
app/src/main/res/values-ru/strings.xml
View file @ 82d68906
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
<string name="ex408">Тайм-аут запроса</string> <string name="ex408">Тайм-аут запроса</string>
<string name="ex409">Конфликт</string> <string name="ex409">Конфликт</string>
<string name="ex413">Тайм-аут запроса</string> <string name="ex413">Тайм-аут запроса</string>
<string name="ex422">Необработанный</string>
<string name="ex429">Необработанный</string> <string name="ex429">Необработанный</string>
<string name="ex500">Ошибка сервера</string> <string name="ex500">Ошибка сервера</string>
<string name="ex502">Неверный шлюз</string>
<string name="exelse">Непредвиденная ошибка, повторите попытку позже</string> <string name="exelse">Непредвиденная ошибка, повторите попытку позже</string>
<string name="ioexception">Ошибка сетевого подключения</string> <string name="ioexception">Ошибка сетевого подключения</string>
<string name="jsonsyntaxexception">Ma\'lumot olishda xatolik</string> <string name="jsonsyntaxexception">Ma\'lumot olishda xatolik</string>
...@@ -99,8 +97,8 @@ ...@@ -99,8 +97,8 @@
<string name="contact_us">Связь с нами</string> <string name="contact_us">Связь с нами</string>
<string name="all_nomer">Со всех номеров</string> <string name="all_nomer">Со всех номеров</string>
<string name="for_abonent">Для абонентов</string> <string name="for_abonent">Для абонентов</string>
<string name="pin_code_updated">Вы ввели неправильный PIN код 3 раза</string> <string name="pin_code_updated">Пин-код успешно обновлен</string>
<string name="popitok_error">"Смена ПИН кода невозможна "</string> <string name="popitok_error">"Смена ПИН кода невозможна \nВы ввели неправильный PIN код 3 раза"</string>
<string name="popitok">Неверный PIN-код \nОсталось %1$s попытки</string> <string name="popitok">Неверный PIN-код \nОсталось %1$s попытки</string>
<string name="popitok_password">Неверный Пароль \nОсталось %1$s попытки</string> <string name="popitok_password">Неверный Пароль \nОсталось %1$s попытки</string>
<string name="confirm_new_pin">Подтвердите PIN-код</string> <string name="confirm_new_pin">Подтвердите PIN-код</string>
......
app/src/main/res/values-uz/strings.xml
View file @ 82d68906
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
<string name="ex408">Тайм-аут запроса</string> <string name="ex408">Тайм-аут запроса</string>
<string name="ex409">Конфликт</string> <string name="ex409">Конфликт</string>
<string name="ex413">Тайм-аут запроса</string> <string name="ex413">Тайм-аут запроса</string>
<string name="ex422">Необработанный</string>
<string name="ex429">Необработанный</string> <string name="ex429">Необработанный</string>
<string name="ex500">Ошибка сервера</string> <string name="ex500">Ошибка сервера</string>
<string name="ex502">Неверный шлюз</string>
<string name="exelse">Непредвиденная ошибка, повторите попытку позже</string> <string name="exelse">Непредвиденная ошибка, повторите попытку позже</string>
<string name="ioexception">Ошибка сетевого подключения</string> <string name="ioexception">Ошибка сетевого подключения</string>
<string name="jsonsyntaxexception">Ma\'lumot olishda xatolik</string> <string name="jsonsyntaxexception">Ma\'lumot olishda xatolik</string>
...@@ -99,8 +97,8 @@ ...@@ -99,8 +97,8 @@
<string name="contact_us">Связь с нами</string> <string name="contact_us">Связь с нами</string>
<string name="all_nomer">Со всех номеров</string> <string name="all_nomer">Со всех номеров</string>
<string name="for_abonent">Для абонентов</string> <string name="for_abonent">Для абонентов</string>
<string name="pin_code_updated">Вы ввели неправильный PIN код 3 раза</string> <string name="pin_code_updated">Пин-код успешно обновлен</string>
<string name="popitok_error">"Смена ПИН кода невозможна "</string> <string name="popitok_error">"Смена ПИН кода невозможна \nВы ввели неправильный PIN код 3 раза"</string>
<string name="popitok">Неверный PIN-код \nОсталось %1$s попытки</string> <string name="popitok">Неверный PIN-код \nОсталось %1$s попытки</string>
<string name="popitok_password">Неверный Пароль \nОсталось %1$s попытки</string> <string name="popitok_password">Неверный Пароль \nОсталось %1$s попытки</string>
<string name="confirm_new_pin">Подтвердите PIN-код</string> <string name="confirm_new_pin">Подтвердите PIN-код</string>
......
app/src/main/res/values/themes.xml
View file @ 82d68906
...@@ -79,14 +79,14 @@ ...@@ -79,14 +79,14 @@
</style> </style>
<style name="BtnStyle"> <style name="BtnStyle">
<item name="android:layout_height">@dimen/_50sdp</item> <item name="android:layout_height">@dimen/_48sdp</item>
<item name="android:layout_width">@dimen/_50sdp</item> <item name="android:layout_width">@dimen/_48sdp</item>
<item name="background">@drawable/bgn_pin_btn</item> <item name="background">@drawable/bgn_pin_btn</item>
<item name="android:clickable">true</item> <item name="android:clickable">true</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
<item name="android:textSize">24sp</item> <item name="android:textSize">@dimen/_16sdp</item>
</style> </style>
<style name="PinStyle"> <style name="PinStyle">
......
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