Skip to content

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

[UPD] MUS-107 Feature, updated home page add drawer

parent a353d31c
Show whitespace changes
Inline Side-by-side
Showing with 964 additions and 646 deletions
app/src/main/java/com/mobiuz/app/dev/MainActivity.kt
View file @ a4a65342
package com.mobiuz.app.dev package com.mobiuz.app.dev
import android.Manifest
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
...@@ -17,6 +18,7 @@ import com.mobiuz.app.dev.ui.global.CONSTANTS ...@@ -17,6 +18,7 @@ import com.mobiuz.app.dev.ui.global.CONSTANTS
import com.mobiuz.app.dev.ui.global.FullScreenDialog import com.mobiuz.app.dev.ui.global.FullScreenDialog
import com.mobiuz.app.dev.utils.extensions.customLog import com.mobiuz.app.dev.utils.extensions.customLog
import com.mobiuz.app.dev.utils.extensions.setupWithNavController import com.mobiuz.app.dev.utils.extensions.setupWithNavController
import com.mobiuz.app.utils.checkPermission
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject import javax.inject.Inject
...@@ -40,7 +42,7 @@ class MainActivity : AppCompatActivity() { ...@@ -40,7 +42,7 @@ class MainActivity : AppCompatActivity() {
_bn = ActivityMainBinding.inflate(layoutInflater) _bn = ActivityMainBinding.inflate(layoutInflater)
setContentView(bn.root) setContentView(bn.root)
window.statusBarColor = Color.TRANSPARENT // window.statusBarColor = Color.RED
FirebaseApp.initializeApp(this) FirebaseApp.initializeApp(this)
mFirebaseAnalytics = FirebaseAnalytics.getInstance(this) mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)
...@@ -54,22 +56,22 @@ class MainActivity : AppCompatActivity() { ...@@ -54,22 +56,22 @@ class MainActivity : AppCompatActivity() {
setupBottomNavigationBar() setupBottomNavigationBar()
} }
intent?.let { // intent?.let {
val arg = it.getStringExtra(CONSTANTS.FIRST) ?: "" // val arg = it.getStringExtra(CONSTANTS.FIRST) ?: ""
if (arg.isEmpty()) { // if (arg.isEmpty()) {
val dialog = FullScreenDialog() // val dialog = FullScreenDialog()
dialog.setOnPinDoneListener { // dialog.setOnPinDoneListener {
pref.setUserToken("") // pref.setUserToken("")
pref.isRegistered = false // pref.isRegistered = false
pref.pin_code = "" // pref.pin_code = ""
val intent = Intent(this, AuthActivity::class.java) // val intent = Intent(this, AuthActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME // intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
startActivity(intent) // startActivity(intent)
finish() // finish()
} // }
dialog.show(supportFragmentManager, "tag") // dialog.show(supportFragmentManager, "tag")
} // }
} // }
customLog("token: ${pref.getUserToken()}") customLog("token: ${pref.getUserToken()}")
} }
......
app/src/main/java/com/mobiuz/app/dev/network/repository/MainRepository.kt
View file @ a4a65342
package com.mobiuz.app.dev.network.repository package com.mobiuz.app.dev.network.repository
import android.content.Context
import com.mobiuz.app.dev.model.SharedPref
import com.mobiuz.app.dev.network.api.ApiService import com.mobiuz.app.dev.network.api.ApiService
import com.mobiuz.app.dev.network.model.Customer
import com.mobiuz.app.dev.network.model.UiStateObject
import com.mobiuz.app.dev.utils.extensions.userMessage
import dagger.hilt.android.qualifiers.ApplicationContext
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
class MainRepository @Inject constructor( class MainRepository @Inject constructor(
private val apiService: ApiService private val apiService: ApiService,
) private val pref: SharedPref,
\ No newline at end of file @ApplicationContext val context: Context
){
suspend fun mainIndex(): UiStateObject<Customer> {
return try {
val res = apiService.mainIndex()
when {
res.status && res.data != null -> {
UiStateObject.SUCCESS(res.data!!)
}
res.errors.isNotEmpty() -> {
var message = ""
res.errors.forEach {
message += "${it.message}\n"
}
UiStateObject.ERROR(message)
}
else -> UiStateObject.ERROR(res.message)
}
} catch (e: Exception) {
UiStateObject.ERROR(e.userMessage(context))
}
}
}
\ No newline at end of file
app/src/main/java/com/mobiuz/app/dev/ui/auth/pin/HomeImageView.kt 0 → 100644
View file @ a4a65342
package com.mobiuz.app.dev.ui.auth.pin
import android.content.Context
import android.util.AttributeSet
import com.makeramen.roundedimageview.RoundedImageView
class HomeImageView(context: Context, atr: AttributeSet) : RoundedImageView(context,atr) {
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
val width = measuredWidth
setMeasuredDimension(width, (width.toFloat() * 0.794666667).toInt())
}
}
\ No newline at end of file
app/src/main/java/com/mobiuz/app/dev/ui/home/HomeFragment.kt
View file @ a4a65342
...@@ -2,8 +2,15 @@ package com.mobiuz.app.dev.ui.home ...@@ -2,8 +2,15 @@ package com.mobiuz.app.dev.ui.home
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.ScrollCaptureCallback
import android.view.View import android.view.View
import android.view.ViewTreeObserver
import androidx.core.view.GravityCompat
import androidx.core.view.isVisible
import androidx.core.widget.NestedScrollView
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.mobiuz.app.R import com.mobiuz.app.R
...@@ -46,9 +53,9 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -46,9 +53,9 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
} }
override fun setUpUI() { override fun setUpUI() {
bn.apply { bn.apply {
btnMenu.setOnClickListener(object : ButtonClick() { btnExit.setOnClickListener {
override fun onSingleClick(v: View?) {
showCustomExitDialog { showCustomExitDialog {
pref.setUserToken("") pref.setUserToken("")
pref.isRegistered = false pref.isRegistered = false
...@@ -59,9 +66,40 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -59,9 +66,40 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
requireActivity().finish() requireActivity().finish()
} }
} }
})
btnAddSum.setOnClickListener(object : ButtonClick() { btnLanguage.setOnClickListener {
override fun onSingleClick(v: View?) {
}
btnSafety.setOnClickListener {
}
btnSupport.setOnClickListener {
}
}
bn.content.apply {
toolbar.setNavigationOnClickListener {
bn.drawerLayout.openDrawer(GravityCompat.START)
}
nestedScrollView.setOnScrollChangeListener(object : NestedScrollView.OnScrollChangeListener{
override fun onScrollChange(v: NestedScrollView?, scrollX: Int, scrollY: Int, oldScrollX: Int, oldScrollY: Int) {
Log.e("SSS","scrollX_"+scrollX+"_scrollY_"+scrollY+"_oldScrollX_"+oldScrollX+"_oldScrollY_"+oldScrollY)
if(scrollY > 100){
toolbarInsideLayout.isVisible = true
// requireActivity().window.statusBarColor = Color.RED
// toolbar.setBackgroundColor(resources.getColor(R.color.primary100))
}
if(scrollY < 90){
toolbarInsideLayout.isVisible = false
// requireActivity().window.statusBarColor = Color.TRANSPARENT
// toolbar.setBackgroundColor(Color.TRANSPARENT)
}
} }
}) })
...@@ -81,10 +119,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -81,10 +119,6 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
showProgressDialog(false) showProgressDialog(false)
// showCustomDialog(it.message,false){} // showCustomDialog(it.message,false){}
} }
is UiStateObject.ERRORS -> {
showProgressDialog(false)
}
is UiStateObject.LOADING -> { is UiStateObject.LOADING -> {
showProgressDialog(true) showProgressDialog(true)
} }
...@@ -99,7 +133,7 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -99,7 +133,7 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
try { try {
customLog("customer:$customer") customLog("customer:$customer")
customer?.customer?.info?.let { customer?.customer?.info?.let {
bn.apply { bn.content.apply {
txtBalance.text = "${it.balance?.amount?.toMoneyFormat()} ${it.balance?.currency}" txtBalance.text = "${it.balance?.amount?.toMoneyFormat()} ${it.balance?.currency}"
it.counters.let { it.counters.let {
txtCountMb.text = it?.BYTE?.value?.toMoneyFormat() ?: "0" txtCountMb.text = it?.BYTE?.value?.toMoneyFormat() ?: "0"
...@@ -111,11 +145,15 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) { ...@@ -111,11 +145,15 @@ class HomeFragment : BaseFragment(R.layout.fragment_home) {
txtCountSms.text = it?.ITEM?.value?.toMoneyFormat() ?: "0" txtCountSms.text = it?.ITEM?.value?.toMoneyFormat() ?: "0"
txtTypeSms.text = it?.ITEM?.unit ?: "sms" txtTypeSms.text = it?.ITEM?.unit ?: "sms"
} }
bn.header.txtUserName.text = customer?.customer?.name ?: ""
txtTarif.text = customer?.customer?.tarifi?.name ?: getString(R.string.my_tarif)
txtMyNumber.text = pref.userPhone txtMyNumber.text = pref.userPhone
toolbarMyNumber.text = pref.userPhone
bn.header.txtUserPhone.text = pref.userPhone
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
showCustomDialog(e.userMessage(requireContext()), false) {} // showSnackMessage(it.message)
} }
......
app/src/main/java/com/mobiuz/app/dev/ui/home/HomeViewModel.kt
View file @ a4a65342
...@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope ...@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
import com.mobiuz.app.dev.network.model.Customer import com.mobiuz.app.dev.network.model.Customer
import com.mobiuz.app.dev.network.model.UiStateObject import com.mobiuz.app.dev.network.model.UiStateObject
import com.mobiuz.app.dev.network.repository.AuthRepository import com.mobiuz.app.dev.network.repository.AuthRepository
import com.mobiuz.app.dev.network.repository.MainRepository
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
...@@ -13,7 +14,7 @@ import javax.inject.Inject ...@@ -13,7 +14,7 @@ import javax.inject.Inject
@HiltViewModel @HiltViewModel
class HomeViewModel @Inject constructor( class HomeViewModel @Inject constructor(
private val repository: AuthRepository private val repository: MainRepository
) : ViewModel() { ) : ViewModel() {
private val _mainIndexUiState = MutableStateFlow<UiStateObject<Customer>>(UiStateObject.EMPTY) private val _mainIndexUiState = MutableStateFlow<UiStateObject<Customer>>(UiStateObject.EMPTY)
......
app/src/main/res/layout/fragment_home.xml
View file @ a4a65342
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:fitsSystemWindows="false"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:id="@+id/drawerLayout"
android:fitsSystemWindows="false" android:fitsSystemWindows="false"
android:orientation="vertical"> tools:openDrawer="start">
<FrameLayout <include
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/_240sdp" android:layout_height="match_parent"
android:background="@drawable/bgn_home" android:id="@+id/content"
android:paddingBottom="@dimen/_70sdp"> layout="@layout/fragment_home_content" />
<ImageView
android:id="@+id/btn_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/_28sdp"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/_10sdp"
android:src="@drawable/ic_menu" />
<LinearLayout <com.google.android.material.navigation.NavigationView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center" android:fitsSystemWindows="false"
android:layout_marginStart="12dp" android:layout_gravity="start"
android:layout_marginTop="@dimen/_16sdp" android:background="@color/white100">
android:layout_marginBottom="@dimen/_6sdp">
<com.makeramen.roundedimageview.RoundedImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:src="@drawable/ic_photo"
app:riv_corner_radius="14dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/my_number"
android:textColor="@color/light" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="+998 97 980 25 52"
android:textColor="@color/white"
android:id="@+id/txt_my_number"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="bottom" android:padding="@dimen/_16sdp"
android:layout_marginTop="@dimen/_10sdp"
android:paddingHorizontal="16dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <include
android:layout_width="wrap_content" android:id="@+id/header"
android:layout_height="wrap_content" layout="@layout/layout_home_header"
android:text="@string/balance" android:layout_width="match_parent"
android:textColor="@color/light" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0 UZS"
android:id="@+id/txt_balance"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/btn_add_sum"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" />
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_plus" />
</FrameLayout>
</FrameLayout>
<com.google.android.material.card.MaterialCardView <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:background="@color/grey30"
android:layout_marginHorizontal="@dimen/_10sdp" android:layout_marginTop="@dimen/_24sdp"
android:layout_marginTop="-70dp" android:layout_height="1dp"/>
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/_4sdp"
android:layout_weight="1">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:orientation="vertical"
android:orientation="vertical"> android:layout_height="match_parent">
<FrameLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:orientation="horizontal"
android:layout_marginTop="12dp" android:paddingVertical="10dp"
android:paddingHorizontal="@dimen/_12sdp"> android:paddingStart="10dp"
android:background="?android:selectableItemBackground"
android:id="@+id/btn_safety"
android:layout_marginTop="@dimen/_24sdp"
android:layout_height="match_parent">
<TextView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:src="@drawable/ic_safety"
android:text="My tarif" android:layout_height="wrap_content"/>
android:textSize="20sp"
android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/bezopasnost"
android:layout_gravity="end" android:textStyle="bold"
android:text="0 Сум/мес" android:textSize="16sp"
android:textColor="@color/light" /> android:layout_marginStart="10dp"
</FrameLayout> android:layout_height="wrap_content"/>
<View </LinearLayout>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:orientation="horizontal"
android:layout_marginTop="16dp" android:paddingVertical="10dp"
android:background="@color/lang_bgn" /> android:id="@+id/btn_language"
android:paddingStart="10dp"
android:background="?android:selectableItemBackground"
android:layout_marginTop="@dimen/_10sdp"
android:layout_height="match_parent">
<TextView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="10dp" android:src="@drawable/ic_image_language"
android:text="@string/oatatok_tarifu" android:layout_height="wrap_content"/>
android:textColor="@color/light" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<LinearLayout <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:orientation="vertical"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/ic_wi_fi" /> android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/language_app"
android:layout_gravity="center" android:textStyle="bold"
android:layout_marginVertical="6dp" android:textSize="16sp"
android:text="0" android:layout_marginStart="10dp"
android:id="@+id/txt_count_mb" android:layout_height="wrap_content"/>
android:textSize="20sp"
android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="Русский"
android:layout_gravity="center" android:textSize="12sp"
android:text="mb" android:textColor="@color/grey80"
android:id="@+id/txt_type_mb" android:layout_marginStart="10dp"
android:textColor="@color/light_dark" /> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:orientation="horizontal"
android:layout_weight="1" android:paddingVertical="10dp"
android:orientation="vertical"> android:id="@+id/btn_support"
android:paddingStart="10dp"
android:background="?android:selectableItemBackground"
android:layout_marginTop="@dimen/_10sdp"
android:layout_height="match_parent">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:src="@drawable/ic_image_support"
android:layout_gravity="center" android:layout_height="wrap_content"/>
android:src="@drawable/ic_phone" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/support"
android:layout_gravity="center" android:textStyle="bold"
android:layout_marginVertical="6dp" android:textSize="16sp"
android:text="0" android:layout_marginStart="10dp"
android:id="@+id/txt_count_minut" android:layout_height="wrap_content"/>
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="min"
android:id="@+id/txt_type_minut"
android:textColor="@color/light_dark" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:paddingVertical="10dp"
android:orientation="vertical"> android:id="@+id/btn_exit"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/ic_message" /> android:src="@drawable/ic_log_out" />
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/txt_user_name"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginStart="12dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/exit"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:id="@+id/txt_count_sms"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/txt_user_phone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="v 0.01.1"
android:textColor="@color/grey80"
android:layout_gravity="center" android:layout_gravity="center"
android:text="SMS"
android:id="@+id/txt_type_sms"
android:textColor="@color/light_dark" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/lang_bgn" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next_spisanie"
android:textColor="@color/light"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
tools:text="22 Декабря"
android:textColor="@color/light_dark"
android:textStyle="bold" />
</FrameLayout>
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
<include
layout="@layout/item_home"
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_16sdp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_group_12" />
<include
layout="@layout/item_home"
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_16sdp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_group_12" />
</LinearLayout> </LinearLayout>
</ScrollView>
\ No newline at end of file </com.google.android.material.navigation.NavigationView>
</androidx.drawerlayout.widget.DrawerLayout>
app/src/main/res/layout/fragment_home_content.xml 0 → 100644
View file @ a4a65342
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:fitsSystemWindows="false"
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/bgn_home" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:navigationIcon="@drawable/ic_menu">
<LinearLayout
android:id="@+id/toolbar_inside_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_gravity="start"
android:layout_marginStart="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/toolbar_my_number_helper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/my_number"
android:textColor="@color/white100" />
<TextView
android:id="@+id/toolbar_my_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:text="+998 97 980 25 52" />
</LinearLayout>
</com.google.android.material.appbar.MaterialToolbar>
<androidx.core.widget.NestedScrollView
android:id="@+id/nestedScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/_6sdp"
android:layout_marginBottom="@dimen/_6sdp">
<com.makeramen.roundedimageview.RoundedImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:src="@drawable/ic_photo"
app:riv_corner_radius="14dp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/my_number"
android:textColor="@color/white100" />
<TextView
android:id="@+id/txt_my_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:text="+998 97 980 25 52" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginTop="@dimen/_12sdp"
android:paddingHorizontal="16dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/balance"
android:textColor="@color/white100" />
<TextView
android:id="@+id/txt_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0 UZS"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/btn_add_sum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_plus" />
</FrameLayout>
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/_10sdp"
android:layout_marginTop="@dimen/_12sdp"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="12dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/my_tarif"
android:id="@+id/txt_tarif"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="end"
android:text="0 Сум/мес"
android:textColor="@color/grey70"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/grey20" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:text="@string/oatatok_tarifu"
android:textColor="@color/grey70" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_wi_fi" />
<TextView
android:id="@+id/txt_count_mb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_type_mb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="mb"
android:textColor="@color/black80" />
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey20" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_phone" />
<TextView
android:id="@+id/txt_count_minut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_type_minut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="min"
android:textColor="@color/black80" />
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey20" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_message" />
<TextView
android:id="@+id/txt_count_sms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_type_sms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="SMS"
android:textColor="@color/black80" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/grey20" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next_spisanie"
android:textColor="@color/grey70"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
tools:text="22 Декабря" />
</FrameLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<include
layout="@layout/item_home"
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_16sdp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_group_12" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/home_home.xml deleted 100644 → 0
View file @ a353d31c
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutDescription="@xml/layout_description"
android:fitsSystemWindows="false"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="false"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_240sdp"
android:background="@drawable/bgn_home"
android:paddingBottom="@dimen/_70sdp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:padding="@dimen/_10sdp"
android:layout_marginStart="12dp"
android:id="@+id/btn_menu"
android:layout_marginTop="@dimen/_28sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_menu" />
<LinearLayout
android:layout_width="match_parent"
android:layout_gravity="center"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/_16sdp"
android:layout_marginBottom="@dimen/_6sdp"
android:layout_height="wrap_content">
<com.makeramen.roundedimageview.RoundedImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center"
app:riv_corner_radius="14dp"
android:src="@drawable/ic_photo" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/light"
android:text="@string/my_number" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="+998 97 980 25 52"
android:textStyle="bold"
android:textSize="16sp"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:paddingHorizontal="16dp"
android:layout_gravity="bottom"
android:layout_marginTop="@dimen/_10sdp"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/light"
android:text="@string/balance" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="24 350 UZS"
android:textStyle="bold"
android:textSize="20sp"
android:textColor="@color/white" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:id="@+id/btn_add_sum"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_plus" />
</FrameLayout>
</FrameLayout>
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
android:layout_marginHorizontal="@dimen/_10sdp"
android:layout_marginTop="-70dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textSize="20sp"
android:text="Mobi 50" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="50 000 Сум/мес"
android:textColor="@color/light" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/lang_bgn" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:text="@string/oatatok_tarifu"
android:textColor="@color/light" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_wi_fi" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="4,5"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="гигабайт"
android:textColor="@color/light_dark" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_phone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="234"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="минут"
android:textColor="@color/light_dark" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_message" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="500"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="SMS"
android:textColor="@color/light_dark" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/lang_bgn" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next_spisanie"
android:textSize="14sp"
android:textColor="@color/light" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textStyle="bold"
android:text="22 Декабря"
android:textColor="@color/light_dark" />
</FrameLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<include
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_16sdp"
layout="@layout/item_home"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_group_12" />
<include
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_16sdp"
layout="@layout/item_home"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_group_12" />
</LinearLayout>
</ScrollView>
\ No newline at end of file
app/src/main/res/layout/home_motion.xml
View file @ a4a65342
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.motion.widget.MotionLayout <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:id="@+id/motionLayout" android:fitsSystemWindows="false">
android:orientation="vertical"
android:scrollbars="vertical"
android:fitsSystemWindows="false"
app:layoutDescription="@xml/home_motion_scene">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:id="@+id/appBar"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing"
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<ImageView <ImageView
android:id="@+id/image" android:id="@+id/image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/_240sdp" android:layout_height="@dimen/_240sdp"
android:src="@drawable/bgn_home" android:scaleType="fitXY"
app:layout_collapseMode="parallax"
android:src="@drawable/bgn_home" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/_240sdp"
app:layout_collapseMode="none"
android:paddingBottom="@dimen/_70sdp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="12dp"
app:layout_collapseMode="pin"
android:layout_marginTop="@dimen/_16sdp"
android:layout_marginBottom="@dimen/_6sdp">
<com.makeramen.roundedimageview.RoundedImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center"
app:layout_collapseMode="pin"
android:src="@drawable/ic_photo"
app:riv_corner_radius="14dp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:layout_collapseMode="parallax"
android:layout_marginStart="10dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/my_number"
android:textColor="@color/grey110" />
<TextView
android:id="@+id/txt_my_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_collapseMode="parallax"
android:textStyle="bold"
android:text="+998 97 980 25 52" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:layout_collapseMode="pin"
android:layout_marginTop="@dimen/_10sdp"
android:paddingHorizontal="16dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/balance"
android:textColor="@color/grey110" />
<TextView
android:id="@+id/txt_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0 UZS"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/btn_add_sum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
app:layout_anchor="@id/appBar"
app:layout_anchorGravity="bottom|end"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_plus" />
</FrameLayout>
</FrameLayout>
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
app:layout_collapseMode="pin"
android:layout_height="wrap_content"
android:layout_marginTop="24dp">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/btn_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/ic_menu"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file </FrameLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-70dp"
app:layout_collapseMode="parallax"
android:id="@+id/nestedScrollView"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/_10sdp"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="My tarif"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="0 Сум/мес"
android:textColor="@color/grey110" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/grey20" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:text="@string/oatatok_tarifu"
android:textColor="@color/grey110" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_wi_fi" />
<TextView
android:id="@+id/txt_count_mb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_type_mb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="mb"
android:textColor="@color/grey80" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_phone" />
<TextView
android:id="@+id/txt_count_minut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_type_minut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="min"
android:textColor="@color/grey80" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_message" />
<TextView
android:id="@+id/txt_count_sms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginVertical="6dp"
android:text="0"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_type_sms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="SMS"
android:textColor="@color/grey80" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:background="@color/grey80" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:paddingHorizontal="@dimen/_12sdp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next_spisanie"
android:textColor="@color/grey110"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:textColor="@color/grey80"
android:textStyle="bold"
tools:text="22 Декабря" />
</FrameLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<include
layout="@layout/item_home"
android:layout_width="match_parent"
android:layout_height="@dimen/_150sdp"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_16sdp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="@dimen/_8sdp"
android:layout_marginBottom="@dimen/_20sdp"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_group_12" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/layout/layout_sender.xml
View file @ a4a65342
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/light" android:background="@color/grey20"
android:layout_height="1dp"/> android:layout_height="1dp"/>
<TextView <TextView
......
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