iroiro

Iroiro
コンストラクタインジェクションに変更
2026-11-07 19:47:36 +00:00 · 2024-01-29 04:31:38 +09:00 · 2024-01-29 04:31:14 +09:00 · 2024-01-29 04:26:22 +09:00 · 2024-01-29 04:24:01 +09:00 · 2024-01-29 04:23:41 +09:00
40 changed files with 1665 additions and 30 deletions
@@ -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);
+        }
+    }
+}
@@ -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();
+        });
+    }
+}
@@ -0,0 +1,4 @@
+package one.nem.lacerta.component.common;
+
+public class LacertaEditMetaDialog {
+}
@@ -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;
+    }
+}
@@ -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>
@@ -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>
@@ -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>
@@ -52,4 +52,6 @@ dependencies {
    implementation project(':vcs')

    implementation project(':data')
+
+    implementation project(':component:common')
 }
@@ -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,7 +30,9 @@ 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.processor.factory.DocumentProcessorFactory;
@@ -53,9 +56,25 @@ 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 single = false;
+
    View view;

    DocumentScanner documentScanner = new DocumentScanner(
@@ -85,6 +104,36 @@ public class ScannerManagerActivity extends AppCompatActivity {
            null
    );

+    DocumentScanner documentScannerSingle = 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);
+                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 +157,21 @@ public class ScannerManagerActivity extends AppCompatActivity {
        setSupportActionBar(toolbar);
        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);

+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        if (bundle != null) {
+            this.single = bundle.getBoolean("single", false);
+        }
+
+        if (this.single) {
+            documentScanner = documentScannerSingle;
+        }
        documentScanner.startScan();
        // Init

        this.view = findViewById(R.id.main); // TODO-rca:なんとかする

+
    }

    @Override
@@ -125,15 +184,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) {
-//            // 既存ドキュメントに挿入
-//            Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
-//            insertToExistDocument();
-//            return true;
+        }
+        else if (item.getItemId() == R.id.action_insert_exist) {
+            // 既存ドキュメントに挿入
+            insertToExistDocument();
+            return true;
        } else if (item.getItemId() == android.R.id.home) {
            finish();
            return true;
@@ -174,7 +231,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, null).join();
            document.updateDocument(documentDetail).join();
            dialog.dismiss();
            finish();
