From 2e6837390a2957e3e054b501d7046ac03a7cb9d1 Mon Sep 17 00:00:00 2001 From: A1pha Date: Wed, 27 Nov 2024 15:15:59 +0300 Subject: [PATCH] Reduced some unused imports --- .../myitschool/work/data/UserRepositoryImplementation.java | 2 -- .../ru/myitschool/work/data/network/RetrofitFactory.java | 1 - .../java/ru/myitschool/work/data/source/Credentials.java | 1 - .../java/ru/myitschool/work/domain/qr/PushQrUseCase.java | 2 -- .../java/ru/myitschool/work/ui/login/LoginFragment.java | 7 +------ .../java/ru/myitschool/work/ui/login/LoginViewModel.java | 7 +------ .../java/ru/myitschool/work/ui/profile/UserFragment.java | 6 ++---- .../java/ru/myitschool/work/ui/profile/UserViewModel.java | 3 --- .../ru/myitschool/work/ui/qr/result/QrResultFragment.java | 2 -- .../ru/myitschool/work/ui/qr/result/QrResultViewModel.java | 4 +--- app/src/main/java/ru/myitschool/work/utils/Utils.java | 1 - 11 files changed, 5 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/ru/myitschool/work/data/UserRepositoryImplementation.java b/app/src/main/java/ru/myitschool/work/data/UserRepositoryImplementation.java index 59a237d..113dacc 100644 --- a/app/src/main/java/ru/myitschool/work/data/UserRepositoryImplementation.java +++ b/app/src/main/java/ru/myitschool/work/data/UserRepositoryImplementation.java @@ -1,7 +1,5 @@ package ru.myitschool.work.data; -import android.util.Log; - import androidx.annotation.NonNull; import java.util.function.Consumer; diff --git a/app/src/main/java/ru/myitschool/work/data/network/RetrofitFactory.java b/app/src/main/java/ru/myitschool/work/data/network/RetrofitFactory.java index 9166a2a..3410b2c 100644 --- a/app/src/main/java/ru/myitschool/work/data/network/RetrofitFactory.java +++ b/app/src/main/java/ru/myitschool/work/data/network/RetrofitFactory.java @@ -4,7 +4,6 @@ import static ru.myitschool.work.core.Constants.SERVER_ADDRESS; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -import ru.myitschool.work.data.UserRepositoryImplementation; import ru.myitschool.work.data.source.UserApi; public class RetrofitFactory { diff --git a/app/src/main/java/ru/myitschool/work/data/source/Credentials.java b/app/src/main/java/ru/myitschool/work/data/source/Credentials.java index 69d9870..4521324 100644 --- a/app/src/main/java/ru/myitschool/work/data/source/Credentials.java +++ b/app/src/main/java/ru/myitschool/work/data/source/Credentials.java @@ -1,6 +1,5 @@ package ru.myitschool.work.data.source; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; public class Credentials { diff --git a/app/src/main/java/ru/myitschool/work/domain/qr/PushQrUseCase.java b/app/src/main/java/ru/myitschool/work/domain/qr/PushQrUseCase.java index 22486e9..2dc3554 100644 --- a/app/src/main/java/ru/myitschool/work/domain/qr/PushQrUseCase.java +++ b/app/src/main/java/ru/myitschool/work/domain/qr/PushQrUseCase.java @@ -1,7 +1,5 @@ package ru.myitschool.work.domain.qr; -import android.util.Log; - import androidx.annotation.NonNull; import java.util.function.Consumer; diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java index c715527..9dd828f 100644 --- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java +++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java @@ -4,9 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.text.Editable; -import android.util.Log; import android.view.View; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -59,9 +57,7 @@ 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())); viewModel.openProfileLiveData.observe(getViewLifecycleOwner(), (unused) -> { if (getContext() != null) { @@ -72,7 +68,6 @@ public class LoginFragment extends Fragment { } if (getView() == null) return; - Log.d("process", "navigated"); Navigation.findNavController(getView()).navigate( R.id.action_loginFragment_to_userFragment); }); diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java index 8b18faf..6fcec4d 100644 --- a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java +++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java @@ -1,7 +1,5 @@ package ru.myitschool.work.ui.login; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; @@ -14,9 +12,7 @@ import ru.myitschool.work.domain.login.IsUserExistUseCase; public class LoginViewModel extends ViewModel { private final State INIT_STATE = new State(false); - private final MutableLiveData mutableStateLiveData = new MutableLiveData( - INIT_STATE - ); + private final MutableLiveData mutableStateLiveData = new MutableLiveData(INIT_STATE); public final LiveData stateLiveData = mutableStateLiveData; private final MutableLiveData mutableErrorLiveData = new MutableLiveData(); public final LiveData errorLiveData = mutableErrorLiveData; @@ -52,7 +48,6 @@ public class LoginViewModel extends ViewModel { } isUserExistUseCase.execute(currentLogin, status -> { if (status.getValue() == null || status.getErrors() != null) { - Log.e("errors", status.getErrors().getLocalizedMessage()); mutableErrorLiveData.postValue("Something went wrong. Try again later"); return; } diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java b/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java index 689ab1d..50ba18d 100644 --- a/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java +++ b/app/src/main/java/ru/myitschool/work/ui/profile/UserFragment.java @@ -74,10 +74,8 @@ public class UserFragment extends Fragment { } }); - binding.scan.setOnClickListener(v -> { - Navigation.findNavController(getView()).navigate( - R.id.action_userFragment_to_qrScanFragment); - }); + binding.scan.setOnClickListener(v -> Navigation.findNavController(getView()).navigate( + R.id.action_userFragment_to_qrScanFragment)); binding.logout.setOnClickListener(v -> { if (getContext() != null) { diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/UserViewModel.java b/app/src/main/java/ru/myitschool/work/ui/profile/UserViewModel.java index b9a1b27..290cd09 100644 --- a/app/src/main/java/ru/myitschool/work/ui/profile/UserViewModel.java +++ b/app/src/main/java/ru/myitschool/work/ui/profile/UserViewModel.java @@ -1,7 +1,5 @@ package ru.myitschool.work.ui.profile; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; @@ -9,7 +7,6 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; import ru.myitschool.work.data.UserRepositoryImplementation; -import ru.myitschool.work.domain.entities.Status; import ru.myitschool.work.domain.entities.UserEntity; import ru.myitschool.work.domain.user.GetUserByLoginUseCase; diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java index dbc130c..552fc9a 100644 --- a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java +++ b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java @@ -3,9 +3,7 @@ package ru.myitschool.work.ui.qr.result; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.util.Log; import android.view.View; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultViewModel.java b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultViewModel.java index ebe5989..97c49da 100644 --- a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultViewModel.java +++ b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultViewModel.java @@ -20,9 +20,7 @@ public class QrResultViewModel extends ViewModel { ); public void update(@NonNull String login, @NonNull String qr) { - pushQrUseCase.execute(new QrEntity(login, qr), status -> { - mutableStateLiveData.postValue(fromStatus(status)); - }); + pushQrUseCase.execute(new QrEntity(login, qr), status -> mutableStateLiveData.postValue(fromStatus(status))); } private State fromStatus(Status status) { diff --git a/app/src/main/java/ru/myitschool/work/utils/Utils.java b/app/src/main/java/ru/myitschool/work/utils/Utils.java index 128903a..4e046c6 100644 --- a/app/src/main/java/ru/myitschool/work/utils/Utils.java +++ b/app/src/main/java/ru/myitschool/work/utils/Utils.java @@ -3,7 +3,6 @@ package ru.myitschool.work.utils; import static android.view.View.GONE; import static android.view.View.VISIBLE; -import android.view.View; public class Utils {