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

Last hope

Browse Source
This commit is contained in:
A1pha 2024-12-08 12:00:23 +03:00
parent 6266e01a0d
commit 241a9ac5f6
8 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/ru/myitschool/work/data/UserRepositoryImplementation.java
View File

@ -36,21 +36,22 @@ public class UserRepositoryImplementation implements UserRepository, LoginReposi
userApi.getByLogin(login).enqueue(new CallToConsumer<>( userApi.getByLogin(login).enqueue(new CallToConsumer<>(
callback, callback,
userDto -> { userDto -> {
final String resultLogin = userDto.login; if (userDto != null) {
final String id = userDto.id; final String resultLogin = userDto.login;
final String name = userDto.name; final String id = userDto.id;
if (resultLogin != null && id != null && name != null) { final String name = userDto.name;
return new UserEntity( if (resultLogin != null && id != null && name != null) {
id, return new UserEntity(
resultLogin, id,
name, resultLogin,
userDto.lastVisit, name,
userDto.photoUrl, userDto.lastVisit,
userDto.position userDto.photoUrl,
); userDto.position
} else { );
return null; }
} }
return null;
} }
)); ));
} }

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

@ -52,7 +52,7 @@ public class LoginFragment extends Fragment {
viewModel.errorLiveData.observe(getViewLifecycleOwner(), error -> viewModel.errorLiveData.observe(getViewLifecycleOwner(), error ->
binding.error.setVisibility(Utils.visibleOrGone(error != null))); binding.error.setVisibility(Utils.visibleOrGone(error != null)));
viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> { viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> {
binding.login.setClickable(state.isButtonActive()); binding.login.setEnabled(state.isButtonActive());
if (state.isButtonActive()) { if (state.isButtonActive()) {
binding.login.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.main_button, getContext().getTheme())); binding.login.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.main_button, getContext().getTheme()));
binding.login.setTextColor(ResourcesCompat.getColor(getResources(), R.color.white, getContext().getTheme())); binding.login.setTextColor(ResourcesCompat.getColor(getResources(), R.color.white, getContext().getTheme()));

3
app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java
View File

@ -53,8 +53,7 @@ public class LoginViewModel extends ViewModel {
} }
if (status.getStatusCode() == 401) { if (status.getStatusCode() == 401) {
mutableErrorLiveData.postValue("There is no such login or incorrect"); mutableErrorLiveData.postValue("There is no such login or incorrect");
} } else if (status.getStatusCode() == 200) {
if (status.getStatusCode() == 200) {
mutableOpenProfileLiveData.postValue(null); mutableOpenProfileLiveData.postValue(null);
} }
}); });

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

@ -8,6 +8,7 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentResultListener; import androidx.fragment.app.FragmentResultListener;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;

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

@ -40,22 +40,18 @@ public class QrResultFragment extends Fragment {
@Override @Override
public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) { public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
resultQr = QrScanDestination.INSTANCE.getDataIfExist(result); resultQr = QrScanDestination.INSTANCE.getDataIfExist(result);
viewModel.update(Utils.getLogin(getContext()), resultQr);
if (getContext() != null && Utils.getLogin(getContext()) != null) {
viewModel.update(Utils.getLogin(getContext()), resultQr);
}
} }
}); });
viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> { viewModel.stateLiveData.observe(getViewLifecycleOwner(), state -> {
Log.d("status", resultQr != null ? resultQr : "None");
if (resultQr == null) { if (resultQr == null) {
binding.result.setText(R.string.door_closed); binding.result.setText(R.string.door_closed);
binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.warn_button, getContext().getTheme())); binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.warn_button, getContext().getTheme()));
} else if (state.getErrorMessage() == null && state.isOpened()) { } else if (state.isOpened()) {
binding.result.setText(R.string.door_opened); binding.result.setText(R.string.door_opened);
binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.main_button, getContext().getTheme())); binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.main_button, getContext().getTheme()));
} else if (state.getErrorMessage() != null || !state.isOpened()) { } else {
binding.result.setText(R.string.error); binding.result.setText(R.string.error);
binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.warn_button, getContext().getTheme())); binding.close.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.warn_button, getContext().getTheme()));
} }

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

@ -40,7 +40,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login" android:text="@string/login"
android:clickable="false" android:enabled="false"
android:background="@drawable/inactive_button" /> android:background="@drawable/inactive_button" />
<TextView <TextView

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

@ -12,7 +12,9 @@
tools:layout="@layout/fragment_user"> tools:layout="@layout/fragment_user">
<action <action
android:id="@+id/action_userFragment_to_loginFragment" android:id="@+id/action_userFragment_to_loginFragment"
app:destination="@id/loginFragment" /> app:destination="@id/loginFragment"
app:popUpTo="@id/nav_graph"
app:popUpToInclusive="true" />
<action <action
android:id="@+id/action_userFragment_to_qrResultFragment" android:id="@+id/action_userFragment_to_qrResultFragment"
app:destination="@id/qrResultFragment" /> app:destination="@id/qrResultFragment" />

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

@ -9,7 +9,7 @@
<string name="to_main_menu">Close</string> <string name="to_main_menu">Close</string>
<string name="door_opened">Success</string> <string name="door_opened">Success</string>
<string name="door_closed">Operation was cancelled</string> <string name="door_closed">Operation was cancelled</string>
<string name="error">Something went wrong</string> <string name="error">Something wrong</string>
<string name="close_button">Close</string> <string name="close_button">Close</string>
<string name="logout_text">Logout</string> <string name="logout_text">Logout</string>
<string name="last_visit">"Last visit:"</string> <string name="last_visit">"Last visit:"</string>