diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3caa385..1f943f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + + tools:targetApi="31" + android:usesCleartextTraffic="true" + android:networkSecurityConfig="@xml/network_security_config"> 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 7c8e285..3019a14 100644 --- a/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/MyBookshelfFragment.java @@ -8,6 +8,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -70,6 +71,8 @@ private List bookList; + BooksViewModel booksViewModel; + @Override public void onCreate(Bundle savedInstanceState) { @@ -78,14 +81,18 @@ mParam1 = getArguments().getString(ARG_PARAM1); mParam2 = getArguments().getString(ARG_PARAM2); } + + booksViewModel = new ViewModelProvider(this).get(BooksViewModel.class); + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment + View rootView = inflater.inflate(R.layout.fragment_my_bookshelf_fragment, container, false); - return inflater.inflate(R.layout.fragment_my_bookshelf_fragment, container, false); + return rootView; } @@ -116,16 +123,14 @@ ((MainActivity) getActivity()).showFragment(new CreateBookFragment()); }); - BooksViewModel booksViewModel = new BooksViewModel(); - booksViewModel.getBookLiveData().observe(getViewLifecycleOwner(), new Observer>() { @Override public void onChanged(HashMap integerBookHashMap) { -// bookList = new ArrayList<>(integerBookHashMap.values()); -// bookAdapter.notifyDataSetChanged(); - + bookList = new ArrayList<>(integerBookHashMap.values()); + bookAdapter.notifyDataSetChanged(); } }); + booksViewModel.loadBooks("bird", "xyz"); diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..a1f074e --- /dev/null +++ b/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file