diff --git a/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt b/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt index 47b27c8..a6769ce 100644 --- a/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt +++ b/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt @@ -7,4 +7,6 @@ data class PersonInfoDto( val photo: String, val position: String, val lastVisit: String, + val role: String, + val isBanned: Boolean ) diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt index f4eef65..866b9c4 100644 --- a/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt @@ -108,6 +108,12 @@ class MainFragment: Fragment(R.layout.fragment_main) { if (state.photo.isNotEmpty()) { picasso.load(state.photo).into(binding.photo) } + if (state.isBanned){ + binding.scan.visibility = View.VISIBLE + } + if (state.role == "ADMIN"){ + binding.admin.visibility = View.VISIBLE + } binding.fullname.text = state.fullName binding.position.text = state.position binding.lastEntry.text = state.lastVisit diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt index 5596a57..1155a12 100644 --- a/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt +++ b/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt @@ -5,5 +5,7 @@ data class MainState( val photo: String = "", val position: String = "", val lastVisit: String = "", + val role: String = "", + val isBanned: Boolean = false, val error: String? = null ) diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt index 864c33f..d7506c9 100644 --- a/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt +++ b/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt @@ -52,6 +52,8 @@ class MainViewModel @Inject constructor( photo = personInfo.photo, position = personInfo.position, lastVisit = dfo.format(dfi.parse(personInfo.lastVisit)!!), + role = personInfo.role, + isBanned = personInfo.isBanned, error = null ) } diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml new file mode 100644 index 0000000..1c19a0d --- /dev/null +++ b/app/src/main/res/drawable/button.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/entry.xml b/app/src/main/res/drawable/entry.xml index 1c19a0d..c751c5d 100644 --- a/app/src/main/res/drawable/entry.xml +++ b/app/src/main/res/drawable/entry.xml @@ -1,13 +1,13 @@ - - + + + app:layout_constraintTop_toBottomOf="@+id/refresh" + tools:visibility="visible" />