Merge remote-tracking branch 'origin/develop' into develop

最終バージョンに追従

app/build.gradle

@@ -14,8 +14,8 @@ android {
 
         // ベータ, Internal, Release問わず毎回インクリメントする
         // https://developer.android.com/studio/publish/versioning#versioningsettings
-        versionCode 1
+        versionCode 2
-        versionName "0.1.0"
+        versionName "0.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -17,10 +17,10 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher_temp_round"
+        android:icon="@mipmap/ic_launcher_final"
         android:name=".LacertaApplication"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher_final_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Lacerta"
         tools:targetApi="31">

app/src/main/res/drawable/ic_launcher_final_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <group android:scaleX="0.37"
+      android:scaleY="0.37"
+      android:translateX="302.4"
+      android:translateY="302.4">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M92.12,225.15L92.12,51.92L265.15,51.92L265.15,107.88L148.08,107.88L148.08,225.15L92.12,225.15ZM812.12,225.15L812.12,107.88L694.85,107.88L694.85,51.92L868.08,51.92L868.08,225.15L812.12,225.15ZM92.12,907.88L92.12,734.85L148.08,734.85L148.08,851.92L265.15,851.92L265.15,907.88L92.12,907.88ZM694.85,907.88L694.85,851.92L812.12,851.92L812.12,734.85L868.08,734.85L868.08,907.88L694.85,907.88ZM268.08,719.61Q268.08,724.42 271.83,728.17Q275.58,731.92 280.39,731.92L679.81,731.92Q684.42,731.92 688.27,728.17Q692.12,724.42 692.12,719.61L692.12,240.19Q692.12,235.58 688.27,231.73Q684.42,227.88 679.81,227.88L280.39,227.88Q275.58,227.88 271.83,231.73Q268.08,235.58 268.08,240.19L268.08,719.61ZM280.39,787.88Q251.74,787.88 231.93,768.07Q212.12,748.26 212.12,719.61L212.12,240.19Q212.12,211.76 231.93,191.84Q251.74,171.92 280.39,171.92L679.81,171.92Q708.24,171.92 728.16,191.84Q748.08,211.76 748.08,240.19L748.08,719.61Q748.08,748.26 728.16,768.07Q708.24,787.88 679.81,787.88L280.39,787.88ZM372.12,387.88L588.08,387.88L588.08,331.92L372.12,331.92L372.12,387.88ZM372.12,507.88L588.08,507.88L588.08,451.92L372.12,451.92L372.12,507.88ZM372.12,627.88L588.08,627.88L588.08,571.92L372.12,571.92L372.12,627.88ZM268.08,719.61L268.08,240.19Q268.08,235.58 268.08,231.73Q268.08,227.88 268.08,227.88L268.08,227.88Q268.08,227.88 268.08,231.73Q268.08,235.58 268.08,240.19L268.08,719.61Q268.08,724.42 268.08,728.17Q268.08,731.92 268.08,731.92L268.08,731.92Q268.08,731.92 268.08,728.17Q268.08,724.42 268.08,719.61Z"/>
+  </group>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_final.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_final_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_final_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_final_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
+</adaptive-icon>

app/src/main/res/values/ic_launcher_final_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_final_background">#B8D3C3</color>
+</resources>

component/common/src/main/java/one/nem/lacerta/component/common/LacertaApplyTagAdapter.java

@@ -0,0 +1,83 @@
+package one.nem.lacerta.component.common;
+
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+
+import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
+import one.nem.lacerta.model.document.tag.DocumentTag;
+
+public class LacertaApplyTagAdapter extends RecyclerView.Adapter<LacertaApplyTagAdapter.LacertaApplyTagViewHolder>{
+
+    // Listener
+    public interface LacertaApplyTagDialogListener {
+        void itemChecked(View view, String tagId);
+        void itemUnchecked(View view, String tagId);
+    }
+
+    // Variables
+    private ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList;
+    private LacertaApplyTagDialogListener listener;
+
+    // Setter
+    public LacertaApplyTagAdapter setListener(LacertaApplyTagDialogListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    public LacertaApplyTagAdapter setDocumentTagArrayList(ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList) {
+        this.documentTagArrayList = documentTagArrayList;
+        return this;
+    }
+
+    // Empty constructor
+    public LacertaApplyTagAdapter() {
+    }
+
+    @NonNull
+    @Override
+    public LacertaApplyTagAdapter.LacertaApplyTagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.apply_tag_list_item, parent, false);
+        return new LacertaApplyTagAdapter.LacertaApplyTagViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull LacertaApplyTagAdapter.LacertaApplyTagViewHolder holder, int position) {
+        DocumentTagApplyTagDialogExtendedModel documentTag = documentTagArrayList.get(position);
+        if (holder.checkBox == null) {
+            Log.d("LacertaApplyTagAdapter", "onBindViewHolder: holder.checkBox is null");
+        }
+        holder.checkBox.setText(documentTag.getName());
+        holder.checkBox.setChecked(documentTag.getIsChecked());
+        holder.checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                listener.itemChecked(buttonView, documentTag.getId());
+            } else {
+                listener.itemUnchecked(buttonView, documentTag.getId());
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return documentTagArrayList == null ? 0 : documentTagArrayList.size();
+    }
+
+    public class LacertaApplyTagViewHolder extends RecyclerView.ViewHolder {
+
+        CheckBox checkBox;
+
+        public LacertaApplyTagViewHolder(@NonNull View itemView) {
+            super(itemView);
+
+            checkBox = itemView.findViewById(R.id.tag_check_box);
+        }
+    }
+}

component/common/src/main/java/one/nem/lacerta/component/common/LacertaApplyTagDialog.java

@@ -0,0 +1,184 @@
+package one.nem.lacerta.component.common;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.Checkable;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.model.document.tag.DocumentTag;
+import one.nem.lacerta.utils.LacertaLogger;
+
+@AndroidEntryPoint
+public class LacertaApplyTagDialog extends DialogFragment {
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    // Listener
+    public interface LacertaApplyTagDialogListener {
+        void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags);
+        void onDialogNegativeClick();
+    }
+
+    // Variables
+    private String title;
+    private String message;
+    private String positiveButtonText;
+    private String negativeButtonText;
+    private String documentId;
+    private LacertaApplyTagDialogListener listener;
+    private ArrayList<DocumentTag> registeredTags;
+    private ArrayList<DocumentTag> appliedTags;
+
+    // Setter
+
+    public LacertaApplyTagDialog setListener(LacertaApplyTagDialogListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    public LacertaApplyTagDialog setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public LacertaApplyTagDialog setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public LacertaApplyTagDialog setPositiveButtonText(String positiveButtonText) {
+        this.positiveButtonText = positiveButtonText;
+        return this;
+    }
+
+    public LacertaApplyTagDialog setNegativeButtonText(String negativeButtonText) {
+        this.negativeButtonText = negativeButtonText;
+        return this;
+    }
+
+    public LacertaApplyTagDialog setDocumentId(String documentId) {
+        this.documentId = documentId;
+        return this;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
+        LayoutInflater inflater = requireActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.lacerta_dialog_apply_tag, null);
+
+        // RecyclerView
+        RecyclerView recyclerView = view.findViewById(R.id.apply_tag_list);
+
+        LacertaApplyTagAdapter lacertaApplyTagAdapter = new LacertaApplyTagAdapter();
+        lacertaApplyTagAdapter.setListener(new LacertaApplyTagAdapter.LacertaApplyTagDialogListener() {
+            @Override
+            public void itemChecked(View view, String tagId) {
+                applyChangeToVariable(true, tagId);
+            }
+
+            @Override
+            public void itemUnchecked(View view, String tagId) {
+                applyChangeToVariable(false, tagId);
+            }
+        });
+
+        recyclerView.setAdapter(lacertaApplyTagAdapter);
+        recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
+
+        getDocumentTagArrayList(documentId).thenAccept(documentTagArrayList -> {
+            lacertaApplyTagAdapter.setDocumentTagArrayList(documentTagArrayList);
+            lacertaApplyTagAdapter.notifyDataSetChanged(); // TODO-rca: アニメーション
+        });
+
+        // Set the dialog title
+        builder.setTitle(title)
+                .setMessage(message)
+                .setView(view)
+                .setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, id) -> {
+                    // Send the positive button event back to the host activity
+                    listener.onDialogPositiveClick(this.appliedTags);
+                })
+                .setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, id) -> {
+                    // Send the negative button event back to the host activity
+                    listener.onDialogNegativeClick();
+                });
+        return builder.create();
+    }
+
+    private void applyChangeToVariable(boolean isChecked, String tagId) {
+        if (isChecked) {
+            this.registeredTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.add(tag));
+        } else {
+            this.appliedTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.remove(tag));
+        }
+    }
+
+    private CompletableFuture<ArrayList<DocumentTagApplyTagDialogExtendedModel>> getDocumentTagArrayList(String documentId) {
+        return CompletableFuture.supplyAsync(() -> {
+            ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
+            setRegisteredTagList().thenRun(() -> setAppliedTagList(documentId).join()).thenAccept(Void -> {
+                logger.debug("getDocumentTagArrayList", "this.registeredTags.size(): " + this.registeredTags.size());
+                logger.debug("getDocumentTagArrayList", "this.appliedTags.size(): " + this.appliedTags.size());
+
+                documentTagArrayList.addAll(this.registeredTags.stream().map(tag -> {
+                    DocumentTagApplyTagDialogExtendedModel documentTag = new DocumentTagApplyTagDialogExtendedModel(
+                            new DocumentTag(tag.getId(), tag.getName(), tag.getColor()),
+                            this.appliedTags.stream().anyMatch(appliedTag -> appliedTag.getId().equals(tag.getId()))
+                    );
+                    return documentTag;
+                }).collect(Collectors.toCollection(ArrayList::new)));
+
+            }).join();
+            return documentTagArrayList;
+        });
+    }
+
+    private CompletableFuture<Void> setRegisteredTagList() {
+        return CompletableFuture.runAsync(() -> {
+            this.registeredTags = new ArrayList<>();
+            this.lacertaLibrary.getTagList().thenAccept(documentTagList -> {
+                for (int i = 0; i < documentTagList.size(); i++) {
+                    this.registeredTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
+                }
+            }).join();
+        });
+    }
+
+    private CompletableFuture<Void> setAppliedTagList(String documentId) {
+        return CompletableFuture.runAsync(() -> {
+            this.appliedTags = new ArrayList<>();
+            this.lacertaLibrary.getAppliedTagList(documentId).thenAccept(documentTagList -> {
+                for (int i = 0; i < documentTagList.size(); i++) {
+                    this.appliedTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
+                }
+            }).join();
+        });
+    }
+}

component/common/src/main/java/one/nem/lacerta/component/common/LacertaEditMetaDialog.java

@@ -0,0 +1,4 @@
+package one.nem.lacerta.component.common;
+
+public class LacertaEditMetaDialog {
+}

component/common/src/main/java/one/nem/lacerta/component/common/model/DocumentTagApplyTagDialogExtendedModel.java

@@ -0,0 +1,31 @@
+package one.nem.lacerta.component.common.model;
+
+import one.nem.lacerta.model.document.tag.DocumentTag;
+
+// TODO-rca: クラス名が長すぎ
+
+/**
+ * DocumentTagを設定するダイアログで使うための拡張モデル
+ * チェックボックスの状態を保持するように
+ */
+public class DocumentTagApplyTagDialogExtendedModel extends DocumentTag {
+
+    private boolean isChecked;
+
+    public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag) {
+        super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
+    }
+
+    public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag, boolean isChecked) {
+        super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
+        this.isChecked = isChecked;
+    }
+
+    public boolean getIsChecked() {
+        return isChecked;
+    }
+
+    public void setIsChecked(boolean checked) {
+        isChecked = checked;
+    }
+}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaFilePickerAdapter.java

@@ -0,0 +1,42 @@
+package one.nem.lacerta.component.common.picker;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItemType;
+
+public class LacertaFilePickerAdapter extends LacertaFilePickerAdapterBase {
+
+    // Listener
+    public interface LacertaFilePickerAdapterListener extends LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener {
+        void onDocumentSelected(String documentId);
+        void onCombinedDocumentSelected(String documentId);
+    }
+
+    // Variables
+    LacertaFilePickerAdapterListener listener;
+
+    // Setter
+    public LacertaFilePickerAdapter setListener(LacertaFilePickerAdapterListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    @Override
+    public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
+        super.onBindViewHolder(holder, position);
+        if (libraryItemPage.getListItems().get(position).getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
+            if (libraryItemPage.getListItems().get(position).getHasCombined()) {
+                holder.itemView.setOnClickListener(v -> {
+                    listener.onCombinedDocumentSelected(libraryItemPage.getListItems().get(position).getItemId());
+                });
+            } else {
+                holder.itemView.setOnClickListener(v -> {
+                    ListItem listItem = libraryItemPage.getListItems().get(position);
+                    listener.onDocumentSelected(listItem.getItemId());
+                });
+            }
+        }
+    }
+}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaFilePickerDialog.java

