GitBucket
|
Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into setting3
# Conflicts: # app/src/main/java/com/example/citrusclient/views/SettingsFragment.java |
|---|
|
|
| app/src/main/java/com/example/citrusclient/rest/BooksRest.java |
|---|
| app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java |
|---|
| app/src/main/java/com/example/citrusclient/views/CalendarFragment.java |
|---|
| app/src/main/java/com/example/citrusclient/views/FavoritesBooksFragment.java |
|---|
| app/src/main/java/com/example/citrusclient/views/MyAdapter.java |
|---|
| app/src/main/java/com/example/citrusclient/views/OtherHomeFragment.java |
|---|
| app/src/main/java/com/example/citrusclient/views/SearchFragment.java |
|---|
| app/src/main/res/layout/a_favorites_book.xml |
|---|
| app/src/main/res/layout/a_public_book.xml |
|---|
| app/src/main/res/values/strings.xml |
|---|