代替としてStoreで管理するように

fixUI

app/src/main/java/one/nem/lacerta/MainActivity.java

@@ -1,8 +1,11 @@
 package one.nem.lacerta;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.NavigationUI;
@@ -14,9 +17,11 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import one.nem.lacerta.model.FragmentNavigation;
 import one.nem.lacerta.model.pref.FeatureSwitchOverride;
 import one.nem.lacerta.utils.FeatureSwitch;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 
@@ -28,7 +33,7 @@ import one.nem.lacerta.utils.repository.SharedPrefUtils;
 import javax.inject.Inject;
 
 @AndroidEntryPoint
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity implements FragmentNavigation {
 
     @Inject
     SharedPrefUtils sharedPrefUtils;
@@ -68,8 +73,8 @@ public class MainActivity extends AppCompatActivity {
 
         // Set status bar color
         getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
-    }
 
+    }
     private void initializeApp() {
         Log.d("Init", "Initializing app");
         // Set feature switch override to default value
@@ -84,4 +89,69 @@ public class MainActivity extends AppCompatActivity {
         boolean isEnabled = FeatureSwitch.Meta.canOverrideSwitch ? sharedPrefUtils.getFeatureSwitchOverride(featureSwitchOverride) : defaultValue;
         if (!isEnabled) bottomNavigationView.getMenu().removeItem(menuId);
     }
+
+    @Override
+    public void navigateToFragment(Fragment fragment) {
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.nav_host_fragment, fragment)
+                .addToBackStack(null)
+                .commit();
+    }
+
+    @Override
+    public void navigateToFragment(Fragment fragment, boolean addToBackStack) {
+        if (addToBackStack) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.nav_host_fragment, fragment)
+                    .addToBackStack(null)
+                    .commit();
+        } else {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.nav_host_fragment, fragment)
+                    .commit();
+        }
+    }
+
+    @Override
+    public void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack) {
+        if (clearBackStack) {
+            getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        }
+        if (addToBackStack) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.nav_host_fragment, fragment)
+                    .addToBackStack(null)
+                    .commit();
+        } else {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.nav_host_fragment, fragment)
+                    .commit();
+        }
+    }
+
+    public void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack) {
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+
+        // get the current fragment
+        Fragment currentFragment = getSupportFragmentManager().getPrimaryNavigationFragment();
+
+        // hide the current fragment
+        if (currentFragment != null) {
+            transaction.hide(currentFragment);
+        }
+
+        // Add the new fragment
+        transaction.add(R.id.nav_host_fragment, fragment);
+
+        // Add the transaction to the back stack if needed
+        if (addToBackStack) {
+            transaction.addToBackStack(null);
+        }
+
+        // Commit the transaction
+        transaction.commit();
+
+        // Update the primary navigation fragment
+        getSupportFragmentManager().beginTransaction().setPrimaryNavigationFragment(fragment).commit();
+    }
 }

app/src/main/res/layout/activity_main.xml

@@ -31,6 +31,7 @@
         app:labelVisibilityMode="selected"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/bottom_nav_menu" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

component/viewer/build.gradle

@@ -54,4 +54,6 @@ dependencies {
 
     implementation project(':model')
 
+    implementation project(':vcs')
+
 }

component/viewer/src/main/java/one/nem/lacerta/component/viewer/ComponentViewerTopFragment.java

@@ -3,7 +3,9 @@ package one.nem.lacerta.component.viewer;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -67,6 +69,10 @@ public class ComponentViewerTopFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
 
+        // Toolbar
+        Toolbar toolbar = view.findViewById(R.id.toolbar);
+        toolbarSetup(toolbar, true, "Revision List");
+
         RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
@@ -85,4 +91,39 @@ public class ComponentViewerTopFragment extends Fragment {
 
         return view;
     }
+
+    /**
+     * ToolbarをInitする
+     *
+     * @param toolbar Toolbar
+     * @param showBackButton 戻るボタンを表示するか
+     * @param title タイトル
+     */
+    private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
+        getActivity().runOnUiThread(() -> {
+            if (showBackButton) {
+                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
+                toolbar.setNavigationOnClickListener(v -> {
+                    //this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
+                    // Back
+                    Navigation.findNavController(requireView()).popBackStack();
+                });
+            } else {
+                toolbar.setNavigationIcon(null);
+            }
+            toolbar.setTitle(title);
+            toolbar.inflateMenu(R.menu.viewer_menu);
+            toolbar.setOnMenuItemClickListener(item -> {
+                if (item.getItemId() == R.id.action_open_vcs_rev_list) {
+                    // Open vcs rev list
+                    getParentFragmentManager().beginTransaction()
+                            .replace(R.id.nav_host_fragment, ViewerVcsRevListFragment.newInstance(documentId))
+                            .commit();
+                    return true;
+                } else {
+                    return false;
+                }
+            });
+        });
+    }
 }

component/viewer/src/main/java/one/nem/lacerta/component/viewer/RevAdapter.java

@@ -0,0 +1,80 @@
+package one.nem.lacerta.component.viewer;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+
+import one.nem.lacerta.model.VcsRevModel;
+import one.nem.lacerta.utils.FeatureSwitch;
+
+public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
+
+    private ArrayList<VcsRevModel> revModels;
+
+    public RevAdapter(ArrayList<VcsRevModel> revModels) {
+        this.revModels = revModels;
+    }
+
+    public RevAdapter() {
+    }
+
+    public void setRevModels(ArrayList<VcsRevModel> revModels) {
+        this.revModels = revModels;
+    }
+
+
+    @NonNull
+    @Override
+    public RevAdapter.RevViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.viewer_rev_list_item, parent, false);
+        return new RevAdapter.RevViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RevAdapter.RevViewHolder holder, int position) {
+        VcsRevModel revModel = revModels.get(position);
+        holder.title.setText(revModel.getCommitMessage());
+        if (FeatureSwitch.Vcs.disableBranchDisplay) {
+//            holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()));
+            holder.detail.setText("DateTimePlaceholder");
+        } else {
+            //        holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + revModel.getBranchName());
+            holder.detail.setText("DateTimePlaceholder" + " " + revModel.getBranchName());
+        }
+        holder.revId.setText("RevID: " + revModel.getId());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        if (revModels == null) {
+            return 0;
+        } else {
+            return revModels.size();
+        }
+    }
+
+    class RevViewHolder extends RecyclerView.ViewHolder {
+
+        TextView title;
+
+        TextView detail;
+
+        TextView revId;
+
+        public RevViewHolder(@NonNull View itemView) {
+            super(itemView);
+
+            title = itemView.findViewById(R.id.rev_item_title);
+            detail = itemView.findViewById(R.id.rev_item_detail);
+            revId = itemView.findViewById(R.id.rev_item_id);
+        }
+    }
+}