@@ -0,0 +1,127 @@
+package one.nem.lacerta.component.common.picker;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.common.R;
+import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
+import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
+import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.model.ListItemType;
+
+@AndroidEntryPoint
+public class LacertaFilePickerDialog extends LacertaFilePickerDialogBase {
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    // Listener
+    public interface LacertaFilePickerDialogListener {
+        void onFileSelected(String name, String fileId);
+    }
+
+    // Variables
+    LacertaFilePickerDialogListener listener;
+
+    // Setter
+    public LacertaFilePickerDialog setListener(LacertaFilePickerDialogListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        super.onCreateDialog(savedInstanceState);
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
+
+        View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
+
+        // 高さを画面の40%にする
+        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
+        view.setMinimumHeight(height);
+
+        RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
+        TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
+
+        LacertaFilePickerAdapter adapter = new LacertaFilePickerAdapter();
+        adapter.setListener(new LacertaFilePickerAdapter.LacertaFilePickerAdapterListener() {
+            @Override
+            public void onItemSelected(String dirId) {
+                updateList(adapter, dirId);
+                updatePublicPath(currentDirTextView, dirId);
+            }
+
+            @Override
+            public void onBackSelected(String dirId) {
+                updateList(adapter, dirId);
+                updatePublicPath(currentDirTextView, dirId);
+            }
+
+            @Override
+            public void onDocumentSelected(String documentId) {
+                if (listener != null) {
+                    dismiss();
+                    listener.onFileSelected(documentId, documentId);
+                }
+            }
+
+            @Override
+            public void onCombinedDocumentSelected(String documentId) {
+                if (listener != null) {
+                    LacertaFilePickerSelectDocumentDialog dialog = new LacertaFilePickerSelectDocumentDialog();
+                    dialog.setDocumentId(documentId);
+                    dialog.setListener(documentId1 -> {
+                        dismiss();
+                        listener.onFileSelected(documentId1, documentId1);
+                    });
+                    dialog.show(getParentFragmentManager(), "select_document_dialog");
+                }
+            }
+        });
+
+        recyclerView.setAdapter(adapter);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        this.updateList(adapter, null); // ルートディレクトリのリストを表示
+
+        // Init dialog
+        builder.setTitle(this.title == null ? "ファイルを選択" : this.title);
+        builder.setMessage(this.message == null ? "ファイルを選択してください" : this.message);
+        builder.setView(view);
+        builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
+            dismiss();
+        });
+
+        return builder.create();
+    }
+
+    private void updatePublicPath(TextView currentDirTextView, String folderId) {
+        lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
+            this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
+        });
+    }
+
+    private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
+        lacertaLibrary.getLibraryPage(folderId, 100).thenAccept(libraryItemPage -> { // TODO-rca: 100 is a magic number
+            int currentCount = adapter.getItemCount();
+            String currentId = adapter.getCurrentId();
+//            adapter.setListItems(libraryItemPage);
+            getActivity().runOnUiThread(() -> {
+                this.updateListView(adapter, libraryItemPage, currentCount, currentId);
+            });
+        });
+    }
+
+}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaFilePickerSelectDocumentAdapter.java

@@ -0,0 +1,75 @@
+package one.nem.lacerta.component.common.picker;
+
+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.component.common.R;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.document.DocumentMeta;
+
+public class LacertaFilePickerSelectDocumentAdapter extends RecyclerView.Adapter<LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder>{
+
+    // Listener
+    public interface LacertaFilePickerSelectDocumentAdapterListener {
+        void onDocumentSelected(String documentId);
+    }
+
+    // Variables
+    LacertaFilePickerSelectDocumentAdapterListener listener;
+
+    ArrayList<ListItem> listItems;
+
+    // Setter
+    public LacertaFilePickerSelectDocumentAdapter setListener(LacertaFilePickerSelectDocumentAdapterListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    public void setListItems(ArrayList<ListItem> listItems) {
+        this.listItems = listItems;
+    }
+
+
+    @NonNull
+    @Override
+    public LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder 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 LacertaFilePickerSelectDocumentViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder holder, int position) {
+        ListItem listItem = listItems.get(position);
+        holder.title.setText(listItem.getTitle());
+        holder.description.setVisibility(View.GONE);
+        holder.icon.setImageResource(listItem.getItemType().getIconId());
+        holder.itemView.setOnClickListener(v -> listener.onDocumentSelected(listItem.getItemId()));
+    }
+
+    @Override
+    public int getItemCount() {
+        return listItems == null ? 0 : listItems.size();
+    }
+
+    public class LacertaFilePickerSelectDocumentViewHolder extends RecyclerView.ViewHolder {
+
+        ImageView icon;
+        TextView title;
+        TextView description;
+
+        public LacertaFilePickerSelectDocumentViewHolder(@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);
+        }
+    }
+}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaFilePickerSelectDocumentDialog.java

@@ -0,0 +1,88 @@
+package one.nem.lacerta.component.common.picker;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.common.R;
+import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItemType;
+import one.nem.lacerta.model.pref.ToxiDocumentModel;
+
+@AndroidEntryPoint
+public class LacertaFilePickerSelectDocumentDialog extends DialogFragment {
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    // Listener
+    public interface LacertaFilePickerSelectDocumentDialogListener {
+        void onDocumentSelected(String documentId);
+    }
+
+    // Variables
+    LacertaFilePickerSelectDocumentDialogListener listener;
+
+    String documentId;
+
+    // Setter
+    public LacertaFilePickerSelectDocumentDialog setListener(LacertaFilePickerSelectDocumentDialogListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    public LacertaFilePickerSelectDocumentDialog setDocumentId(String documentId) {
+        this.documentId = documentId;
+        return this;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        super.onCreateDialog(savedInstanceState);
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
+        View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_doc, null);
+
+        // 高さを画面の40%にする
+        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
+        view.setMinimumHeight(height);
+
+        RecyclerView recyclerView = view.findViewById(R.id.document_list_recycler_view);
+
+        LacertaFilePickerSelectDocumentAdapter adapter = new LacertaFilePickerSelectDocumentAdapter();
+
+        adapter.setListener(documentId -> listener.onDocumentSelected(documentId));
+
+        recyclerView.setAdapter(adapter);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        builder.setTitle("追加先を選択");
+
+        builder.setView(view);
+
+        lacertaLibrary.getCombinedDocumentToxiList(this.documentId).thenAccept(toxiDocumentModels -> {
+            ArrayList<ListItem> listItems = new ArrayList<>();
+            for (ToxiDocumentModel toxiDocumentModel : toxiDocumentModels) {
+                listItems.add(new ListItem(toxiDocumentModel.titleCache, null, ListItemType.ITEM_TYPE_DOCUMENT, toxiDocumentModel.childDocumentId));
+            }
+            adapter.setListItems(listItems);
+            adapter.notifyDataSetChanged();
+        });
+
+        return builder.create();
+    }
+
+
+}

component/common/src/main/java/one/nem/lacerta/component/common/picker/base/LacertaFilePickerAdapterBase.java

@@ -21,9 +21,9 @@ public class LacertaFilePickerAdapterBase extends RecyclerView.Adapter<LacertaFi
         void onBackSelected(String dirId);
     }
 
-    private LibraryItemPage libraryItemPage;
+    protected LibraryItemPage libraryItemPage;
 
