Merge
This commit is contained in:
Universall
commit
b7972d638a
78
app/src/main/res/drawable/qr_scan_res.xml
Normal file
78
app/src/main/res/drawable/qr_scan_res.xml
Normal file
@ -0,0 +1,78 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="512dp"
|
||||
android:height="512dp"
|
||||
android:viewportWidth="512"
|
||||
android:viewportHeight="512">
|
||||
<path
|
||||
android:pathData="M6.5,0.9c-1.1,0.5 -2.9,1.9 -4,3.1 -1.9,2.2 -2,3.8 -2.3,64.7l-0.2,62.5 3.4,3.4c4.6,4.6 10,4.8 14.8,0.5l3.3,-2.9 0.3,-55.1 0.2,-55.1 55.1,-0.2 55.1,-0.3 2.9,-3.3c4.3,-4.7 4.1,-10.2 -0.5,-14.8l-3.4,-3.4 -61.4,0.1c-33.7,-0 -62.2,0.4 -63.3,0.8z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M377.4,3.4c-4.6,4.6 -4.8,10.1 -0.5,14.8l2.9,3.3 55.1,0.3 55.1,0.2 0.2,55.1 0.3,55.1 3.3,2.9c4.5,4 9.9,4 14.4,-0l3.3,-2.9 0.3,-61.6c0.2,-53.9 0.1,-62 -1.3,-64.6 -3.2,-6.2 -1.4,-6 -68.6,-6l-61.1,-0 -3.4,3.4z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M74.5,55c-7.1,0.3 -13.8,0.9 -14.8,1.4 -4.7,2.2 -4.7,2.6 -4.7,67.8 0,67.3 -0.3,64 6,67.3 4.5,2.3 120.6,2.2 125.5,-0.1 6.6,-3.1 6.5,-1.7 6.5,-67.8 0,-64.1 0,-64.4 -5.1,-68 -2.1,-1.4 -7.5,-1.6 -51.4,-1.4 -26.9,0.1 -54.8,0.4 -62,0.8zM171,123.5l0,47.5 -47,-0 -47,-0 0,-47.5 0,-47.5 47,-0 47,-0 0,47.5z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M219.7,57c-5.7,4.5 -5.2,13.7 0.9,17.7 2.5,1.6 5.6,1.8 26.1,2.1l23.3,0.3 0,23.4 0,23.3 2.6,3.1c5,6 14.4,4.9 17.7,-2.2 1.5,-3 1.7,-7.5 1.7,-31.6 0,-30.2 -0.4,-33.2 -5.1,-36.5 -2,-1.4 -6.3,-1.6 -33.5,-1.6 -29.8,-0 -31.2,0.1 -33.7,2z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M324.2,56.6c-5.3,3.7 -5.2,2.7 -5.2,66.9 0,66.2 -0.1,64.8 6.5,67.9 2.9,1.4 10.7,1.6 62.9,1.6 64.7,-0 64.6,-0 68.2,-5.5 1.5,-2.4 1.6,-7.1 1.2,-63.3 -0.5,-66.2 -0.4,-65.3 -6.3,-68 -1.9,-0.9 -18.5,-1.2 -63.8,-1.2 -53.9,-0 -61.5,0.2 -63.5,1.6zM436,124l0,47 -47.5,-0 -47.5,-0 0,-47 0,-47 47.5,-0 47.5,-0 0,47z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M225.1,99.6c-5.1,3.6 -5.1,4.2 -5.1,64.4l0,56 -78,-0c-67.3,-0 -78.5,0.2 -81,1.5 -6,3.1 -6,3 -6,37.3l0,31.4 3.4,3.4c4,4 8.3,4.5 13.3,1.4 4.6,-2.8 5.3,-6.6 5.3,-31.3l0,-21.7 79.1,-0 79.1,-0 3.4,-3.4 3.4,-3.4 0,-64.7c0,-45.6 -0.3,-65.3 -1.1,-66.8 -2.8,-5.5 -10.8,-7.5 -15.8,-4.1z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M270,164l0,11 11,-0 11,-0 0,-11 0,-11 -11,-0 -11,-0 0,11z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M386.7,214.7c-0.4,0.3 -0.7,5.3 -0.7,11l0,10.3 11,-0 11,-0 0,-11 0,-11 -10.3,-0c-5.7,-0 -10.7,0.3 -11,0.7z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M442.5,215c-1.1,0.4 -3.1,2 -4.5,3.5l-2.5,2.7 -0.3,60.4 -0.3,60.4 -29.7,-0c-16.6,-0 -31.3,0.4 -33.3,1 -5.4,1.5 -8.4,5.3 -8.4,10.7 0,3.8 0.5,4.9 3.3,7.4l3.2,2.9 40.3,-0c43.7,-0 42.6,0.1 45.6,-5.7 0.8,-1.5 1.1,-21.9 1.1,-69.5 0,-73.9 0.3,-70 -6,-73.3 -3.2,-1.7 -5.5,-1.8 -8.5,-0.5z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M300.4,223.1c-1.1,0.6 -2.8,2.3 -3.7,3.9 -2.5,4.1 -2.5,60.5 -0.1,65.1 3,5.8 3.5,5.9 57.9,5.9 55.4,-0 54.8,0.1 57.9,-6.5 2.5,-5.1 0.9,-10.7 -3.7,-13.5 -3,-1.9 -5.4,-2 -47.4,-2l-44.2,-0 -0.3,-24.1 -0.3,-24.1 -3.3,-2.9c-3.4,-3.1 -8.6,-3.8 -12.8,-1.8z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M104,281l0,11 11,-0 11,-0 0,-11 0,-11 -11,-0 -11,-0 0,11z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M171,281l0,11 11,-0 11,-0 0,-11 0,-11 -11,-0 -11,-0 0,11z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M227.5,271c-1.1,0.4 -3.1,2 -4.5,3.5l-2.5,2.7 -0.3,43.3c-0.3,47.5 -0.2,48.5 5.4,52.2 2.4,1.6 5.5,1.8 23.6,2.1l20.8,0.3 0,30 0,29.9 -21.7,-0c-24.7,-0 -28.5,0.7 -31.3,5.3 -3.1,5 -2.6,9.3 1.4,13.3l3.4,3.4 31.4,-0c34.8,-0 34.6,-0 37.4,-6.6 2.1,-4.9 2.1,-85.9 0,-90.8 -2.6,-6.3 -3.7,-6.6 -27.3,-6.6l-21.3,-0 0,-37.8c0,-41.4 0.1,-40.5 -6,-43.7 -3.2,-1.7 -5.5,-1.8 -8.5,-0.5z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M60.3,320.5c-6.9,3 -6.6,-0.2 -6.1,67.3 0.4,47.7 0.8,61.3 1.9,63.5 2.7,5.8 1.3,5.7 68.1,5.7 67.3,-0 64,0.3 67.3,-6 2.3,-4.5 2.2,-120.6 -0.1,-125.5 -3.1,-6.6 -1.6,-6.5 -68.1,-6.5 -48.6,0.1 -60.4,0.3 -63,1.5zM171,388l0,47 -47.5,-0 -47.5,-0 0,-47 0,-47 47.5,-0 47.5,-0 0,47z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M319.2,353.7l0.3,10.8 10.8,0.3 10.7,0.3 0,-11.1 0,-11 -11,-0 -11.1,-0 0.3,10.7z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M3.4,377.4l-3.4,3.4 0,61.1c0,52.8 0.2,61.6 1.5,64.1 3.2,6.1 1.5,6 68.6,6l61.1,-0 3.4,-3.4c4.6,-4.6 4.8,-10.1 0.5,-14.8l-2.9,-3.3 -55.1,-0.3 -55.1,-0.2 -0.2,-55.1 -0.3,-55.1 -3.3,-2.9c-4.7,-4.3 -10.2,-4.1 -14.8,0.5z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M493.8,376.9l-3.3,2.9 -0.3,55.1 -0.2,55.1 -55.1,0.2 -55.1,0.3 -2.9,3.3c-4.3,4.7 -4.1,10.2 0.5,14.8l3.4,3.4 61.1,-0c67.1,-0 65.4,0.1 68.6,-6 1.3,-2.5 1.5,-11.3 1.5,-64.1l0,-61.1 -3.4,-3.4c-4.6,-4.6 -10.1,-4.8 -14.8,-0.5z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M324.2,388.6c-4.9,3.4 -5.2,5.5 -5.2,33.4 0,21.2 0.3,26.6 1.5,29 3.3,6.3 0,6 67.2,6 45.3,-0 61.9,-0.3 63.8,-1.2 5.2,-2.3 5.5,-4.4 5.5,-33.8 0,-23.6 -0.2,-27.6 -1.7,-30 -4.5,-7.7 -16.8,-6 -19.2,2.7 -0.6,2.1 -1.1,12 -1.1,22l0,18.3 -47,-0 -47,-0 0,-20.6 0,-20.6 -3.4,-3.4c-2.7,-2.7 -4.2,-3.4 -7.3,-3.4 -2.1,-0 -4.9,0.7 -6.1,1.6z"
|
||||
android:fillColor="#000000"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
||||
@ -42,7 +42,6 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:background="@drawable/gradient_1"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
@ -14,15 +15,31 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="150dp"
|
||||
android:src="@drawable/qr_scan_res"
|
||||
app:layout_constraintBottom_toTopOf="@+id/result"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="NO RESULT"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
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" />
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -35,7 +35,7 @@
|
||||
<fragment
|
||||
android:id="@+id/nav_auth"
|
||||
android:name="com.displaynone.acss.ui.auth.AuthFragment"
|
||||
android:label="AuthFragment" >
|
||||
android:label="@string/authFragment" >
|
||||
<action
|
||||
android:id="@+id/action_authFragment_to_profileFragment"
|
||||
app:destination="@id/nav_profile" />
|
||||
@ -43,7 +43,7 @@
|
||||
<fragment
|
||||
android:id="@+id/nav_scan"
|
||||
android:name="com.displaynone.acss.ui.scan.QrScanFragment"
|
||||
android:label="QrScanFragment" >
|
||||
android:label="@string/qrScanFragment" >
|
||||
<action
|
||||
android:id="@+id/action_nav_scan_to_nav_profile"
|
||||
app:destination="@id/nav_profile" />
|
||||
@ -51,7 +51,7 @@
|
||||
<fragment
|
||||
android:id="@+id/qrResultFragment"
|
||||
android:name="com.displaynone.acss.ui.result.QrResultFragment"
|
||||
android:label="QrResultFragment" >
|
||||
android:label="@string/qrResultFragment" >
|
||||
<action
|
||||
android:id="@+id/action_qrResultFragment_to_profileFragment"
|
||||
app:destination="@id/nav_profile" />
|
||||
@ -59,7 +59,7 @@
|
||||
<fragment
|
||||
android:id="@+id/nav_admin"
|
||||
android:name="com.displaynone.acss.ui.admin.AdminFragment"
|
||||
android:label="AdminFragment" >
|
||||
android:label="@string/AdminFragment" >
|
||||
<action
|
||||
android:id="@+id/action_adminFragment_to_profileFragment"
|
||||
app:destination="@id/nav_profile" />
|
||||
|
||||
@ -17,7 +17,11 @@
|
||||
<string name="administrator_search">Enter the username</string>
|
||||
<string name="administrator_searc_button_search"> Search </string>
|
||||
<string name="title_profile">Your profile</string>
|
||||
<string name="сhange_rights">Change rights using smartphone</string>
|
||||
<string name="change_rights">Change rights using smartphone</string>
|
||||
<string name="admin">Admin panel</string>
|
||||
<string name="noInternet">Internet disconnected</string>
|
||||
<string name="authFragment">Log in to your account</string>
|
||||
<string name="qrScanFragment">QR code scanning</string>
|
||||
<string name="qrResultFragment">Scan result</string>
|
||||
<string name="AdminFragment">Checking the session employee</string>
|
||||
</resources>
|
||||
@ -15,10 +15,15 @@
|
||||
<string name="error_401">Логина не существует или неверный</string>
|
||||
<string name="ok">ОК</string>
|
||||
<string name="error">Ошибка</string>
|
||||
<string name="change_rights">Изменить права входа с помощью смартфона</string>
|
||||
<string name="noInternet">Интернет соединение потеряно</string>
|
||||
<string name="administrator_search">Введите логин пользователя</string>
|
||||
<string name="administrator_searc_button_search">🔍 Поиск 🔍</string>
|
||||
<string name="title_profile">Профиль</string>
|
||||
<string name="сhange_rights">Изменить права входа с помощью смартфона</string>
|
||||
<string name="admin">Панель администратора</string>
|
||||
<string name="noInternet">Интернет соединение потеряно</string>
|
||||
<string name="authFragment">Log in to your account</string>
|
||||
<string name="qrScanFragment">QR code scanning</string>
|
||||
<string name="qrResultFragment">Scan result</string>
|
||||
<string name="AdminFragment">Checking the session employee</string>
|
||||
|
||||
</resources>
|
||||
@ -17,9 +17,13 @@
|
||||
<string name="administrator_search">Enter the username</string>
|
||||
<string name="administrator_searc_button_search"> Search </string>
|
||||
<string name="title_profile">Your profile</string>
|
||||
<string name="сhange_rights">Change rights using smartphone</string>
|
||||
<string name="change_rights">Change rights using smartphone</string>
|
||||
<string name="admin">Admin panel</string>
|
||||
<string name="profile">Profile</string>
|
||||
<string name="noInternet">Internet disconnected</string>
|
||||
<string name="serverIsUnabailable">Server is unavailable</string>
|
||||
<string name="authFragment">Log in to your account</string>
|
||||
<string name="qrScanFragment">QR code scanning</string>
|
||||
<string name="qrResultFragment">Scan result</string>
|
||||
<string name="AdminFragment">Checking the session employee</string>
|
||||
|
||||
</resources>
|
||||
Loading…
x
Reference in New Issue
Block a user