From ae7a743d41c6c23fe954a4947664d771a0f95e09 Mon Sep 17 00:00:00 2001
From: SunZar <121431240+SunZar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:18:36 +0300
Subject: [PATCH] feat: commit for sync

---
 .../work/domain/UserRepository.java           | 22 -------------------
 .../work/ui/admin/AdminFragment.java          |  4 ++++
 .../work/ui/admin/AdminViewModel.java         |  4 ++++
 .../work/ui/information/HistoryAdapter.java   |  6 ++---
 .../ui/information/InformationViewModel.java  |  2 +-
 .../work/ui/profile/ProfileViewModel.java     |  6 ++---
 6 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 app/src/main/java/ru/myitschool/work/domain/UserRepository.java
 create mode 100644 app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.java
 create mode 100644 app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.java

diff --git a/app/src/main/java/ru/myitschool/work/domain/UserRepository.java b/app/src/main/java/ru/myitschool/work/domain/UserRepository.java
deleted file mode 100644
index b2d7e6e..0000000
--- a/app/src/main/java/ru/myitschool/work/domain/UserRepository.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.myitschool.work.domain;
-
-import androidx.annotation.NonNull;
-
-import java.util.List;
-import java.util.function.Consumer;
-
-import ru.myitschool.work.domain.entities.HistoryEntity;
-import ru.myitschool.work.domain.entities.Status;
-import ru.myitschool.work.domain.entities.UserEntity;
-
-public interface UserRepository {
-    //void getAllUsers(@NonNull Consumer<Status<List<UserEntity>>> callback);
-
-    //void getUser(@NonNull Integer id, @NonNull Consumer<Status<UserEntity>> callback);
-    void getAllUserHistory(@NonNull String username, @NonNull Consumer<Status<List<HistoryEntity>>> callback);
-    //void getVolunteerCenterById(@NonNull Integer id, @NonNull Consumer<Status<HistoryEntity>> callback);
-    //void isExist(@NonNull String username, @NonNull Consumer<Status<Void>> callback);
-    //void register(@NonNull String id, @NonNull Consumer<Status<FullUserEntity>> callback);
-
-    void login(@NonNull String username, @NonNull String password, @NonNull Consumer<Status<Void>> callback);
-}
diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.java b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.java
new file mode 100644
index 0000000..eabca9b
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminFragment.java
@@ -0,0 +1,4 @@
+package ru.myitschool.work.ui.admin;
+
+public class AdminFragment {
+}
diff --git a/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.java b/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.java
new file mode 100644
index 0000000..9c735d7
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/ui/admin/AdminViewModel.java
@@ -0,0 +1,4 @@
+package ru.myitschool.work.ui.admin;
+
+public class AdminViewModel {
+}
diff --git a/app/src/main/java/ru/myitschool/work/ui/information/HistoryAdapter.java b/app/src/main/java/ru/myitschool/work/ui/information/HistoryAdapter.java
index c9acd3b..9bbb10d 100644
--- a/app/src/main/java/ru/myitschool/work/ui/information/HistoryAdapter.java
+++ b/app/src/main/java/ru/myitschool/work/ui/information/HistoryAdapter.java
@@ -58,13 +58,13 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold
         public void bind(HistoryEntity item) {
             binding.time.setText(item.getTime().toString().substring(0, 10) + " "
                     + item.getTime().toString().substring(11, 16));
-            binding.nameReader.setText(item.getNameReader());
-            if (item.getType() == 1){
+            binding.nameReader.setText(item.getType());
+            /*if (item.getType() == 1){
                 binding.type.setText("QR-code");
             }
             else{
                 binding.type.setText("Карта");
-            }
+            }*/
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/information/InformationViewModel.java b/app/src/main/java/ru/myitschool/work/ui/information/InformationViewModel.java
index c8bed19..8a5a0ec 100644
--- a/app/src/main/java/ru/myitschool/work/ui/information/InformationViewModel.java
+++ b/app/src/main/java/ru/myitschool/work/ui/information/InformationViewModel.java
@@ -40,7 +40,7 @@ public class InformationViewModel extends ViewModel {
 
     public void load() {
         mutableStateAllUserHistoryLiveData.setValue(new InformationViewModel.State(null, null, false));
-        getHistById(username);
+        getHistById();
         /*getAllUserHistoryUseCase.execute(username, status -> {
             mutableStateHistoryLiveData.postValue(fromStatus(status));
         });*/
diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.java b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.java
index 5897765..5cfe7f2 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.java
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.java
@@ -48,8 +48,8 @@ public class ProfileViewModel extends ViewModel {
                 return;
             }
             //userCheckCompleted = true;
-            if (status.getStatusCode() == 200) {
-                if (status.getValue().g != null) {
+            /*if (status.getStatusCode() == 200) {
+                if (status.getValue() != null) {
                     GetAllUserHistoryUseCase.execute(status.getValue().getStatus(), status2 -> {
                         Log.d("taggis", status.getStatusCode() + " " + status.getErrors());
                         if (status.getStatusCode() == 200 && status.getErrors() == null) {
@@ -71,7 +71,7 @@ public class ProfileViewModel extends ViewModel {
                             false
                     ));
                 }
-            }
+            }*/
         });
     }