-    private LacertaFilePickerAdapterListener listener;
+    protected LacertaFilePickerAdapterListener listener;
 
     // Empty constructor
     public LacertaFilePickerAdapterBase() {

component/common/src/main/res/layout/apply_tag_list_item.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <CheckBox
+        android:id="@+id/tag_check_box"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginVertical="4dp"
+        android:text="CheckBox" />
+
+</LinearLayout>

component/common/src/main/res/layout/lacerta_dialog_apply_tag.xml

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

component/common/src/main/res/layout/lacerta_dialog_edit_meta.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/title_text_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingHorizontal="16dp"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/tag_name_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>

component/common/src/main/res/layout/lacerta_dialog_select_doc.xml

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

component/scanner/build.gradle

@@ -52,4 +52,6 @@ dependencies {
     implementation project(':vcs')
 
     implementation project(':data')
+
+    implementation project(':component:common')
 }

component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerManagerActivity.java

@@ -2,6 +2,7 @@ package one.nem.lacerta.component.scanner;
 
 import android.Manifest;
 import android.app.ProgressDialog;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -29,9 +30,13 @@ import java.util.concurrent.CompletableFuture;
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
 import one.nem.lacerta.data.Document;
+import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.document.DocumentDetail;
 import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.model.document.page.Page;
+import one.nem.lacerta.processor.DocumentProcessor;
 import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
 import one.nem.lacerta.utils.LacertaLogger;
 import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
@@ -53,9 +58,27 @@ public class ScannerManagerActivity extends AppCompatActivity {
     @Inject
     LacertaVcsFactory lacertaVcsFactory;
 
+//    @Inject
+//    public ScannerManagerActivity(LacertaLogger logger, Document document, LacertaLibrary lacertaLibrary, DocumentProcessorFactory documentProcessorFactory, LacertaVcsFactory lacertaVcsFactory) {
+//        this.logger = logger;
+//        this.document = document;
+//        this.lacertaLibrary = lacertaLibrary;
+//        this.documentProcessorFactory = documentProcessorFactory;
+//        this.lacertaVcsFactory = lacertaVcsFactory;
+//    }
+
+    @Inject
+    public ScannerManagerActivity() {
+        // Required empty public constructor
+    }
+
     // Variables
     private ArrayList<Bitmap> croppedImages = new ArrayList<>();
 
+    private boolean update = false;
+    private String documentId;
+    private int index = 0;
+
     View view;
 
     DocumentScanner documentScanner = new DocumentScanner(
@@ -85,6 +108,37 @@ public class ScannerManagerActivity extends AppCompatActivity {
             null
     );
 
+    DocumentScanner documentScannerUpdate = new DocumentScanner( // TODO-rca: ひどすぎるのでなんとかする
+            this,
+            (croppedImageResults) -> {
+                logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
+                ArrayList<Bitmap> croppedImages = new ArrayList<>();
+                for (String result : croppedImageResults) {
+                    croppedImages.add(BitmapFactory.decodeFile(result));
+                }
+                processResult(croppedImages);
+                updatePage();
+                return null;
+            },
+            (errorMessage) -> {
+                // an error happened
+                logger.error(TAG, "Error: " + errorMessage);
+                logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
+                finish();
+                return null;
+            },
+            () -> {
+                // user canceled document scan
+                logger.debug(TAG, "User canceled document scan");
+                finish();
+                return null;
+            },
+            null,
+            null,
+            1
+    );
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -108,11 +162,22 @@ public class ScannerManagerActivity extends AppCompatActivity {
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
 
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        if (bundle != null) {
+            update = bundle.getBoolean("update", false);
+            documentId = bundle.getString("documentId");
+            index = bundle.getInt("index", 0);
+        }
+        if (this.update) {
+            documentScanner = documentScannerUpdate;
+        }
         documentScanner.startScan();
         // Init
 
         this.view = findViewById(R.id.main); // TODO-rca:なんとかする
 
+
     }
 
     @Override
@@ -125,15 +190,13 @@ public class ScannerManagerActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(android.view.MenuItem item) {
         if (item.getItemId() == R.id.action_save_new) {
             // 新ドキュメントとして保存
-            Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
             saveNewDocument();
             return true;
-//        }
+        }
-//        else if (item.getItemId() == R.id.action_insert_exist) {
+        else if (item.getItemId() == R.id.action_insert_exist) {
-//            // 既存ドキュメントに挿入
+            // 既存ドキュメントに挿入
-//            Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
+            insertToExistDocument();
-//            insertToExistDocument();
+            return true;
-//            return true;
         } else if (item.getItemId() == android.R.id.home) {
             finish();
             return true;
@@ -174,7 +237,7 @@ public class ScannerManagerActivity extends AppCompatActivity {
             Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
             croppedImages.toArray(bitmaps);
             logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
-            addPagesToDocumentDetail(documentDetail, bitmaps).join();
+            addPagesToDocumentDetail(documentDetail, bitmaps, "Initial Commit").join();
             document.updateDocument(documentDetail).join();
             dialog.dismiss();
             finish();
@@ -182,11 +245,11 @@ public class ScannerManagerActivity extends AppCompatActivity {
 
     }
 
-    private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
+    private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps, String commitMessage) {
         return CompletableFuture.runAsync(() -> {
             try {
                 document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
-                lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
+                lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(commitMessage == null ? "NONE" : commitMessage);
             } catch (Exception e) {
                 logger.error(TAG, "Error: " + e.getMessage());
                 logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
@@ -194,9 +257,48 @@ public class ScannerManagerActivity extends AppCompatActivity {
         });
     }
 
+    private void updatePage() {
+        logger.debug(TAG, "updatePage");
+        // Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
+        ProgressDialog dialog = new ProgressDialog(this);
+        dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
+        dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+        dialog.setCancelable(false);
+        dialog.show();
+        document.getDocument(documentId).thenAccept((documentDetail) -> {
+            DocumentProcessor documentProcessor = documentProcessorFactory.create(documentDetail);
+            if (croppedImages.size() != 1) {
+                logger.error(TAG, "croppedImages.size() != 1");
+                logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
+                return;
+            }
+            if (croppedImages.get(0) == null) {
+                logger.error(TAG, "croppedImages.get(0) == null");
+                logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
+                return;
+            }
+            documentProcessor.updatePageAtIndex(croppedImages.get(0), index);
+            document.updateDocument(documentProcessor.getDocumentDetail()).join();
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(index + "ページ目を更新"); // TODO-rca: メッセージを動的にする, 指定できるようにする
+            dialog.dismiss();
+        });
+    }
+
     private void insertToExistDocument() {
         logger.debug(TAG, "insertToExistDocument");
-        // TODO-rca: 実装
+        LacertaFilePickerDialog dialog = new LacertaFilePickerDialog();
+        dialog.setListener(((name, fileId) -> {
+            document.getDocument(fileId).thenAccept((documentDetail) -> {
+                Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
+                croppedImages.toArray(bitmaps);
+                logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
+                addPagesToDocumentDetail(documentDetail, bitmaps, "ページを追加").join();
+                document.updateDocument(documentDetail).join();
+                finish();
+            });
+        }));
+        dialog.setTitle("追加するドキュメントを選択");
+        dialog.show(getSupportFragmentManager(), "LacertaFilePickerDialog");
     }
 
     private void updateResultView(ArrayList<Bitmap> resultImages) {
@@ -224,6 +326,8 @@ public class ScannerManagerActivity extends AppCompatActivity {
 
             resultView.addView(resultImageView);
         }
+
+        selectedImage.setImageBitmap(resultImages.get(0));
     }
 
 }

component/scanner/src/main/res/menu/scanner_result_toolbar.xml

@@ -6,9 +6,9 @@
         android:icon="@drawable/save_24px"
         android:title="Save"
         app:showAsAction="ifRoom"/>
-<!--    <item-->
+    <item
-<!--        android:id="@+id/action_insert_exist"-->
+        android:id="@+id/action_insert_exist"
-<!--        android:icon="@drawable/description_24px"-->
+        android:icon="@drawable/description_24px"
-<!--        android:title="Insert"-->
+        android:title="Insert"
-<!--        app:showAsAction="ifRoom"/>-->
+        app:showAsAction="ifRoom"/>
 </menu>

component/viewer/build.gradle

@@ -61,4 +61,8 @@ dependencies {
     // TODO-rca: バージョンカタログに切り出す
     implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
 
+    // ViewPager2
+    implementation "androidx.viewpager2:viewpager2:1.0.0"
+
+    implementation project(':component:scanner') // めちゃくちゃよくないけどもう正しくやってる時間がないので
 }

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

@@ -2,4 +2,6 @@ package one.nem.lacerta.component.viewer;
 
 public interface ItemClickListener {
     void onItemClick(String fileName); // DEBUG
+
+    void onItemLongClick(String fileName, int position);
 }

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

@@ -44,8 +44,9 @@ public class ViewerBodyAdapter extends RecyclerView.Adapter<ViewerBodyAdapter.Vi
     public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
         Bitmap bitmap = pages.get(position).getBitmap();
         holder.image.setImageBitmap(bitmap);
-        holder.itemView.setOnClickListener(v -> {
+        holder.itemView.setOnLongClickListener(v -> {
-
+            listener.onItemLongClick(pages.get(position).getFileName(), position);
+            return true;
         });
     }
 

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

@@ -0,0 +1,167 @@
+package one.nem.lacerta.component.viewer;
+
+import android.content.Intent;
+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 android.widget.Toast;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.scanner.ScannerManagerActivity;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.data.LacertaLibrary;
+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 ViewerBodyFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+@AndroidEntryPoint
+public class ViewerBodyFragment extends Fragment {
+
+    @Inject
+    Document document;
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
+
+    // Variables
+    private String documentId;
+    private String documentName;
+    private String revisionId;
+
+    public ViewerBodyFragment() {
+        // Required empty public constructor
+    }
+
+    public static ViewerBodyFragment newInstance(String documentId, String documentName) {
+        ViewerBodyFragment fragment = new ViewerBodyFragment();
+        Bundle args = new Bundle();
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public static ViewerBodyFragment newInstance(String documentId, String documentName, String revisionId) {
+        ViewerBodyFragment fragment = new ViewerBodyFragment();
+        Bundle args = new Bundle();
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        args.putString("revisionId", revisionId);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            documentId = getArguments().getString("documentId");
+            documentName = getArguments().getString("documentName");
+            revisionId = getArguments().getString("revisionId");
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_viewer_body, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        logger.debug("ViewerBodyFragment", "ViewerBodyFragment.onViewCreated");
+
+        RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(new ItemClickListener() {
+            @Override
+            public void onItemClick(String fileName) {
+
+            }
+
+            @Override
+            public void onItemLongClick(String fileName, int position) {
+                MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
+                builder.setTitle("ページを更新しますか？");
+
+                builder.setPositiveButton("更新", (dialog, which) -> {
+                    // ScannerをIntent
+                    Intent intent = new Intent(getActivity(), ScannerManagerActivity.class);
+                    intent.putExtra("update", true);
+                    intent.putExtra("documentId", documentId);
+                    intent.putExtra("index", position);
+                    startActivity(intent);
+                });
+                builder.setNegativeButton("キャンセル", (dialog, which) -> {
+                    // cancel
+                    dialog.dismiss();
+                });
+
+                builder.show();
+            }
+        });
+
+        getActivity().runOnUiThread(() -> {
+            recyclerView.setAdapter(viewerBodyAdapter);
+            viewerBodyAdapter.notifyDataSetChanged();
+        });
+
+        loadDocument(viewerBodyAdapter, documentId, revisionId);
+    }
+
+    private void loadDocument(ViewerBodyAdapter adapter, String documentId, String revisionId) {
+        if (revisionId == null) { // load latest revision
+            document.getDocument(documentId).thenApply(document -> {
+                getActivity().runOnUiThread(() -> {
+                    adapter.setPages(document.getPages());
+                    adapter.notifyDataSetChanged();
+                });
+                return null;
+            });
+        } else { // load specified revision
+            LacertaVcs vcs = lacertaVcsFactory.create(documentId);
+//            document.getDocumentPageListByFileNameList(documentId, vcs.getDocumentPagePathListRev(revisionId).join()).thenApply(documentPageList -> {
+//                getActivity().runOnUiThread(() -> {
+//                    adapter.setPages(documentPageList);
+//                    adapter.notifyDataSetChanged();
+//                });
+//                return null;
+//            });
+
+            ArrayList<String> fileNameList = vcs.getDocumentPagePathListRev(revisionId).join();
+            document.getDocumentPageListByFileNameList(documentId, fileNameList).thenApply(documentPageList -> {
+                getActivity().runOnUiThread(() -> {
+                    adapter.setPages(documentPageList);
+                    adapter.notifyDataSetChanged();
+                });
+                return null;
+            });
+        }
+    }
+}

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

@@ -0,0 +1,439 @@
+package one.nem.lacerta.component.viewer;
+
+import android.os.Bundle;
+
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager2.widget.ViewPager2;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.common.LacertaApplyTagDialog;
+import one.nem.lacerta.component.common.LacertaSelectRevDialog;
+import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
+import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
+import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.model.ListItemType;
+import one.nem.lacerta.model.document.page.Page;
+import one.nem.lacerta.model.document.tag.DocumentTag;
+import one.nem.lacerta.model.pref.ToxiDocumentModel;
+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 ViewerContainerFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+@AndroidEntryPoint
+public class ViewerContainerFragment extends Fragment {
+
+    // Inject
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    @Inject
+    Document document;
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
+
+    // Variables
+    private String documentId;
+    private String documentName;
+    private boolean hasCombined = false;
+    private String revId;
+    private ViewerViewPagerAdapter viewerViewPagerAdapter;
+
+    public ViewerContainerFragment() {
+        // Required empty public constructor
+    }
+
+    public static ViewerContainerFragment newInstance(String documentId, String documentName, boolean hasCombined) {
+        ViewerContainerFragment fragment = new ViewerContainerFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        args.putBoolean("hasCombined", hasCombined);
+        args.putString("revId", null);
+        return fragment;
+    }
+
+    public static ViewerContainerFragment newInstance(String documentId, String documentName) {
+        ViewerContainerFragment fragment = new ViewerContainerFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        args.putBoolean("hasCombined", false);
+        args.putString("revId", null);
+        return fragment;
+    }
+
+    public static ViewerContainerFragment newInstance(String documentId, String documentName, String revId) {
+        ViewerContainerFragment fragment = new ViewerContainerFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        args.putBoolean("hasCombined", false);
+        args.putString("revId", revId);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null){
+            documentId = getArguments().getString("documentId");
+            documentName = getArguments().getString("documentName");
+            hasCombined = getArguments().getBoolean("hasCombined");
+            revId = getArguments().getString("revId");
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_viewer_container, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        // Init view pager
+        ViewPager2 viewPager = view.findViewById(R.id.view_pager);
+
+        // Init view pager adapter
+        this.viewerViewPagerAdapter = new ViewerViewPagerAdapter(requireActivity());
+        viewPager.setAdapter(viewerViewPagerAdapter);
+
+        // Init tab layout
+        TabLayout tabLayout = view.findViewById(R.id.tab_layout);
+
+        // Init toolbar
+        Toolbar toolbar = view.findViewById(R.id.toolbar);
+        initToolbar(toolbar, true, documentName);
+
+        if (this.revId != null) { // Revが指定されている場合
+            LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
+            viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
+            viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}}); // TODO-rca: 読みにくいので直接追加できるようにする
+            viewerViewPagerAdapter.setFragmentRevisionList(new ArrayList<String>(){{add(revId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
+            viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
+            tabLayout.setVisibility(View.GONE);
+            toolbar.setSubtitle("リビジョン: " + revId);
+        } else {
+            // Get document page
+            if (this.hasCombined) { // 結合親の場合
+                // バージョンを遡る操作を非表示
+                toolbar.getMenu().findItem(R.id.action_open_vcs_rev_list).setVisible(false);
+                logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
+                lacertaLibrary.getCombinedDocumentToxiList(documentId).thenAccept(combinedDocumentToxiList -> {
+                    logger.debug("ViewerContainerFragment", "combinedDocumentToxiList: " + combinedDocumentToxiList.size());
+
+                    viewerViewPagerAdapter.setFragmentTargetIdList(
+                            combinedDocumentToxiList.stream().map(ToxiDocumentModel::getChildDocumentId).collect(Collectors.toCollection(ArrayList::new)));
+                    viewerViewPagerAdapter.setFragmentTitleList(
+                            combinedDocumentToxiList.stream().map(ToxiDocumentModel::getTitleCache).collect(Collectors.toCollection(ArrayList::new)));
+
+                    viewerViewPagerAdapter.notifyItemRangeChanged(0, combinedDocumentToxiList.size());
+                    toolbar.setSubtitle("結合ドキュメント");
+                });
+            } else { // それ以外の場合
+                logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
+                tabLayout.setVisibility(View.GONE);
+                viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
+                viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}});
+                viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
+            }
+
+            // サブタイトルとしてパスを表示(暫定)
+            lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT).thenAccept(publicPath -> {
+                logger.debug("ViewerContainerFragment", "publicPath: " + publicPath);
+                toolbar.setSubtitle("/" + publicPath.parent().getStringPath());
+            });
+
+        }
+        // Attach tab layout to view pager
+        new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
+            View customView = LayoutInflater.from(getContext()).inflate(R.layout.viewer_custom_tab, null);
+
+            TextView textView = customView.findViewById(R.id.tab_title);
+            textView.setText(viewerViewPagerAdapter.getTabTitle(position));
+
+            ImageButton imageButton = customView.findViewById(R.id.tab_modify);
+            imageButton.setOnClickListener(v -> {
+                PopupMenu popupMenu = new PopupMenu(getContext(), v);
+                popupMenu.inflate(R.menu.viewer_tab_menu);
+                popupMenu.setOnMenuItemClickListener(item -> {
+                    if (item.getItemId() == R.id.action_open_vcs_rev_list) {
+                        showRevList(viewerViewPagerAdapter.getFragmentTargetId(position), viewerViewPagerAdapter.getFragmentTitle(position));
+                        return true;
+                    } else if (item.getItemId() == R.id.action_rename) {
+                        renameCombinedDocument(
+                                documentId,
+                                viewerViewPagerAdapter.getFragmentTargetIdList().get(position),
+                                viewerViewPagerAdapter.getFragmentTitle(position),
+                                position);
+                        return true;
+                    } else if (item.getItemId() == R.id.action_delete) {
+                        Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
+                        return true;
+                    } else {
+                        return false;
+                    }
+                });
+                popupMenu.show();
+            });
+
+            tab.setCustomView(customView);
+        }).attach();
+    }
+
+    private void renameCombinedDocument(String parentId, String childId, String current, int position) { // TODO-rca: 無理やりpositionを渡してるのでなんとかする
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
+        builder.setTitle("アイテム名の変更");
+        builder.setMessage("アイテム名を入力してください");
+
+        View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
+        TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
+        TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
+        textInputEditText.setText(current);
+        textInputLayout.setHint("アイテム名");
+        builder.setView(view);
+
+        builder.setPositiveButton("変更", (dialog, which) -> {
+            document.renameDocument(childId, textInputEditText.getText().toString()).thenCombine(
+                lacertaLibrary.updateTitleCache(parentId, childId, textInputEditText.getText().toString()), (aVoid, aVoid2) -> {
+                    getActivity().runOnUiThread(() -> {
+                        Toast.makeText(getContext(), "変更しました", Toast.LENGTH_SHORT).show();
+                        updateTabTitle(position, textInputEditText.getText().toString());
+                        dialog.dismiss();
+                    });
+                    return null;
+                });
+        });
+        builder.setNegativeButton("キャンセル", (dialog, which) -> {
+            dialog.cancel();
+        });
+
+        builder.show();
+    }
+
+    private void updateTabTitle(int position, String title) {
+        ArrayList<String> fragmentTitleList = viewerViewPagerAdapter.getFragmentTitleList();
+        fragmentTitleList.set(position, title);
+        viewerViewPagerAdapter.setFragmentTitleList(fragmentTitleList);
+        viewerViewPagerAdapter.notifyItemChanged(position);
+    }
+
+    /**
+     * Toolbarをinitする
+     *
+     * @param toolbar Toolbar
+     * @param showCloseButton Closeボタンを表示するかどうか
+     * @param title タイトル
+     */
+    private void initToolbar(Toolbar toolbar, boolean showCloseButton, String title) {
+        getActivity().runOnUiThread(() -> {
+            // Close button
+            if (showCloseButton) {
+                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
+                toolbar.setNavigationOnClickListener(v -> {
+                    getActivity().finish();
+                });
+            } else {
+                toolbar.setNavigationIcon(null);
+            }
+
+            // Title
+            toolbar.setTitle(title);
+
+            // Menu
+            toolbar.inflateMenu(R.menu.viewer_menu);
+            toolbar.setOnMenuItemClickListener(item -> {
+                if (item.getItemId() == R.id.action_open_vcs_rev_list) {
+                    showRevList(this.documentId, this.documentName);
+                    return true;
+                } else if (item.getItemId() == R.id.action_rename) {
+                    renameDocument();
+                    return true;
+                } else if (item.getItemId() == R.id.action_delete) {
+                    deleteDocument();
+                    return true;
+                } else if (item.getItemId() == R.id.action_move) {
+                    moveDocument();
+                    return true;
+                } else if (item.getItemId() == R.id.action_combine) {
+                    combineDocument();
+                    return true;
+                } else if (item.getItemId() == R.id.action_apply_tag) {
+                    applyTag();
+                    return true;
+                } else {
+                    return false;
+                }
+            });
+        });
+    }
+
+    private void showRevList(String targetId, String targetName) {
+        LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
+        lacertaSelectRevDialog.setDocumentId(targetId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
+        lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
+            @Override
+            public void onItemSelected(String revId) {
+                logger.debug("ViewerContainerFragment", "Dialog Result: revId: " + revId);
+                getParentFragmentManager().beginTransaction()
+                        .replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(targetId, targetName, revId))
+                        .commit();
+            }
+
+            @Override
+            public void onDialogCanceled() {
+            }
+        });
+        lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
+    }
+
+    private void moveDocument() {
+        LacertaDirPickerDialog lacertaDirPickerDialog = new LacertaDirPickerDialog();
+        lacertaDirPickerDialog.setListener((name, dirId) -> {
+            logger.debug("MoveDocument", "Selected dir: " + name + ", " + dirId);
+            document.moveDocument(documentId, dirId).thenAccept(aVoid -> {
+                getActivity().runOnUiThread(() -> {
+                    // Stop Activity
+                    getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
+                });
+            });
+        });
+        lacertaDirPickerDialog.setTitle("ファイルの移動")
+                .setMessage("ファイルを移動するフォルダを選択してください。")
+                .setPositiveButtonText("移動")
+                .setNegativeButtonText("キャンセル");
+        lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
+    }
+
+    private void deleteDocument() {
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
+        builder.setTitle("ファイルの削除");
+        builder.setMessage("ファイルを削除しますか？");
+
+        builder.setPositiveButton("削除", (dialog, which) -> {
+            document.deleteDocument(documentId).thenAccept(aVoid -> {
+                getActivity().runOnUiThread(() -> {
+                    Toast.makeText(getContext(), "削除しました", Toast.LENGTH_SHORT).show();
+                    getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
+                });
+            });
+        });
+        builder.setNegativeButton("キャンセル", (dialog, which) -> {
+            dialog.cancel();
+        });
+
+        builder.show();
+    }
+
+    private void applyTag() {
+        LacertaApplyTagDialog lacertaApplyTagDialog = new LacertaApplyTagDialog();
+        lacertaApplyTagDialog
+                .setTitle("タグの適用")
+                .setMessage("適用するタグを選択してください")
+                .setNegativeButtonText("キャンセル")
+                .setDocumentId(documentId)
+                .setListener(new LacertaApplyTagDialog.LacertaApplyTagDialogListener() {
+                    @Override
+                    public void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags) {
+                        logger.debug("ViewerContainerFragment", "Dialog Result: appliedTags: " + appliedTags.size());
+                        lacertaLibrary.applyTagListToDocument(documentId, appliedTags).thenAccept(aVoid -> {
+                            getActivity().runOnUiThread(() -> {
+                                Toast.makeText(getContext(), "タグを適用しました", Toast.LENGTH_SHORT).show();
+                                lacertaApplyTagDialog.dismiss();
+                            });
+                        });
+                    }
+
+                    @Override
+                    public void onDialogNegativeClick() {
+                        lacertaApplyTagDialog.dismiss();
+                    }
+                })
+                .show(getChildFragmentManager(), "LacertaApplyTagDialog");
+    }
+
+    private void combineDocument() {
+        LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
+        lacertaFilePickerDialog.setListener((fileName, selectedId) -> {
+            lacertaLibrary.combineDocument(documentId, selectedId).thenAccept(aVoid -> {
+                getActivity().runOnUiThread(() -> {
+                    Toast.makeText(getContext(), "結合しました", Toast.LENGTH_SHORT).show();
+                    getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
+                });
+            });
+        });
+        lacertaFilePickerDialog
+                .setTitle("ファイルの結合")
+                .setMessage("結合するファイルを選択してください")
+                .setNegativeButtonText("キャンセル")
+                .show(getChildFragmentManager(), "LacertaFilePickerDialog");
+    }
+
+    /**
+     * ドキュメント名を変更する
+     */
+    private void renameDocument() {
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
+        builder.setTitle("ファイル名の変更");
+        builder.setMessage("ファイル名を入力してください");
+
+        View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
+        TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
+        TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
+        textInputEditText.setText(documentName);
+        textInputLayout.setHint("ファイル名");
+        builder.setView(view);
+
+        builder.setPositiveButton("変更", (dialog, which) -> {
+            document.renameDocument(documentId, textInputEditText.getText().toString()).thenAccept(aVoid -> {
+                getActivity().runOnUiThread(() -> {
+                    this.documentName = textInputEditText.getText().toString();
+                    // TODO-rca: Toolbarのタイトルも変更する
+                });
+            });
+        });
+        builder.setNegativeButton("キャンセル", (dialog, which) -> {
+            dialog.cancel();
+        });
+
+        builder.show();
+    }
+}

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

