diff --git a/README.md b/README.md index faab69f..08d5669 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ [![Android Studio version](https://img.shields.io/endpoint?url=https%3A%2F%2Fsicampus.ru%2Fgitea%2Fcore%2Fdocs%2Fraw%2Fbranch%2Fmain%2Fandroid-studio-label.json)](https://sicampus.ru/gitea/core/docs/src/branch/main/how-upload-project.md) +# Figma Design file - https://www.figma.com/design/L2bc8N9gPzGhcWQJa3OPmG/Untitled?node-id=0-1&t=EDlrWwl5oFm6xpoN-1 + # НТО 2024. II отборочный этап. Командные задани — клиентская часть ## 📖 Предыстория diff --git a/app/src/main/res/drawable/button_beigestroke_whitefill.xml b/app/src/main/res/drawable/button_beigestroke_whitefill.xml new file mode 100644 index 0000000..5de5240 --- /dev/null +++ b/app/src/main/res/drawable/button_beigestroke_whitefill.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_grey.xml b/app/src/main/res/drawable/button_grey.xml index f51f6ed..d835cbd 100644 --- a/app/src/main/res/drawable/button_grey.xml +++ b/app/src/main/res/drawable/button_grey.xml @@ -1,8 +1,8 @@ - + + android:color="@color/light_grey" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/res_success.xml b/app/src/main/res/drawable/res_success.xml new file mode 100644 index 0000000..dfefcb7 --- /dev/null +++ b/app/src/main/res/drawable/res_success.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 12ab792..3444646 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.4" /> + app:layout_constraintGuide_percent="0.36" /> + + + - + app:layout_constraintTop_toBottomOf="@+id/block"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index a89cd59..1c060db 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.53" /> + app:layout_constraintGuide_percent="0.55" /> + app:layout_constraintGuide_percent="0.35" /> + + + app:layout_constraintGuide_percent="0.21" /> + app:layout_constraintGuide_percent="0.62" /> @@ -76,7 +76,7 @@ android:layout_width="320dp" android:layout_height="80dp" android:layout_marginTop="10dp" - android:background="@drawable/button_grey" + android:background="@drawable/button_beige" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/guideline_bottom" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 87bac92..1d7b81d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,5 +10,6 @@ #5C5C5C #C0C0C0 #808080 - #E9D4C3 + #BEBEBE + #E2D8C7 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 41369d0..d0100cc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,5 +5,4 @@ @null - \ No newline at end of file