Merge branch 'develop' into improve/fixui

# Conflicts:
#	app/src/main/java/one/nem/lacerta/MainActivity.java
#	feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryPageFragment.java

feature/library/src/main/java/one/nem/lacerta/feature/library/DocumentSelectListener.java

@@ -1,5 +1,6 @@
 package one.nem.lacerta.feature.library;
 
 public interface DocumentSelectListener {
-    void onDocumentSelect(String documentId);
+    void onFolderSelected(String folderId, String folderName);
+    void onDocumentSelected(String documentId, String documentName);
 }

feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryPageFragment.java

@@ -35,17 +35,20 @@ import javax.inject.Inject;
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.lacerta.data.Document;
 import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.document.DocumentMeta;
-import one.nem.lacerta.model.document.tag.DocumentTag;
+import one.nem.lacerta.model.FragmentNavigation;
 import one.nem.lacerta.utils.LacertaLogger;
 
+
 /**
  * A simple {@link Fragment} subclass.
- * Use the {@link LibraryTopFragment#newInstance} factory method to
+ * Use the {@link LibraryPageFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
 @AndroidEntryPoint
-public class LibraryTopFragment extends Fragment {
+public class LibraryPageFragment extends Fragment {
+
+    // Param
+    private String folderId;
 
     @Inject
     LacertaLibrary lacertaLibrary;
@@ -57,12 +60,21 @@ public class LibraryTopFragment extends Fragment {
 
     int currentTotalItemCount = 0;
 
-    public LibraryTopFragment() {
+    public LibraryPageFragment() {
         // Required empty public constructor
     }
-    public static LibraryTopFragment newInstance() {
-        LibraryTopFragment fragment = new LibraryTopFragment();
+    public static LibraryPageFragment newInstance(String folderId) {
+        LibraryPageFragment fragment = new LibraryPageFragment();
         Bundle args = new Bundle();
+        args.putString("folderId", folderId);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public static LibraryPageFragment newInstance() {
+        LibraryPageFragment fragment = new LibraryPageFragment();
+        Bundle args = new Bundle();
+        args.putString("folderId", null);
         fragment.setArguments(args);
         return fragment;
     }
@@ -89,20 +101,55 @@ public class LibraryTopFragment extends Fragment {
 
         RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
 
-        this.listItemAdapter = new ListItemAdapter(documentId -> {
-            Toast.makeText(getContext(), documentId, Toast.LENGTH_SHORT).show();
+        this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
+            @Override
+            public void onFolderSelected(String folderId, String folderName) {
+                logger.debug("LibraryTopFragment", "Folder selected! folderId: " + folderId + ", folderName: " + folderName);
+                // 画面遷移
+                FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
+                assert fragmentNavigation != null;
+                fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId));
+            }
+
+            @Override
+            public void onDocumentSelected(String documentId, String documentName) {
+                Toast.makeText(getContext(), "Document selected! documentId: " + documentId + ", documentName: " + documentName, Toast.LENGTH_SHORT).show();
+            }
         });
         recyclerView.setAdapter(listItemAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-        lacertaLibrary.getLibraryPage(10).thenAccept(libraryItemPage -> {
-            logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
-            listItemAdapter.setLibraryItemPage(libraryItemPage);
-            this.currentTotalItemCount = libraryItemPage.getListItems().size();
-            getActivity().runOnUiThread(() -> {
-                listItemAdapter.notifyItemRangeInserted(0, this.currentTotalItemCount - 1);
+        if (getArguments() != null) {
+            this.folderId = getArguments().getString("folderId");
+        }
+
+        if (this.folderId == null) { // Root
+            lacertaLibrary.getLibraryPage(10).thenAccept(libraryItemPage -> {
+                logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+                listItemAdapter.setLibraryItemPage(libraryItemPage);
+                getActivity().runOnUiThread(() -> {
+                    // ActionBarのタイトルを変更する
+                    getActivity().setTitle("ライブラリ");
+                    // ActionBarに戻るボタンを非表示にする
+//                    getActivity().getActionBar().setDisplayHomeAsUpEnabled(false);
+                    listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
+                });
+                this.currentTotalItemCount = libraryItemPage.getListItems().size();
             });
-        });
+        } else { // Root以外
+            lacertaLibrary.getLibraryPage(this.folderId, 10).thenAccept(libraryItemPage -> {
+                logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+                listItemAdapter.setLibraryItemPage(libraryItemPage);
+                getActivity().runOnUiThread(() -> {
+                    // ActionBarのタイトルを変更する
+                    getActivity().setTitle(libraryItemPage.getPageTitle());
+                    // ActionBarに戻るボタンを表示する
+//                    getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
+                    listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
+                });
+                this.currentTotalItemCount = libraryItemPage.getListItems().size();
+            });
+        }
     }
 
     @Override

feature/library/src/main/java/one/nem/lacerta/feature/library/ListItemAdapter.java

@@ -14,6 +14,7 @@ import java.util.ArrayList;
 
 import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItemType;
 
 public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
 
@@ -46,9 +47,12 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
         holder.description.setText(listItem.getDescription());
 
         holder.itemView.setOnClickListener( v -> {
-//            Intent intent = new Intent(v.getContext(), ViewerMainActivity.class);
-//            intent.putExtra("documentId", listItem.getItemId());
-//            v.getContext().startActivity(intent);
+            if (listItem.getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
+                listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle());
+            }
+            else if (listItem.getItemType() == ListItemType.ITEM_TYPE_FOLDER) {
+                listener.onFolderSelected(listItem.getItemId(), listItem.getTitle());
+            }
         });
     }
 

feature/library/src/main/res/navigation/feature_library_navigation.xml

@@ -6,7 +6,7 @@
     app:startDestination="@id/feature_library_top_fragment">
     <fragment
         android:id="@+id/feature_library_top_fragment"
-        android:name="one.nem.lacerta.feature.library.LibraryTopFragment"
+        android:name="one.nem.lacerta.feature.library.LibraryPageFragment"
         android:label="fragment_library_top"
         tools:layout="@layout/fragment_library_top" />
 </navigation>