@@ -24,6 +24,8 @@ import one.nem.lacerta.component.common.LacertaSelectDirDialogListener;
 import one.nem.lacerta.component.common.LacertaSelectRevDialog;
 import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
 import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
+import one.nem.lacerta.component.common.picker.LacertaFilePickerAdapter;
+import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
 import one.nem.lacerta.data.Document;
 import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.ListItemType;
@@ -104,8 +106,16 @@ public class ViewerListFragment extends Fragment {
 
         RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
+        ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(new ItemClickListener() {
-            Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
+            @Override
+            public void onItemClick(String fileName) {
+
+            }
+
+            @Override
+            public void onItemLongClick(String fileName, int position) {
+
+            }
         });
         recyclerView.setAdapter(viewerBodyAdapter);
 
@@ -256,6 +266,21 @@ public class ViewerListFragment extends Fragment {
                             .setNegativeButtonText("キャンセル");
                     lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
                     return true;
+                } else if(item.getItemId() == R.id.action_combine) {
+                    LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
+                    lacertaFilePickerDialog.setListener((name, fileId) -> {
+                        lacertaLibrary.combineDocument(documentId, fileId).thenAccept(aVoid -> {
+                            getActivity().runOnUiThread(() -> {
+                                // Stop Activity
+                                getActivity().finish(); // TODO-rca: 終了せずにUIを更新したい
+                            });
+                        });
+                    });
+                    lacertaFilePickerDialog.setTitle("ファイルの結合")
+                            .setMessage("結合するファイルを選択してください。")
+                            .setNegativeButtonText("キャンセル");
+                    lacertaFilePickerDialog.show(getParentFragmentManager(), "select_file_dialog");
+                    return true;
                 } else {
                     return false;
                 }

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

@@ -30,6 +30,7 @@ public class ViewerMainActivity extends AppCompatActivity {
     private static final String TAG = "ViewerMainActivity";
     String documentId;
     String documentName;
+    boolean hasCombined = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,6 +50,7 @@ public class ViewerMainActivity extends AppCompatActivity {
         try {
             documentId = intent.getStringExtra("documentId");
             documentName = intent.getStringExtra("documentName");
+            hasCombined = intent.getBooleanExtra("hasCombined", false);
         }
         catch (Exception e) {
             logger.error(TAG, "Failed to get documentId from intent");
@@ -58,9 +60,18 @@ public class ViewerMainActivity extends AppCompatActivity {
         }
 
         // Navigation
+//        getSupportFragmentManager().beginTransaction()
+//                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
+//                .commit();
+        if (hasCombined) {
             getSupportFragmentManager().beginTransaction()
-                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
+                    .replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName, hasCombined))
                     .commit();
+        } else {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName))
+                    .commit();
+        }
     }
 
 }

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