@@ -182,11 +239,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 ? "Update" : commitMessage);
            } catch (Exception e) {
                logger.error(TAG, "Error: " + e.getMessage());
                logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
@@ -196,7 +253,19 @@ public class ScannerManagerActivity extends AppCompatActivity {

    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) {
@@ -6,9 +6,9 @@
        android:icon="@drawable/save_24px"
        android:title="Save"
        app:showAsAction="ifRoom"/>
-<!--    <item-->
-<!--        android:id="@+id/action_insert_exist"-->
-<!--        android:icon="@drawable/description_24px"-->
-<!--        android:title="Insert"-->
-<!--        app:showAsAction="ifRoom"/>-->
+    <item
+        android:id="@+id/action_insert_exist"
+        android:icon="@drawable/description_24px"
+        android:title="Insert"
+        app:showAsAction="ifRoom"/>
 </menu>
@@ -61,4 +61,6 @@ dependencies {
    // TODO-rca: バージョンカタログに切り出す
    implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"

+    // ViewPager2
+    implementation "androidx.viewpager2:viewpager2:1.0.0"
 }
@@ -0,0 +1,123 @@
+package one.nem.lacerta.component.viewer;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.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(fileName -> {
+            Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
+            // TODO-rca: なにか処理をもたせる
+        });
+        recyclerView.setAdapter(viewerBodyAdapter);
+
+        loadDocument(viewerBodyAdapter, documentId, revisionId);
+    }
+
+    private void loadDocument(ViewerBodyAdapter adapter, String documentId, String revisionId) {
+        if (revisionId == null) { // load latest revision
+            document.getDocument(documentId).thenAccept(document -> {
+                getActivity().runOnUiThread(() -> {
+                    adapter.setPages(document.getPages());
+                    adapter.notifyDataSetChanged();
+                });
+            });
+        } else { // load specified revision
+            LacertaVcs vcs = lacertaVcsFactory.create(documentId);
+            document.getDocumentPageListByFileNameList(documentId, vcs.getDocumentPagePathListRev(revisionId).join()).thenAccept(documentPageList -> {
+                getActivity().runOnUiThread(() -> {
+                    adapter.setPages(documentPageList);
+                    adapter.notifyDataSetChanged();
+                });
+            });
+        }
+    }
+}
@@ -0,0 +1,322 @@
+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.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.picker.LacertaFilePickerDialog;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.data.LacertaLibrary;
+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;
+
+/**
+ * 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;
+
+    // Variables
+    private String documentId;
+    private String documentName;
+    private boolean hasCombined = false;
+    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);
+        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);
+        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");
+        }
+    }
+
+    @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);
+
+        // Get document page
+        if (this.hasCombined) { // 結合親の場合
+            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());
+            });
+        } 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);
+        }
+
+        // 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 -> {
+                renameCombinedDocument(
+                        this.documentId,
+                        viewerViewPagerAdapter.getFragmentTargetId(position),
+                        viewerViewPagerAdapter.getFragmentTitle(position),
+                        position);
+            });
+
+            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) {
+                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
+                    return true;
+                } else if (item.getItemId() == R.id.action_rename) {
+                    renameDocument();
+                    return true;
+                } else if (item.getItemId() == R.id.action_delete) {
+                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
+                    return true;
+                } else if (item.getItemId() == R.id.action_move) {
+                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
+                    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 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();
+    }
+}
@@ -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;
@@ -256,6 +258,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;
                }
@@ -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();
+//        getSupportFragmentManager().beginTransaction()
+//                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
+//                .commit();
+        if (hasCombined) {
+            getSupportFragmentManager().beginTransaction()
+                    .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();
+        }
    }

 }
@@ -0,0 +1,72 @@
+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<>();
+
+    // Setter
+
+    public void setFragmentTargetIdList(ArrayList<String> fragmentTargetIdList) {
+        this.fragmentTargetIdList = fragmentTargetIdList;
+    }
+
+    public void setFragmentTitleList(ArrayList<String> fragmentTitleList) {
+        this.fragmentTitleList = fragmentTitleList;
+    }
+
+    public ViewerViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
+        super(fragmentActivity);
+    }
+
+    @NonNull
+    @Override
+    public Fragment createFragment(int position) {
+        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;
+    }
+}
@@ -0,0 +1,15 @@
+<?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"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</FrameLayout>
@@ -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>
@@ -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>
@@ -16,4 +16,16 @@
        android:id="@+id/action_move"
        android:title="移動" />

+    <item
+        android:id="@+id/action_combine"
+        android:title="結合" />
+
+    <item
+        android:id="@+id/action_edit_meta"
+        android:title="メタデータ編集" />
+
+    <item
+        android:id="@+id/action_apply_tag"
+        android:title="タグの管理" />
+
 </menu>
@@ -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 {

@@ -34,6 +35,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 +45,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);
 }
@@ -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);
    }

@@ -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;
@@ -54,6 +57,7 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                listItem.setTitle(documentEntity.title);
                listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
                listItem.setItemId(documentEntity.id);
+                listItem.setHasCombined(documentEntity.isCombineParent);
                listItems.add(listItem);
            }

@@ -103,6 +107,7 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                listItem.setTitle(childFolderEntity.name);
                listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
                listItem.setItemId(childFolderEntity.id);
+                listItem.setHasCombined(false);
                listItems.add(listItem);
            }

@@ -115,6 +120,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 +183,7 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                listItem.setTitle(childFolderEntity.name);
                listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
                listItem.setItemId(childFolderEntity.id);
+                listItem.setHasCombined(false);
                listItems.add(listItem);
            }

@@ -241,6 +261,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 +321,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 +344,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;
+        });
+    }
+
    /**
     * 再帰的にパスを解決する
     *
@@ -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);
 }
@@ -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());
            }
        });
@@ -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());
        });
    }

@@ -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);
 }
@@ -21,9 +21,11 @@ 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.tag.DocumentTag;
 import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;

@@ -53,6 +55,9 @@ public class LibraryPageFragment extends Fragment {
    @Inject
    LacertaLogger logger;

+    @Inject
+    Document document;
+
    ListItemAdapter listItemAdapter;

    public LibraryPageFragment() {
@@ -164,11 +169,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 +238,9 @@ public class LibraryPageFragment extends Fragment {
        });
    }

+    private void getTag(String documentId) { //debug
+    }
+
    /**
     * Toolbarのサブタイトルを更新
     * @param subtitle サブタイトル
@@ -1,14 +1,19 @@
 package one.nem.lacerta.feature.library;

+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 +36,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 +48,22 @@ 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()) {
+            for (int i = 0; i < listItem.getTagList().size(); i++) {
+                Toast.makeText(holder.tagGroup.getContext(), listItem.getTagList().get(i).getName(), Toast.LENGTH_SHORT).show();
+                ChipGroup chipGroup = holder.tagGroup;
+                Chip chip = new Chip(chipGroup.getContext());
+                chip.setText(listItem.getTagList().get(i).getName());
+                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 +82,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);
        }
    }
 }
@@ -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;
+    }
+}
@@ -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;
+    }
 }
@@ -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を現在時刻に設定する
     */