component/viewer/src/main/java/one/nem/lacerta/component/viewer/ViewerMainActivity.java

@@ -58,8 +58,9 @@ public class ViewerMainActivity extends AppCompatActivity {
             finish();
         }
 
+        // Navigation
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
-                .commitNow();
+                .commit();
     }
 }

component/viewer/src/main/java/one/nem/lacerta/component/viewer/ViewerVcsRevListFragment.java

@@ -0,0 +1,95 @@
+package one.nem.lacerta.component.viewer;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link ViewerVcsRevListFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+@AndroidEntryPoint
+public class ViewerVcsRevListFragment extends Fragment {
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
+
+    @Inject
+    LacertaLogger logger;
+
+    LacertaVcs lacertaVcs;
+
+    private String documentId;
+
+    public ViewerVcsRevListFragment() {
+        // Required empty public constructor
+    }
+
+    public static ViewerVcsRevListFragment newInstance(String documentId) {
+        ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
+        Bundle args = new Bundle();
+        args.putString("documentId", documentId);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_viewer_vcs_rev_list, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        // Init arg
+        if (getArguments() != null) {
+            this.documentId = getArguments().getString("documentId");
+            logger.debug("ViewerVcsRevListFragment", "documentId: " + documentId);
+        }
+
+        // Init vcs
+        lacertaVcs = lacertaVcsFactory.create(documentId);
+
+        // Init view
+        RecyclerView recyclerView = view.findViewById(R.id.rev_list);
+
+        // Init adapter
+        RevAdapter revAdapter = new RevAdapter();
+
+        // Set adapter
+        recyclerView.setAdapter(revAdapter);
+
+        // Set layout manager
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        lacertaVcs.getRevisionHistory().thenAccept(revModels -> {
+            logger.debug("ViewerVcsRevListFragment", "revModels.size(): " + revModels.size());
+            getActivity().runOnUiThread(() -> {
+                revAdapter.setRevModels(revModels);
+                revAdapter.notifyDataSetChanged();
+            });
+        });
+    }
+}

component/viewer/src/main/res/layout/fragment_viewer_vcs_rev_list.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ViewerVcsRevListFragment">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rev_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>

component/viewer/src/main/res/layout/viewer_body_list_item.xml

@@ -11,6 +11,7 @@
         android:layout_height="wrap_content"
         android:elevation="8dp"
         android:adjustViewBounds="true"
+        android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

component/viewer/src/main/res/layout/viewer_rev_list_item.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="24dp"
+    android:paddingVertical="16dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/item_text_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/rev_item_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginEnd="8dp"
+            android:text="Placeholder Title"
+            android:textColor="@color/colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/rev_item_detail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:text="2023/01/01 00:00:00 - hogehoge"
+            android:textColor="@color/colorOnSurfaceSecondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
+
+        <TextView
+            android:id="@+id/rev_item_id"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
+            android:textColor="@color/colorOnSurfaceSecondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

component/viewer/src/main/res/menu/viewer_menu.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_open_vcs_rev_list"
+        android:title="Open VCS Rev List" />
+
+</menu>

component/viewer/src/main/res/navigation/component_viewer_navigation.xml

@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/component_viewer_navigation"
     app:startDestination="@id/componentViewerTopFragment">
 
     <fragment
         android:id="@+id/componentViewerTopFragment"
         android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
-        android:label="ComponentViewerTopFragment" />
+        android:label="ComponentViewerTopFragment" >
+        <action
+            android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"
+            app:destination="@id/viewerVcsRevListFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/viewerVcsRevListFragment"
+        android:name="one.nem.lacerta.component.viewer.ViewerVcsRevListFragment"
+        android:label="fragment_viewer_vcs_rev_list"
+        tools:layout="@layout/fragment_viewer_vcs_rev_list" />
 </navigation>

data/src/main/java/one/nem/lacerta/data/LacertaLibrary.java

@@ -7,6 +7,7 @@ import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
 
 import one.nem.lacerta.model.LibraryItemPage;
+import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
 
 public interface LacertaLibrary {
@@ -15,10 +16,14 @@ public interface LacertaLibrary {
     CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit);
     CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset);
 
-    // Get Library page
-    CompletableFuture<LibraryItemPage> getLibraryPage(int limit);
-    CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset);
+    // Get Library Page
     CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
     CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
 
+    // Create Folder
+    CompletableFuture<String> createFolder(String parentId, String name);
+
+    // Get Public Path
+    CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
+
 }

data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java