@@ -0,0 +1,81 @@
+package one.nem.lacerta.component.viewer;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import java.util.ArrayList;
+
+public class ViewerViewPagerAdapter extends FragmentStateAdapter {
+
+    // Variables
+    private ArrayList<String> fragmentTargetIdList = new ArrayList<>();
+    private ArrayList<String> fragmentTitleList = new ArrayList<>();
+    private ArrayList<String> fragmentRevisionList = new ArrayList<>();
+
+    // Setter
+
+    public void setFragmentTargetIdList(ArrayList<String> fragmentTargetIdList) {
+        this.fragmentTargetIdList = fragmentTargetIdList;
+    }
+
+    public void setFragmentTitleList(ArrayList<String> fragmentTitleList) {
+        this.fragmentTitleList = fragmentTitleList;
+    }
+
+    public void setFragmentRevisionList(ArrayList<String> fragmentRevisionList) {
+        this.fragmentRevisionList = fragmentRevisionList;
+    }
+
+    public ViewerViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
+        super(fragmentActivity);
+    }
+
+    @NonNull
+    @Override
+    public Fragment createFragment(int position) {
+        if (fragmentRevisionList != null && fragmentRevisionList.size() > position) {
+            return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position), fragmentRevisionList.get(position));
+        } else {
+            return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        if (fragmentTargetIdList == null || fragmentTitleList == null) {
+            return 0;
+        } else if (fragmentTargetIdList.size() != fragmentTitleList.size()) {
+            throw new IllegalStateException("fragmentTargetIdList.size() != fragmentTitleList.size()");
+        } else {
+            return fragmentTargetIdList.size();
+        }
+    }
+
+    @Nullable
+    public CharSequence getTabTitle(int position) {
+        return fragmentTitleList.get(position);
+    }
+
+    // Getter
+
+    public String getFragmentTargetId(int position) {
+        return fragmentTargetIdList.get(position);
+    }
+
+    public String getFragmentTitle(int position) {
+        return fragmentTitleList.get(position);
+    }
+
+    public ArrayList<String> getFragmentTargetIdList() {
+        return fragmentTargetIdList;
+    }
+
+    public ArrayList<String> getFragmentTitleList() {
+        return fragmentTitleList;
+    }
+}

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

@@ -0,0 +1,16 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".ViewerBodyFragment">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</FrameLayout>

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

@@ -0,0 +1,66 @@
+<FrameLayout 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="match_parent"
+    android:background="@color/colorSurface">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        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.SubtitleCollapsingToolbarLayout
+                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="Title" />
+
+            </com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabMode="scrollable"
+                />
+
+            <ProgressBar
+                android:id="@+id/loading_progress_bar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:indeterminate="true"
+                android:background="@color/colorSurface"
+                android:visibility="gone" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/view_pager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</FrameLayout>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="16dp">
+
+    <TextView
+        android:id="@+id/tab_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TAB TITLE"
+        android:textSize="16sp"
+        android:layout_gravity="center"/>
+
+    <ImageButton
+        android:id="@+id/tab_modify"
+        android:layout_marginStart="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:background="@android:color/transparent"
+        android:src="@drawable/more_vert_24px"
+        android:layout_gravity="center_vertical" />
+</LinearLayout>

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

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_open_vcs_rev_list"
-        android:title="Open VCS Rev List" />
+        android:title="バージョン履歴" />
 
     <item
         android:id="@+id/action_rename"
@@ -10,10 +11,22 @@
 
     <item
         android:id="@+id/action_delete"
-        android:title="削除" />
+        android:icon="@drawable/delete_24px"
+        android:title="削除"
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_move"
         android:title="移動" />
 
+    <item
+        android:id="@+id/action_combine"
+        android:icon="@drawable/merge_type_24px"
+        android:title="結合"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_apply_tag"
+        android:title="タグの管理" />
+
 </menu>

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

@@ -0,0 +1,14 @@
+<?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="過去のリビジョン" />
+
+    <item
+        android:id="@+id/action_rename"
+        android:title="リネーム" />
+
+    <item
+        android:id="@+id/action_delete"
+        android:title="削除" />
+</menu>

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

@@ -10,6 +10,7 @@ import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
 import one.nem.lacerta.model.document.tag.DocumentTag;
+import one.nem.lacerta.model.pref.ToxiDocumentModel;
 
 public interface LacertaLibrary {
 
@@ -27,6 +28,9 @@ public interface LacertaLibrary {
     // Create Folder
     CompletableFuture<String> createFolder(String parentId, String name);
 
+    // delete Folder
+    CompletableFuture<Void> deleteFolder(String folderId);
+
     // Get Public Path
     CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
 
@@ -34,6 +38,8 @@ public interface LacertaLibrary {
     // Tag
     CompletableFuture<ArrayList<DocumentTag>> getTagList();
 
+    CompletableFuture<ArrayList<DocumentTag>> getAppliedTagList(String documentId);
+
     CompletableFuture<Void> createTag(DocumentTag tag);
 
     CompletableFuture<Void> updateTag(DocumentTag tag);
@@ -42,5 +48,21 @@ public interface LacertaLibrary {
 
     CompletableFuture<Void> addTagToDocument(String documentId, String tagId);
 
+    CompletableFuture<Void> applyTagListToDocument(String documentId, ArrayList<DocumentTag> tagList);
+
     CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId);
+
+    // Combined Document
+
+    CompletableFuture<Void> combineDocument(String parentId, String childId);
+
+    CompletableFuture<Void> updateTitleCache(String parentId, String childId, String titleCache);
+
+    CompletableFuture<Void> uncombineDocument(String parentId, String childId);
+
+//    CompletableFuture<Void> combineDocument(String parentId, ArrayList<String> childIdList);
+//
+//    CompletableFuture<Void> uncombineDocument(String parentId, ArrayList<String> childIdList);
+
+    CompletableFuture<ArrayList<ToxiDocumentModel>> getCombinedDocumentToxiList(String parentId);
 }

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

@@ -81,6 +81,8 @@ public class DocumentImpl implements Document {
             documentEntity.updatedAt = meta.getUpdatedAt();
             documentEntity.createdAt = meta.getCreatedAt();
             documentEntity.parentId = meta.getParentId();
+            documentEntity.isCombineChild = meta.getIsCombineChild();
+            documentEntity.isCombineParent = meta.getIsCombineParent();
 
             database.documentDao().insert(documentEntity);
 
@@ -104,6 +106,8 @@ public class DocumentImpl implements Document {
         meta.setUpdatedAt(new Date());
         meta.setCreatedAt(new Date());
         meta.setParentId(null);
+        meta.setIsCombineChild(false);
+        meta.setIsCombineParent(false);
         return createDocument(meta);
     }
 

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

@@ -8,6 +8,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -22,11 +23,13 @@ import one.nem.lacerta.model.ListItemType;
 import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
 import one.nem.lacerta.model.document.tag.DocumentTag;
+import one.nem.lacerta.model.pref.ToxiDocumentModel;
 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.source.database.entity.TagEntity;
+import one.nem.lacerta.source.database.entity.ToxiDocumentEntity;
 import one.nem.lacerta.source.database.entity.ToxiDocumentTagEntity;
 import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
@@ -47,13 +50,15 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         return CompletableFuture.supplyAsync(() -> {
             List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
 
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             ArrayList<ListItem> listItems = new ArrayList<>();
             for (DocumentEntity documentEntity : documentEntities) {
                 ListItem listItem = new ListItem();
                 listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
                 listItem.setTitle(documentEntity.title);
-                listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
+                listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
                 listItem.setItemId(documentEntity.id);
+                listItem.setHasCombined(documentEntity.isCombineParent);
                 listItems.add(listItem);
             }
 
@@ -103,10 +108,11 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                 listItem.setTitle(childFolderEntity.name);
                 listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
                 listItem.setItemId(childFolderEntity.id);
+                listItem.setHasCombined(false);
                 listItems.add(listItem);
             }
 
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
 
             for (DocumentEntity documentEntity : documentEntities) {
                 logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
@@ -115,6 +121,20 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                 listItem.setTitle(documentEntity.title);
                 listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
                 listItem.setItemId(documentEntity.id);
+                listItem.setHasCombined(documentEntity.isCombineParent);
+                // タグを取得して関連付ける処理 TODO-rca: わかりにくい + 責任がめちゃくちゃ + めちゃくちゃ重いのでなんとかする
+                List<ToxiDocumentTagEntity> documentTagEntities = database.toxiDocumentTagDao().findByDocumentId(documentEntity.id);
+                ArrayList<DocumentTag> documentTags = new ArrayList<>();
+                for (ToxiDocumentTagEntity toxiDocumentTagEntity : documentTagEntities) {
+                    logger.debug("LacertaLibraryImpl", "toxiDocumentTagEntity.tagId: " + toxiDocumentTagEntity.tagId);
+                    TagEntity tagEntity = database.tagDao().findById(toxiDocumentTagEntity.tagId);
+                    if (tagEntity != null) {
+                        logger.debug("LacertaLibraryImpl", "tagEntity.tagName: " + tagEntity.tagName);
+                        documentTags.add(convertTagEntityToDocumentTag(tagEntity));
+                    }
+                }
+                listItem.setTagList(documentTags);
+                logger.debug("LacertaLibraryImpl", "documentTags.size(): " + documentTags.size());
                 listItems.add(listItem);
             }
 
@@ -164,6 +184,7 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                 listItem.setTitle(childFolderEntity.name);
                 listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
                 listItem.setItemId(childFolderEntity.id);
+                listItem.setHasCombined(false);
                 listItems.add(listItem);
             }
 
@@ -186,6 +207,14 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         });
     }
 
+    @Override
+    public CompletableFuture<Void> deleteFolder(String folderId) {
+        return CompletableFuture.supplyAsync(() -> {
+            database.folderDao().deleteById(folderId);
+            return null;
+        });
+    }
+
     @Override
     public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
         return CompletableFuture.supplyAsync(() -> {
@@ -241,6 +270,22 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         });
     }
 
+    @Override
+    public CompletableFuture<ArrayList<DocumentTag>> getAppliedTagList(String documentId) {
+        return CompletableFuture.supplyAsync(() -> {
+            List<ToxiDocumentTagEntity> toxiDocumentTagEntities = database.toxiDocumentTagDao().findByDocumentId(documentId);
+            logger.debug("LacertaLibraryImpl", "Database Query: Get ToxiDocumentTagEntity List (Size: " + toxiDocumentTagEntities.size() + ")");
+            ArrayList<DocumentTag> documentTags = new ArrayList<>();
+            for (ToxiDocumentTagEntity toxiDocumentTagEntity : toxiDocumentTagEntities) {
+                TagEntity tagEntity = database.tagDao().findById(toxiDocumentTagEntity.tagId);
+                if (tagEntity != null) {
+                    documentTags.add(convertTagEntityToDocumentTag(tagEntity));
+                }
+            }
+            return documentTags;
+        });
+    }
+
     @Override
     public CompletableFuture<Void> createTag(DocumentTag tag) {
         return CompletableFuture.supplyAsync(() -> {
@@ -285,6 +330,20 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         });
     }
 
+    @Override
+    public CompletableFuture<Void> applyTagListToDocument(String documentId, ArrayList<DocumentTag> tagArrayList) {
+        return CompletableFuture.supplyAsync(() -> { // TODO-rca: 必要なものだけInsertするべき, 時間があれば...
+            // 一旦全てのタグを削除
+            database.toxiDocumentTagDao().deleteByDocumentId(documentId);
+            logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentTagEntity");
+            // タグを追加
+            for (DocumentTag documentTag : tagArrayList) {
+                addTagToDocument(documentId, documentTag.getId());
+            }
+            return null;
+        });
+    }
+
     @Override
     public CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId) {
         return CompletableFuture.supplyAsync(() -> {
@@ -294,6 +353,105 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         });
     }
 
