diff --git a/app/src/main/java/com/example/citrusclient/views/MainActivity.java b/app/src/main/java/com/example/citrusclient/views/MainActivity.java index ea3db46..4f26114 100644 --- a/app/src/main/java/com/example/citrusclient/views/MainActivity.java +++ b/app/src/main/java/com/example/citrusclient/views/MainActivity.java @@ -26,7 +26,6 @@ public class MainActivity extends AppCompatActivity { - BooksViewModel booksViewModel; Citrus citrus; @Override @@ -43,15 +42,7 @@ citrus = (Citrus) getApplication(); - booksViewModel = new ViewModelProvider(this).get(BooksViewModel.class); - booksViewModel.getBookLiveData().observe(this, new Observer>() { - @Override - public void onChanged(HashMap integerBookHashMap) { - citrus.setBook(new ArrayList<>(integerBookHashMap.values())); - } - }); - - showFragment(new MyBookshelfFragment()); +// showFragment(new HomeFragment()); setNavViewEvent(); @@ -66,6 +57,8 @@ private void setNavViewEvent(){ BottomNavigationView navView = findViewById(R.id.bottomNavigationView); + navView.setSelectedItemId(R.id.home); + showFragment(new HomeFragment()); navView.setOnItemSelectedListener(new NavigationBarView.OnItemSelectedListener() { @Override public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { diff --git a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java index 606bfbf..a8918ab 100644 --- a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java @@ -133,7 +133,7 @@ } }); - booksViewModel.loadBooks("bird", "xyz"); + booksViewModel.loadBooks(accountId, token); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index df65e07..785db3b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -28,9 +28,10 @@ android:background="#BAE4C3" android:minHeight="50dp" app:itemHorizontalTranslationEnabled="false" - app:itemIconSize="50dp" + app:itemIconSize="30dp" app:itemIconTint="@drawable/bottom_navigation_item_state" - app:itemPadding="100dp" + app:itemPaddingBottom="0dp" + app:itemPaddingTop="-50dp" app:itemTextAppearanceActiveBoldEnabled="true" app:itemTextColor="@drawable/bottom_navigation_item_state" app:menu="@menu/bottom_navigation_item" />