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

Final (may be) commit

Browse Source
This commit is contained in:
A1pha 2024-11-27 22:13:16 +03:00
parent 2e6837390a
commit 432796e731
21 changed files with 368 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@
android:theme="@style/Theme.Default"
tools:targetApi="31">
<activity
android:windowSoftInputMode="adjustResize"
android:name=".ui.RootActivity"
android:exported="true">
<intent-filter>

12
app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
View File

@ -8,6 +8,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.Navigation;
@ -57,7 +58,16 @@ public class LoginFragment extends Fragment {
binding.error.setVisibility(Utils.visibleOrGone(error != null));
binding.error.setText(error);
});
viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> binding.login.setClickable(state.isButtonActive()));
viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> {
binding.login.setClickable(state.isButtonActive());
if (state.isButtonActive()) {
binding.login.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.main_button, getContext().getTheme()));
binding.login.setTextColor(ResourcesCompat.getColor(getResources(), R.color.white, getContext().getTheme()));
} else {
binding.login.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.inactive_button, getContext().getTheme()));
binding.login.setTextColor(ResourcesCompat.getColor(getResources(), R.color.black, getContext().getTheme()));
}
});
viewModel.openProfileLiveData.observe(getViewLifecycleOwner(), (unused) -> {
if (getContext() != null) {

8
app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java
View File

@ -14,6 +14,8 @@ import androidx.navigation.Navigation;
import com.squareup.picasso.Picasso;
import java.text.MessageFormat;
import ru.myitschool.work.R;
import ru.myitschool.work.databinding.FragmentUserBinding;
import ru.myitschool.work.domain.entities.UserEntity;
@ -52,7 +54,9 @@ public class UserFragment extends Fragment {
binding.fullname.setText(entity.getName());
binding.position.setText(entity.getPosition());
binding.lastEntry.setText(entity.getLast_visit());
String lastVisit = entity.getLast_visit();
binding.lastEntry.setText(MessageFormat.format("{0} {1}",
lastVisit.substring(0, 10), lastVisit.substring(11, 16)));
if (entity.getPhotoUrl() != null) {
Picasso.get().load(entity.getPhotoUrl()).into(binding.photo);
@ -94,7 +98,7 @@ public class UserFragment extends Fragment {
@Override
public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
if (QrScanDestination.INSTANCE.getDataIfExist(result) != null) {
getParentFragmentManager().setFragmentResult("requestKey", result);
getParentFragmentManager().setFragmentResult(QrScanDestination.REQUEST_KEY, result);
Navigation.findNavController(getView()).navigate(
R.id.action_userFragment_to_qrResultFragment);
}

4
app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java
View File

@ -7,6 +7,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentResultListener;
import androidx.lifecycle.ViewModelProvider;
@ -32,13 +33,14 @@ public class QrResultFragment extends Fragment {
binding = FragmentQrResultBinding.bind(view);
viewModel = new ViewModelProvider(this).get(QrResultViewModel.class);
getParentFragmentManager().setFragmentResultListener("requestKey", this, new FragmentResultListener() {
getParentFragmentManager().setFragmentResultListener(QrScanDestination.REQUEST_KEY, this, new FragmentResultListener() {
@Override
public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
resultQr = QrScanDestination.INSTANCE.getDataIfExist(result);
if (resultQr == null) {
binding.result.setText(R.string.door_closed);
binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.warn_button, getContext().getTheme()));
}
viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> {

7
app/src/main/res/drawable/inactive_button.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/gray"/>
<corners android:radius="10dp"/>
</shape>

5
app/src/main/res/drawable/input_field.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/gray" />
<corners android:radius="10dp"/>
</shape>

7
app/src/main/res/drawable/main_button.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/main_button_color"/>
<corners android:radius="10dp"/>
</shape>

7
app/src/main/res/drawable/main_button_outline.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="@color/main_button_color" android:width="1dp"/>
<corners android:radius="10dp"/>
</shape>

7
app/src/main/res/drawable/warn_button.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/warn_button_color"/>
<corners android:radius="10dp"/>
</shape>

7
app/src/main/res/drawable/warn_button_outline.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="@color/warn_button_color" android:width="1dp"/>
<corners android:radius="10dp"/>
</shape>

BIN
app/src/main/res/font/manrope_bold.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/manrope_light.ttf Normal file
View File

Binary file not shown.

121
app/src/main/res/layout-land/fragment_user.xml Normal file
View File

@ -0,0 +1,121 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="50dp"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center">
<ImageView
android:id="@+id/photo"
tools:src="@mipmap/ic_launcher"
android:layout_width="130dp"
android:layout_height="130dp"
android:layout_marginEnd="60dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center">
<TextView
android:textAlignment="center"
android:id="@+id/fullname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="@font/manrope_bold"
android:textSize="24sp"
android:textStyle="bold"
android:maxWidth="280dp"
tools:text="Алексеев Виталий Александрович" />
<TextView
android:layout_marginTop="4dp"
android:textColor="@color/main_button_color"
android:id="@+id/position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Начальник" />
<LinearLayout
android:layout_marginTop="4dp"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<TextView
android:layout_marginEnd="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/last_visit" />
<TextView
android:fontFamily="@font/manrope_light"
android:id="@+id/lastEntry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="19.09.24:10:00:01" />
</LinearLayout>
<TextView
android:layout_marginTop="8dp"
android:textColor="@color/warn_button_color"
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Some error"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_marginBottom="10dp"
android:layout_marginHorizontal="20dp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:foreground="?attr/selectableItemBackground"
android:textColor="@color/warn_button_color"
android:id="@+id/logout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/logout_text"
android:background="@drawable/warn_button_outline"/>
<Button
android:foreground="?attr/selectableItemBackground"
android:textColor="@color/main_button_color"
android:layout_marginTop="10dp"
android:id="@+id/refresh"
android:text="@string/refresh_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/main_button_outline"/>
<Button
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/main_button"
android:textColor="@color/white"
android:layout_marginTop="10dp"
android:id="@+id/scan"
android:text="@string/scan_qr_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -6,4 +6,5 @@
android:id="@+id/root"
app:navGraph="@navigation/nav_graph"
android:name="androidx.navigation.fragment.NavHostFragment"
app:defaultNavHost="true" />
app:defaultNavHost="true"
android:background="@color/white" />

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

@ -1,45 +1,56 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white">
<androidx.constraintlayout.helper.widget.Flow
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:flow_verticalStyle="packed"
app:flow_verticalGap="24dp"
app:layout_constraintBottom_toBottomOf="parent"
<LinearLayout
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:constraint_referenced_ids="title, username, login, error" />
<TextView
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_text" />
android:gravity="center_vertical">
<TextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/manrope_bold"
android:text="@string/welcome_text"
android:textSize="24sp" />
<EditText
android:layout_marginTop="24dp"
android:paddingStart="20dp"
android:fontFamily="@font/manrope_light"
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="50dp"
android:background="@drawable/input_field"
android:hint="@string/login_hint" />
<EditText
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:hint="@string/login_hint" />
<Button
android:foreground="?attr/selectableItemBackground"
android:layout_marginTop="8dp"
android:id="@+id/login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login"
android:clickable="false"
android:background="@drawable/inactive_button" />
<Button
android:id="@+id/login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login"
android:clickable="false" />
<TextView
android:textAlignment="center"
android:layout_marginTop="8dp"
android:id="@+id/error"
android:textColor="@color/warn_button_color"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="Some error"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -2,31 +2,31 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:tools="http://schemas.android.com/tools">
<TextView
android:id="@+id/result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="50dp" />
<Button
android:id="@+id/close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/to_main_menu"/>
<androidx.constraintlayout.helper.widget.Flow
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="result,close"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:flow_verticalStyle="packed"
app:flow_verticalGap="24dp" />
android:gravity="center"
android:layout_marginHorizontal="24dp">
<TextView
android:id="@+id/result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24dp"
tools:text="Успешно!"/>
<Button
android:foreground="?attr/selectableItemBackground"
android:textColor="@color/white"
android:layout_marginTop="16dp"
android:id="@+id/close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/to_main_menu"
android:background="@drawable/main_button" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -6,65 +6,107 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/fullname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Виталий" />
<ImageView
android:id="@+id/photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Начальник" />
<TextView
android:id="@+id/lastEntry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="19.09.24:10:00:01" />
<TextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="ошибка" />
<Button
android:id="@+id/logout"
android:text="@string/logout_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
android:id="@+id/refresh"
android:text="@string/refresh_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
android:id="@+id/scan"
android:text="@string/scan_qr_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/flow2"
android:layout_width="wrap_content"
<LinearLayout
android:layout_marginHorizontal="20dp"
android:layout_marginTop="131dp"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:flow_verticalGap="24dp"
app:constraint_referenced_ids="fullname,photo,position,lastEntry,logout,refresh,scan,error"
app:flow_lastVerticalStyle="spread"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:gravity="center_horizontal">
<ImageView
android:id="@+id/photo"
tools:src="@mipmap/ic_launcher"
android:layout_width="130dp"
android:layout_height="130dp" />
<TextView
android:textAlignment="center"
android:id="@+id/fullname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:fontFamily="@font/manrope_bold"
android:textSize="24sp"
android:textStyle="bold"
android:maxWidth="280dp"
tools:text="Алексеев Виталий Александрович" />
<TextView
android:layout_marginTop="4dp"
android:textColor="@color/main_button_color"
android:id="@+id/position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Начальник" />
<LinearLayout
android:layout_marginTop="4dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<TextView
android:layout_marginEnd="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/last_visit" />
<TextView
android:fontFamily="@font/manrope_light"
android:id="@+id/lastEntry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="19.09.24:10:00:01" />
</LinearLayout>
<Button
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/main_button"
android:textColor="@color/white"
android:layout_marginTop="24dp"
android:id="@+id/scan"
android:text="@string/scan_qr_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_marginTop="8dp"
android:textColor="@color/warn_button_color"
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Some error"/>
</LinearLayout>
<LinearLayout
android:layout_marginBottom="37dp"
android:layout_marginHorizontal="20dp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:foreground="?attr/selectableItemBackground"
android:textColor="@color/warn_button_color"
android:id="@+id/logout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/logout_text"
android:background="@drawable/warn_button_outline"/>
<Button
android:foreground="?attr/selectableItemBackground"
android:textColor="@color/main_button_color"
android:layout_marginTop="10dp"
android:id="@+id/refresh"
android:text="@string/refresh_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/main_button_outline"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -3,7 +3,7 @@
<string name="app_name">NTO Pass</string>
<string name="scan_qr_text">Scan QR</string>
<string name="login_hint">Enter login</string>
<string name="welcome_text">Welcome</string>
<string name="welcome_text">Welcome to NTO Pass app</string>
<string name="login">Login</string>
<string name="refresh_data">Refresh</string>
<string name="to_main_menu">Close</string>
@ -12,4 +12,5 @@
<string name="error">Something went wrong</string>
<string name="close_button">Close</string>
<string name="logout_text">Logout</string>
<string name="last_visit">"Last visit:"</string>
</resources>

6
app/src/main/res/values/colors.xml
View File

@ -5,6 +5,10 @@
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="black">#272728</color>
<color name="white">#FFFFFFFF</color>
<color name="main_button_color">#001A8C</color>
<color name="warn_button_color">#D71A1E</color>
<color name="gray">#F8F8FA</color>
<color name="ripple">#FFFFFF</color>
</resources>

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

@ -2,12 +2,13 @@
<string name="app_name">NTO Pass</string>
<string name="scan_qr_text">Сканировать QR-код</string>
<string name="login_hint">Введите логин</string>
<string name="welcome_text">Добро пожаловать</string>
<string name="welcome_text">Добро пожаловать в NTO Pass</string>
<string name="login">Войти</string>
<string name="refresh_data">Обновить данные</string>
<string name="to_main_menu">Закрыть</string>
<string name="door_opened">успешно</string>
<string name="door_opened">Успешно</string>
<string name="door_closed">Вход был отменён</string>
<string name="error">Что-то пошло не так</string>
<string name="logout_text">Выйти из аккаунта</string>
<string name="last_visit">Последний вход: </string>
</resources>

18
app/src/main/res/values/themes.xml
View File

@ -1,16 +1,12 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.Default" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.Default" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
<item name="android:statusBarColor">@color/white</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:fontFamily">@font/manrope_bold</item>
<item name="android:textColor">@color/black</item>
<item name="textAllCaps">false</item>
</style>
</resources>