+    @Override
+    public CompletableFuture<Void> combineDocument(String targetId1, String tagetId2) {
+        return CompletableFuture.supplyAsync(() -> {
+            DocumentEntity target1DocumentEntity = database.documentDao().findById(targetId1);
+            DocumentEntity target2DocumentEntity = database.documentDao().findById(tagetId2);
+            if (target1DocumentEntity == null || target2DocumentEntity == null) {
+                logger.warn("LacertaLibraryImpl", "DocumentEntity is not found.");
+                return null;
+            }
+            target1DocumentEntity.isCombineChild = true;
+            target2DocumentEntity.isCombineChild = true;
+            database.documentDao().update(target1DocumentEntity);
+            database.documentDao().update(target2DocumentEntity);
+            logger.debug("LacertaLibraryImpl", "Database Query: Updated DocumentEntity");
+
+            DocumentEntity parentDocumentEntity = new DocumentEntity();
+            parentDocumentEntity.id = UUID.randomUUID().toString();
+            parentDocumentEntity.title = target1DocumentEntity.title + "(Combined)";
+            parentDocumentEntity.parentId = target1DocumentEntity.parentId;
+            parentDocumentEntity.author = target1DocumentEntity.author; // TODO-rca: Target1とTarget2の作者が異なる場合の処理
+            // CombinedなDocumentはいま作成された と考える
+            parentDocumentEntity.createdAt = new Date();
+            parentDocumentEntity.updatedAt = new Date();
+            parentDocumentEntity.isCombineParent = true;
+            parentDocumentEntity.isCombineChild = false;
+            database.documentDao().insert(parentDocumentEntity);
+            logger.debug("LacertaLibraryImpl", "Database Query: Inserted DocumentEntity");
+
+            insertCombineDocumentToxi(parentDocumentEntity.id, target1DocumentEntity.id, target1DocumentEntity.title);
+            insertCombineDocumentToxi(parentDocumentEntity.id, target2DocumentEntity.id, target2DocumentEntity.title);
+            return null;
+        });
+    }
+
+    private void insertCombineDocumentToxi(String parentId, String childId, String titleCache) {
+        ToxiDocumentEntity toxiDocumentEntity = new ToxiDocumentEntity();
+        toxiDocumentEntity.parentDocumentId = parentId;
+        toxiDocumentEntity.childDocumentId = childId;
+        toxiDocumentEntity.order = 0; // TODO-rca: 並び順の概念をもたせる
+        toxiDocumentEntity.isActive = true; // TODO-rca: タブから非表示にできるようにする
+        toxiDocumentEntity.titleCache = titleCache;
+        database.toxiDocumentDao().insert(toxiDocumentEntity);
+        logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentEntity");
+    }
+
+    @Override
+    public CompletableFuture<Void> updateTitleCache(String parentId, String documentId, String titleCache) {
+        return CompletableFuture.supplyAsync(() -> {
+            ToxiDocumentEntity toxiDocumentEntity = database.toxiDocumentDao().findByParentIdAndChildId(parentId, documentId);
+            if (toxiDocumentEntity == null) {
+                logger.warn("LacertaLibraryImpl", "ToxiDocumentEntity is not found.");
+                return null;
+            }
+            toxiDocumentEntity.titleCache = titleCache;
+            database.toxiDocumentDao().update(toxiDocumentEntity);
+            logger.debug("LacertaLibraryImpl", "Database Query: Updated ToxiDocumentEntity");
+            return null;
+        });
+    }
+
+    @Override
+    public CompletableFuture<Void> uncombineDocument(String parentId, String childId) {
+        return CompletableFuture.supplyAsync(() -> {
+            DocumentEntity parentDocumentEntity = database.documentDao().findById(parentId);
+            DocumentEntity childDocumentEntity = database.documentDao().findById(childId);
+            if (parentDocumentEntity == null || childDocumentEntity == null) {
+                logger.warn("LacertaLibraryImpl", "DocumentEntity is not found.");
+                return null;
+            }
+            parentDocumentEntity.isCombineParent = false;
+            childDocumentEntity.isCombineChild = false;
+            database.documentDao().update(parentDocumentEntity);
+            database.documentDao().update(childDocumentEntity);
+            logger.debug("LacertaLibraryImpl", "Database Query: Updated DocumentEntity");
+
+            database.toxiDocumentDao().deleteByParentIdAndChildId(parentId, childId);
+            logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentEntity");
+            return null;
+        });
+    }
+
+    @Override
+    public CompletableFuture<ArrayList<ToxiDocumentModel>> getCombinedDocumentToxiList(String parentId) {
+        return CompletableFuture.supplyAsync(() -> {
+            List<ToxiDocumentEntity> toxiDocumentEntities = database.toxiDocumentDao().findByParentId(parentId);
+            ArrayList<ToxiDocumentModel> toxiDocumentModels = new ArrayList<>();
+            for (ToxiDocumentEntity toxiDocumentEntity : toxiDocumentEntities) {
+                ToxiDocumentModel toxiDocumentModel = new ToxiDocumentModel();
+                toxiDocumentModel.setParentDocumentId(toxiDocumentEntity.parentDocumentId);
+                toxiDocumentModel.setChildDocumentId(toxiDocumentEntity.childDocumentId);
+                toxiDocumentModel.setOrder(toxiDocumentEntity.order);
+                toxiDocumentModel.setActive(toxiDocumentEntity.isActive);
+                toxiDocumentModel.setTitleCache(toxiDocumentEntity.titleCache);
+                toxiDocumentModels.add(toxiDocumentModel);
+            }
+            return toxiDocumentModels;
+        });
+    }
+
     /**
      * 再帰的にパスを解決する
      *

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

@@ -1,5 +1,5 @@
 package one.nem.lacerta.feature.home;
 
 public interface DocumentSelectListener {
-    void onDocumentSelect(String documentId, String documentName);
+    void onDocumentSelect(String documentId, String documentName, boolean hasCombined);
 }

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

@@ -85,11 +85,12 @@ public class HomeTopFragment extends Fragment {
 
         this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
             @Override
-            public void onDocumentSelect(String documentId, String documentName) {
+            public void onDocumentSelect(String documentId, String documentName, boolean hasCombined) {
                 Intent intent = new Intent(getContext(), ViewerMainActivity.class);
                 Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
                 intent.putExtra("documentId", documentId);
                 intent.putExtra("documentName", documentName);
+                intent.putExtra("hasCombined", hasCombined);
                 startActivity(intent, ActivityOptions.makeCustomAnimation(getContext(), one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
             }
         });

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

@@ -46,7 +46,7 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
         holder.description.setText(listItem.getDescription());
 
         holder.itemView.setOnClickListener( v -> {
-            listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle());
+            listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle(), listItem.getHasCombined());
         });
     }
 

feature/library/build.gradle

@@ -55,6 +55,10 @@ dependencies {
 
     implementation project(':component:viewer')
 
+    implementation project(':processor') // TODO-rca: あんまり依存したくないけど時間がないので一旦
+
+    implementation project(':vcs') // TODO-rca: あんまり依存したくないけど時間がないので一旦
+
     // TODO-rca: バージョンカタログに切り出す
     implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
 }

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

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

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

@@ -1,8 +1,13 @@
 package one.nem.lacerta.feature.library;
 
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -17,15 +22,22 @@ import android.view.ViewGroup;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import java.util.concurrent.CompletableFuture;
+
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.lacerta.component.viewer.ViewerMainActivity;
+import one.nem.lacerta.data.Document;
 import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.ListItemType;
+import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.tag.DocumentTag;
+import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
 import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 
 /**
@@ -46,6 +58,8 @@ public class LibraryPageFragment extends Fragment {
     String parentId;
     Toolbar toolbar;
 
+    // ActivityResultContracts
+    ActivityResultLauncher<String> getContent;
 
     @Inject
     LacertaLibrary lacertaLibrary;
@@ -53,6 +67,15 @@ public class LibraryPageFragment extends Fragment {
     @Inject
     LacertaLogger logger;
 
+    @Inject
+    Document document;
+
+    @Inject
+    DocumentProcessorFactory documentProcessorFactory;
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
+
     ListItemAdapter listItemAdapter;
 
     public LibraryPageFragment() {
@@ -92,6 +115,37 @@ public class LibraryPageFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        getContent = registerForActivityResult(new ActivityResultContracts.GetMultipleContents(), uris -> {
+            for (int i = 0; i < uris.size(); i++) {
+                logger.debug("LibraryTopFragment", "uris.get(" + i + "): " + uris.get(i).getPath());
+            }
+            // ここで取得したURIリストを使用して画像を操作します。
+            if (uris != null) {
+                Bitmap[] bitmaps = new Bitmap[uris.size()];
+                for (int i = 0; i < uris.size(); i++) {
+                    Uri uri = uris.get(i);
+                    try {
+                        bitmaps[i] = BitmapFactory.decodeStream(requireContext().getContentResolver().openInputStream(uri));
+                    } catch (Exception e) {
+                        logger.error("LibraryTopFragment", "Error: " + e.getMessage());
+                        logger.e_code("826da745-7fc9-43e6-9935-9daa17a3932f");
+                    }
+                }
+
+                logger.debug("LibraryTopFragment", "bitmaps.length: " + bitmaps.length);
+                // ドキュメントを作成
+                document.createDocument().thenApply(documentDetail -> {
+                    logger.debug("LibraryTopFragment", "create document (may) success!");
+                    // ドキュメントにページを追加
+                    addPagesToDocumentDetail(documentDetail, bitmaps, "Initial commit(IMPORT)").join();
+                    document.updateDocument(documentDetail).join();
+                    return null;
+                });
+            } else {
+                logger.debug("LibraryTopFragment", "uris is null");
+            }
+        });
     }
 
 
@@ -148,10 +202,6 @@ public class LibraryPageFragment extends Fragment {
             @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);
@@ -164,11 +214,12 @@ public class LibraryPageFragment extends Fragment {
             }
 
             @Override
-            public void onDocumentSelected(String documentId, String documentName) {
+            public void onDocumentSelected(String documentId, String documentName, boolean hasCombined) {
                 Intent intent = new Intent(getContext(), ViewerMainActivity.class);
                 logger.debug("LibraryTopFragment", "Document selected! documentId: " + documentId + ", documentName: " + documentName);
                 intent.putExtra("documentId", documentId);
                 intent.putExtra("documentName", documentName);
+                intent.putExtra("hasCombined", hasCombined);
                 startActivity(intent);
             }
         });
@@ -232,6 +283,13 @@ public class LibraryPageFragment extends Fragment {
         });
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        updateItem(this.folderId); // 暫定, Pull-to-refreshを実装するまで
+    }
+
     /**
      * Toolbarのサブタイトルを更新
      * @param subtitle サブタイトル
@@ -261,6 +319,7 @@ public class LibraryPageFragment extends Fragment {
             } else {
                 toolbar.setNavigationIcon(null);
             }
+
             toolbar.setTitle(title);
             toolbar.getMenu().clear();
             toolbar.inflateMenu(R.menu.dir_menu);
@@ -268,10 +327,70 @@ public class LibraryPageFragment extends Fragment {
                 if (item.getItemId() == R.id.menu_item_create_new_folder) {
                     createFolder(this.folderId);
                     return true;
+                } else if (item.getItemId() == R.id.menu_item_add_by_media) {
+                    createDocByMediaPicker();
+                    return true;
+                } else if (item.getItemId() == R.id.menu_item_delete_folder) {
+                    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
+                    builder.setTitle("フォルダの削除");
+                    builder.setMessage("フォルダを削除しますか？");
+
+                    builder.setPositiveButton("削除", (dialog, which) -> {
+                        deleteMe();
+                    });
+                    builder.setNegativeButton("キャンセル", (dialog, which) -> {
+                        dialog.cancel();
+                    });
+
+                    builder.show();
+                    return true;
                 } else {
                     return false;
                 }
             });
+
+            if (this.folderId == null) toolbar.getMenu().findItem(R.id.menu_item_delete_folder).setVisible(false); // ルートフォルダの場合は削除ボタンを非表示にする
+        });
+    }
+
+    private void deleteMe() {
+        lacertaLibrary.deleteFolder(this.folderId).thenAccept(aVoid -> {
+            // Move to root
+            getActivity().runOnUiThread(() -> {
+                Navigation.findNavController(requireView()).popBackStack(R.id.feature_library_top_fragment, false);
+
+                // Refresh
+                updateItem(this.folderId);
+
+                // Update toolbar
+                toolbarSetup(this.toolbar, false, "ライブラリ");
+            });
+        });
+    }
+
+    /**
+     * メディアピッカーを使用してドキュメントを作成する(呼び出し部分)
+     */
+    private void createDocByMediaPicker() {
+        getContent.launch("image/*");
+    }
+
+    /**
+     * ページを追加する
+     * @param documentDetail ドキュメント詳細
+     * @param bitmaps ビットマップ
+     * @param commitMessage コミットメッセージ
+     * @return CompletableFuture
+     */
+    private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps, String commitMessage) {
+        return CompletableFuture.runAsync(() -> {
+            try {
+                document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
+                lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(commitMessage == null ? "NONE" : commitMessage);
+            } catch (Exception e) {
+                logger.error("LibraryAddSupport", "Error: " + e.getMessage());
+                logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
+            }
         });
     }
 }

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

@@ -1,14 +1,20 @@
 package one.nem.lacerta.feature.library;
 
+import android.graphics.Color;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.chip.Chip;
+import com.google.android.material.chip.ChipGroup;
+
 import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
@@ -31,7 +37,7 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
     @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);
+        View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item_with_tag, parent, false);
         return new ListItemViewHolder(view);
     }
 
@@ -43,9 +49,25 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
         holder.title.setText(listItem.getTitle());
         holder.description.setText(listItem.getDescription());
 