@@ -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;
+    }
+}
@@ -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>
@@ -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>
@@ -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();
@@ -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
@@ -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);
+}
@@ -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; // 結合されたドキュメントの親かどうか
 }
@@ -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;
+}
Author	SHA1	Message	Date
r-ca	1fb37a0317	iroiro	2024-01-29 04:31:38 +09:00
r-ca	57d1c7809c	Iroiro	2024-01-29 04:31:14 +09:00
r-ca	4158faf453	コンストラクタインジェクションに変更	2024-01-29 04:26:22 +09:00
r-ca	beef661e3b	WIP	2024-01-29 04:24:01 +09:00
r-ca	8329769028	コメント解除	2024-01-29 04:23:41 +09:00
r-ca	49ac5c2ddc	依存関係追加	2024-01-29 04:18:33 +09:00
r-ca	5645cf64b6	失敗したら終了するように	2024-01-29 04:17:46 +09:00
r-ca	d76d0a02e2	スキャンがキャンセルされたら終了するように	2024-01-29 04:17:31 +09:00
r-ca	719769c045	Singleモード追加	2024-01-29 04:17:01 +09:00
r-ca	b0a0682561	修正	2024-01-29 04:13:59 +09:00
r-ca	3c75a04a5f	引数で最大撮影枚数を指定できるように	2024-01-29 04:13:04 +09:00
ろむねこ	0a0a4b56b9	Merge pull request #124 from lacerta-doc/add_edit_meta_dialog 結合したドキュメントの名前を変えられるように, タグをドキュメントに付与/剥奪できるように	2024-01-29 02:51:32 +09:00
r-ca	d393087ff6	編集に追従してタブのタイトルも正しく変わるように	2024-01-29 02:49:04 +09:00
r-ca	d691ee0126	タブタイトル更新メソッド作成	2024-01-29 02:44:15 +09:00
r-ca	e85c8a7ed0	Getter追加	2024-01-29 02:43:11 +09:00
r-ca	c44fd3ae8b	Revert "Revert "Adapterをインタンス変数に持たせるように"" This reverts commit `1a2cf77f62`.	2024-01-29 02:40:55 +09:00
r-ca	1a2cf77f62	Revert "Adapterをインタンス変数に持たせるように" This reverts commit `19f6eb1683`.	2024-01-29 02:39:30 +09:00
r-ca	19f6eb1683	Adapterをインタンス変数に持たせるように	2024-01-29 02:38:47 +09:00
r-ca	f673954bef	リネームできるように	2024-01-29 02:37:16 +09:00
r-ca	6fdef14eec	タイトルキャッシュ更新メソッド追加	2024-01-29 02:16:03 +09:00
r-ca	dcfb22f6a0	findByParentIdAndChildId追加	2024-01-29 02:15:00 +09:00
r-ca	f2bbfca36c	ミス修正	2024-01-29 02:09:54 +09:00
r-ca	972487fec1	Combinedなドキュメントの名前を変更できるように	2024-01-29 02:06:51 +09:00
r-ca	1fd992fb4a	Getter追加	2024-01-29 02:03:55 +09:00
r-ca	8b1af8e2d7	コメント追加	2024-01-29 02:02:58 +09:00
r-ca	53ae1dadb8	リファクタリング	2024-01-29 02:02:01 +09:00
r-ca	7bcb2f07ab	リファクタリング	2024-01-29 02:01:18 +09:00
r-ca	da78f5eef1	Adapterの変更に追従, StreamAPIに変更	2024-01-29 02:00:32 +09:00
r-ca	fcdb7c838b	不足していたSetterを追加	2024-01-29 01:59:44 +09:00
r-ca	7086582fad	getItemCountでインスタンス変数の中身を軽くチェックするように	2024-01-29 01:56:57 +09:00
r-ca	9084613e38	FragmentではなくTargetIdを持つように変更	2024-01-29 01:55:06 +09:00
r-ca	c849fdae2e	WIP	2024-01-29 01:43:18 +09:00
r-ca	6d73bede6b	メタデータ編集ダイアログ実装WIP	2024-01-29 01:41:28 +09:00
r-ca	74784a76d3	ログ追加	2024-01-29 01:39:16 +09:00
r-ca	4e17c5636c	デバッグログ削除	2024-01-29 01:39:06 +09:00
r-ca	331a520be0	正常に切り替えできるように	2024-01-29 01:38:52 +09:00
r-ca	0735c90d5e	修正	2024-01-29 01:33:14 +09:00
r-ca	ea345c45e4	StreamAPIで書き直し	2024-01-29 01:29:50 +09:00
r-ca	50f00411ca	PositiveButtonを押されたときに更新するようにした	2024-01-29 01:18:29 +09:00
r-ca	1e0ba33519	applyTagListToDocument実装	2024-01-29 01:17:46 +09:00
r-ca	b32ce60ad8	レイアウト修正	2024-01-29 01:14:00 +09:00
r-ca	55ceb2838e	レイアウト修正	2024-01-29 01:13:35 +09:00
r-ca	bbc8674c0b	レイアウト修正	2024-01-29 01:13:10 +09:00
r-ca	4ed8d96caa	修正	2024-01-29 01:12:51 +09:00
r-ca	141c91e1d7	WIP	2024-01-29 01:07:54 +09:00
r-ca	68dddbabee	WIP	2024-01-29 01:07:41 +09:00
r-ca	efdf9c1fea	修正	2024-01-29 01:03:14 +09:00
r-ca	a13f6e28ec	WIP	2024-01-29 01:02:43 +09:00
r-ca	fa4f074871	修正	2024-01-29 00:52:44 +09:00
r-ca	3715627c07	イベントをContainerまで伝達させるように	2024-01-29 00:47:34 +09:00
r-ca	8542869a63	選択肢のテキストが指定されていない場合の既定値を定義	2024-01-29 00:45:10 +09:00
r-ca	d66546a567	CheckBoxの変化に応じてインスタンス変数のTagListを変化させるように	2024-01-29 00:44:02 +09:00
r-ca	f2f4c77016	登録されているタグ一覧の取得を切り出し	2024-01-29 00:40:06 +09:00
r-ca	9a4d3a1310	非同期実行に変更	2024-01-29 00:38:03 +09:00
r-ca	bf58f25cd5	AppliedTagをクラス変数で持つように	2024-01-29 00:35:51 +09:00
r-ca	04e0c9c05a	Inflateするレイアウトを間違えていたので修正	2024-01-29 00:32:54 +09:00
r-ca	4770977e66	CheckBoxのId変更	2024-01-29 00:32:17 +09:00
r-ca	d794bb97b6	メニューアイテムのイベント実装(テスト)	2024-01-29 00:28:03 +09:00
r-ca	0d5c3c4337	メニューアイテム追加	2024-01-29 00:26:20 +09:00
r-ca	67a8f42ef1	コンストラクタ追加	2024-01-29 00:25:30 +09:00
r-ca	79a64c3108	ダイアログ実装WIP	2024-01-29 00:25:20 +09:00
r-ca	6847af9b9a	コールバックにタグを使うように	2024-01-29 00:23:18 +09:00
r-ca	d562447777	拡張モデルを使うようにアダプタを修正	2024-01-29 00:14:02 +09:00
r-ca	425616c335	コメント	2024-01-29 00:12:28 +09:00
r-ca	dcd10b7d2b	Dialogで使う拡張モデルを作成	2024-01-29 00:12:02 +09:00
r-ca	1515e53484	Adapter実装 WIP	2024-01-29 00:06:28 +09:00
r-ca	8ca05fe454	ダイアログ内容レイアウト作成	2024-01-28 23:57:03 +09:00
r-ca	33766fbe18	ApplyTagListItem作成仮	2024-01-28 23:56:26 +09:00
ろむねこ	5e0310beb2	Merge pull request #123 from lacerta-doc/add_tag_chip タグ関係 WIP	2024-01-28 23:33:44 +09:00
r-ca	d8c525fe37	デバッグログ削除	2024-01-28 23:28:59 +09:00
r-ca	8af2afe996	修正	2024-01-28 23:27:14 +09:00
r-ca	9045cec67d	とりあえずタグを表示できるようにした	2024-01-28 23:13:20 +09:00
r-ca	ab92c6ce93	TagAdapter実装 WIP	2024-01-28 22:50:09 +09:00
r-ca	10621d2935	ListItemにtagListを追加	2024-01-28 16:40:24 +09:00
r-ca	45c2b5f0fb	Chipつきのレイアウトを作成	2024-01-28 16:34:37 +09:00
r-ca	6ed09e6103	getAppliedTagList実装	2024-01-28 16:27:24 +09:00
ろむねこ	23489e20c6	Merge pull request #122 from lacerta-doc/combined_doc ドキュメントを結合できるように	2024-01-28 15:17:44 +09:00
r-ca	8f0bdbb89a	hasCombined対応	2024-01-28 15:15:33 +09:00
r-ca	289f70c6cb	ボタンに仮のリスナーを追加	2024-01-28 15:13:20 +09:00
r-ca	fa9b86e909	レイアウト調整	2024-01-28 15:09:18 +09:00
r-ca	88c801aedf	アイコンリソース追加	2024-01-28 15:03:27 +09:00
r-ca	6f9384039a	カスタムタブレイアウト実装 WIP	2024-01-28 15:01:51 +09:00
r-ca	457eabcdf4	カスタムタブレイアウト作成 WIP	2024-01-28 14:57:41 +09:00
r-ca	fa985b86bd	修正	2024-01-28 14:40:58 +09:00
r-ca	0dafecc75d	Combine処理の変更に追従	2024-01-28 14:13:53 +09:00
r-ca	47c6478227	Combine処理の変更に追従	2024-01-28 14:13:47 +09:00
r-ca	671718ba83	Combine処理を変更	2024-01-28 14:13:17 +09:00
r-ca	0210bcaeb6	タイトルを表示できるように WIP	2024-01-28 14:07:23 +09:00
r-ca	3a13b8e4b7	親要素を追加するように	2024-01-28 13:54:09 +09:00
r-ca	b3c1f3a949	ログ追加	2024-01-28 13:51:33 +09:00
r-ca	c88ab85cf2	WIP	2024-01-28 13:51:04 +09:00
r-ca	8270156373	hasCombinedを初期化するように	2024-01-28 13:49:22 +09:00
r-ca	aa2ee9462f	追加	2024-01-28 13:47:48 +09:00
r-ca	8052b9b329	追加	2024-01-28 13:47:34 +09:00
r-ca	b7414cf8aa	追加	2024-01-28 13:47:21 +09:00
r-ca	435fe7b3ce	hasCombinedに変更	2024-01-28 13:47:08 +09:00
r-ca	b86843bd57	ListItemにisCombinedを追加	2024-01-28 13:46:03 +09:00
r-ca	b9c1c521cf	combine実装	2024-01-28 13:43:56 +09:00
r-ca	f9df1379f4	JavaDoc対応	2024-01-28 13:40:23 +09:00
r-ca	4649399ef9	Combineされていないドキュメントの場合はTabLayoutを隠すように	2024-01-28 13:30:33 +09:00
r-ca	e1bc6466e7	Toolbarのinitを起動時呼び出すように	2024-01-28 13:29:04 +09:00
r-ca	eeeef90ec2	ドキュメントのリネームだけ実装	2024-01-28 13:28:13 +09:00
r-ca	8038b7e198	Toolbarを処理するメソッド実装 WIP	2024-01-28 13:23:16 +09:00
r-ca	3afe8ce4cb	Bodyレイアウト	2024-01-28 13:17:29 +09:00
r-ca	a239fd2f9c	Combineされていないときの処理を追加	2024-01-28 13:14:34 +09:00
r-ca	314214f734	ViewerMainActivityからContainerを呼び出すように	2024-01-28 13:13:51 +09:00
r-ca	92167656fc	コンテナフラグメント処理実装 WIP	2024-01-28 13:12:03 +09:00
r-ca	beceec0abe	Combineするときのタイトルをキャッシュするように	2024-01-28 13:09:26 +09:00
r-ca	0a96a9443d	インターフェース変更, Impl変更	2024-01-28 13:07:32 +09:00
r-ca	ff5ef8611a	ToxiDocumentModel実装	2024-01-28 13:03:57 +09:00
r-ca	9110352f68	DBのバージョンをインクリメント	2024-01-28 13:00:42 +09:00
r-ca	a2a3d2ab54	ToxiテーブルのEntityにタイトルのキャッシュを追加	2024-01-28 13:00:14 +09:00
r-ca	5f0e88d804	Adapter実装修正	2024-01-28 12:54:41 +09:00
r-ca	874946a38d	ViewPager2に変更	2024-01-28 12:52:41 +09:00
r-ca	6ec0710bac	引数処理実装	2024-01-28 12:51:38 +09:00
r-ca	adcf9f16b9	ViewerBodyFragment処理実装WIP	2024-01-28 12:49:58 +09:00
r-ca	b7822945fd	引数処理, LoadDocumentメソッド実装	2024-01-28 12:49:06 +09:00
r-ca	2812b02ba2	Factoryメソッド実装	2024-01-28 12:39:10 +09:00
r-ca	e6cdba337e	HiltのInjectを追加	2024-01-28 12:37:48 +09:00
r-ca	bd1ea74c4c	PagerAdapter実装WIP	2024-01-28 12:35:16 +09:00
r-ca	adb60b7fb2	依存関係にViewPager2を追加	2024-01-28 12:31:11 +09:00
r-ca	a0dc49ab95	引数削除	2024-01-28 12:25:02 +09:00
r-ca	f693c5e88b	Bodyフラグメント作成	2024-01-28 12:24:45 +09:00
r-ca	a349bc7317	引数削除	2024-01-28 12:23:59 +09:00
r-ca	f9938867ae	コンテナフラグメント作成	2024-01-28 12:23:31 +09:00
r-ca	79beb8f87f	結合アクションを実装	2024-01-28 11:44:05 +09:00
r-ca	8e1127586d	主キー指定漏れ	2024-01-28 11:39:23 +09:00
r-ca	ff210f50a9	メニューにアイテムを追加	2024-01-28 11:34:58 +09:00
r-ca	6fbe4081d2	Merge branch 'develop' into combined_doc	2024-01-28 11:33:31 +09:00
ろむねこ	e517e08b51	Merge pull request #120 from lacerta-doc/component/common/file_picker ファイルピッカーを実装	2024-01-28 11:33:07 +09:00
r-ca	d7bfcd8970	getCombinedDocumentIdList実装	2024-01-28 09:08:56 +09:00
r-ca	575df32157	インターフェース変更	2024-01-28 09:08:17 +09:00
r-ca	0a98cfd8a5	uncombineDocument実装	2024-01-28 09:06:56 +09:00
r-ca	cd784cad15	combineDocument実装	2024-01-28 09:06:13 +09:00
r-ca	68635e2f12	Impl生成	2024-01-27 17:24:38 +09:00
r-ca	244fba1616	必要なメソッドをリポジトリに追加	2024-01-27 17:24:18 +09:00
r-ca	3ac7c4072d	Documentを作成するときに正しく既定値を設定するように	2024-01-27 17:21:39 +09:00
r-ca	4bdb1a489c	すべてのコンストラクタで既定値(false)を入れるように	2024-01-27 17:20:50 +09:00
r-ca	45e6b9ab05	DocumentMetaにフラグを追加, コンストラクタ, Getter/Setter追加	2024-01-27 17:20:02 +09:00
r-ca	98b141f96f	DocumentDaoのSelectクエリを修正(CombineのChildを含めないように	2024-01-27 17:13:51 +09:00
r-ca	4ffcd970b4	ToxiテーブルDao実装WIP	2024-01-27 17:09:52 +09:00
r-ca	e43c3beda0	ToxiテーブルのDaoを追加	2024-01-27 17:08:04 +09:00
r-ca	c43b516320	エンティティをLacertaDBに追加	2024-01-27 17:07:05 +09:00
r-ca	e1f2a43d0b	Toxiテーブル作成	2024-01-27 17:06:24 +09:00
r-ca	217b152c47	子/親をDocumentEntity単体で管理するように	2024-01-27 17:04:50 +09:00
r-ca	a187ef3523	Revert "CombineDocumentEntity作成" This reverts commit `74563f75b1`.	2024-01-27 17:03:46 +09:00
r-ca	74563f75b1	CombineDocumentEntity作成	2024-01-27 17:03:25 +09:00
r-ca	055f1fdae1	DocumentEntityにisCombinedフラグを追加	2024-01-27 16:54:19 +09:00