@@ -79,7 +79,7 @@ public class DocumentImpl implements Document {
             documentEntity.defaultBranch = meta.getDefaultBranch();
             documentEntity.updatedAt = meta.getUpdatedAt();
             documentEntity.createdAt = meta.getCreatedAt();
-            documentEntity.publicPath = meta.getPath().getStringPath();
+            documentEntity.parentId = meta.getParentId();
             documentEntity.tagIds = meta.getTagIds();
 
             database.documentDao().insert(documentEntity);
@@ -104,7 +104,7 @@ public class DocumentImpl implements Document {
         meta.setDefaultBranch("master");
         meta.setUpdatedAt(new Date());
         meta.setCreatedAt(new Date());
-        meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
+        meta.setParentId(null);
         meta.setTags(new ArrayList<>());
         return createDocument(meta);
     }
@@ -138,7 +138,7 @@ public class DocumentImpl implements Document {
             meta.setDefaultBranch(documentEntity.defaultBranch);
             meta.setUpdatedAt(documentEntity.updatedAt);
             meta.setCreatedAt(documentEntity.createdAt);
-            meta.setPath(new PublicPath().resolve(documentEntity.publicPath));
+            meta.setParentId(documentEntity.parentId);
             meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
 
             DocumentDetail detail = new DocumentDetail();

data/src/main/java/one/nem/lacerta/data/impl/LacertaLibraryImpl.java

@@ -1,9 +1,12 @@
 package one.nem.lacerta.data.impl;
 
 import java.text.DateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 import javax.inject.Inject;
@@ -12,10 +15,13 @@ import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
+import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
 import one.nem.lacerta.source.database.LacertaDatabase;
 import one.nem.lacerta.source.database.common.DateTypeConverter;
 import one.nem.lacerta.source.database.entity.DocumentEntity;
+import one.nem.lacerta.source.database.entity.FolderEntity;
+import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
 
 public class LacertaLibraryImpl implements LacertaLibrary {
@@ -60,24 +66,61 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         return null; // TODO-rca: Implement
     }
 
-    @Override
-    public CompletableFuture<LibraryItemPage> getLibraryPage(int limit) {
-        return CompletableFuture.supplyAsync(() -> {
-            return null;
-        });
-    }
-
-    @Override
-    public CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset) {
-        return CompletableFuture.supplyAsync(() -> {
-            return null;
-        });
-    }
-
     @Override
     public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) {
         return CompletableFuture.supplyAsync(() -> {
-            return null;
+            LibraryItemPage libraryItemPage = new LibraryItemPage();
+
+            List<FolderEntity> folderEntities;
+            List<DocumentEntity> documentEntities;
+
+            if (pageId == null) { // When root folder
+                libraryItemPage.setPageTitle("ライブラリ");
+                libraryItemPage.setPageId(null);
+                libraryItemPage.setParentId(null);
+
+                folderEntities = database.folderDao().findRootFolders();
+                documentEntities = database.documentDao().findRootDocuments();
+            } else {
+                FolderEntity folderEntity = database.folderDao().findById(pageId);
+                if (folderEntity == null) {
+                    logger.warn("LacertaLibraryImpl", pageId + " is not found.");
+                    return null;
+                }
+                libraryItemPage.setPageTitle(folderEntity.name);
+                libraryItemPage.setPageId(folderEntity.id);
+                libraryItemPage.setParentId(folderEntity.parentId);
+
+                folderEntities = database.folderDao().findByParentId(pageId);
+                documentEntities = database.documentDao().findByParentId(pageId);
+            }
+
+            ArrayList<ListItem> listItems = new ArrayList<>();
+            for (FolderEntity childFolderEntity : folderEntities) {
+                logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
+                ListItem listItem = new ListItem();
+                listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
+                listItem.setTitle(childFolderEntity.name);
+                listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
+                listItem.setItemId(childFolderEntity.id);
+                listItems.add(listItem);
+            }
+
+            for (DocumentEntity documentEntity : documentEntities) {
+                logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
+                ListItem listItem = new ListItem();
+                listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
+                listItem.setTitle(documentEntity.title);
+//                listItem.setDescription(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").format(documentEntity.updatedAt.toInstant()));
+                listItem.setItemId(documentEntity.id);
+                listItems.add(listItem);
+            }
+
+            libraryItemPage.setListItems(listItems);
+
+            logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+
+            return libraryItemPage;
         });
     }
 
@@ -87,4 +130,71 @@ public class LacertaLibraryImpl implements LacertaLibrary {
             return null;
         });
     }
+
+    @Override
+    public CompletableFuture<String> createFolder(String parentId, String name) {
+        return CompletableFuture.supplyAsync(() -> {
+            FolderEntity folderEntity = new FolderEntity();
+            folderEntity.id = UUID.randomUUID().toString();
+            folderEntity.name = name;
+            folderEntity.parentId = parentId;
+            database.folderDao().insert(folderEntity);
+            return folderEntity.id;
+        });
+    }
+
+    @Override
+    public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
+        return CompletableFuture.supplyAsync(() -> {
+            if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
+                DocumentEntity documentEntity = database.documentDao().findById(itemId);
+                if (documentEntity == null) {
+                    logger.warn("LacertaLibraryImpl", itemId + " is not found.");
+                    return null;
+                }
+                PublicPath publicPath = recursiveResolve(documentEntity.parentId);
+                publicPath.resolve(documentEntity.title);
+                return publicPath;
+            } else if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
+                FolderEntity folderEntity = database.folderDao().findById(itemId);
+                if (folderEntity == null) {
+                    return null;
+                }
+                return recursiveResolve(folderEntity.id);
+            } else {
+                logger.warn("LacertaLibraryImpl", "Unknown ListItemType: " + itemType);
+                return null;
+            }
+        });
+    }
+
+    /**
+     * 再帰的にパスを解決する
+     *
+     * @param folderId
+     * @return
+     */
+    private PublicPath recursiveResolve(String folderId) {
+        String current = folderId;
+        boolean continueFlag = true;
+        ArrayList<String> folderNames = new ArrayList<>();
+        while (continueFlag) {
+            FolderEntity folderEntity = database.folderDao().findById(current);
+            if (folderEntity == null) { // 存在しないフォルダIDが指定された場合
+                continueFlag = false;
+            } else {
+                folderNames.add(folderEntity.name);
+                current = folderEntity.parentId;
+                if (current == null) { // ルートフォルダに到達した場合
+                    continueFlag = false;
+                }
+            }
+        }
+
+        // フォルダ名を逆順にしてListに変換
+        Collections.reverse(folderNames);
+        List<String> folderNamesReversed = new ArrayList<>(folderNames);
+
+        return new PublicPath(folderNamesReversed);
+    }
 }

feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java

@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -70,6 +71,7 @@ public class HomeTopFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_home_top, container, false);
 