+        if (listItem.getTagList() != null && !listItem.getTagList().isEmpty()) {
+            if (holder.tagGroup.getChildCount() > 0) { // ごまかし
+                holder.tagGroup.removeAllViews();
+            }
+            for (int i = 0; i < listItem.getTagList().size(); i++) {
+                ChipGroup chipGroup = holder.tagGroup;
+                Chip chip = new Chip(chipGroup.getContext());
+                chip.setText(listItem.getTagList().get(i).getName());
+                chip.setTextColor(Color.parseColor(listItem.getTagList().get(i).getColor()));
+                chipGroup.addView(chip);
+            }
+            holder.tagGroup.setVisibility(View.VISIBLE);
+        } else {
+            holder.tagGroup.setVisibility(View.GONE);
+        }
+
         holder.itemView.setOnClickListener( v -> {
             if (listItem.getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
-                listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle());
+                listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle(), listItem.getHasCombined());
             }
             else if (listItem.getItemType() == ListItemType.ITEM_TYPE_FOLDER) {
                 listener.onFolderSelected(listItem.getItemId(), listItem.getTitle());
@@ -64,12 +86,14 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
         ImageView icon;
         TextView title;
         TextView description;
+        ChipGroup tagGroup;
         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);
+            tagGroup = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_tags);
         }
     }
 }

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

@@ -0,0 +1,44 @@
+package one.nem.lacerta.feature.library;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.google.android.material.chip.Chip;
+
+import java.util.ArrayList;
+
+import one.nem.lacerta.model.document.tag.DocumentTag;
+
+public class TagAdapter extends BaseAdapter {
+
+    private ArrayList<DocumentTag> tagList;
+
+    @Override
+    public int getCount() {
+        return 0;
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Chip chip;
+        if (convertView == null) {
+            chip = new Chip(parent.getContext());
+        }
+        else {
+            chip = (Chip) convertView;
+        }
+        chip.setText(tagList.get(position).getName());
+        return chip;
+    }
+}

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

@@ -8,4 +8,15 @@
         android:title="@string/create_new_folder"
         app:showAsAction="never"/>
 
+    <item
+        android:id="@+id/menu_item_delete_folder"
+        android:title="このフォルダを削除"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/menu_item_add_by_media"
+        android:icon="@drawable/developer_mode_24px"
+        android:title="DEBUG_MediaPicker"
+        app:showAsAction="never"/>
+
 </menu>

feature/setting/src/main/res/menu/setting_tag_manage_menu.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/setting_tag_manage_menu_add"
-        android:icon="@drawable/outline_developer_mode_24"
+        android:icon="@drawable/add_24px"
         android:title="@string/placeholder"
         app:showAsAction="ifRoom"/>
 </menu>

feature/setting/src/main/res/navigation/feature_setting_navigation.xml

@@ -12,34 +12,38 @@
         <action
             android:id="@+id/action_settingTopFragment_to_settingAboutPageFragment"
             app:destination="@id/settingAboutPageFragment"
-            app:enterAnim="@anim/slide_from_right"
+            app:enterAnim="@anim/nav_twitter_enter_anim"
-            app:exitAnim="@anim/slide_to_left"
+            app:exitAnim="@anim/nav_twitter_exit_anim"
-            app:popEnterAnim="@anim/slide_from_left"
+            app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
-            app:popExitAnim="@anim/slide_to_right" />
+            app:popExitAnim="@anim/nav_twitter_pop_exit_anim" />
         <action
             android:id="@+id/action_settingTopFragment_to_settingDisplayPageFragment"
             app:destination="@id/settingDisplayPageFragment"
-            app:enterAnim="@anim/slide_from_right"
+            app:enterAnim="@anim/nav_twitter_enter_anim"
-            app:exitAnim="@anim/slide_to_left"
+            app:exitAnim="@anim/nav_twitter_exit_anim"
-            app:popEnterAnim="@anim/slide_from_left"
+            app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
-            app:popExitAnim="@anim/slide_to_right" />
+            app:popExitAnim="@anim/nav_twitter_pop_exit_anim" />
         <action
             android:id="@+id/action_settingTopFragment_to_settingDataPageFragment"
             app:destination="@id/settingDataPageFragment"
-            app:enterAnim="@anim/slide_from_right"
+            app:enterAnim="@anim/nav_twitter_enter_anim"
-            app:exitAnim="@anim/slide_to_left"
+            app:exitAnim="@anim/nav_twitter_exit_anim"
-            app:popEnterAnim="@anim/slide_from_left"
+            app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
-            app:popExitAnim="@anim/slide_to_right" />
+            app:popExitAnim="@anim/nav_twitter_pop_exit_anim" />
         <action
             android:id="@+id/action_settingTopFragment_to_settingScanPageFragment"
             app:destination="@id/settingScanPageFragment"
-            app:enterAnim="@anim/slide_from_right"
+            app:enterAnim="@anim/nav_twitter_enter_anim"
-            app:exitAnim="@anim/slide_to_left"
+            app:exitAnim="@anim/nav_twitter_exit_anim"
-            app:popEnterAnim="@anim/slide_from_left"
+            app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
-            app:popExitAnim="@anim/slide_to_right" />
+            app:popExitAnim="@anim/nav_twitter_pop_exit_anim"/>
         <action
             android:id="@+id/action_settingTopFragment_to_settingTagManageFragment"
-            app:destination="@id/settingTagManageFragment" />
+            app:destination="@id/settingTagManageFragment"
+            app:enterAnim="@anim/nav_twitter_enter_anim"
+            app:exitAnim="@anim/nav_twitter_exit_anim"
+            app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
+            app:popExitAnim="@anim/nav_twitter_pop_exit_anim" />
     </fragment>
     <fragment
         android:id="@+id/settingAboutPageFragment"

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

@@ -2,6 +2,10 @@ package one.nem.lacerta.model;
 
 import android.graphics.drawable.Drawable;
 
+import java.util.ArrayList;
+
+import one.nem.lacerta.model.document.tag.DocumentTag;
+
 public class ListItem {
 
     // Properties
@@ -10,6 +14,8 @@ public class ListItem {
     String description;
     ListItemType itemType;
     String itemId;
+    boolean hasCombined;
+    ArrayList<DocumentTag> tagList;
 
     // Constructor
 
@@ -20,6 +26,23 @@ public class ListItem {
         this.itemId = itemId;
     }
 
+    public ListItem(String title, String description, ListItemType itemType, String itemId, boolean hasCombined) {
+        this.title = title;
+        this.description = description;
+        this.itemType = itemType;
+        this.itemId = itemId;
+        this.hasCombined = hasCombined;
+    }
+
+    public ListItem(String title, String description, ListItemType itemType, String itemId,boolean hasCombined, ArrayList<DocumentTag> tagList) {
+        this.title = title;
+        this.description = description;
+        this.itemType = itemType;
+        this.itemId = itemId;
+        this.hasCombined = hasCombined;
+        this.tagList = tagList;
+    }
+
     public ListItem() {
         // Empty constructor
     }
@@ -42,6 +65,14 @@ public class ListItem {
         return itemId;
     }
 
+    public boolean getHasCombined() {
+        return hasCombined;
+    }
+
+    public ArrayList<DocumentTag> getTagList() {
+        return tagList;
+    }
+
     // Setter
 
     public void setTitle(String title) {
@@ -60,4 +91,11 @@ public class ListItem {
         this.itemId = itemId;
     }
 
+    public void setHasCombined(boolean hasCombined) {
+        this.hasCombined = hasCombined;
+    }
+
+    public void setTagList(ArrayList<DocumentTag> tagList) {
+        this.tagList = tagList;
+    }
 }

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

@@ -36,6 +36,10 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
 
     String author;
 
+    boolean isCombineChild;
+
+    boolean isCombineParent;
+
     // Constructor
 
     public DocumentMeta() {
@@ -48,12 +52,16 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.parentId = null;
         this.updatedAt = new Date();
         this.createdAt = new Date();
+        this.isCombineChild = false;
+        this.isCombineParent = false;
     }
 
     public DocumentMeta(String title, String author) {
         this.id = UUID.randomUUID().toString();
         this.title = title;
         this.author = author;
+        this.isCombineChild = false;
+        this.isCombineParent = false;
     }
 
     public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, String author) {
@@ -62,6 +70,8 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.updatedAt = updatedAt;
         this.createdAt = createdAt;
         this.author = author;
+        this.isCombineChild = false;
+        this.isCombineParent = false;
     }
 
     public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, String parentId, String author) {
@@ -71,6 +81,19 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.createdAt = createdAt;
         this.parentId = parentId;
         this.author = author;
+        this.isCombineChild = false;
+        this.isCombineParent = false;
+    }
+
+    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, String parentId, String author, boolean isCombineChild, boolean isCombineParent) {
+        this.id = id;
+        this.title = title;
+        this.updatedAt = updatedAt;
+        this.createdAt = createdAt;
+        this.parentId = parentId;
+        this.author = author;
+        this.isCombineChild = isCombineChild;
+        this.isCombineParent = isCombineParent;
     }
 
     // Getter
@@ -117,6 +140,20 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         return author;
     }
 
+    /**
+     * ドキュメントの結合子フラグ(boolean)を取得する
+     */
+    public boolean getIsCombineChild() {
+        return isCombineChild;
+    }
+
+    /**
+     * ドキュメントの結合親フラグ(boolean)を取得する
+     */
+    public boolean getIsCombineParent() {
+        return isCombineParent;
+    }
+
     // Setter
 
     /**
@@ -167,6 +204,22 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.author = author;
     }
 
+    /**
+     * ドキュメントの結合子フラグ(boolean)を設定する
+     * @param isCombineChild ドキュメントの結合子フラグ
+     */
+    public void setIsCombineChild(boolean isCombineChild) {
+        this.isCombineChild = isCombineChild;
+    }
+
+    /**
+     * ドキュメントの結合親フラグ(boolean)を設定する
+     * @param isCombineParent ドキュメントの結合親フラグ
+     */
+    public void setIsCombineParent(boolean isCombineParent) {
+        this.isCombineParent = isCombineParent;
+    }
+
     /**
      * updatedAtを現在時刻に設定する
      */

model/src/main/java/one/nem/lacerta/model/pref/ToxiDocumentModel.java

