Merge
This commit is contained in:
commit
aecbab7cd3
34
app/src/main/res/drawable/dinosaur.xml
Normal file
34
app/src/main/res/drawable/dinosaur.xml
Normal file
@ -0,0 +1,34 @@
|
||||
<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="M192,109.5l0,8.5 -9,-0 -9,-0 0,45 0,45 -10,-0 -10,-0 0,9 0,8.9 -7.7,0.3 -7.8,0.3 -0.3,9.2 -0.3,9.3 -7.4,-0 -7.5,-0 0,9 0,9 -16.5,-0 -16.5,-0 0,-9.5 0,-9.5 -9,-0 -9,-0 0,-8.5 0,-8.5 -9.5,-0 -9.5,-0 0,-18 0,-18 -13,-0 -13,-0 0,50 0,50 9,-0 9,-0 0,8.5 0,8.4 9.3,0.3 9.2,0.3 0.3,8.2 0.3,8.3 8.9,-0 9,-0 0,9.5 0,9.5 9,-0 9,-0 0,13 0,13 -34.5,-0 -34.5,-0 0,4 0,4 34.5,-0 34.5,-0 0,16.5 0,16.5 22.5,-0 22.5,-0 0,-13 0,-13 -9,-0 -9,-0 0,-3.5 0,-3.5 23.5,-0 23.5,-0 0,16.5 0,16.5 22,-0 22,-0 0,-13 0,-13 -9,-0 -9,-0 0,-3.5 0,-3.5 95.5,-0 95.5,-0 0,16.5 0,16.5 21.5,-0 21.5,-0 0,-16.5 0,-16.5 23.5,-0 23.5,-0 0,-4 0,-4 -23.5,-0 -23.5,-0 0,-19.5 0,-19.5 16.5,-0 16.5,-0 0,-5.5 0,-5.5 4.5,-0 4.5,-0 0,-5 0,-5 4.5,-0 4.5,-0 0,-60.5 0,-60.5 -4.5,-0 -4.5,-0 0,-4.5 0,-4.5 -12.5,-0 -12.5,-0 0,4.5 0,4.5 -4.5,-0 -4.5,-0 0,46 0,46 -4,-0 -4,-0 0,-65 0,-65 -4.5,-0 -4.5,-0 0,-4.5 0,-4.5 -12.5,-0 -12.5,-0 0,4.5 0,4.5 -4.5,-0 -4.5,-0 0,42.5 0,42.5 -4,-0 -4,-0 0,-23.5 0,-23.5 -4.5,-0 -4.5,-0 0,-4.5 0,-4.5 -12.5,-0 -12.5,-0 0,4.4 0,4.5 -4.2,0.3 -4.3,0.3 -0.3,37.7 -0.2,37.8 4.5,-0 4.5,-0 0,5 0,5 5,-0 5,-0 0,5.5 0,5.5 16,-0 16,-0 0,42 0,42 -95.5,-0 -95.5,-0 0,-23.5 0,-23.5 9,-0 8.9,-0 0.3,-7.8 0.3,-7.7 8.3,-0.3 8.2,-0.3 0,-17.9 0,-18 5,-0 5,-0 0,9 0,9 12.5,-0 12.5,-0 0,-22 0,-22 -17.2,-0.2 -17.3,-0.3 -0.3,-14.3 -0.3,-14.2 37.1,-0 37,-0 0,-13 0,-13 -27.2,-0.2 -27.3,-0.3 -0.3,-4.2 -0.3,-4.3 36.3,-0.2 36.3,-0.3 0.3,-31.3 0.2,-31.2 -9,-0 -9,-0 0,-8.5 0,-8.5 -58.5,-0 -58.5,-0 0,8.5zM301,117.5l0,8.5 9,-0 9,-0 -0.2,23.2 -0.3,23.3 -36.3,0.3 -36.3,0.2 0.3,12.3 0.3,12.2 27.3,0.3 27.2,0.2 0,5 0,5 -37,-0 -37,-0 0.2,22.2 0.3,22.3 17.3,0.3 17.2,0.2 0,14 0,14 -4.5,-0 -4.5,-0 0,-9 0,-9 -13,-0 -13,-0 0,18 0,17.9 -8.2,0.3 -8.3,0.3 -0.3,7.7 -0.3,7.8 -8.9,-0 -9,-0 0,39 0,39 9,-0 9,-0 0,5 0,5 -14,-0 -14,-0 0,-16.5 0,-16.5 -9.5,-0 -9.5,-0 0,-9.5 0,-9.5 -13,-0 -13,-0 0,9.5 0,9.5 -9,-0 -9,-0 0,11.5 0,11.5 9,-0 9,-0 0,5 0,5 -14.5,-0 -14.5,-0 0,-33.5 0,-33.5 -9,-0 -9,-0 0,-9.5 0,-9.5 -9,-0 -8.9,-0 -0.3,-8.3 -0.3,-8.2 -9.3,-0.3 -9.2,-0.3 0,-8.4 0,-8.5 -9,-0 -9,-0 0,-42 0,-42 5,-0 5,-0 0,18 0,18 9.5,-0 9.5,-0 0,8.5 0,8.5 9,-0 9,-0 0,9.5 0,9.5 24.5,-0 24.5,-0 0,-9 0,-9 7.5,-0 7.4,-0 0.3,-9.3 0.3,-9.2 7.8,-0.3 7.7,-0.3 0,-8.9 0,-9 10,-0 10,-0 0,-45 0,-45 9,-0 9,-0 0,-8.5 0,-8.5 50.5,-0 50.5,-0 0,8.5zM417,154.5l0,4.5 4.5,-0 4.5,-0 0,65 0,65 12,-0 12,-0 0,-46 0,-46 4.5,-0 4.5,-0 0,-4.5 0,-4.5 4.5,-0 4.5,-0 0,4.5 0,4.5 4.5,-0 4.5,-0 0,52.5 0,52.5 -4.5,-0 -4.5,-0 0,5 0,5 -4.5,-0 -4.5,-0 0,5.5 0,5.5 -16.5,-0 -16.5,-0 0,40 0,40 -13.5,-0 -13.5,-0 0,-62.5 0,-62.5 -16,-0 -16,-0 0,-5.5 0,-5.5 -5,-0 -5,-0 0,-5 0,-5 -4.5,-0 -4.5,-0 0.2,-29.8 0.3,-29.7 4.3,-0.3 4.2,-0.3 0,-4.5 0,-4.4 4.5,-0 4.5,-0 0,4.5 0,4.5 4.5,-0 4.5,-0 0,23.5 0,23.5 12,-0 12,-0 0,-42.5 0,-42.5 4.5,-0 4.5,-0 0,-4.5 0,-4.5 4.5,-0 4.5,-0 0,4.5zM155,364.5l0,5.5 -5,-0 -5,-0 0,-5.5 0,-5.5 5,-0 5,-0 0,5.5z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M210,130.5l0,12.5 12.5,-0 12.5,-0 0,-12.5 0,-12.5 -12.5,-0 -12.5,-0 0,12.5zM227,130.5l0,4.5 -4.5,-0 -4.5,-0 0,-4.5 0,-4.5 4.5,-0 4.5,-0 0,4.5z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M60,390l0,4 11.5,-0 11.5,-0 0,-4 0,-4 -11.5,-0 -11.5,-0 0,4z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M325,390l0,4 16,-0 16,-0 0,-4 0,-4 -16,-0 -16,-0 0,4z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M31,407l0,4 7.5,-0 7.5,-0 0,-4 0,-4 -7.5,-0 -7.5,-0 0,4z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M274,407l0,4 8.5,-0 8.5,-0 0,-4 0,-4 -8.5,-0 -8.5,-0 0,4z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M453,407l0,4 9,-0 9,-0 0,-4 0,-4 -9,-0 -9,-0 0,4z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
BIN
app/src/main/res/drawable/lost_connection.png
Normal file
BIN
app/src/main/res/drawable/lost_connection.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
@ -4,18 +4,32 @@
|
||||
android:layout_height="match_parent"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<ImageView
|
||||
android:layout_width="250dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_margin="10dp"
|
||||
android:layout_height="250dp"
|
||||
android:src="@drawable/lost_connection"/>
|
||||
<TextView
|
||||
android:id="@+id/error"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:textSize="24sp"
|
||||
android:layout_margin="15dp"
|
||||
android:letterSpacing="0.05"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
tools:text="@string/noInternet"
|
||||
tools:ignore="MissingConstraints" />
|
||||
<ImageView
|
||||
android:layout_width="250dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_margin="10dp"
|
||||
android:layout_height="250dp"
|
||||
android:src="@drawable/dinosaur"/>
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -23,5 +23,7 @@
|
||||
<string name="authFragment">Log in to your account</string>
|
||||
<string name="qrScanFragment">QR code scanning</string>
|
||||
<string name="qrResultFragment">Scan result</string>
|
||||
<string name="profile">Profile</string>
|
||||
<string name="serverIsUnabailable">Server is unavailable</string>
|
||||
<string name="AdminFragment">Checking the session employee</string>
|
||||
</resources>
|
@ -24,6 +24,8 @@
|
||||
<string name="authFragment">Log in to your account</string>
|
||||
<string name="qrScanFragment">QR code scanning</string>
|
||||
<string name="qrResultFragment">Scan result</string>
|
||||
<string name="profile">Profile</string>
|
||||
|
||||
<string name="AdminFragment">Checking the session employee</string>
|
||||
|
||||
</resources>
|
Loading…
x
Reference in New Issue
Block a user