diff --git a/app/src/main/res/drawable/qr_scan_res.xml b/app/src/main/res/drawable/qr_scan_res.xml new file mode 100644 index 0000000..9a1cbd6 --- /dev/null +++ b/app/src/main/res/drawable/qr_scan_res.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml index 79713c3..95db346 100644 --- a/app/src/main/res/layout/fragment_auth.xml +++ b/app/src/main/res/layout/fragment_auth.xml @@ -42,7 +42,6 @@ app:layout_constraintTop_toTopOf="parent" /> @@ -14,15 +15,31 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + android:textSize="24sp" + android:textColor="#333333" + android:fontFamily="sans-serif-medium" + android:letterSpacing="0.05" + + android:padding="16dp" + android:elevation="4dp" + app:layout_constraintBottom_toBottomOf="parent" + 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/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index f883975..d620eee 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -32,7 +32,7 @@ + android:label="@string/authFragment" > @@ -40,7 +40,7 @@ + android:label="@string/qrScanFragment" > @@ -48,7 +48,7 @@ + android:label="@string/qrResultFragment" > @@ -56,7 +56,7 @@ + android:label="@string/AdminFragment" > diff --git a/app/src/main/res/values-en/strings-en.xml b/app/src/main/res/values-en/strings-en.xml index 8a52364..7475436 100644 --- a/app/src/main/res/values-en/strings-en.xml +++ b/app/src/main/res/values-en/strings-en.xml @@ -17,7 +17,11 @@ Enter the username Search Your profile - Change rights using smartphone + Change rights using smartphone Admin panel - + Profile + Log in to your account + QR code scanning + Scan result + Checking the session employee \ 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 18da3e6..cd7fe9c 100644 --- a/app/src/main/res/values-ru/strings-ru.xml +++ b/app/src/main/res/values-ru/strings-ru.xml @@ -18,6 +18,11 @@ Введите логин пользователя 🔍 Поиск 🔍 Профиль - Изменить права входа с помощью смартфона - >Панель администратора + Изменить права входа с помощью смартфона + >Панель администратораProfile + Log in to your account + QR code scanning + Scan result + Checking the session employee + \ 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 2250060..bb1de64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,9 +17,13 @@ Enter the username Search Your profile - Change rights using smartphone + Change rights using smartphone Admin panel - Profile + Profile + Log in to your account + QR code scanning + Scan result + Checking the session employee \ No newline at end of file