diff --git a/app/src/main/java/com/example/citrusclient/views/HomeFragment.java b/app/src/main/java/com/example/citrusclient/views/HomeFragment.java
index 8c23744..1dd8e26 100644
--- a/app/src/main/java/com/example/citrusclient/views/HomeFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/HomeFragment.java
@@ -172,7 +172,7 @@
((MainActivity) getActivity()).showFragment(new CreateScheduleFragment(year, month, day));
});
- ImageButton prevBotton = view.findViewById(R.id.prev_day_botton);
+ ImageButton prevBotton = view.findViewById(R.id.prev_day_button);
prevBotton.setOnClickListener(v -> {
curDate = curDate.minusDays(1);
year = curDate.getYear();
@@ -184,7 +184,7 @@
updateTodoSchedule(integerBookHashMap);
});
- ImageButton nextBotton = view.findViewById(R.id.next_day_botton);
+ ImageButton nextBotton = view.findViewById(R.id.next_day_button);
nextBotton.setOnClickListener(v -> {
curDate = curDate.plusDays(1);
year = curDate.getYear();
diff --git a/app/src/main/java/com/example/citrusclient/views/OtherHomeFragment.java b/app/src/main/java/com/example/citrusclient/views/OtherHomeFragment.java
index 5eed4ef..95d5fab 100644
--- a/app/src/main/java/com/example/citrusclient/views/OtherHomeFragment.java
+++ b/app/src/main/java/com/example/citrusclient/views/OtherHomeFragment.java
@@ -167,7 +167,7 @@
((MainActivity) getActivity()).showFragment(new OtherCalendarFragment());
});
- ImageButton prevBotton = view.findViewById(R.id.prev_day_botton);
+ ImageButton prevBotton = view.findViewById(R.id.prev_day_button);
prevBotton.setOnClickListener(v -> {
curDate = curDate.minusDays(1);
year = curDate.getYear();
@@ -181,7 +181,7 @@
updateTodoSchedule(book);
});
- ImageButton nextBotton = view.findViewById(R.id.next_day_botton);
+ ImageButton nextBotton = view.findViewById(R.id.next_day_button);
nextBotton.setOnClickListener(v -> {
curDate = curDate.plusDays(1);
year = curDate.getYear();
@@ -195,6 +195,11 @@
});
+ ImageButton backButton = view.findViewById(R.id.back_button);
+ backButton.setOnClickListener(v -> {
+ ((MainActivity) getActivity()).backFragment();
+ });
+
booksViewModel.loadBook(accountId, token, curBookId);
todosViewModel.loadTodosByDay(accountId, curBookId, year, month, day, token);
scheduleViewModel.updateSchedulesByDayAndBookId(accountId, year, month, day, token, curBookId);
diff --git a/app/src/main/res/drawable/baseline_arrow_back_24.xml b/app/src/main/res/drawable/baseline_arrow_back_24.xml
new file mode 100644
index 0000000..075e95d
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_arrow_back_24.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index bea8a30..7a91bed 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -27,7 +27,7 @@
@@ -89,13 +89,22 @@
android:layout_height="match_parent"
android:layout_gravity="right"
android:layout_marginTop="120dp"
- android:layout_marginBottom="20dp"
+ android:layout_marginBottom="80dp"
android:layout_marginLeft="210dp"
android:layout_marginRight="10dp" />
+
/>