diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..8ac2d3f
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
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 469c44c..db7a2ba 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
@@ -13,7 +13,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.myitschool.work.R
-import ru.myitschool.work.databinding.MainFragmentBinding
+import ru.myitschool.work.databinding.FragmentMainBinding
import ru.myitschool.work.ui.login.LoginDestination
import ru.myitschool.work.ui.qr.scan.QrScanDestination
import ru.myitschool.work.utils.AuthPreferences
@@ -23,8 +23,8 @@ import java.util.Locale
@AndroidEntryPoint
class MainFragment : Fragment(R.layout.fragment_main) {
- private var _binding: MainFragmentBinding? = null
- private val binding: MainFragmentBinding get() = _binding!!
+ private var _binding: FragmentMainBinding? = null
+ private val binding: FragmentMainBinding get() = _binding!!
private lateinit var authPreferences: AuthPreferences
private val viewModel: MainViewModel by viewModels()
@@ -39,7 +39,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
- _binding = MainFragmentBinding.bind(view)
+ _binding = FragmentMainBinding.bind(view)
if (authPreferences.isLoggedIn()) {
setupMainComponents()
diff --git a/app/src/main/res/drawable/button_beige.xml b/app/src/main/res/drawable/button_beige.xml
new file mode 100644
index 0000000..a0e9cbe
--- /dev/null
+++ b/app/src/main/res/drawable/button_beige.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_beigestroke.xml b/app/src/main/res/drawable/button_beigestroke.xml
new file mode 100644
index 0000000..5de5240
--- /dev/null
+++ b/app/src/main/res/drawable/button_beigestroke.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_black.xml b/app/src/main/res/drawable/button_black.xml
index fc6d007..140ce49 100644
--- a/app/src/main/res/drawable/button_black.xml
+++ b/app/src/main/res/drawable/button_black.xml
@@ -1,8 +1,11 @@
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_building.xml b/app/src/main/res/drawable/ic_building.xml
new file mode 100644
index 0000000..bdb2f32
--- /dev/null
+++ b/app/src/main/res/drawable/ic_building.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9..34850bb 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +1,26 @@
-
+ android:viewportWidth="1920"
+ android:viewportHeight="1080">
+
+ android:pathData="M0,0h1920v1080h-1920z"
+ android:fillColor="#FFFFFF"/>
+ android:pathData="M0,264.7L80,262.6C160,260.4 320,256.1 480,255.4C640,254.8 800,257.7 960,258.1C1120,258.4 1280,256.1 1440,227.4C1600,198.7 1760,143.5 1840,116L1920,88.4L1920,1080L1840,1080C1760,1080 1600,1080 1440,1080C1280,1080 1120,1080 960,1080C800,1080 640,1080 480,1080C320,1080 160,1080 80,1080L0,1080Z"
+ android:fillColor="#E9E7E7"/>
+ android:pathData="M0,495.9L80,458.9C160,422 320,348.1 480,343.9C640,339.7 800,405.2 960,421.5C1120,437.8 1280,405 1440,374.5C1600,344.1 1760,316.1 1840,302.1L1920,288.1L1920,1080L1840,1080C1760,1080 1600,1080 1440,1080C1280,1080 1120,1080 960,1080C800,1080 640,1080 480,1080C320,1080 160,1080 80,1080L0,1080Z"
+ android:fillColor="#D3CFCF"/>
+ android:pathData="M0,728.8L80,710.6C160,692.4 320,656 480,637.8C640,619.6 800,619.6 960,646C1120,672.3 1280,725.2 1440,753.5C1600,781.9 1760,785.8 1840,787.8L1920,789.7L1920,1080L1840,1080C1760,1080 1600,1080 1440,1080C1280,1080 1120,1080 960,1080C800,1080 640,1080 480,1080C320,1080 160,1080 80,1080L0,1080Z"
+ android:fillColor="#BAB8B8"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:pathData="M0,854.2L80,860.2C160,866.2 320,878.3 480,904.7C640,931.1 800,971.9 960,1000.7C1120,1029.6 1280,1046.5 1440,1035.4C1600,1024.3 1760,985.1 1840,965.5L1920,945.9L1920,1080L1840,1080C1760,1080 1600,1080 1440,1080C1280,1080 1120,1080 960,1080C800,1080 640,1080 480,1080C320,1080 160,1080 80,1080L0,1080Z"
+ android:fillColor="#A1A1A1"/>
+
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 2b068d1..fc9b91c 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,30 +1,265 @@
-
-
-
-
-
-
-
-
+ android:viewportWidth="500"
+ android:viewportHeight="500">
+
-
\ No newline at end of file
+ android:pathData="M182.03,262.73L243.12,262.73A1.56,1.56 0,0 1,244.68 264.29L244.68,289.77A1.56,1.56 0,0 1,243.12 291.33L182.03,291.33A1.56,1.56 0,0 1,180.47 289.77L180.47,264.29A1.56,1.56 0,0 1,182.03 262.73z"
+ android:fillColor="#B29E8C"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_no_img.xml b/app/src/main/res/drawable/ic_no_img.xml
index 44206c9..0e50214 100644
--- a/app/src/main/res/drawable/ic_no_img.xml
+++ b/app/src/main/res/drawable/ic_no_img.xml
@@ -1,5 +1,18 @@
-
-
-
-
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index a3c942c..bb00a12 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -37,6 +37,16 @@
app:layout_constraintGuide_percent="0.55" />
+
+
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6f3b755..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,5 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
index c209e78..f1c37fa 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index b2dfe3d..bf4994b 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
index 4f0f1d6..6864a04 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index 62b611d..9fe92e5 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 948a307..7a7b2d4 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index 1b9a695..23f5133 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 28d4b77..39ec0dc 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index 9287f50..eee2d21 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index aa7d642..0f801f5 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index 9126ae3..7fbbad0 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 17e04d7..87bac92 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,4 +10,5 @@
#5C5C5C
#C0C0C0
#808080
+ #E9D4C3
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+
+
+ #FFFFFF
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 721dd84..4e97408 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,4 +33,5 @@
error
Заблокировать
доступ
+ NFC
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e8af0e3..a594c3e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,8 +2,8 @@