TheDevs/TheDevs-front
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'Frontend_UI'

Browse Source
This commit is contained in:
EgorVorobev 2025-02-20 16:32:30 +03:00
commit 44e17c69de
8 changed files with 78 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ru/myitschool/work/core/Constants.kt
View File

@ -1,5 +1,5 @@
package ru.myitschool.work.core
// БЕРИТЕ И ИЗМЕНЯЙТЕ ХОСТ ТОЛЬКО ЗДЕСЬ И НЕ БЕРИТЕ ИЗ ДРУГИХ МЕСТ. ФАЙЛ ПЕРЕМЕЩАТЬ НЕЛЬЗЯ
object Constants {
const val SERVER_ADDRESS = "http://192.168.1.131:8080"
const val SERVER_ADDRESS = "http://10.6.66.110:8080"
}

60
app/src/main/res/layout-land/fragment_admin.xml Normal file
View File

@ -0,0 +1,60 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enter_worker_username"
android:textSize="18sp"
android:layout_marginBottom="8dp" />
<EditText
android:id="@+id/employee_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/worker_username"
android:padding="12dp"
android:background="@drawable/ic_android_black_24dp"
android:inputType="text" />
<Button
android:id="@+id/view_employee_info"
android:layout_width="280dp"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
android:text="@string/watch_info_about_worker"
android:backgroundTint="@color/colorPrimary"
app:cornerRadius="16dp"
android:layout_marginTop="16dp" />
<TextView
android:id="@+id/employee_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textSize="16sp"
android:visibility="gone" />
<Button
android:id="@+id/toggle_access"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/block_or_unblock"
android:layout_marginTop="16dp"
android:visibility="gone" />
<Button
android:id="@+id/close"
android:layout_width="280dp"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
android:text="@string/back"
android:backgroundTint="@color/colorPrimary"
app:cornerRadius="16dp"
android:layout_marginTop="0dp" />
</LinearLayout>

1
app/src/main/res/layout-land/fragment_login.xml
View File

@ -43,6 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:gravity="center_horizontal"
android:textColor="@android:color/holo_red_light"
android:layout_marginBottom="16dp"/>

11
app/src/main/res/layout/fragment_admin.xml
View File

@ -47,4 +47,15 @@
android:layout_marginTop="16dp"
android:visibility="gone" />
<Button
android:id="@+id/close"
android:layout_width="280dp"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
android:text="@string/back"
android:backgroundTint="@color/colorPrimary"
app:cornerRadius="16dp"
android:layout_marginTop="0dp" />
</LinearLayout>

3
app/src/main/res/layout/fragment_login.xml
View File

@ -21,7 +21,7 @@
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Введите пароль"
android:hint="@string/password_hint"
android:inputType="textPassword"
android:padding="12dp"
android:background="@drawable/ic_android_black_24dp"
@ -43,6 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:gravity="center_horizontal"
android:textColor="@android:color/holo_red_light"
android:layout_marginBottom="16dp"/>

2
app/src/main/res/layout/fragment_main.xml
View File

@ -1,4 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"

1
app/src/main/res/values-en-rGB/strings.xml
View File

@ -40,4 +40,5 @@
<string name="worker_username">Employee\'s login</string>
<string name="watch_info_about_worker">View employee information</string>
<string name="block_or_unblock">Block/Unblock access</string>
<string name="back">Back</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -41,4 +41,5 @@
<string name="worker_username">Логин сотрудника</string>
<string name="watch_info_about_worker">Просмотреть информацию о сотруднике</string>
<string name="block_or_unblock">Блокировать/Разблокировать доступ</string>
<string name="back">Назад</string>
</resources>