+        setHasOptionsMenu(true);
         return view;
     }
 
@@ -95,32 +97,12 @@ public class HomeTopFragment extends Fragment {
                 listItemAdapter.notifyItemRangeInserted(0, listItems.size());
             });
         });
+    }
 
-        CollapsingToolbarLayout collapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
-        Toolbar toolbar = view.findViewById(R.id.toolbar);
-
-        // Set the Toolbar
-        ((AppCompatActivity)getActivity()).setSupportActionBar(toolbar);
-
-        // Set the title of the CollapsingToolbarLayout
-        collapsingToolbarLayout.setTitle("Lacerta");
-
-        AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
-        appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
-                    // Collapsed
-                    getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getActivity(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
-                } else if (verticalOffset == 0) {
-                    // Expanded
-                    getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getActivity(), one.nem.lacerta.shared.ui.R.color.colorSurface));
-                } else {
-                    // Somewhere in between
-                    // Here you can add a color transition if you want
-                }
-            }
-        });
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        inflater.inflate(R.menu.drawer_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
     }
 }
 

feature/library/build.gradle

@@ -51,5 +51,7 @@ dependencies {
 
     implementation project(':data')
 
+    implementation project(':utils')
+
 
 }

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

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

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

@@ -1,38 +0,0 @@
-package one.nem.lacerta.feature.library;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-// LibraryArchiveFragment.java
-
-//画面変移用のコード
-//Fragmentへのデータの受け渡し機能
-public class LibraryArchiveFragment extends AppCompatActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_library_top);
-
-        // ここに入力された内容を表示する機能
-        TextView textView = findViewById(R.id.document_list);
-
-        textView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // 文字をタップしたときの処理
-
-                // 移動先のアクティビティを指定
-                Intent intent = new Intent(LibraryArchiveFragment.this, LibraryDocFragment.class);
-
-                // データを付加する
-                intent.putExtra("key_name", "value_data");
-
-                startActivity(intent);
-            }
-        });
-    }
-}

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

@@ -0,0 +1,283 @@
+package one.nem.lacerta.feature.library;
+
+import android.app.AlertDialog;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+
+import org.w3c.dom.Text;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+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.FragmentNavigation;
+import one.nem.lacerta.model.LibraryItemPage;
+import one.nem.lacerta.model.PublicPath;
+import one.nem.lacerta.utils.LacertaLogger;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link LibraryPageFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+@AndroidEntryPoint
+public class LibraryPageFragment extends Fragment {
+
+    // Variables
+    // このインスタンスで表示されているページ
+    LibraryItemPage libraryItemPage;
+
+    // Arguments
+    String folderId;
+    String title;
+    String parentId;
+
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    @Inject
+    LacertaLogger logger;
+
+    ListItemAdapter listItemAdapter;
+
+    public LibraryPageFragment() {
+        // Required empty public constructor
+    }
+
+    public static LibraryPageFragment newInstance(String folderId, String title, String parentId) {
+        LibraryPageFragment fragment = new LibraryPageFragment();
+        Bundle args = new Bundle();
+        args.putString("folderId", folderId);
+        args.putString("title", title);
+        args.putString("publicPath", parentId);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public static LibraryPageFragment newInstance(String folderId) { // Back action
+        LibraryPageFragment fragment = new LibraryPageFragment();
+        Bundle args = new Bundle();
+        args.putString("folderId", folderId);
+        args.putString("title", null);
+        args.putString("publicPath", null);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public static LibraryPageFragment newInstance() {
+        LibraryPageFragment fragment = new LibraryPageFragment();
+        Bundle args = new Bundle();
+        args.putString("folderId", null);
+        args.putString("title", null);
+        args.putString("publicPath", null);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_library_top, container, false);
+
+        // Set status bar color
+        AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
+        appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
+            @Override
+            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
+                if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
+                    // Collapsed
+                    getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
+                } else if (verticalOffset == 0) {
+                    // Expanded
+                    getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
+                } else {
+                    // Somewhere in between
+                    // Here you can add a color transition if you want
+                }
+            }
+        });
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (getArguments() != null) {
+            this.folderId = getArguments().getString("folderId"); // Required
+            if (getArguments().getString("title") == null && getArguments().getString("publicPath") == null) {
+                this.libraryItemPage = new LibraryItemPage();
+            } else {
+                this.title = getArguments().getString("title");
+                this.parentId = getArguments().getString("publicPath");
+            }
+        } else {
+            logger.debug("LibraryTopFragment", "getArguments() is null(maybe root)");
+            this.libraryItemPage = new LibraryItemPage();
+        }
+
+        // Toolbar Setup
+        toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
+
+        // RecyclerView Setup
+
+        RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
+        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();
+//                // folderId: 推移先で表示するフォルダのID, folderName: 推移先で表示するフォルダの名前, parentId: このフラグメントで表示しているフォルダのID(推移先の親)
+//                fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, libraryItemPage != null ? libraryItemPage.getParentId() : null), false);
+                Bundle bundle = new Bundle();
+                bundle.putString("folderId", folderId);
+                bundle.putString("title", folderName);
+                bundle.putString("publicPath", libraryItemPage != null ? libraryItemPage.getParentId() : null);
+                try {
+                    Navigation.findNavController(requireView()).navigate(R.id.action_feature_library_top_fragment_self, bundle);
+                } catch (IllegalStateException e) {
+                    logger.error("LibraryTopFragment", "IllegalStateException: " + e.getMessage());
+                }
+            }
+
+            @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()));
+
+        // Get library page and update RecyclerView items
+        lacertaLibrary.getLibraryPage(this.folderId, 10).thenAccept(libraryItemPage -> {
+            this.libraryItemPage = libraryItemPage;
+
+            if (this.parentId == null) {
+                this.parentId = libraryItemPage.getParentId();
+            }
+            if (this.title == null) {
+                this.title = libraryItemPage.getPageTitle();
+                // Toolbar init again
+                toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
+            }
+
+            logger.debug("LibraryTopFragment", "Item selected! Total item page: " + this.libraryItemPage.getListItems().size());
+            getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える？
+                listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
+            });
+            listItemAdapter.setLibraryItemPage(this.libraryItemPage);
+            getActivity().runOnUiThread(() -> {
+                listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
+            });
+        });
+    }
+
+    /**
+     * Currentにフォルダを作成する
+     */
+    private void createFolder(String pageId) {
+        // TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("フォルダの作成");
+        builder.setMessage("フォルダ名を入力してください");
+        final android.widget.EditText input = new android.widget.EditText(getContext());
+        input.setText("フォルダ名");
+        builder.setView(input);
+        builder.setPositiveButton("作成", (dialog, which) -> {
+            lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
+                // Refresh
+                updateItem(pageId);
+            });
+        });
+        builder.setNegativeButton("キャンセル", (dialog, which) -> {
+            dialog.cancel();
+        });
+        builder.show();
+    }
+
+    /**
+     * RecyclerViewのアイテムを更新する
+     */
+    private void updateItem(String pageId) {
+        lacertaLibrary.getLibraryPage(pageId, 10).thenAccept(libraryItemPage -> {
+            this.libraryItemPage = libraryItemPage;
+            logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+            getActivity().runOnUiThread(() -> {
+                listItemAdapter.notifyItemRangeRemoved(0, libraryItemPage.getListItems().size() - 1);
+            });
+            listItemAdapter.setLibraryItemPage(libraryItemPage);
+            getActivity().runOnUiThread(() -> {
+                listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
+            });
+        });
+    }
+
+    /**
+     * ToolbarをInitする
+     *
+     * @param toolbar Toolbar
+     * @param showBackButton 戻るボタンを表示するか
+     * @param title タイトル
+     */
+    private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
+        getActivity().runOnUiThread(() -> {
+            if (showBackButton) {
+                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
+                toolbar.setNavigationOnClickListener(v -> {
+                    //this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
+                    // Back
+                    Navigation.findNavController(requireView()).popBackStack();
+                });
+            } else {
+                toolbar.setNavigationIcon(null);
+            }
+            toolbar.setTitle(title);
+            toolbar.inflateMenu(R.menu.dir_menu);
+            toolbar.setOnMenuItemClickListener(item -> {
+                if (item.getItemId() == R.id.menu_item_create_new_folder) {
+                    createFolder(this.folderId);
+                    return true;
+                } else {
+                    return false;
+                }
+            });
+        });
+    }
+}

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

