diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt index 7d25b93..591b287 100644 --- a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.kt @@ -11,7 +11,6 @@ import androidx.fragment.app.viewModels import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentAdminBinding import ru.myitschool.work.entities.EmployeeEntity -import ru.myitschool.work.ui.login.LoginViewModel import ru.myitschool.work.utils.collectWithLifecycle class AdminFragment : Fragment(R.layout.fragment_admin) { 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 1362c4f..48c376c 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 @@ -12,7 +12,6 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.paging.LoadState -import androidx.paging.map import androidx.recyclerview.widget.LinearLayoutManager import com.squareup.picasso.Picasso import kotlinx.coroutines.delay diff --git a/app/src/main/res/drawable/avatar_alt.xml b/app/src/main/res/drawable/avatar_alt.xml index 98811f3..471c79d 100644 --- a/app/src/main/res/drawable/avatar_alt.xml +++ b/app/src/main/res/drawable/avatar_alt.xml @@ -7,8 +7,8 @@ android:pathData="M50,50m-48.5,0a48.5,48.5 0,1 1,97 0a48.5,48.5 0,1 1,-97 0" android:strokeWidth="3" android:fillColor="#AEC3FF" - android:strokeColor="#ffffff"/> + android:strokeColor="@color/theme_color"/> + android:fillColor="@color/theme_color"/> diff --git a/app/src/main/res/drawable/logo_scan.xml b/app/src/main/res/drawable/logo_scan.xml index c7ee74a..99c6f8a 100644 --- a/app/src/main/res/drawable/logo_scan.xml +++ b/app/src/main/res/drawable/logo_scan.xml @@ -5,41 +5,41 @@ android:viewportHeight="36"> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> + android:fillColor="@color/white"/> diff --git a/app/src/main/res/drawable/logo_visit_card.xml b/app/src/main/res/drawable/logo_visit_card.xml index 4c940b8..0334d38 100644 --- a/app/src/main/res/drawable/logo_visit_card.xml +++ b/app/src/main/res/drawable/logo_visit_card.xml @@ -6,7 +6,7 @@ android:viewportHeight="48"> + android:fillColor="@color/bg_color"/> + android:fillColor="@color/bg_color"/> diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 457d895..022ecb5 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -129,7 +129,7 @@