Browse code Merge branch 'master' into View_SignUp # Conflicts: # app/src/main/AndroidManifest.xml AccountColorDialogFragment BooksAddFavoriteCount BooksRest CalendarFragment ColorChoice CorrectFavorite CreateBookActivity CreateScheduleFragment CreateTodoFragment EditSchedule FavoritesRest FavoritesViewModel GetOneBook HelpSearch HomeFragment LoginActivity MyBookshelfActivity OtherHomeFragment PublicBooksViewModel ScheduleViewModel SearchFragment Settings2 SettingsFragment TodoViewModel TodosRest View_SignUp Views_SignUp bagFixSakoda booksViewModels check citrus color favoritesFragment favoritesSakoda fixFavoritesCount master setting3 setting4 settings3 test-dialog

commit 339545c4eda8b81669df83af81387e8140fdfcfb 2 parents f3ade49 + 160ee7d k-iwamoto authored on 20 Jun

Showing 27 changed files

• .idea/gradle.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/citrusclient/Citrus.java
• app/src/main/java/com/example/citrusclient/models/Book.java
• app/src/main/java/com/example/citrusclient/models/Todo.java
• app/src/main/java/com/example/citrusclient/rest/AccountsRest.java
• app/src/main/java/com/example/citrusclient/rest/BooksRest.java
• app/src/main/java/com/example/citrusclient/rest/TodosRest.java
• app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java
• app/src/main/java/com/example/citrusclient/views/MainActivity.java
• app/src/main/java/com/example/citrusclient/views/MyBookshelfActivity.java
• app/src/main/java/com/example/citrusclient/views/MyBookshelfAdapter.java
• app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java
• app/src/main/res/drawable/baseline_add_24.xml
• app/src/main/res/drawable/baseline_calendar_month_24.xml
• app/src/main/res/drawable/baseline_face_24.xml
• app/src/main/res/drawable/baseline_home_24.xml
• app/src/main/res/drawable/baseline_menu_book_24.xml
• app/src/main/res/drawable/baseline_search_24.xml
• app/src/main/res/drawable/bottom_navigation_item_state.xml
• app/src/main/res/layout/a_book.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_my_bookshelf.xml
• app/src/main/res/layout/fragment_my_bookshelf_fragment.xml
• app/src/main/res/menu/bottom_navigation_item.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/Citrus.java 0 → 100644

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

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/models/Todo.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/rest/AccountsRest.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/TodosRest.java

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

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/MainActivity.java 0 → 100644

Show notes View app/src/main/java/com/example/citrusclient/views/MyBookshelfActivity.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/MyBookshelfAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java 0 → 100644

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/layout/a_book.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml 0 → 100644

Show notes View app/src/main/res/layout/activity_my_bookshelf.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/layout/fragment_my_bookshelf_fragment.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/menu/bottom_navigation_item.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below