@@ -1,106 +0,0 @@
-package one.nem.lacerta.feature.library;
-
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.model.document.DocumentMeta;
-import one.nem.lacerta.model.document.tag.DocumentTag;
-
-
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link LibraryTopFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class LibraryTopFragment extends Fragment {
-
-//    @Inject
-//    Document document;
-
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
-    public LibraryTopFragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment LibraryTopFragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static LibraryTopFragment newInstance(String param1, String param2) {
-        LibraryTopFragment fragment = new LibraryTopFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_library_top, container, false);
-
-        // Use view.findViewById instead of findViewById
-        RecyclerView documentRecyclerView = view.findViewById(R.id.document_list);
-
-        LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
-        documentRecyclerView.setLayoutManager(layoutManager);
-
-        //データを取得
-
-//        List<DocumentMeta>  metas = document.getAllDocumentMetas(100);
-
-//        Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
-
-// Create and set the adapter
-//        DocumentAdapter adapter = new DocumentAdapter(metas);
-//        documentRecyclerView.setAdapter(adapter);
-
-// Use a LinearLayoutManager to specify the layout
-        return view;
-    }
-}

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

@@ -0,0 +1,78 @@
+package one.nem.lacerta.feature.library;
+
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+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>{
+
+    LibraryItemPage libraryItemPage;
+
+    DocumentSelectListener listener;
+
+
+    public ListItemAdapter(DocumentSelectListener listener) {
+        this.listener = listener;
+    }
+
+    public void setLibraryItemPage(LibraryItemPage libraryItemPage) {
+        this.libraryItemPage = libraryItemPage;
+    }
+
+    @NonNull
+    @Override
+    public ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
+        return new ListItemViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ListItemViewHolder holder, int position) {
+        ListItem listItem = libraryItemPage.getListItems().get(position);
+        holder.icon.setImageResource(listItem.getItemType().getIconId());
+        holder.icon.setColorFilter(one.nem.lacerta.shared.ui.R.color.colorOnSurface);
+        holder.title.setText(listItem.getTitle());
+        holder.description.setText(listItem.getDescription());
+
+        holder.itemView.setOnClickListener( v -> {
+            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());
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return this.libraryItemPage == null ? 0
+                : this.libraryItemPage.getListItems() == null ? 0 : this.libraryItemPage.getListItems().size();
+    }
+
+    public static class ListItemViewHolder extends RecyclerView.ViewHolder{
+
+        ImageView icon;
+        TextView title;
+        TextView description;
+        public ListItemViewHolder(@NonNull View itemView) {
+            super(itemView);
+
+            icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
+            title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
+            description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
+        }
+    }
+}

feature/library/src/main/res/layout/fragment_library_top.xml

@@ -1,32 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/Theme.Lacerta"
-    tools:context=".LibraryTopFragment">
+    android:background="@color/colorSurface">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/tool_bar"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorPrimaryContainer"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:title="Library"
-        app:titleTextColor="@color/colorOnPrimaryContainer" />
+        android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/document_list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                app:contentScrim="@color/colorSecondaryContainer"
+                android:background="@color/colorSurface"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:expandedTitleGravity="start|bottom"
+                app:expandedTitleMarginBottom="16dp"
+                app:expandedTitleMarginStart="16dp"
+                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/library_toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_collapseMode="pin"
+                    app:title="HOGE" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/library_item_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</FrameLayout>

feature/library/src/main/res/menu/dir_menu.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_create_new_folder"
+        android:icon="@drawable/developer_mode_24px"
+        android:title="@string/app_name"
+        app:showAsAction="ifRoom"/> <!-- TODO-rca: change this -->
+
+</menu>

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

