From 01ff55a4d10d28c0e2cac4b930ef6214d130e43f Mon Sep 17 00:00:00 2001 From: Maksim-Neskashin 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 @@ - \ 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 @@ - 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@ + + + + + + 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 @@ - - - - - - - - + android:viewportWidth="330" + android:viewportHeight="330"> + - \ 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"/> + + 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 @@ + + + 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 @@ + + + + + + + + + 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 @@ + + + + + + \ 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 @@ + + + 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 @@ + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + + + + \ 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 @@ + + + + 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 @@ + + + + + \ 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 @@ + + + + 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 @@ + + + + + \ 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 @@ #FF000000 #FFFFFFFF + #EBEBEB + #FFB71B + #717171 + #FFE5A6 \ 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 @@ + + + #FFB71B + \ 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 @@ NTO-2024-client + Имя + Регистрация + Вход + Профиль + Лист \ No newline at end of file