From 9e0f181f56c2aac50d5520f2031694aaaa8a5838 Mon Sep 17 00:00:00 2001 From: aklyushova Date: Thu, 20 Feb 2025 10:03:26 +0300 Subject: [PATCH 1/2] added fragment_admin.xml --- .../myitschool/work/data/dto/HistoryDto.java | 3 ++ app/src/main/res/layout/fragment_admin.xml | 39 ++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/ru/myitschool/work/data/dto/HistoryDto.java b/app/src/main/java/ru/myitschool/work/data/dto/HistoryDto.java index 88c7179..d9ae352 100644 --- a/app/src/main/java/ru/myitschool/work/data/dto/HistoryDto.java +++ b/app/src/main/java/ru/myitschool/work/data/dto/HistoryDto.java @@ -21,10 +21,13 @@ public class HistoryDto { @SerializedName("nameReader") public String nameReader; + + @Nullable @SerializedName("type") public String type; + } diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 3f2847f..233bf3b 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -15,20 +15,47 @@ app:layout_constraintTop_toTopOf="parent" />