@@ -6,7 +6,17 @@
     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" />
+        tools:layout="@layout/fragment_library_top" >
+        <action
+            android:id="@+id/action_feature_library_top_fragment_self"
+            app:destination="@id/feature_library_top_fragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim"
+            app:popUpTo="@id/feature_library_top_fragment"
+            app:popUpToInclusive="false"/>
+    </fragment>
 </navigation>

feature/setting/build.gradle

@@ -45,4 +45,8 @@ dependencies {
     // shared
     implementation project(':shared:ui')
 
+    // https://mvnrepository.com/artifact/androidx.preference/preference
+    implementation 'androidx.preference:preference:1.2.1'
+
+
 }

feature/setting/src/main/java/one/nem/lacerta/setting/SettingScanPageFragment.java

@@ -2,8 +2,12 @@ package one.nem.lacerta.setting;
 
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceFragmentCompat;
 
+import android.preference.PreferenceFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,12 +17,17 @@ import android.view.ViewGroup;
  * Use the {@link SettingScanPageFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class SettingScanPageFragment extends Fragment {
+public class SettingScanPageFragment extends PreferenceFragmentCompat {
 
     public SettingScanPageFragment() {
         // Required empty public constructor
     }
 
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        addPreferencesFromResource(R.xml.scan_preferences);
+    }
+
     public static SettingScanPageFragment newInstance() {
         SettingScanPageFragment fragment = new SettingScanPageFragment();
         Bundle args = new Bundle();
@@ -26,16 +35,4 @@ public class SettingScanPageFragment extends Fragment {
         return fragment;
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
-    }
 }

feature/setting/src/main/res/layout/fragment_setting_scan_page.xml

@@ -1,14 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingScanPageFragment">
+    android:background="@color/colorSurface">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                app:contentScrim="@color/colorSecondaryContainer"
+                android:background="@color/colorSurface"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:expandedTitleGravity="start|bottom"
+                app:expandedTitleMarginBottom="16dp"
+                app:expandedTitleMarginStart="16dp"
+                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/setting_top_scan_title" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <FrameLayout
+            android:id="@+id/setting_scan_page_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>

feature/setting/src/main/res/values/scan_setting_array.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="png_quality_array">
+        <item name="5">5</item>
+        <item name="6">6</item>
+        <item name="7">7</item>
+        <item name="8">8</item>
+        <item name="9">9</item>
+    </array>
+
+</resources>

feature/setting/src/main/res/values/setting_integers.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="png_quality_default">70</integer>
+    <integer name="png_quality_min">5</integer>
+    <integer name="png_quality_max">100</integer>
+</resources>

feature/setting/src/main/res/xml/scan_preferences.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory android:title="@string/setting_scan_quality_title">
+        <SeekBarPreference
+            android:defaultValue="@integer/png_quality_default"
+            android:key="png_quality"
+            android:max="@integer/png_quality_max"
+            android:min="@integer/png_quality_min"
+            android:summary="@string/setting_scan_quality_png_quality_description"
+            android:title="@string/setting_scan_quality_png_quality_title" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/setting_scan_default_title">
+
+        <EditTextPreference
+            android:defaultValue="Untitled"
+            android:key="new_doc_default_title"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/setting_scan_default_document_name" />
+        <EditTextPreference
+            android:defaultValue="NewFolder"
+            android:key="new_dir_default_title"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/setting_scan_default_folder_name" />
+    </PreferenceCategory>
+</PreferenceScreen>

model/src/main/java/one/nem/lacerta/model/FragmentNavigation.java

@@ -0,0 +1,13 @@
+package one.nem.lacerta.model;
+
+import androidx.fragment.app.Fragment;
+
+public interface FragmentNavigation {
+    void navigateToFragment(Fragment fragment);
+
+    void navigateToFragment(Fragment fragment, boolean addToBackStack);
+
+    void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack);
+
+    void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack);
+}

model/src/main/java/one/nem/lacerta/model/LibraryItemPage.java

