Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into favoritesFragment

Fork: 0

nitta-lab-2024 / CitrusClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into favoritesFragment # Conflicts: # app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java # app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java CalendarFragment OtherHomeFragment SearchFragment bagFixSakoda check favoritesFragment fixFavoritesCount master setting3
commit 07484587d91c7398ea9cf945046011a1640369ce 2 parents 6f05b9b + 5bafbec k-sakoda authored on 22 Oct

Browse code

# Conflicts:
#	app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java
#	app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java

CalendarFragment OtherHomeFragment SearchFragment bagFixSakoda check favoritesFragment fixFavoritesCount master setting3

commit 07484587d91c7398ea9cf945046011a1640369ce

2 parents 6f05b9b + 5bafbec

k-sakoda authored on 22 Oct

Patch

Unified Split

Showing 15 changed files

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/models/Book.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/rest/BooksRest.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/CalendarFragment.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/HomeFragment.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/OtherCalendarFragment.java

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/OtherHomeFragment.java

Ignore Space Show notes View app/src/main/res/drawable/baseline_arrow_back_24.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/vertical_dotted_line.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/a_schedule.xml

Ignore Space Show notes View app/src/main/res/layout/a_todo.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_home.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_other_home.xml

Show line notes below