From 01ff55a4d10d28c0e2cac4b930ef6214d130e43f Mon Sep 17 00:00:00 2001
From: Maksim-Neskashin <maksimneskashin@mail.ru>
Date: Wed, 19 Feb 2025 17:45:47 +0300
Subject: [PATCH] Base UI/UX
---
.idea/kotlinc.xml | 2 +-
.idea/misc.xml | 1 -
app/src/main/res/drawable/background.png | Bin 0 -> 6760 bytes
app/src/main/res/drawable/history.xml | 7 ++
.../res/drawable/ic_launcher_foreground.xml | 36 ++-----
app/src/main/res/drawable/ic_navigation.xml | 11 +++
app/src/main/res/drawable/profile.xml | 9 ++
app/src/main/res/drawable/shape_button.xml | 8 ++
.../main/res/drawable/shape_rectangle3.xml | 9 ++
app/src/main/res/layout/fragment_login.xml | 82 +++++++++++++++
app/src/main/res/layout/fragment_register.xml | 93 ++++++++++++++++++
app/src/main/res/layout/main_qr.xml | 39 ++++++++
app/src/main/res/layout/menu/list.xml | 12 +++
app/src/main/res/layout/menu/top_app_bar.xml | 11 +++
app/src/main/res/menu/list.xml | 12 +++
app/src/main/res/menu/top_app_bar.xml | 11 +++
app/src/main/res/values/colors.xml | 4 +
.../res/values/ic_launcher_background.xml | 4 +
app/src/main/res/values/strings.xml | 5 +
19 files changed, 328 insertions(+), 28 deletions(-)
create mode 100644 app/src/main/res/drawable/background.png
create mode 100644 app/src/main/res/drawable/history.xml
create mode 100644 app/src/main/res/drawable/ic_navigation.xml
create mode 100644 app/src/main/res/drawable/profile.xml
create mode 100644 app/src/main/res/drawable/shape_button.xml
create mode 100644 app/src/main/res/drawable/shape_rectangle3.xml
create mode 100644 app/src/main/res/layout/fragment_login.xml
create mode 100644 app/src/main/res/layout/fragment_register.xml
create mode 100644 app/src/main/res/layout/main_qr.xml
create mode 100644 app/src/main/res/layout/menu/list.xml
create mode 100644 app/src/main/res/layout/menu/top_app_bar.xml
create mode 100644 app/src/main/res/menu/list.xml
create mode 100644 app/src/main/res/menu/top_app_bar.xml
create mode 100644 app/src/main/res/values/ic_launcher_background.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 148fdd2..f5e115d 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
- <option name="version" value="1.9.24" />
+ <option name="version" value="2.0.0-RC1" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/src/main/res/drawable/background.png b/app/src/main/res/drawable/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f27656dd8a0da2ae59eb6ae6abe4276c24e7f8b
GIT binary patch
literal 6760
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
VALe(-Uo?1|FX@<E%+R*E`#(SA2!sFt
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable/history.xml b/app/src/main/res/drawable/history.xml
new file mode 100644
index 0000000..4ed9769
--- /dev/null
+++ b/app/src/main/res/drawable/history.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="50dp" android:viewportHeight="24" android:viewportWidth="24" android:width="50dp">
+
+ <path android:fillColor="#00000000" android:pathData="M12,8V12L14.5,14.5" android:strokeColor="#1C274C" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.5"/>
+
+ <path android:fillColor="#1C274C" android:pathData="M5.604,5.604L5.074,5.074V5.074L5.604,5.604ZM4.338,6.871L3.588,6.874C3.59,7.286 3.923,7.619 4.334,7.621L4.338,6.871ZM6.88,7.633C7.294,7.635 7.631,7.301 7.633,6.887C7.635,6.473 7.301,6.135 6.887,6.133L6.88,7.633ZM5.075,4.321C5.073,3.907 4.735,3.573 4.321,3.575C3.907,3.577 3.573,3.915 3.575,4.329L5.075,4.321ZM3.75,12C3.75,11.586 3.414,11.25 3,11.25C2.586,11.25 2.25,11.586 2.25,12H3.75ZM16.875,20.445C17.234,20.238 17.357,19.779 17.149,19.42C16.942,19.062 16.483,18.939 16.125,19.147L16.875,20.445ZM19.147,16.125C18.939,16.483 19.062,16.942 19.42,17.149C19.779,17.357 20.238,17.234 20.445,16.875L19.147,16.125ZM5.14,5.071C4.846,5.363 4.844,5.838 5.135,6.132C5.426,6.426 5.901,6.429 6.196,6.137L5.14,5.071ZM18.862,5.138C15.042,1.318 8.869,1.279 5.074,5.074L6.135,6.135C9.334,2.935 14.557,2.954 17.802,6.199L18.862,5.138ZM5.074,5.074L3.808,6.34L4.868,7.401L6.135,6.135L5.074,5.074ZM4.334,7.621L6.88,7.633L6.887,6.133L4.342,6.121L4.334,7.621ZM5.088,6.867L5.075,4.321L3.575,4.329L3.588,6.874L5.088,6.867ZM12,3.75C16.556,3.75 20.25,7.444 20.25,12H21.75C21.75,6.615 17.385,2.25 12,2.25V3.75ZM12,20.25C7.444,20.25 3.75,16.556 3.75,12H2.25C2.25,17.385 6.615,21.75 12,21.75V20.25ZM16.125,19.147C14.912,19.848 13.504,20.25 12,20.25V21.75C13.775,21.75 15.441,21.275 16.875,20.445L16.125,19.147ZM20.25,12C20.25,13.504 19.848,14.912 19.147,16.125L20.445,16.875C21.275,15.441 21.75,13.775 21.75,12H20.25ZM6.196,6.137C7.687,4.661 9.736,3.75 12,3.75V2.25C9.325,2.25 6.901,3.328 5.14,5.071L6.196,6.137Z"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 2b068d1..6c44089 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,30 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:endX="85.84757"
- android:endY="92.4963"
- android:startX="42.9492"
- android:startY="49.59793"
- android:type="linear">
- <item
- android:color="#44000000"
- android:offset="0.0" />
- <item
- android:color="#00000000"
- android:offset="1.0" />
- </gradient>
- </aapt:attr>
- </path>
+ android:viewportWidth="330"
+ android:viewportHeight="330">
+ <group android:scaleX="0.55"
+ android:scaleY="0.55"
+ android:translateX="74.25"
+ android:translateY="74.25">
<path
- android:fillColor="#FFFFFF"
- android:fillType="nonZero"
- android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
+ android:pathData="M65,330h200c8.28,0 15,-6.72 15,-15V145c0,-8.28 -6.72,-15 -15,-15h-15V85c0,-46.87 -38.13,-85 -85,-85S80,38.13 80,85v45H65c-8.28,0 -15,6.72 -15,15v170C50,323.28 56.72,330 65,330zM180,234.99V255c0,8.28 -6.72,15 -15,15s-15,-6.72 -15,-15v-20.01c-6.07,-4.57 -10,-11.82 -10,-19.99c0,-13.78 11.22,-25 25,-25s25,11.22 25,25C190,223.16 186.07,230.42 180,234.99zM110,85c0,-30.33 24.67,-55 55,-55s55,24.67 55,55v45H110V85z"
+ android:fillColor="#000000"/>
+ </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_navigation.xml b/app/src/main/res/drawable/ic_navigation.xml
new file mode 100644
index 0000000..b2532c3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigation.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="25dp"
+ android:height="25dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:pathData="M12,4C11.448,4 11,4.448 11,5C11,5.552 11.448,6 12,6C12.552,6 13,5.552 13,5C13,4.448 12.552,4 12,4ZM15,5C15,6.657 13.657,8 12,8C10.343,8 9,6.657 9,5C9,3.343 10.343,2 12,2C13.657,2 15,3.343 15,5ZM12,11C11.448,11 11,11.448 11,12C11,12.552 11.448,13 12,13C12.552,13 13,12.552 13,12C13,11.448 12.552,11 12,11ZM15,12C15,13.657 13.657,15 12,15C10.343,15 9,13.657 9,12C9,10.343 10.343,9 12,9C13.657,9 15,10.343 15,12ZM11,19C11,18.448 11.448,18 12,18C12.552,18 13,18.448 13,19C13,19.552 12.552,20 12,20C11.448,20 11,19.552 11,19ZM12,22C13.657,22 15,20.657 15,19C15,17.343 13.657,16 12,16C10.343,16 9,17.343 9,19C9,20.657 10.343,22 12,22Z"
+ android:fillColor="#000000"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/profile.xml b/app/src/main/res/drawable/profile.xml
new file mode 100644
index 0000000..5687370
--- /dev/null
+++ b/app/src/main/res/drawable/profile.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="50dp" android:viewportHeight="24" android:viewportWidth="24" android:width="50dp">
+
+ <path android:fillColor="#00000000" android:pathData="M12.12,12.78C12.05,12.77 11.96,12.77 11.88,12.78C10.12,12.72 8.72,11.28 8.72,9.51C8.72,7.7 10.18,6.23 12,6.23C13.81,6.23 15.28,7.7 15.28,9.51C15.27,11.28 13.88,12.72 12.12,12.78Z" android:strokeColor="#292D32" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.5"/>
+
+ <path android:fillColor="#00000000" android:pathData="M18.74,19.38C16.96,21.01 14.6,22 12,22C9.4,22 7.04,21.01 5.26,19.38C5.36,18.44 5.96,17.52 7.03,16.8C9.77,14.98 14.25,14.98 16.97,16.8C18.04,17.52 18.64,18.44 18.74,19.38Z" android:strokeColor="#292D32" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.5"/>
+
+ <path android:fillColor="#00000000" android:pathData="M12,22C17.523,22 22,17.523 22,12C22,6.477 17.523,2 12,2C6.477,2 2,6.477 2,12C2,17.523 6.477,22 12,22Z" android:strokeColor="#292D32" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.5"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/shape_button.xml b/app/src/main/res/drawable/shape_button.xml
new file mode 100644
index 0000000..5f70ac2
--- /dev/null
+++ b/app/src/main/res/drawable/shape_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <stroke
+ android:width="1dp"
+ android:color="@color/orange"/>
+ <corners android:radius="22dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rectangle3.xml b/app/src/main/res/drawable/shape_rectangle3.xml
new file mode 100644
index 0000000..6cea2c6
--- /dev/null
+++ b/app/src/main/res/drawable/shape_rectangle3.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="263dp"
+ android:height="50dp"
+ android:viewportWidth="263"
+ android:viewportHeight="50">
+ <path
+ android:pathData="M25,0L238,0A25,25 0,0 1,263 25L263,25A25,25 0,0 1,238 50L25,50A25,25 0,0 1,0 25L0,25A25,25 0,0 1,25 0z"
+ android:fillColor="#EBEBEB"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
new file mode 100644
index 0000000..5d07b36
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/main"
+ android:background="@drawable/background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".MainActivity">
+
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/Login"
+ android:textSize="16pt"
+ app:layout_constraintBottom_toTopOf="@+id/editTextText1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.497"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.721" />
+
+ <EditText
+
+ android:id="@+id/editTextText1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="240dp"
+ android:background="@drawable/shape_rectangle3"
+ android:gravity="center"
+ android:inputType="text"
+ android:text="Логин"
+ android:textColor="@color/dark_grey"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="MissingConstraints" />
+
+ <EditText
+ android:id="@+id/editTextText3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:background="@drawable/shape_rectangle3"
+ android:gravity="center"
+ android:inputType="text"
+ android:text="Пароль"
+ android:textColor="@color/dark_grey"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextText1"
+ app:layout_constraintVertical_bias="0.076" />
+
+ <android.widget.Button
+ android:id="@+id/button"
+ android:layout_width="250dp"
+ android:layout_height="50dp"
+ android:layout_marginTop="32dp"
+ android:background="@drawable/shape_button"
+ android:text="Регистрация"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextText3" />
+
+ <android.widget.Button
+ android:id="@+id/button2"
+ android:layout_width="250dp"
+ android:layout_height="50dp"
+ android:layout_marginTop="32dp"
+ android:background="@drawable/shape_button"
+ android:text="Вход"
+ app:layout_constraintBottom_toTopOf="@+id/button"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.503"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextText3"
+ app:layout_constraintVertical_bias="0.074" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
new file mode 100644
index 0000000..8fcd7e1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/main"
+ android:background="@drawable/background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".MainActivity">
+
+
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/registration"
+ android:textSize="16pt"
+ app:layout_constraintBottom_toTopOf="@+id/editTextText1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.497"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.721" />
+
+ <EditText
+
+ android:id="@+id/editTextText1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="240dp"
+ android:background="@drawable/shape_rectangle3"
+ android:gravity="center"
+ android:inputType="text"
+ android:text="Имя"
+ android:textColor="@color/dark_grey"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="MissingConstraints" />
+
+ <EditText
+ android:id="@+id/editTextText2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/shape_rectangle3"
+ android:gravity="center"
+ android:inputType="text"
+ android:text="Фамилия"
+ android:textColor="@color/dark_grey"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextText1" />
+
+ <EditText
+ android:id="@+id/editTextText3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:background="@drawable/shape_rectangle3"
+ android:gravity="center"
+ android:inputType="text"
+ android:text="Пароль"
+ android:textColor="@color/dark_grey"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextText2"
+ app:layout_constraintVertical_bias="0.076" />
+
+ <android.widget.Button
+ android:id="@+id/button"
+ android:layout_width="250dp"
+ android:layout_height="50dp"
+ android:layout_marginTop="32dp"
+ android:background="@drawable/shape_button"
+ android:text="Регистрация"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextText3" />
+
+ <FrameLayout
+ android:id="@+id/fragment_login"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_qr.xml b/app/src/main/res/layout/main_qr.xml
new file mode 100644
index 0000000..2ab8edd
--- /dev/null
+++ b/app/src/main/res/layout/main_qr.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/background"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context=".ListActivity">
+
+
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/orange"
+ app:menu="@menu/top_app_bar"
+ android:minHeight="?attr/actionBarSize"
+ android:theme="?attr/actionBarTheme"
+ app:layout_anchor="@+id/toolbar"
+ app:layout_anchorGravity="center" />
+ <ImageButton
+ android:background="@android:color/transparent"
+ android:id="@+id/imageButton"
+ android:layout_width="75dp"
+ android:layout_gravity="bottom|right"
+ android:layout_height="75dp"
+ app:srcCompat="@drawable/history"
+ tools:ignore="RtlHardcoded" />
+ <ImageButton
+ android:background="@android:color/transparent"
+ android:id="@+id/profile"
+ android:layout_width="75dp"
+ android:layout_gravity="bottom|left"
+ android:layout_height="75dp"
+ app:srcCompat="@drawable/profile"
+ tools:ignore="RtlHardcoded" />
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/menu/list.xml b/app/src/main/res/layout/menu/list.xml
new file mode 100644
index 0000000..ac0263e
--- /dev/null
+++ b/app/src/main/res/layout/menu/list.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="800dp"
+ android:height="800dp"
+ android:viewportWidth="325"
+ android:viewportHeight="325">
+ <path
+ android:pathData="M233.73,325h5.46c1.71,0 3.34,-0.73 4.47,-2l36.1,-40.39c0.98,-1.1 1.53,-2.52 1.53,-4v-4.69h-47.56V325z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M275.29,0H49.71c-3.31,0 -6,2.69 -6,6v313c0,3.31 2.69,6 6,6h168.02v-59.08c0,-4.42 3.58,-8 8,-8h55.56V6C281.29,2.69 278.6,0 275.29,0zM130.92,261.37H76.78c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8h54.14c4.42,0 8,3.58 8,8C138.92,257.79 135.34,261.37 130.92,261.37zM248.22,200.79H76.78c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8h171.44c4.42,0 8,3.58 8,8C256.22,197.21 252.64,200.79 248.22,200.79zM248.22,140.21H76.78c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8h171.44c4.42,0 8,3.58 8,8S252.64,140.21 248.22,140.21zM248.22,79.63H76.78c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8h171.44c4.42,0 8,3.58 8,8S252.64,79.63 248.22,79.63z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/menu/top_app_bar.xml b/app/src/main/res/layout/menu/top_app_bar.xml
new file mode 100644
index 0000000..a1190dc
--- /dev/null
+++ b/app/src/main/res/layout/menu/top_app_bar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/topbar_menu"
+ android:icon="@drawable/ic_navigation"
+ app:showAsAction="ifRoom"
+ android:title="@string/Profile"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/list.xml b/app/src/main/res/menu/list.xml
new file mode 100644
index 0000000..ac0263e
--- /dev/null
+++ b/app/src/main/res/menu/list.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="800dp"
+ android:height="800dp"
+ android:viewportWidth="325"
+ android:viewportHeight="325">
+ <path
+ android:pathData="M233.73,325h5.46c1.71,0 3.34,-0.73 4.47,-2l36.1,-40.39c0.98,-1.1 1.53,-2.52 1.53,-4v-4.69h-47.56V325z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M275.29,0H49.71c-3.31,0 -6,2.69 -6,6v313c0,3.31 2.69,6 6,6h168.02v-59.08c0,-4.42 3.58,-8 8,-8h55.56V6C281.29,2.69 278.6,0 275.29,0zM130.92,261.37H76.78c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8h54.14c4.42,0 8,3.58 8,8C138.92,257.79 135.34,261.37 130.92,261.37zM248.22,200.79H76.78c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8h171.44c4.42,0 8,3.58 8,8C256.22,197.21 252.64,200.79 248.22,200.79zM248.22,140.21H76.78c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8h171.44c4.42,0 8,3.58 8,8S252.64,140.21 248.22,140.21zM248.22,79.63H76.78c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8h171.44c4.42,0 8,3.58 8,8S252.64,79.63 248.22,79.63z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/menu/top_app_bar.xml b/app/src/main/res/menu/top_app_bar.xml
new file mode 100644
index 0000000..a1190dc
--- /dev/null
+++ b/app/src/main/res/menu/top_app_bar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/topbar_menu"
+ android:icon="@drawable/ic_navigation"
+ app:showAsAction="ifRoom"
+ android:title="@string/Profile"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c8524cd..688c1bf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,8 @@
<resources>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
+ <color name="grey2">#EBEBEB</color>
+ <color name="orange">#FFB71B</color>
+ <color name="dark_grey">#717171</color>
+ <color name="background">#FFE5A6</color>
</resources>
\ 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..24bed71
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="ic_launcher_background">#FFB71B</color>
+</resources>
\ 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 7ffe446..74e9a57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,8 @@
<resources>
<string name="app_name">NTO-2024-client</string>
+ <string name="Plaintext">Имя</string>
+ <string name="registration">Регистрация</string>
+ <string name="Login">Вход</string>
+ <string name="Profile">Профиль</string>
+ <string name="list">Лист</string>
</resources>
\ No newline at end of file