@@ -6,10 +6,18 @@ public class LibraryItemPage {
 
     String pageTitle;
     String pageId;
+    String parentId;
     ArrayList<ListItem> listItems;
 
     // Constructor
 
+    public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems, String parentId) {
+        this.pageTitle = pageTitle;
+        this.pageId = pageId;
+        this.listItems = listItems;
+        this.parentId = parentId;
+    }
+
     public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems) {
         this.pageTitle = pageTitle;
         this.pageId = pageId;
@@ -30,6 +38,10 @@ public class LibraryItemPage {
         return pageId;
     }
 
+    public String getParentId() {
+        return parentId;
+    }
+
     public ArrayList<ListItem> getListItems() {
         return listItems;
     }
@@ -44,6 +56,10 @@ public class LibraryItemPage {
         this.pageId = pageId;
     }
 
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
     public void setListItems(ArrayList<ListItem> listItems) {
         this.listItems = listItems;
     }

model/src/main/java/one/nem/lacerta/model/PublicPath.java

@@ -1,5 +1,7 @@
 package one.nem.lacerta.model;
 
+import android.util.Log;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,11 +31,31 @@ public class PublicPath {
     private void resolveInternal(String path) {
         if (path.equals("..")) {
             this.path.remove(this.path.size() - 1);
+        } else if (path.equals(".")) {
+            // do nothing
         } else {
-            add(path);
+            this.path.add(path);
         }
     }
 
+    public PublicPath parse(String path) {
+        if (path == null) {
+            this.path.clear();
+            this.path.add("/");
+        } else {
+            if (path.startsWith("/")) {
+                this.path.clear();
+                path = path.substring(1);
+            }
+            String[] pathArray = path.split("/");
+            for (String p : pathArray) {
+                Log.d("PublicPath", "parse: " + p);
+                resolveInternal(p);
+            }
+        }
+        return this;
+    }
+
     public PublicPath resolve(String path) {
         resolveInternal(path);
         return this;

model/src/main/java/one/nem/lacerta/model/VcsRevModel.java

@@ -0,0 +1,80 @@
+package one.nem.lacerta.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+public class VcsRevModel {
+
+    String id;
+
+    String documentId;
+
+    String branchName;
+
+    String commitMessage;
+
+    Date createdAt;
+
+    ArrayList<String> logIds;
+
+    public VcsRevModel(String id, String documentId, String branchName, String commitMessage, Date createdAt, ArrayList<String> logIds) {
+        this.id = id;
+        this.documentId = documentId;
+        this.branchName = branchName;
+        this.commitMessage = commitMessage;
+        this.createdAt = createdAt;
+        this.logIds = logIds;
+    }
+
+    // Empty constructor
+    public VcsRevModel() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getDocumentId() {
+        return documentId;
+    }
+
+    public String getBranchName() {
+        return branchName;
+    }
+
+    public String getCommitMessage() {
+        return commitMessage;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public ArrayList<String> getLogIds() {
+        return logIds;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setDocumentId(String documentId) {
+        this.documentId = documentId;
+    }
+
+    public void setBranchName(String branchName) {
+        this.branchName = branchName;
+    }
+
+    public void setCommitMessage(String commitMessage) {
+        this.commitMessage = commitMessage;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public void setLogIds(ArrayList<String> logIds) {
+        this.logIds = logIds;
+    }
+}

model/src/main/java/one/nem/lacerta/model/document/DocumentMeta.java

@@ -37,7 +37,7 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
      */
     List<DocumentTag> tags;
 
-    PublicPath path;
+    String parentId;
 
     String author;
 
@@ -54,7 +54,7 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.tags = new ArrayList<>();
         this.author = ""; // TODO-rca: 作者のデフォルト値を設定できるようにする
         this.defaultBranch = "main"; // TODO-rca: デフォルトブランチのデフォルト値を設定できるようにする
-        this.path = new PublicPath().getRoot();
+        this.parentId = null;
         this.updatedAt = new Date();
         this.createdAt = new Date();
     }
@@ -85,13 +85,13 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.defaultBranch = defaultBranch;
     }
 
-    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, String author, String defaultBranch) {
+    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String parentId, String author, String defaultBranch) {
         this.id = id;
         this.title = title;
         this.updatedAt = updatedAt;
         this.createdAt = createdAt;
         this.tags = tags;
-        this.path = path;
+        this.parentId = parentId;
         this.author = author;
         this.defaultBranch = defaultBranch;
     }
@@ -145,10 +145,10 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
     }
 
     /**
-     * PublicPathを取得する
+     * ドキュメントの親フォルダのID(String)を取得する
      */
-    public PublicPath getPath() {
-        return path;
+    public String getParentId() {
+        return parentId;
     }
 
     /**
@@ -208,11 +208,11 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
     }
 
     /**
-     * PublicPathを設定する
-     * @param path PublicPath
+     * ドキュメントの親フォルダのID(String)を設定する
+     * @param parentId ドキュメントの親フォルダのID
      */
-    public void setPath(PublicPath path) {
-        this.path = path;
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
     }
 
     /**

shared/ui/src/main/res/values/strings.xml

@@ -19,6 +19,14 @@
     <string name="setting_top_scan_title">スキャン</string>
     <string name="setting_top_scan_description">画質, 保存先</string>
 
+    <string name="setting_scan_quality_title">画質</string>
+    <string name="setting_scan_quality_png_quality_title">PNG画質</string>
+    <string name="setting_scan_quality_png_quality_description">PNG画質を設定します. 画質が高いほどファイルサイズが大きくなります.</string>
+
+    <string name="setting_scan_default_title">保存先</string>
+    <string name="setting_scan_default_document_name">新規ドキュメントのデフォルトタイトル</string>
+    <string name="setting_scan_default_folder_name">新規フォルダのデフォルト名</string>
+
     <string name="setting_top_display_title">表示</string>
     <string name="setting_top_display_description">テーマ, フォントサイズ</string>
 

source/src/main/java/one/nem/lacerta/source/database/LacertaDatabase.java

@@ -19,7 +19,7 @@ import one.nem.lacerta.source.database.dao.LibraryDao;
 import one.nem.lacerta.source.database.dao.VcsRevDao;
 import one.nem.lacerta.source.database.dao.VcsLogDao;
 
-@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 4)
+@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 5)
 public abstract class LacertaDatabase extends RoomDatabase {
     public abstract TagDao tagDao();
     public abstract DocumentDao documentDao();

source/src/main/java/one/nem/lacerta/source/database/dao/DocumentDao.java

@@ -6,6 +6,7 @@ import androidx.room.Insert;
 import androidx.room.Query;
 import androidx.room.Update;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import one.nem.lacerta.source.database.entity.DocumentEntity;
@@ -28,8 +29,11 @@ public interface DocumentDao {
     @Query("SELECT * FROM Document WHERE id IN (:ids)")
     List<DocumentEntity> findByIds(List<String> ids);
 
-    @Query("SELECT * FROM Document WHERE public_path = :publicPath LIMIT :limit")
-    List<DocumentEntity> findByPublicPathWithLimit(String publicPath, int limit);
+    @Query("SELECT * FROM Document WHERE parent_id = :parentId")
+    List<DocumentEntity> findByParentId(String parentId);
+
+    @Query("SELECT * FROM Document WHERE parent_id IS NULL")
+    List<DocumentEntity> findRootDocuments();
 
     @Query("SELECT * FROM Document ORDER BY created_at DESC LIMIT :limit")
     List<DocumentEntity> getRecentDocument(int limit);

source/src/main/java/one/nem/lacerta/source/database/dao/FolderDao.java

@@ -4,6 +4,9 @@ import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.Query;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import one.nem.lacerta.source.database.entity.FolderEntity;
 
 @Dao
@@ -12,8 +15,11 @@ public interface FolderDao {
     @Query("SELECT * FROM Folder WHERE id = :id")
     FolderEntity findById(String id);
 
-    @Query("SELECT * FROM Folder WHERE public_path = :publicPath")
-    FolderEntity findByPublicPath(String publicPath);
+    @Query("SELECT * FROM Folder WHERE parent_id = :parentId")
+    List<FolderEntity> findByParentId(String parentId);
+
+    @Query("SELECT * FROM Folder WHERE parent_id IS NULL")
+    List<FolderEntity> findRootFolders();
 
     @Insert
     void insert(FolderEntity folderEntity);

source/src/main/java/one/nem/lacerta/source/database/entity/DocumentEntity.java

@@ -40,6 +40,6 @@ public class DocumentEntity {
     @ColumnInfo(name = "tag_ids")
     public List<String> tagIds; // タグ
 
-    @ColumnInfo(name = "public_path")
-    public String publicPath; // 公開パス
+    @ColumnInfo(name = "parent_id")
+    public String parentId; // 親フォルダID
 }

source/src/main/java/one/nem/lacerta/source/database/entity/FolderEntity.java

@@ -16,7 +16,7 @@ public class FolderEntity {
     @ColumnInfo(name = "title")
     public String name; // フォルダ名
 
-    @ColumnInfo(name = "public_path")
-    public String publicPath; // 公開パス
+    @ColumnInfo(name = "parent_id")
+    public String parentId; // 親フォルダID
 
 }

source/src/main/java/one/nem/lacerta/source/file/impl/FileManagerImpl.java

@@ -22,6 +22,7 @@ import dagger.assisted.AssistedInject;
 import one.nem.lacerta.source.file.FileManager;
 
 import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.utils.Store;
 
 public class FileManagerImpl implements FileManager {
 
@@ -303,7 +304,16 @@ public class FileManagerImpl implements FileManager {
     private void saveBitmapInternal(Bitmap bitmap, Path path) throws IOException {
         try {
             logger.debug("saveBitmapInternal", "path: " + path);
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, Files.newOutputStream(path));
+            // Bitmapの長辺を1024pxにする
+            int width = bitmap.getWidth();
+            int height = bitmap.getHeight();
+            float scale = 1.0f;
+            if (width > height) {
+                scale = Store.Scan.MAX_RESOLUTION_LONG / width;
+            } else {
+                scale = Store.Scan.MAX_RESOLUTION_LONG / height;
+            }
+            bitmap.compress(new Store.Scan().COMPRESS_FORMAT, Store.Scan.QUALITY, Files.newOutputStream(path));
         } catch (Exception e) {
             logger.error("saveBitmapInternal", e.getMessage());
             throw new IOException("Failed to save bitmap");

utils/src/main/java/one/nem/lacerta/utils/FeatureSwitch.java

@@ -3,12 +3,16 @@ package one.nem.lacerta.utils;
 public class FeatureSwitch {
 
     public static class Meta {
-        public static boolean canOverrideSwitch = true;
+        public static boolean canOverrideSwitch = false;
     }
 
     public static class FeatureMaster {
-        public static boolean enableSearch = true;
-        public static boolean enableDebugMenu = false;
+        public static boolean enableSearch = false;
+        public static boolean enableDebugMenu = true;
+    }
+
+    public static class Vcs {
+        public static boolean disableBranchDisplay = true;
     }
 
     public static class Setting {

utils/src/main/java/one/nem/lacerta/utils/Store.java

@@ -0,0 +1,11 @@
+package one.nem.lacerta.utils;
+
+import android.graphics.Bitmap;
+
+public class Store {
+    public static class Scan {
+        public Bitmap.CompressFormat COMPRESS_FORMAT = Bitmap.CompressFormat.JPEG;
+        public static final int QUALITY = 60;
+        public static final float MAX_RESOLUTION_LONG = 2048;
+    }
+}

vcs/src/main/java/one/nem/lacerta/vcs/LacertaVcs.java

@@ -1,5 +1,10 @@
 package one.nem.lacerta.vcs;
 
+import java.util.ArrayList;
+import java.util.concurrent.CompletableFuture;
+
+import one.nem.lacerta.model.VcsRevModel;
+
 public interface LacertaVcs {
 
     // Actions
@@ -13,6 +18,8 @@ public interface LacertaVcs {
 
     public void generateRevisionAtCurrent(String message);
 
+    public CompletableFuture<ArrayList<VcsRevModel>> getRevisionHistory();
+
 
     // debug
     public void printLog();

vcs/src/main/java/one/nem/lacerta/vcs/impl/LacertaVcsImpl.java

@@ -3,11 +3,13 @@ package one.nem.lacerta.vcs.impl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 import javax.inject.Inject;
 
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
+import one.nem.lacerta.model.VcsRevModel;
 import one.nem.lacerta.source.database.LacertaDatabase;
 import one.nem.lacerta.source.database.entity.VcsLogEntity;
 import one.nem.lacerta.source.database.entity.VcsRevEntity;
@@ -122,6 +124,27 @@ public class LacertaVcsImpl implements LacertaVcs {
         logger.debug(TAG, "New revision inserted: " + vcsRevEntity.id);
     }
 
+    @Override
+    public CompletableFuture<ArrayList<VcsRevModel>> getRevisionHistory() {
+        return CompletableFuture.supplyAsync(() -> {
+            logger.debug(TAG, "getRevisionHistoryByDocumentId");
+            ArrayList<VcsRevModel> vcsRevModels = new ArrayList<>();
+
+            List<VcsRevEntity> vcsRevEntities = database.vcsRevDao().findByDocumentId(this.documentId);
+            vcsRevEntities.forEach(vcsRevEntity -> {
+                VcsRevModel vcsRevModel = new VcsRevModel();
+                vcsRevModel.setId(vcsRevEntity.id);
+                vcsRevModel.setDocumentId(vcsRevEntity.documentId);
+                vcsRevModel.setBranchName(vcsRevEntity.branchName);
+                vcsRevModel.setCommitMessage(vcsRevEntity.commitMessage);
+                vcsRevModel.setLogIds(vcsRevEntity.logIds);
+                vcsRevModels.add(vcsRevModel);
+            });
+
+            return vcsRevModels;
+        });
+    }
+
     @Override
     public void printLog() {
         logger.debug(TAG, "printLog");