@@ -0,0 +1,68 @@
+package one.nem.lacerta.model.pref;
+
+public class ToxiDocumentModel {
+
+    // Field
+    public String parentDocumentId;
+
+    public String childDocumentId;
+
+    public int order;
+
+    public boolean isActive;
+
+    public String titleCache;
+
+    // Constructor
+    public ToxiDocumentModel() {
+    }
+
+    public ToxiDocumentModel(String parentDocumentId, String childDocumentId, int order, boolean isActive, String titleCache) {
+        this.parentDocumentId = parentDocumentId;
+        this.childDocumentId = childDocumentId;
+        this.order = order;
+        this.isActive = isActive;
+        this.titleCache = titleCache;
+    }
+
+    // Getter / Setter
+    public String getParentDocumentId() {
+        return parentDocumentId;
+    }
+
+    public void setParentDocumentId(String parentDocumentId) {
+        this.parentDocumentId = parentDocumentId;
+    }
+
+    public String getChildDocumentId() {
+        return childDocumentId;
+    }
+
+    public void setChildDocumentId(String childDocumentId) {
+        this.childDocumentId = childDocumentId;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+
+    public String getTitleCache() {
+        return titleCache;
+    }
+
+    public void setTitleCache(String titleCache) {
+        this.titleCache = titleCache;
+    }
+}

processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java

@@ -130,7 +130,30 @@ public class DocumentProcessorImpl implements DocumentProcessor{
 
     @Override
     public DocumentProcessor updatePageAtIndex(Bitmap bitmap, int index) {
-        return null;
+        logger.debug("updatePageAtIndex", "called");
+        String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
+
+        logger.debug("updatePageAtIndex", "filename1: " + filename);
+
+        try {
+            this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
+        } catch (Exception e) {
+            logger.error("updatePageAtIndex", "failed: Unknown error");
+            logger.e_code("d9191286-6092-40b3-80ed-9239106a8c65");
+            // Recover (Undo latest action)
+            lacertaVcs.undo();
+        }
+
+        logger.debug("updatePageAtIndex", "filename: " + filename);
+
+        Page page = new Page();
+        page.setFileName(filename);
+        page.setBitmap(bitmap);
+        this.documentDetail.getPages().set(index, page);
+
+        lacertaVcs.updatePage(index, filename);
+
+        return this;
     }
 
     @Override

shared/ui/src/main/res/drawable/add_24px.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/colorOnSurface"
+      android:pathData="M450,510L220,510L220,450L450,450L450,220L510,220L510,450L740,450L740,510L510,510L510,740L450,740L450,510Z"/>
+</vector>

shared/ui/src/main/res/drawable/delete_24px.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/colorOnSurface"
+      android:pathData="M292.31,820Q262.39,820 241.19,798.81Q220,777.61 220,747.69L220,240L180,240L180,180L360,180L360,144.62L600,144.62L600,180L780,180L780,240L740,240L740,747.69Q740,778 719,799Q698,820 667.69,820L292.31,820ZM680,240L280,240L280,747.69Q280,753.08 283.46,756.54Q286.92,760 292.31,760L667.69,760Q672.31,760 676.15,756.15Q680,752.31 680,747.69L680,240ZM376.15,680L436.15,680L436.15,320L376.15,320L376.15,680ZM523.85,680L583.84,680L583.84,320L523.85,320L523.85,680ZM280,240L280,240L280,747.69Q280,753.08 280,756.54Q280,760 280,760L280,760Q280,760 280,756.54Q280,753.08 280,747.69L280,240Z"/>
+</vector>

shared/ui/src/main/res/drawable/merge_type_24px.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@color/colorOnSurface"
+      android:pathData="M671.69,780L450,558.31L450,256.54L336,370.54L293.23,327.77L480,141L666.15,327.15L623.39,369.92L510,256.54L510,534L713.85,737.85L671.69,780ZM288.31,780.61L246.15,738.46L381.23,602.77L424,645.54L288.31,780.61Z"/>
+</vector>

shared/ui/src/main/res/drawable/more_vert_24px.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/colorOnSurface"
+      android:pathData="M480,770.77Q455.25,770.77 437.63,753.14Q420,735.52 420,710.77Q420,686.02 437.63,668.4Q455.25,650.77 480,650.77Q504.75,650.77 522.37,668.4Q540,686.02 540,710.77Q540,735.52 522.37,753.14Q504.75,770.77 480,770.77ZM480,540Q455.25,540 437.63,522.37Q420,504.75 420,480Q420,455.25 437.63,437.63Q455.25,420 480,420Q504.75,420 522.37,437.63Q540,455.25 540,480Q540,504.75 522.37,522.37Q504.75,540 480,540ZM480,309.23Q455.25,309.23 437.63,291.6Q420,273.98 420,249.23Q420,224.48 437.63,206.86Q455.25,189.23 480,189.23Q504.75,189.23 522.37,206.86Q540,224.48 540,249.23Q540,273.98 522.37,291.6Q504.75,309.23 480,309.23Z"/>
+</vector>

shared/ui/src/main/res/layout/common_list_item_with_tag.xml

@@ -0,0 +1,63 @@
+<?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"
+    android:theme="@style/Theme.Lacerta">
+
+    <ImageView
+        android:id="@+id/item_icon"
+        android:layout_width="32dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/item_text_container"
+        app:srcCompat="@drawable/description_24px"
+        android:contentDescription="icon" />
+
+    <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_toEndOf="@id/item_icon"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/item_title"
+            android:layout_width="match_parent"
+            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/item_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:text="Placeholder Description"
+            android:textColor="@color/colorOnSurfaceSecondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/item_title" />
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/item_tags"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/item_description">
+
+        </com.google.android.material.chip.ChipGroup>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,11 +5,13 @@ import androidx.room.RoomDatabase;
 
 // Entities
 import one.nem.lacerta.source.database.dao.FolderDao;
+import one.nem.lacerta.source.database.dao.ToxiDocumentDao;
 import one.nem.lacerta.source.database.dao.ToxiDocumentTagDao;
 import one.nem.lacerta.source.database.entity.FolderEntity;
 import one.nem.lacerta.source.database.entity.TagEntity;
 import one.nem.lacerta.source.database.entity.DocumentEntity;
 import one.nem.lacerta.source.database.entity.LibraryEntity;
+import one.nem.lacerta.source.database.entity.ToxiDocumentEntity;
 import one.nem.lacerta.source.database.entity.ToxiDocumentTagEntity;
 import one.nem.lacerta.source.database.entity.VcsRevEntity;
 import one.nem.lacerta.source.database.entity.VcsLogEntity;
@@ -21,11 +23,12 @@ 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, ToxiDocumentTagEntity.class}, version = 6)
+@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class, ToxiDocumentTagEntity.class, ToxiDocumentEntity.class}, version = 8)
 public abstract class LacertaDatabase extends RoomDatabase {
     public abstract TagDao tagDao();
     public abstract DocumentDao documentDao();
     public abstract ToxiDocumentTagDao toxiDocumentTagDao();
+    public abstract ToxiDocumentDao toxiDocumentDao();
     public abstract LibraryDao libraryDao();
     public abstract VcsRevDao vcsRevDao();
     public abstract VcsLogDao vcsLogDao();

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

@@ -29,13 +29,13 @@ public interface DocumentDao {
     @Query("SELECT * FROM Document WHERE id IN (:ids)")
     List<DocumentEntity> findByIds(List<String> ids);
 
-    @Query("SELECT * FROM Document WHERE parent_id = :parentId")
+    @Query("SELECT * FROM Document WHERE parent_id = :parentId AND is_combine_child = 0 ORDER BY created_at DESC")
     List<DocumentEntity> findByParentId(String parentId);
 
-    @Query("SELECT * FROM Document WHERE parent_id IS NULL")
+    @Query("SELECT * FROM Document WHERE parent_id IS NULL AND is_combine_child = 0 ORDER BY created_at DESC")
     List<DocumentEntity> findRootDocuments();
 
-    @Query("SELECT * FROM Document ORDER BY created_at DESC LIMIT :limit")
+    @Query("SELECT * FROM Document WHERE is_combine_child = 0 ORDER BY created_at DESC LIMIT :limit")
     List<DocumentEntity> getRecentDocument(int limit);
 
     // Insert

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

@@ -26,4 +26,7 @@ public interface FolderDao {
 
     @Insert
     void insertAll(FolderEntity... folderEntities);
+
+    @Query("DELETE FROM Folder WHERE id = :id")
+    void deleteById(String id);
 }

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

@@ -0,0 +1,38 @@
+package one.nem.lacerta.source.database.dao;
+
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import java.util.List;
+
+import one.nem.lacerta.source.database.entity.ToxiDocumentEntity;
+
+@Dao
+public interface ToxiDocumentDao {
+
+    @Query("SELECT * FROM toxi_document WHERE parent_document_id = :parentId AND is_active = 1 ORDER BY `order` ASC")
+    List<ToxiDocumentEntity> findByParentId(String parentId);
+
+    @Query("SELECT * FROM toxi_document WHERE parent_document_id = :parentId AND child_document_id = :childId AND is_active = 1")
+    ToxiDocumentEntity findByParentIdAndChildId(String parentId, String childId);
+
+    @Insert
+    void insert(ToxiDocumentEntity toxiDocument);
+
+    @Insert
+    void insertAll(ToxiDocumentEntity... toxiDocuments);
+
+    @Update
+    void update(ToxiDocumentEntity toxiDocument);
+
+    @Update
+    void updateAll(ToxiDocumentEntity... toxiDocuments);
+
+    @Query("DELETE FROM toxi_document WHERE parent_document_id = :parentId")
+    void deleteByParentId(String parentId);
+
+    @Query("DELETE FROM toxi_document WHERE parent_document_id = :parentId AND child_document_id = :childId")
+    void deleteByParentIdAndChildId(String parentId, String childId);
+}

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

@@ -36,4 +36,10 @@ public class DocumentEntity {
 
     @ColumnInfo(name = "parent_id")
     public String parentId; // 親フォルダID
+
+    @ColumnInfo(name = "is_combine_child")
+    public boolean isCombineChild; // 結合されたドキュメントの子かどうか
+
+    @ColumnInfo(name = "is_combine_parent")
+    public boolean isCombineParent; // 結合されたドキュメントの親かどうか
 }

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

@@ -0,0 +1,26 @@
+package one.nem.lacerta.source.database.entity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+
+@Entity(primaryKeys = {"parent_document_id", "child_document_id"}, tableName = "toxi_document")
+public class ToxiDocumentEntity {
+
+    @ColumnInfo(name = "parent_document_id")
+    @NonNull
+    public String parentDocumentId;
+
+    @ColumnInfo(name = "child_document_id")
+    @NonNull
+    public String childDocumentId;
+
+    @ColumnInfo(name = "order")
+    public int order;
+
+    @ColumnInfo(name = "is_active")
+    public boolean isActive;
+
+    @ColumnInfo(name = "title_cache")
+    public String titleCache;
+}

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

@@ -1,6 +1,7 @@
 package one.nem.lacerta.vcs.impl;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -41,7 +42,20 @@ public class LacertaVcsImpl implements LacertaVcs {
 
     @Override
     public void updatePage(int index, String fileName) {
+        logger.debug(TAG, "updatePage");
 
+        // UpdatePage
+        UpdatePage updatePage = new UpdatePage(index, fileName);
+        updatePage.setActionType(ActionType.UPDATE_PAGE);
+
+        VcsLogEntity vcsLogEntity = new VcsLogEntity();
+        vcsLogEntity.id = UUID.randomUUID().toString();
+        vcsLogEntity.documentId = documentId;
+        vcsLogEntity.branchName = "master";
+        vcsLogEntity.createdAt = new java.util.Date();
+        vcsLogEntity.actionType = ActionType.UPDATE_PAGE.getValue();
+        vcsLogEntity.action = JsonUtils.toJson(updatePage);
+        database.vcsLogDao().insert(vcsLogEntity);
     }
 
     @Override
@@ -182,16 +196,20 @@ public class LacertaVcsImpl implements LacertaVcs {
     }
 
     private CompletableFuture<ArrayList<VcsRevEntity>> getRevBeforeTargetIdAsync(String revId){
+        logger.debug(TAG, "getRevBeforeTargetIdAsync called: " + revId);
         return CompletableFuture.supplyAsync(() -> {
             ArrayList<VcsRevEntity> vcsRevEntities = new ArrayList<>(database.vcsRevDao().findByDocumentId(this.documentId));
+            // 古い順に並び替え
+            vcsRevEntities.sort(Comparator.comparing(a -> a.createdAt));
             ArrayList<VcsRevEntity> vcsRevEntitiesBeforeTarget = new ArrayList<>();
-            vcsRevEntities.forEach(vcsRevEntity -> {
+            for (VcsRevEntity vcsRevEntity : vcsRevEntities) {
                 if(vcsRevEntity.id.equals(revId)){
+                    logger.debug(TAG, "getRevBeforeTargetIdAsync: Target found");
                     vcsRevEntitiesBeforeTarget.add(vcsRevEntity);
-                    return;
+                    break;
                 }
                 vcsRevEntitiesBeforeTarget.add(vcsRevEntity);
-            });
+            }
             logger.debug(TAG, "getRevBeforeTargetIdAsync finished\nResult size: " + vcsRevEntitiesBeforeTarget.size());
             return vcsRevEntitiesBeforeTarget;
         });
@@ -203,8 +221,8 @@ public class LacertaVcsImpl implements LacertaVcs {
             vcsRevEntities.forEach(vcsRevEntity -> {
                 logIds.addAll(vcsRevEntity.logIds);
             });
-            // TODO-rca: ソートしないといけないかも（順番が保証されているわけではない + 順番が変わるとほぼ確実に壊れる）
             ArrayList<VcsLogEntity> vcsLogEntities = new ArrayList<>(database.vcsLogDao().findByIds(logIds));
+            vcsLogEntities.sort(Comparator.comparing(a -> a.createdAt));
             logger.debug(TAG, "getLogInRevsAsync finished\nResult size: " + vcsLogEntities.size());
             return vcsLogEntities;
         });
@@ -222,7 +240,13 @@ public class LacertaVcsImpl implements LacertaVcs {
     public CompletableFuture<ArrayList<String>> getDocumentPagePathListRev(String revId) {
         return CompletableFuture.supplyAsync(() -> {
             logger.debug(TAG, "getDocumentPagePathListRev");
-            ArrayList<VcsLogEntity> vcsLogEntities = getRevBeforeTargetIdAsync(revId).thenCompose(this::getLogInRevsAsync).join();
+            ArrayList<VcsRevEntity> vcsRevEntities = getRevBeforeTargetIdAsync(revId).join();
+
+            logger.debug(TAG, "getDocumentPagePathListRev: vcsRevEntities size: " + vcsRevEntities.size());
+
+            ArrayList<VcsLogEntity> vcsLogEntities = getLogInRevsAsync(vcsRevEntities).join();
+
+            logger.debug(TAG, "getDocumentPagePathListRev: vcsLogEntities size: " + vcsLogEntities.size());
 
             ArrayList<String> fileNameList = new ArrayList<>();
             for(VcsLogEntity vcsLogEntity : vcsLogEntities){