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

feat: some xml-values and const changes

Browse Source
This commit is contained in:
a1pha 2025-02-19 18:50:02 +03:00
parent 57b42a0e91
commit ec4f09c455
8 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application
android:name=".App"

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

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

20
app/src/main/res/layout/fragment_find_employee.xml
View File

@ -5,19 +5,19 @@
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="24dp"
android:gravity="center"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:orientation="vertical">
<TextView
android:layout_gravity="start"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:fontFamily="@font/manrope_bold"
android:text="@string/find_employee_header"
android:text="@string/find_employee_button_text"
android:textSize="24sp" />
<EditText
@ -41,6 +41,16 @@
android:foreground="?attr/selectableItemBackground"
android:text="@string/find_button_text"
android:textColor="@color/white" />
<TextView
android:id="@+id/error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/error"
android:textAlignment="center"
android:textColor="@color/warn_button_color"
android:visibility="gone" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -15,7 +15,7 @@
android:id="@+id/result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24dp"
android:textSize="24sp"
tools:text="Успешно!"/>
<Button

6
app/src/main/res/layout/fragment_user.xml
View File

@ -116,17 +116,19 @@
android:id="@+id/block"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/warn_button_outline"
android:foreground="?attr/selectableItemBackground"
android:text="@string/block_card_button_text"
android:textColor="@color/warn_button_color" />
android:textColor="@color/warn_button_color"
android:visibility="gone"
tools:visibility="visible" />
<ImageButton
android:id="@+id/logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/warn_button"
android:padding="12dp"
android:src="@drawable/exit" />

17
app/src/main/res/navigation/nav_graph.xml
View File

@ -22,6 +22,9 @@
<action
android:id="@+id/action_userFragment_to_qrScanFragment"
app:destination="@id/qrScanFragment" />
<action
android:id="@+id/action_userFragment_to_adminFragment"
app:destination="@id/adminFragment" />
</fragment>
<fragment
android:id="@+id/qrScanFragment"
@ -63,4 +66,18 @@
android:id="@+id/action_splashFragment_to_loginFragment"
app:destination="@id/loginFragment" />
</fragment>
<fragment
android:id="@+id/adminFragment"
android:name="ru.myitschool.work.ui.admin.search.AdminFragment"
android:label="AdminFragment"
tools:layout="@layout/fragment_find_employee">
<action
android:id="@+id/action_adminFragment_to_viewUserAsAdminFragment"
app:destination="@id/viewUserAsAdminFragment" />
</fragment>
<fragment
android:id="@+id/viewUserAsAdminFragment"
android:name="ru.myitschool.work.ui.admin.view.ViewUserAsAdminFragment"
android:label="ViewUserAsAdminFragment"
tools:layout="@layout/fragment_user" />
</navigation>

8
app/src/main/res/values-en-rUS/strings.xml
View File

@ -13,4 +13,12 @@
<string name="close_button">Close</string>
<string name="logout_text">Logout</string>
<string name="last_visit">"Last visit:"</string>
<string name="password_input_hint">Password</string>
<string name="block_card_button_text">Block card</string>
<string name="card_using_header">Pass using</string>
<string name="find_employee_button_text">Find employee</string>
<string name="find_button_text">Find</string>
<string name="offline_error">Seems you are offline...</string>
<string name="no_internet_instructions">Check your internet connection\\nand try again</string>
<string name="reload_text">" Reload"</string>
</resources>

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

@ -12,10 +12,11 @@
<string name="logout_text">Выйти из аккаунта</string>
<string name="last_visit">Последний вход: </string>
<string name="password_input_hint">Введите пароль</string>
<string name="register_process_button_text">Зарегестрироваться</string>
<string name="block_card_button_text">Заблокировать карту</string>
<string name="card_using_header">Использование пропуска</string>
<string name="find_employee_button_text">Поиск сотрудника</string>
<string name="find_button_text">Найти</string>
<string name="find_employee_header">Поиск сотрудника</string>
<string name="offline_error">Кажется вы оффлайн...</string>
<string name="no_internet_instructions">Проверьте подключение к сети\nи попробуйте еще раз</string>
<string name="reload_text">Перезагрузить</string>
</resources>