diff --git a/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt b/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt
index 700d3ac..25e3946 100644
--- a/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt
+++ b/app/src/main/java/com/displaynone/acss/ui/auth/AuthFragment.kt
@@ -1,6 +1,7 @@
package com.displaynone.acss.ui.auth
import android.annotation.SuppressLint
+import android.graphics.drawable.TransitionDrawable
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
@@ -28,7 +29,6 @@ class AuthFragment: Fragment(R.layout.fragment_auth) {
super.onViewCreated(view, savedInstanceState)
_binding = FragmentAuthBinding.bind(view)
setupLoginButton()
-
viewModel.action.collectWithLifecycle(this) { action ->
if (action is Action.GotoProfile) {
blockLoginButton() // FIXME() При двойном нажатии вылетает с ошибкой
diff --git a/app/src/main/res/drawable/animated_gradient.xml b/app/src/main/res/drawable/animated_gradient.xml
new file mode 100644
index 0000000..d856bbf
--- /dev/null
+++ b/app/src/main/res/drawable/animated_gradient.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_1.xml b/app/src/main/res/drawable/gradient_1.xml
new file mode 100644
index 0000000..69f9ad2
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_1.xml
@@ -0,0 +1,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_2.xml b/app/src/main/res/drawable/gradient_2.xml
new file mode 100644
index 0000000..54ac988
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_2.xml
@@ -0,0 +1,7 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/image_1.xml b/app/src/main/res/drawable/image_1.xml
new file mode 100644
index 0000000..3967ba2
--- /dev/null
+++ b/app/src/main/res/drawable/image_1.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ba770c9..157dd62 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,6 +7,7 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
+
diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index 62ecc25..76afdc5 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -69,6 +69,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
+ android:maxLines="1"
android:hint="@string/login"
diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml
index b7e1c9a..79713c3 100644
--- a/app/src/main/res/layout/fragment_auth.xml
+++ b/app/src/main/res/layout/fragment_auth.xml
@@ -9,6 +9,7 @@
android:background="?android:attr/colorBackground">
@@ -40,8 +42,9 @@
app:layout_constraintTop_toTopOf="parent" />
@@ -54,6 +57,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="24sp"
+ android:visibility="visible"
android:letterSpacing="0.05"
android:background="?android:attr/colorBackground"
android:textColor="?attr/colorOnBackground"
@@ -63,6 +67,8 @@
+ android:layout_marginBottom="10dp"
+ android:hint="@string/password">
@@ -108,7 +120,7 @@
android:id="@+id/next"
app:cardElevation="8dp"
- android:layout_width="match_parent"
+ android:layout_width="200dp"
android:layout_height="wrap_content"
android:text="@string/continue_"
android:padding="12dp"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 01e5175..713ecc4 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -64,7 +64,7 @@
app:layout_constraintTop_toTopOf="parent" />
-
-
+
+
+
diff --git a/app/src/main/res/layout/fragment_qr_result.xml b/app/src/main/res/layout/fragment_qr_result.xml
index e754177..c94f932 100644
--- a/app/src/main/res/layout/fragment_qr_result.xml
+++ b/app/src/main/res/layout/fragment_qr_result.xml
@@ -23,6 +23,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings-en.xml b/app/src/main/res/values-en/strings-en.xml
index 3632634..8a52364 100644
--- a/app/src/main/res/values-en/strings-en.xml
+++ b/app/src/main/res/values-en/strings-en.xml
@@ -18,5 +18,6 @@
Search
Your profile
Change rights using smartphone
+ Admin panel
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index daa82a0..ac03038 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -6,4 +6,6 @@
#FFFFFF
#FFFFFF
+ #FFFFFF
+
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings-ru.xml b/app/src/main/res/values-ru/strings-ru.xml
index 098400f..3cd1857 100644
--- a/app/src/main/res/values-ru/strings-ru.xml
+++ b/app/src/main/res/values-ru/strings-ru.xml
@@ -19,4 +19,5 @@
🔍 Поиск 🔍
Профиль
Изменить права входа с помощью смартфона
+ >Панель администратора
\ 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 9d76676..8d37f95 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -7,4 +7,6 @@
#000000
#FFFFFF
+ #000000
+
\ No newline at end of file