Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into CreateScheduleFragment
AccountColorDialogFragment
BooksAddFavoriteCount
CalendarFragment
CorrectFavorite
CreateScheduleFragment
CreateTodoFragment
EditSchedule
FavoritesRest
FavoritesViewModel
GetOneBook
HelpSearch
HomeFragment
OtherHomeFragment
ScheduleViewModel
SearchFragment
Settings2
SettingsFragment
View_SignUp
Views_SignUp
bagFixSakoda
check
citrus
favoritesFragment
favoritesSakoda
fixFavoritesCount
master
setting3
setting4
settings3
|
---|
app/src/main/java/com/example/citrusclient/Citrus.java |
---|
app/src/main/java/com/example/citrusclient/views/BookColorDialogFragment.java |
---|
app/src/main/java/com/example/citrusclient/views/CalendarFragment.java |
---|
app/src/main/java/com/example/citrusclient/views/MainActivity.java |
---|
app/src/main/java/com/example/citrusclient/views/SearchFragment.java 0 → 100644 |
---|
app/src/main/res/layout/a_public_book.xml 0 → 100644 |
---|
app/src/main/res/layout/activity_login.xml |
---|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/fragment_book_color_dialog.xml |
---|
app/src/main/res/layout/fragment_calendar.xml |
---|
app/src/main/res/layout/fragment_create_book.xml |
---|
app/src/main/res/layout/fragment_my_bookshelf_fragment.xml |
---|
app/src/main/res/layout/fragment_search.xml 0 → 100644 |
---|