DocumentPathを廃止

component/scanner/build.gradle

@@ -30,8 +30,6 @@ dependencies {
 
     implementation libs.androidx.appcompat
     implementation libs.com.google.android.material
-    implementation libs.androidx.activity
-    implementation libs.androidx.constraintlayout
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
@@ -48,8 +46,4 @@ dependencies {
     implementation project(':processor')
 
     implementation project(':utils')
-
-    implementation project(':vcs')
-
-    implementation project(':data')
 }

component/scanner/src/main/AndroidManifest.xml

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
-        <activity
-            android:name=".ScannerManagerActivity"
-            android:exported="false" />
-    </application>
-
 </manifest>

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

@@ -123,110 +123,109 @@ public class ScannerDataManagerStubFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-//        view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
+        view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
-//            Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
+            Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
-//            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-//            if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
+            if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
-//                File photoFile = null;
+                File photoFile = null;
-//                try {
+                try {
-//                    String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
+                    String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
-//                    String imageFileName = "JPEG_" + timeStamp + "_";
+                    String imageFileName = "JPEG_" + timeStamp + "_";
-//                    File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
+                    File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
-//                    photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
+                    photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
-//                } catch (IOException ex) {
+                } catch (IOException ex) {
-//                    Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
+                    Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
-//                }
+                }
-//                if (photoFile != null) {
+                if (photoFile != null) {
-//                    photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
+                    photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
-//                    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
+                    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
-//                    cameraLauncher.launch(takePictureIntent);
+                    cameraLauncher.launch(takePictureIntent);
-//                }
+                }
-//                else {
+                else {
-//                    Log.d("ScannerDataManagerStubFragment", "photoFile is null");
+                    Log.d("ScannerDataManagerStubFragment", "photoFile is null");
-//                }
+                }
-//            }
+            }
-//            else {
+            else {
-//                Log.d("ScannerDataManagerStubFragment", "camera not available");
+                Log.d("ScannerDataManagerStubFragment", "camera not available");
-//            }
+            }
-//            updateResults();
+            updateResults();
-//        });
+        });
-//
+
-//        view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
+        view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
-//            Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
+            Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
-//            Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
-//
+
-//            this.documentDetail = createSampleDocumentDetail();
+            this.documentDetail = createSampleDocumentDetail();
-//
+
-//        });
+        });
-//
+
-//        view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
+        view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
-//            Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
+            Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
-//            Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
-//            // TODO-rca: ここでDocumentProcessorを初期化する
+            // TODO-rca: ここでDocumentProcessorを初期化する
-//            if (this.documentDetail == null) {
+            if (this.documentDetail == null) {
-//                Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
-//                return;
+                return;
-//            }
+            }
-//            this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
+            this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
-//            Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
-//            try {
+            try {
-//                this.documentProcessor.init();
+                this.documentProcessor.init();
-//            } catch (Exception e) {
+            } catch (Exception e) {
-//                Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
-//                Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
+                Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
-//            }
+            }
-//            Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
-//        });
+        });
-//
+
-//        view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
+        view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
-//            Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
+            Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
-//            Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
-//            if (this.documentProcessor == null) {
+            if (this.documentProcessor == null) {
-//                Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
-//                return;
+                return;
-//            }
+            }
-//            Bitmap[] bitmaps = new Bitmap[results.size()];
+            Bitmap[] bitmaps = new Bitmap[results.size()];
-//            for (int i = 0; i < results.size(); i++) {
+            for (int i = 0; i < results.size(); i++) {
-//                bitmaps[i] = results.get(i).getBitmap();
+                bitmaps[i] = results.get(i).getBitmap();
-//            }
+            }
-//
+
-//            try {
+            try {
-//                this.documentProcessor.addNewPagesToLast(bitmaps);
+                this.documentProcessor.addNewPagesToLast(bitmaps);
-//            } catch (Exception e) {
+            } catch (Exception e) {
-//                Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
-//                Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
+                Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
-//            }
+            }
-//
+
-//            Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
-//
+
-//            try {
+            try {
-//                this.documentProcessor.close();
+                this.documentProcessor.close();
-//            } catch (Exception e) {
+            } catch (Exception e) {
-//                Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
-//                Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
+                Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
-//            }
+            }
-//        });
+        });
     }
 
     public DocumentDetail createSampleDocumentDetail() {
-//
+
-//        String id = UUID.randomUUID().toString();
+        String id = UUID.randomUUID().toString();
-//
+
-//        Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
+        Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
-//        //logger.debug("CreateSample", "Generated id: " + id);
+        //logger.debug("CreateSample", "Generated id: " + id);
-//
+
-//        DocumentMeta meta = new DocumentMeta(
+        DocumentMeta meta = new DocumentMeta(
-//                id,
+                id,
-//                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
+                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
-//                new Date(),
+                new Date(),
-//                new Date());
+                new Date());
-//
+
-//        DocumentPath path = new DocumentPath(
+        DocumentPath path = new DocumentPath(
-//                deviceInfoUtils.getExternalStorageDirectoryString(),
+                deviceInfoUtils.getExternalStorageDirectoryString(),
-//                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
+                "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
-//
+
-//        return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
+        return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
-        return null;
     }
 
     @Override

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

@@ -1,181 +0,0 @@
-package one.nem.lacerta.component.scanner;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import androidx.activity.EdgeToEdge;
-import androidx.annotation.AnimatorRes;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-import com.google.android.material.appbar.MaterialToolbar;
-import com.websitebeaver.documentscanner.DocumentScanner;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.utils.LacertaLogger;
-import one.nem.lacerta.data.Document;
-
-@AndroidEntryPoint
-public class ScannerManagerActivity extends AppCompatActivity {
-
-    String TAG = "ScannerManagerActivity";
-
-    @Inject
-    LacertaLogger logger;
-
-    @Inject
-    Document document;
-
-
-    // Variables
-    private ArrayList<Bitmap> croppedImages = new ArrayList<>();
-
-    View view;
-
-    DocumentScanner documentScanner = new DocumentScanner(
-            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");
-                return null;
-            },
-            () -> {
-                // user canceled document scan
-                logger.debug(TAG, "User canceled document scan");
-                return null;
-            },
-            null,
-            null,
-            null
-    );
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_scanner_manager);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-
-        MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
-        setSupportActionBar(toolbar);
-        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-
-        documentScanner.startScan();
-        // Init
-
-        this.view = findViewById(R.id.main); // TODO-rca:なんとかする
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(android.view.Menu menu) {
-        getMenuInflater().inflate(R.menu.scanner_result_toolbar, menu);
-        return true;
-    }
-
-    @Override
-    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, "挿入処理", Toast.LENGTH_SHORT).show();
-            insertToExistDocument();
-            return true;
-        } else if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void processResult(ArrayList<Bitmap> resultImages) {
-        logger.debug(TAG, "processResult");
-
-        if (resultImages.isEmpty()) {
-            logger.debug(TAG, "resultImages(arg) is empty");
-            if (this.croppedImages.isEmpty()) {
-                logger.debug(TAG, "this.resultImages is empty");
-                logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
-                // TODO-rca: なんかする
-            } else {
-                logger.debug(TAG, "this.resultImages is not empty");
-                updateResultView(this.croppedImages);
-            }
-        } else {
-            logger.debug(TAG, "resultImages(arg) is not empty");
-            updateResultView(resultImages);
-            this.croppedImages = resultImages;
-        }
-
-    }
-
-    private void saveNewDocument() {
-        logger.debug(TAG, "saveNewDocument");
-
-    }
-
-    private void insertToExistDocument() {
-        logger.debug(TAG, "insertToExistDocument");
-        // TODO-rca: 実装
-    }
-
-    private void updateResultView(ArrayList<Bitmap> resultImages) {
-        logger.debug(TAG, "updateResultView");
-
-        LinearLayout resultView = findViewById(R.id.result_list_container);
-        ImageView selectedImage = findViewById(R.id.selected_image);
-        resultView.removeAllViews();
-
-        for (Bitmap resultImage : resultImages) {
-            View resultImageView = getLayoutInflater().inflate(R.layout.result_image_container_item, null);
-            ImageView imageView = resultImageView.findViewById(R.id.result_image);
-            imageView.setImageBitmap(resultImage);
-            imageView.setOnClickListener(v -> {
-
-                selectedImage.setImageBitmap(resultImage);
-
-                for (int i = 0; i < resultView.getChildCount(); i++) {
-                    View child = resultView.getChildAt(i).findViewById(R.id.result_image);
-                    child.setSelected(false);
-                }
-
-                v.setSelected(true);
-            });
-
-            resultView.addView(resultImageView);
-        }
-    }
-
-}

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

@@ -1,95 +0,0 @@
-package one.nem.lacerta.component.scanner;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.websitebeaver.documentscanner.DocumentScanner;
-import com.websitebeaver.documentscanner.DocumentScannerActivity;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.utils.LacertaLogger;
-import one.nem.lacerta.vcs.LacertaVcs;
-import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
-
-
-@AndroidEntryPoint
-public class ScannerManagerFragment extends Fragment {
-
-    String TAG = getClass().getSimpleName();
-
-    @Inject
-    LacertaLogger logger;
-
-    @Inject
-    LacertaVcsFactory vcsFactory;
-
-    private static final boolean DEFAULT_SINGLE_PAGE = false;
-    private boolean singlePage;
-
-    public ScannerManagerFragment() {
-        // Required empty public constructor
-    }
-
-//    public static ScannerManagerFragment newInstance(boolean singlePage) {
-//        ScannerManagerFragment fragment = new ScannerManagerFragment();
-//        Bundle args = new Bundle();
-//        args.putBoolean("singlePage", singlePage);
-//        fragment.setArguments(args);
-//        return fragment;
-//    }
-
-    public static ScannerManagerFragment newInstance() {
-        ScannerManagerFragment fragment = new ScannerManagerFragment();
-        Bundle args = new Bundle();
-        args.putBoolean("singlePage", DEFAULT_SINGLE_PAGE);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            singlePage = getArguments().getBoolean("singlePage", DEFAULT_SINGLE_PAGE);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_scanner_manager, container, false);
-
-//        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
-//                ViewGroup.LayoutParams.MATCH_PARENT,
-//                ViewGroup.LayoutParams.MATCH_PARENT
-//        );
-//        view.setLayoutParams(layoutParams);
-
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        // Init
-        logger.debug(TAG, "called");
-
-        view.findViewById(R.id.button_intent_scanner_manager_activity).setOnClickListener(v -> {
-            // DocumentScannerActivityを起動する
-            Intent intent = new Intent(requireActivity().getApplicationContext(), ScannerManagerActivity.class);
-            startActivity(intent);
-        });
-    }
-}

component/scanner/src/main/res/drawable/result_image_container_item_border.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#00000000" />
-            <corners android:radius="8dp" />
-            <stroke android:color="#FF0000" android:width="2dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#00000000" />
-            <corners android:radius="8dp" />
-        </shape>
-    </item>
-</selector>

component/scanner/src/main/res/layout/activity_scanner_manager.xml

@@ -1,55 +0,0 @@
-<?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:id="@+id/main"
-    android:theme="@style/Theme.Lacerta"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/top_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorPrimaryContainer"
-        app:titleTextColor="@color/colorOnPrimaryContainer"
-        app:title="Preview"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/selected_image"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_above="@+id/horizontal_scroll"
-        android:scaleType="centerInside"
-        app:layout_constraintBottom_toTopOf="@+id/horizontal_scroll"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_toolbar" />
-
-    <HorizontalScrollView
-        android:id="@+id/horizontal_scroll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:scrollbars="none"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/selected_image">
-
-        <LinearLayout
-            android:id="@+id/result_list_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-
-        </LinearLayout>
-
-    </HorizontalScrollView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

component/scanner/src/main/res/layout/list_item_scanner_result.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

component/scanner/src/main/res/layout/result_image_container_item.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/result_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxHeight="64dp"
-        android:adjustViewBounds="true"
-        android:background="@drawable/result_image_container_item_border"
-        android:padding="8dp"
-        android:scaleType="centerCrop" />
-
-</FrameLayout>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_save_new"
-        android:icon="@drawable/save_24px"
-        android:title="Save"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_insert_exist"
-        android:icon="@drawable/ic_baseline_add_24"
-        android:title="Save"
-        app:showAsAction="ifRoom"/>
-</menu>

data/build.gradle

@@ -56,6 +56,4 @@ dependencies {
 
     // データソースモジュール
     implementation project(':source')
-
-    implementation project(':vcs')
 }

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

@@ -13,13 +13,34 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
  */
 public interface Document {
 
-    DocumentDetail createDocument(DocumentMeta meta);
+    ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
 
-    DocumentDetail createDocument();
+    ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
 
-    void deleteDocument(String documentId);
+    /**
+     * 更新の新しいドキュメントから順に並べてlimit件取得する
+     * @param limit 取得する上限数
+     */
+    ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
 
-    void updateDocument(DocumentMeta meta, DocumentDetail detail);
+    /**
+     * 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
+     * @param limit 取得する上限数
+     * @param offset 取得するオフセット
+     */
+    ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset);
 
-    DocumentDetail getDocument(String documentId);
+    /**
+     * ドキュメントIDからDocumentDetailを取得する
+     * @param id ドキュメントID
+     */
+    DocumentDetail getDocumentDetail(String id);
+
+    /**
+     * DocumentMetaからDocumentDetailを取得する
+     * @param meta DocumentMeta
+     */
+    DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように
+
+    DocumentDetail createDocumentByMeta(DocumentMeta meta);
 }

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

@@ -0,0 +1,12 @@
+package one.nem.lacerta.data;
+
+import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.path.DocumentPath;
+import one.nem.lacerta.model.document.tag.DocumentTag;
+
+public interface DocumentDebug {
+
+    void insertDocument(DocumentMeta meta, DocumentDetail detail);
+
+}

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

@@ -18,5 +18,5 @@ public interface LacertaLibrary {
     LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
 
     // GetDocument
-    DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する
+    DocumentDetail getDocumentDetailById(String id);
 }

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

@@ -0,0 +1,47 @@
+package one.nem.lacerta.data.impl;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import one.nem.lacerta.data.DocumentDebug;
+import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.DocumentMeta;
+
+import one.nem.lacerta.source.database.entity.DocumentEntity;
+import one.nem.lacerta.source.database.entity.LibraryEntity;
+import one.nem.lacerta.source.database.entity.TagEntity;
+
+import one.nem.lacerta.source.database.LacertaDatabase;
+
+public class DocumentDebugImpl implements DocumentDebug{
+
+    @Inject
+    LacertaDatabase database;
+
+    @Inject
+    public DocumentDebugImpl() {
+    }
+
+
+    public void insertDocument(DocumentMeta meta, DocumentDetail detail) {
+        DocumentEntity documentEntity = new DocumentEntity();
+        LibraryEntity libraryEntity = new LibraryEntity();
+
+        documentEntity.id = meta.getId();
+        documentEntity.title = meta.getTitle();
+        documentEntity.createdAt = meta.getCreatedAt();
+        documentEntity.updatedAt = meta.getUpdatedAt();
+        documentEntity.author = detail.getAuthor();
+        documentEntity.defaultBranch = detail.getDefaultBranch();
+        // ArrayListからListに変換
+        documentEntity.tagIds = meta.getTagIds();
+
+        libraryEntity.id = meta.getId();
+        libraryEntity.path = "Placeholder";
+        libraryEntity.rootPath = "Placeholder";
+
+        database.documentDao().insert(documentEntity);
+        database.libraryDao().insert(libraryEntity);
+    }
+}

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

@@ -1,15 +1,12 @@
 package one.nem.lacerta.data.impl;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 import javax.inject.Inject;
 
 import one.nem.lacerta.data.Document;
 
-import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.DocumentDetail;
 
@@ -21,90 +18,122 @@ import one.nem.lacerta.source.database.entity.DocumentEntity;
 import one.nem.lacerta.source.database.entity.LibraryEntity;
 import one.nem.lacerta.source.database.entity.TagEntity;
 
-import one.nem.lacerta.source.database.entity.VcsLogEntity;
-import one.nem.lacerta.vcs.ActionType;
-import one.nem.lacerta.source.file.factory.FileManagerFactory;
 import one.nem.lacerta.source.jgit.JGitRepository;
-import one.nem.lacerta.utils.LacertaLogger;
-import one.nem.lacerta.utils.XmlMetaParser;
 import one.nem.lacerta.utils.repository.DeviceInfoUtils;
-import one.nem.lacerta.vcs.LacertaVcs;
 
 
-public class DocumentImpl implements Document {
+public class DocumentImpl implements Document{
 
-    String TAG = getClass().getSimpleName();
+    private LacertaDatabase database;
 
     @Inject
-    LacertaLogger logger;
+    public DocumentImpl(LacertaDatabase database) {
+        this.database = database;
+    }
 
     @Inject
-    LacertaDatabase database;
+    JGitRepository jGitRepository;
 
     @Inject
-    LacertaVcs vcs;
+    DeviceInfoUtils deviceInfoUtils;
-
-
-    @Inject
-    public DocumentImpl() {
-        // Init
-        logger.debug(TAG, "called");
-    }
-
 
     @Override
-    public DocumentDetail createDocument(DocumentMeta meta) {
+    public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
-        DocumentDetail detail = new DocumentDetail();
+        ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
-        detail.setMeta(meta);
+        List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
-        detail.setPages(new ArrayList<>());
 
-        // TODO-rca: UIスレッドから追い出す
+        for (DocumentEntity documentEntity : documentEntities) {
+            // タグ取得
+            // TODO-rca: 切り出すべきかも？
+            List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
+            ArrayList<DocumentTag> documentTags = new ArrayList<>();
+            for (TagEntity tagEntity : tagEntities) {
+                documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
+            }
 
-        // Create DocumentEntity
+            // 組み立て処理
-        DocumentEntity documentEntity = new DocumentEntity();
+            // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？
-        documentEntity.id = meta.getId();
+            DocumentMeta documentMeta = new DocumentMeta();
-        documentEntity.title = meta.getTitle();
+            documentMeta.setId(documentEntity.id);
-        documentEntity.author = meta.getAuthor();
+            documentMeta.setTitle(documentEntity.title);
-        documentEntity.defaultBranch = meta.getDefaultBranch();
+            documentMeta.setCreatedAt(documentEntity.createdAt);
-        documentEntity.updatedAt = meta.getUpdatedAt();
+            documentMeta.setUpdatedAt(documentEntity.updatedAt);
-        documentEntity.createdAt = meta.getCreatedAt();
+            documentMeta.setTags(documentTags);
-        documentEntity.publicPath = meta.getPath().getStringPath();
-        documentEntity.tagIds = meta.getTagIds();
 
-        database.documentDao().insert(documentEntity);
+            documentMetas.add(documentMeta);
+        }
 
-        // Vcs
+        return documentMetas;
-        vcs.createDocument(meta.getId());
-
-        return detail;
     }
 
     @Override
-    public DocumentDetail createDocument() {
+    public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
-        DocumentMeta meta = new DocumentMeta();
+        return null; // TODO-rca: 実装する
-        meta.setId(UUID.randomUUID().toString());
-        meta.setTitle("New Document");
-        meta.setAuthor("author");
-        meta.setDefaultBranch("master");
-        meta.setUpdatedAt(new Date());
-        meta.setCreatedAt(new Date());
-        meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
-        meta.setTags(new ArrayList<>());
-        return createDocument(meta);
     }
 
     @Override
-    public void deleteDocument(String documentId) {
+    public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
-
+//        ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
-    }
+//        database.documentDao().
-
+        // TODO-rca: 履歴取得するDao実装する
-    @Override
-    public void updateDocument(DocumentMeta meta, DocumentDetail detail) {
-
-    }
-
-    @Override
-    public DocumentDetail getDocument(String documentId) {
         return null;
     }
+
+    @Override
+    public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
+        return null;
+    }
+
+    @Override
+    public DocumentDetail getDocumentDetail(String id) {
+        DocumentDetail documentDetail = new DocumentDetail();
+        DocumentEntity documentEntity = database.documentDao().findById(id);
+
+        // タグ取得
+        // TODO-rca: 切り出すべきかも？
+        List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
+        ArrayList<DocumentTag> documentTags = new ArrayList<>();
+        for (TagEntity tagEntity : tagEntities) {
+            documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
+        }
+
+        // パス取得
+        // TODO-rca: 切り出すべきかも？
+        LibraryEntity libraryEntity = database.libraryDao().findById(id);
+        DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path);
+
+        // リポジトリ取得
+        documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング
+
+        // 組み立て処理
+        // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？
+        DocumentMeta documentMeta = new DocumentMeta();
+        documentMeta.setId(documentEntity.id);
+        documentMeta.setTitle(documentEntity.title);
+        documentMeta.setCreatedAt(documentEntity.createdAt);
+        documentMeta.setUpdatedAt(documentEntity.updatedAt);
+        documentMeta.setTags(documentTags);
+
+        documentDetail.setMeta(documentMeta);
+        documentDetail.setAuthor(documentEntity.author);
+        documentDetail.setDefaultBranch(documentEntity.defaultBranch);
+
+        return documentDetail;
+    }
+
+    @Override
+    public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) {
+        return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする（処理を切り分ける？）
+    }
+
+    @Override
+    public DocumentDetail createDocumentByMeta(DocumentMeta meta) {
+        DocumentDetail documentDetail = new DocumentDetail();
+
+        documentDetail.setMeta(meta);
+        documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする
+        documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする？
+
+        return documentDetail;
+    }
 }

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

@@ -136,9 +136,9 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
 
         DocumentDetail documentDetail = new DocumentDetail();
         documentDetail.setMeta(documentMeta);
-//        documentDetail.setPath(null); // TODO-rca: なんとかする
+        documentDetail.setPath(null); // TODO-rca: なんとかする
-//        documentDetail.setAuthor(faker.name().fullName());
+        documentDetail.setAuthor(faker.name().fullName());
-//        documentDetail.setRepository(null); // TODO-rca: なんとかする
+        documentDetail.setRepository(null); // TODO-rca: なんとかする
         return documentDetail;
     }
 

data/src/main/java/one/nem/lacerta/data/module/DocumentDebugModule.java

@@ -0,0 +1,16 @@
+package one.nem.lacerta.data.module;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.hilt.InstallIn;
+import dagger.hilt.components.SingletonComponent;
+import one.nem.lacerta.data.DocumentDebug;
+import one.nem.lacerta.data.impl.DocumentDebugImpl;
+
+@Module
+@InstallIn(SingletonComponent.class) // TODO-rca: Singletonでいいのか検討する
+abstract public class DocumentDebugModule {
+
+    @Binds
+    public abstract DocumentDebug bindDocumentDebug(DocumentDebugImpl documentDebugImpl);
+}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterListFragment.java

@@ -0,0 +1,81 @@
+package one.nem.lacerta.feature.debug;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.feature.debug.common.adapter.DebugMenuDocumentListItemAdapter;
+import one.nem.lacerta.feature.debug.common.model.DebugMenuDocumentListItem;
+import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.utils.LacertaLogger;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link DebugMenuDocumentTesterListFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+
+@AndroidEntryPoint
+public class DebugMenuDocumentTesterListFragment extends Fragment {
+
+    @Inject
+    Document document;
+
+    @Inject
+    LacertaLogger logger;
+
+    public DebugMenuDocumentTesterListFragment() {
+        // Required empty public constructor
+    }
+
+    public static DebugMenuDocumentTesterListFragment newInstance() {
+        DebugMenuDocumentTesterListFragment fragment = new DebugMenuDocumentTesterListFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_list, container, false);
+
+        RecyclerView recyclerView = view.findViewById(R.id.recycler_view_document_list);
+        recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
+
+        ArrayList<DocumentMeta> documentMetas = document.getAllDocumentMetas(100);
+
+        logger.debug("Debug/DocList", "Document count: " + documentMetas.size());
+
+        List<DebugMenuDocumentListItem> debugMenuDocumentListItems = new ArrayList<>();
+
+        for (DocumentMeta documentMeta : documentMetas) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            debugMenuDocumentListItems.add(new DebugMenuDocumentListItem(documentMeta.getTitle(), "Internal Id: " + documentMeta.getId(), simpleDateFormat.format(documentMeta.getUpdatedAt())));
+        }
+
+        DebugMenuDocumentListItemAdapter adapter = new DebugMenuDocumentListItemAdapter(debugMenuDocumentListItems);
+        recyclerView.setAdapter(adapter);
+
+        return view;
+    }
+}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterManageFragment.java

@@ -0,0 +1,72 @@
+package one.nem.lacerta.feature.debug;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.google.android.material.textfield.TextInputEditText;
+
+import java.util.UUID;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import dagger.multibindings.IntKey;
+import one.nem.lacerta.data.DocumentDebug;
+
+import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.model.document.DocumentDetail;
+
+import one.nem.lacerta.model.document.path.DocumentPath;
+import one.nem.lacerta.model.document.tag.DocumentTag;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link DebugMenuDocumentTesterManageFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+@AndroidEntryPoint
+public class DebugMenuDocumentTesterManageFragment extends Fragment {
+
+    @Inject
+    DocumentDebug documentDebug;
+
+    public DebugMenuDocumentTesterManageFragment() {
+        // Required empty public constructor
+    }
+
+    public static DebugMenuDocumentTesterManageFragment newInstance() {
+        DebugMenuDocumentTesterManageFragment fragment = new DebugMenuDocumentTesterManageFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_manage, container, false);
+
+        TextInputEditText editTextDocumentTitle = view.findViewById(R.id.edit_text_document_title);
+        view.findViewById(R.id.button_insert_test_data).setOnClickListener( v -> {
+
+            DocumentMeta meta = new DocumentMeta(editTextDocumentTitle != null ? editTextDocumentTitle.getText().toString() : "empty title"); // TODO-rca: Nullable
+            DocumentPath path = new DocumentPath("root", "test_path");
+            DocumentDetail detail = new DocumentDetail(meta, path, "test_author", "test_default_branch");
+
+            documentDebug.insertDocument(meta, detail);
+        });
+
+        return view;
+    }
+}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuDocumentTesterTopFragment.java

@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
 
         List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
 
-//        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
+        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
-//        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
+        debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
 
 
         DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuTopFragment.java

@@ -49,8 +49,7 @@ public class DebugMenuTopFragment extends Fragment {
         List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
 
         debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
-        debugMenuListItems.add(new DebugMenuListItem("ScannerStub", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
+        debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
-        debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerManagerFragment, true));
         debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
         debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true));
 

feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_list.xml

@@ -4,13 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ScannerManagerFragment">
+    tools:context=".DebugMenuDocumentTesterListFragment" >
 
-    <Button
+    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/button_intent_scanner_manager_activity"
+        android:id="@+id/recycler_view_document_list"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
-        android:text="Button"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

feature/debug/src/main/res/layout/fragment_debug_menu_document_tester_manage.xml

@@ -0,0 +1,60 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".DebugMenuDocumentTesterManageFragment" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:layout_margin="16dp"
+                android:background="@drawable/rounded_secondary_container">
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    android:textSize="16sp"
+                    android:textColor="@color/colorOnSecondaryContainer"
+                    android:text="Debug actions" />
+
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Document title"
+                    android:id="@+id/edit_text_document_title"
+                    android:layout_margin="16dp"
+                    android:inputType="text"
+                    android:textSize="16sp"
+                    style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/button_insert_test_data"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:text="Insert test data"/>
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>

feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml

@@ -22,16 +22,29 @@
         <action
             android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
             app:destination="@id/debugMenuVcsGeneralFragment" />
-        <action
-            android:id="@+id/action_debugMenuTopFragment_to_scannerManagerFragment"
-            app:destination="@id/scannerManagerFragment" />
     </fragment>
     <fragment
         android:id="@+id/debugMenuDocumentTesterTopFragment"
         android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
         android:label="fragment_debug_menu_document_tester_top"
         tools:layout="@layout/fragment_debug_menu_document_tester_top" >
+        <action
+            android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment"
+            app:destination="@id/debugMenuDocumentTesterListFragment" />
+        <action
+            android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment"
+            app:destination="@id/debugMenuDocumentTesterManageFragment" />
     </fragment>
+    <fragment
+        android:id="@+id/debugMenuDocumentTesterListFragment"
+        android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterListFragment"
+        android:label="fragment_debug_menu_document_tester_list"
+        tools:layout="@layout/fragment_debug_menu_document_tester_list" />
+    <fragment
+        android:id="@+id/debugMenuDocumentTesterManageFragment"
+        android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterManageFragment"
+        android:label="fragment_debug_menu_document_tester_manage"
+        tools:layout="@layout/fragment_debug_menu_document_tester_manage" />
     <fragment
         android:id="@+id/scannerDataManagerStubFragment"
         android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
@@ -71,8 +84,4 @@
         android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment"
         android:label="fragment_debug_menu_vcs_rev_record"
         tools:layout="@layout/fragment_debug_menu_vcs_rev_record" />
-    <fragment
-        android:id="@+id/scannerManagerFragment"
-        android:name="one.nem.lacerta.component.scanner.ScannerManagerFragment"
-        android:label="ScannerManagerFragment" />
 </navigation>

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

@@ -33,8 +33,8 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
 @AndroidEntryPoint
 public class LibraryTopFragment extends Fragment {
 
-//    @Inject
+    @Inject
-//    Document document;
+    Document document;
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -90,13 +90,13 @@ public class LibraryTopFragment extends Fragment {
 
         //データを取得
 
-//        List<DocumentMeta>  metas = document.getAllDocumentMetas(100);
+        List<DocumentMeta>  metas = document.getAllDocumentMetas(100);
 
-//        Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
+        Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
 
 // Create and set the adapter
-//        DocumentAdapter adapter = new DocumentAdapter(metas);
+        DocumentAdapter adapter = new DocumentAdapter(metas);
-//        documentRecyclerView.setAdapter(adapter);
+        documentRecyclerView.setAdapter(adapter);
 
 // Use a LinearLayoutManager to specify the layout
         return view;

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

@@ -65,10 +65,4 @@ public class PublicPath {
     public String getStringPath() {
         return String.join("/", path);
     }
-
-    public PublicPath getRoot() {
-        PublicPath root = new PublicPath();
-        root.add("/");
-        return root;
-    }
 }

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

@@ -3,14 +3,12 @@ package one.nem.lacerta.model.document;
 import org.eclipse.jgit.lib.Repository;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Date;
 
 import one.nem.lacerta.model.document.path.DocumentPath;
+import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentMeta;
 
-import one.nem.lacerta.model.document.page.Page;
-
 /**
  * ドキュメントの詳細データ
  */
@@ -22,21 +20,31 @@ public class DocumentDetail {
     DocumentMeta meta;
 
     /**
-     * ドキュメントのページ(Pageインスタンスのリスト)
+     * ユーザーが扱うパス
      */
-    ArrayList<Page> pages;
+    PublicPath publicPath;
+
+    /**
+     * ドキュメントの作者(String)
+     */
+    String author;
+
+    /**
+     * ドキュメントのデフォルトブランチ(String)
+     */
+    String defaultBranch;
+
+    Repository repository;
 
     // Constructor
     public DocumentDetail() {
     }
 
-    public DocumentDetail(DocumentMeta meta) {
+    public DocumentDetail(DocumentMeta meta, PublicPath publicPath, String author, String defaultBranch) {
         this.meta = meta;
-    }
+        this.publicPath = publicPath;
-
+        this.author = author;
-    public DocumentDetail(DocumentMeta meta, ArrayList<Page> pages) {
+        this.defaultBranch = defaultBranch;
-        this.meta = meta;
-        this.pages = pages;
     }
 
     // Getter
@@ -49,12 +57,34 @@ public class DocumentDetail {
     }
 
     /**
-     * ドキュメントのページ(Pageインスタンスのリスト)を取得する
+     * ユーザーが扱うパスを取得する
      */
-    public ArrayList<Page> getPages() {
+    public PublicPath getPublicPath() {
-        return pages;
+        return publicPath;
     }
 
+    /**
+     * ドキュメントの作者(String)を取得する
+     */
+    public String getAuthor() {
+        return author;
+    }
+
+    /**
+     * ドキュメントのデフォルトブランチ(String)を取得する
+     */
+    public String getDefaultBranch() {
+        return defaultBranch;
+    }
+
+    /**
+     * ドキュメントのリポジトリを取得する
+     */
+    public Repository getRepository() {
+        return repository;
+    }
+
+
     // Setter
 
     /**
@@ -66,11 +96,34 @@ public class DocumentDetail {
     }
 
     /**
-     * ドキュメントのページ(Pageインスタンスのリスト)を設定する
+     * ユーザーが扱うパスを設定する
-     * @param pages Pageインスタンスのリスト
+     * @param publicPath ユーザーが扱うパス
      */
-    public void setPages(ArrayList<Page> pages) {
+    public void setPublicPath(PublicPath publicPath) {
-        this.pages = pages;
+        this.publicPath = publicPath;
+    }
+
+    /**
+     * ドキュメントの作者(String)を設定する
+     * @param author ドキュメントの作者
+     */
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    /**
+     * ドキュメントのデフォルトブランチ(String)を設定する
+     * @param defaultBranch ドキュメントのデフォルトブランチ
+     */
+    public void setDefaultBranch(String defaultBranch) {
+        this.defaultBranch = defaultBranch;
+    }
+
+    /**
+     * ドキュメントのリポジトリを設定する
+     */
+    public void setRepository(Repository repository) {
+        this.repository = repository;
     }
 
 }

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

@@ -1,8 +1,6 @@
 package one.nem.lacerta.model.document;
 
 import java.util.ArrayList;
-
-import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.tag.DocumentTag;
 import java.util.Date;
 import java.util.List;
@@ -11,7 +9,7 @@ import java.util.UUID;
 /**
  * ドキュメントのメタデータ
  */
-public class DocumentMeta { // TODO-rca: JavaDoc対応
+public class DocumentMeta {
     /**
      * ドキュメントのID(String)
      */
@@ -37,52 +35,42 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
      */
     List<DocumentTag> tags;
 
-    PublicPath path;
-
-    String author;
-
-    String defaultBranch;
-
     // Constructor
-
     public DocumentMeta() {
     }
 
-    public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
+    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags) { // With all
-        this.id = UUID.randomUUID().toString();
-        this.title = title;
-        this.tags = tags;
-        this.author = author;
-        this.defaultBranch = defaultBranch;
-    }
-
-    public DocumentMeta(String id, String title, List<DocumentTag> tags, String author, String defaultBranch) {
-        this.id = id;
-        this.title = title;
-        this.tags = tags;
-        this.author = author;
-        this.defaultBranch = defaultBranch;
-    }
-
-    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String author, String defaultBranch) {
         this.id = id;
         this.title = title;
         this.updatedAt = updatedAt;
         this.createdAt = createdAt;
         this.tags = tags;
-        this.author = author;
-        this.defaultBranch = defaultBranch;
     }
 
-    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, String author, String defaultBranch) {
+    public DocumentMeta(String id, String title, Date updatedAt, Date createdAt) { // Without tags
         this.id = id;
         this.title = title;
         this.updatedAt = updatedAt;
         this.createdAt = createdAt;
-        this.tags = tags;
+        this.tags = new ArrayList<>();
-        this.path = path;
+    }
-        this.author = author;
+
-        this.defaultBranch = defaultBranch;
+    public DocumentMeta(String id, String title) { // Without tags, updatedAt, createdAt
+        this.id = id;
+        this.title = title;
+        // 現在時刻を設定
+        this.updatedAt = new Date();
+        this.createdAt = new Date();
+        this.tags = new ArrayList<>();
+    }
+
+    public DocumentMeta(String title) { // title only
+        this.id = UUID.randomUUID().toString(); // 新規作成時想定なのでコンストラクタで生成してしまう(使う人が楽なので)
+        this.title = title;
+        // 現在時刻を設定
+        this.updatedAt = new Date();
+        this.createdAt = new Date();
+        this.tags = new ArrayList<>();
     }
 
     // Getter
@@ -133,27 +121,6 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         return tagIds;
     }
 
-    /**
-     * PublicPathを取得する
-     */
-    public PublicPath getPath() {
-        return path;
-    }
-
-    /**
-     * ドキュメントの作者(String)を取得する
-     */
-    public String getAuthor() {
-        return author;
-    }
-
-    /**
-     * ドキュメントのデフォルトブランチ(String)を取得する
-     */
-    public String getDefaultBranch() {
-        return defaultBranch;
-    }
-
     // Setter
 
     /**
@@ -196,30 +163,6 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
         this.tags = tags;
     }
 
-    /**
-     * PublicPathを設定する
-     * @param path PublicPath
-     */
-    public void setPath(PublicPath path) {
-        this.path = path;
-    }
-
-    /**
-     * ドキュメントの作者(String)を設定する
-     * @param author ドキュメントの作者
-     */
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    /**
-     * ドキュメントのデフォルトブランチ(String)を設定する
-     * @param defaultBranch ドキュメントのデフォルトブランチ
-     */
-    public void setDefaultBranch(String defaultBranch) {
-        this.defaultBranch = defaultBranch;
-    }
-
     /**
      * updatedAtを現在時刻に設定する
      */

model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java

@@ -4,8 +4,12 @@ import java.util.ArrayList;
 
 public class XmlMetaModel {
 
-    String revisionId;
+    String title;
-
+    String author;
+    String description;
+//    Date created;
+//    Date updated;
+    String defaultBranch;
     ArrayList<XmlMetaPageModel> pages;
 
     // Constructor
@@ -13,15 +17,31 @@ public class XmlMetaModel {
     public XmlMetaModel() {
     }
 
-    public XmlMetaModel(String revisionId, ArrayList<XmlMetaPageModel> pages) {
+    public XmlMetaModel(String title, String author, String description, String defaultBranch, ArrayList<XmlMetaPageModel> pages) {
-        this.revisionId = revisionId;
+        this.title = title;
+        this.author = author;
+        this.description = description;
+        this.defaultBranch = defaultBranch;
         this.pages = pages;
     }
 
+
     // Getter
 
-    public String getRevisionId() {
+    public String getTitle() {
-        return revisionId;
+        return title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getDefaultBranch() {
+        return defaultBranch;
     }
 
     public ArrayList<XmlMetaPageModel> getPages() {
@@ -30,11 +50,24 @@ public class XmlMetaModel {
 
     // Setter
 
-    public void setRevisionId(String revisionId) {
+    public void setTitle(String title) {
-        this.revisionId = revisionId;
+        this.title = title;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setDefaultBranch(String defaultBranch) {
+        this.defaultBranch = defaultBranch;
     }
 
     public void setPages(ArrayList<XmlMetaPageModel> pages) {
         this.pages = pages;
     }
+
 }

model/src/main/java/one/nem/lacerta/model/document/page/Page.java

@@ -1,39 +0,0 @@
-package one.nem.lacerta.model.document.page;
-
-import android.graphics.Bitmap;
-
-public class Page {
-
-    String fileName;
-    Bitmap bitmap;
-
-    // Constructor
-
-    public Page() {
-    }
-
-    public Page(String fileName, Bitmap bitmap) {
-        this.fileName = fileName;
-        this.bitmap = bitmap;
-    }
-
-    // Getter
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public Bitmap getBitmap() {
-        return bitmap;
-    }
-
-    // Setter
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public void setBitmap(Bitmap bitmap) {
-        this.bitmap = bitmap;
-    }
-}

processor/build.gradle

@@ -44,5 +44,4 @@ dependencies {
     implementation project(':source')
     implementation project(':utils')
     implementation project(':data')
-    implementation project(':vcs')
 }

processor/src/main/java/one/nem/lacerta/processor/DocumentProcessor.java

@@ -2,14 +2,13 @@ package one.nem.lacerta.processor;
 
 import android.graphics.Bitmap;
 
-import one.nem.lacerta.model.document.DocumentDetail;
-
 public interface DocumentProcessor {
 
     // ページ操作
     void addNewPageToLast(Bitmap bitmap) throws Exception;
     void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
-    void insertPageAtIndex(Bitmap bitmap, int index) throws Exception;
+    void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception;
+    void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception;
     void removePageAtIndex(int index) throws Exception;
 
     // 更新
@@ -19,5 +18,7 @@ public interface DocumentProcessor {
     Bitmap getPageAtIndex(int index);
     int getPageCount();
 
-    DocumentDetail getDocumentDetail();
+    void close() throws Exception;
+    void init() throws Exception; // TODO-rca: 例外処理
+
 }

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

@@ -14,18 +14,12 @@ import one.nem.lacerta.processor.DocumentProcessor;
 import one.nem.lacerta.model.document.DocumentDetail;
 
 import one.nem.lacerta.model.document.internal.XmlMetaModel;
-
-import one.nem.lacerta.model.document.page.Page;
-
 import one.nem.lacerta.source.file.FileManager;
 import one.nem.lacerta.source.file.factory.FileManagerFactory;
 
 import one.nem.lacerta.utils.LacertaLogger;
 
 import one.nem.lacerta.utils.XmlMetaParser;
-import one.nem.lacerta.utils.repository.DeviceInfoUtils;
-import one.nem.lacerta.vcs.LacertaVcs;
-import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 
 public class DocumentProcessorImpl implements DocumentProcessor{
@@ -38,48 +32,78 @@ public class DocumentProcessorImpl implements DocumentProcessor{
     private XmlMetaModel xmlMetaModel;
     private Path documentRootPath;
     private FileManager fileManager;
-    private LacertaVcs lacertaVcs;
 
     // Injection
     private final FileManagerFactory fileManagerFactory;
     private final LacertaLogger logger;
     private final XmlMetaParser xmlMetaParser;
-    private final LacertaVcsFactory lacertaVcsFactory;
-    private final DeviceInfoUtils deviceInfoUtils;
     @AssistedInject
-    public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, LacertaVcsFactory lacertaVcsFactory, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) {
+    public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, @Assisted DocumentDetail documentDetail) {
         this.fileManagerFactory = fileManagerFactory;
         this.logger = logger;
         this.xmlMetaParser = xmlMetaParser;
         if (documentDetail == null) {
             throw new IllegalArgumentException("documentDetail must not be null");
         }
-        this.lacertaVcsFactory = lacertaVcsFactory;
         this.documentDetail = documentDetail;
-        this.deviceInfoUtils = deviceInfoUtils;
-
-        // Init
-        this.documentRootPath = deviceInfoUtils.getExternalStorageDirectory().resolve(this.documentDetail.getMeta().getId());
-        logger.debug("init", "documentRootPath: " + this.documentRootPath);
-        this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
-        this.lacertaVcs = lacertaVcsFactory.create(this.documentDetail.getMeta().getId());
     }
 
+    @Override
+    public void init() throws Exception{
+        logger.debug("init", "called");
+        // Init Variables
+        this.documentRootPath = this.documentDetail.getPath().getFullPath();
+        logger.debug("init", "documentRootPath: " + this.documentRootPath);
+
+        this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
+
+        FileManager initFileManager = this.fileManager.getNewInstance();
+
+        logger.debug("init", "fileManager created");
+
+        // xmlファイルの読み込み
+        if (initFileManager.isExist("meta.xml")) {
+            logger.debug("init", "meta.xml found");
+            try {
+                this.xmlMetaModel = xmlMetaParser.deserialize(this.fileManager.loadXml("meta.xml"));
+                logger.debug("init", "meta.xml parsed");
+            } catch (Exception e) {
+                logger.debug("init", "meta.xml parse failed");
+                logger.trace("init", e.getMessage());
+            }
+        } else {
+            logger.debug("init", "meta.xml not found");
+            xmlMetaModel = new XmlMetaModel();
+
+            xmlMetaModel.setTitle(this.documentDetail.getMeta().getTitle());
+            xmlMetaModel.setAuthor(this.documentDetail.getAuthor());
+            xmlMetaModel.setDescription(""); // FIXME-rca:
+            xmlMetaModel.setDefaultBranch(this.documentDetail.getDefaultBranch());
+            xmlMetaModel.setPages(new ArrayList<>());
+
+            try {
+                initFileManager.createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
+                logger.debug("init", "meta.xml saved");
+            } catch (Exception e) {
+                logger.error("init", "meta.xml save failed");
+                logger.trace("init", e.getMessage());
+            }
+        }
+
+        logger.info("init", "finished");
+    }
 
     @Override
     public void addNewPageToLast(Bitmap bitmap) throws Exception{
         logger.debug("addNewPageToLast", "called");
         String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
 
-        Page page = new Page();
-        page.setFileName(filename);
-        page.setBitmap(bitmap);
-        this.documentDetail.getPages().add(page);
-
-        lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
-
         this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
 
+        XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
+        xmlMetaPageModel.setFilename(filename);
+        xmlMetaModel.getPages().add(xmlMetaPageModel);
+
         logger.info("addNewPageToLast", "finished");
         logger.info("addNewPageToLast", "filename: " + filename);
     }
@@ -94,18 +118,27 @@ public class DocumentProcessorImpl implements DocumentProcessor{
     }
 
     @Override
-    public void insertPageAtIndex(Bitmap bitmap, int index) throws Exception {
+    public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception {
         logger.debug("addNewPageAfterIndex", "called");
         String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
 
         this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
 
-        Page page = new Page();
+        XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
-        page.setFileName(filename);
+        xmlMetaPageModel.setFilename(filename);
-        page.setBitmap(bitmap);
+        xmlMetaModel.getPages().add(index, xmlMetaPageModel);
-        this.documentDetail.getPages().add(index, page);
+    }
 
-        lacertaVcs.insertPage(index, filename);
+    @Override
+    public void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception {
+        logger.debug("addNewPageBeforeIndex", "called");
+        String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
+
+        this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
+
+        XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
+        xmlMetaPageModel.setFilename(filename);
+        xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel);
     }
 
     @Override
@@ -129,7 +162,14 @@ public class DocumentProcessorImpl implements DocumentProcessor{
     }
 
     @Override
-    public DocumentDetail getDocumentDetail() {
+    public void close() throws Exception{
-        return this.documentDetail;
+        logger.debug("close", "called");
+        try {
+            this.fileManager.getNewInstance().createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
+            logger.debug("close", "meta.xml saved");
+        } catch (Exception e) {
+            logger.error("close", "meta.xml save failed");
+            logger.trace("close", e.getMessage());
+        }
     }
 }

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

@@ -1,10 +0,0 @@
-<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/colorOnBackground"
-      android:pathData="M256,746.15L213.85,704L437.85,480L213.85,256L256,213.85L480,437.85L704,213.85L746.15,256L522.15,480L746.15,704L704,746.15L480,522.15L256,746.15Z"/>
-</vector>

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

@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@color/colorOnBackground"
+      android:fillColor="@android:color/white"
       android:pathData="M330,710L630,710L630,650L330,650L330,710ZM330,550L630,550L630,490L330,490L330,550ZM252.31,860Q222,860 201,839Q180,818 180,787.69L180,172.31Q180,142 201,121Q222,100 252.31,100L570,100L780,310L780,787.69Q780,818 759,839Q738,860 707.69,860L252.31,860ZM540,340L540,160L252.31,160Q247.69,160 243.85,163.85Q240,167.69 240,172.31L240,787.69Q240,792.31 243.85,796.15Q247.69,800 252.31,800L707.69,800Q712.31,800 716.15,796.15Q720,792.31 720,787.69L720,340L540,340ZM240,160L240,160L240,340L240,340L240,160L240,340L240,340L240,787.69Q240,792.31 240,796.15Q240,800 240,800L240,800Q240,800 240,796.15Q240,792.31 240,787.69L240,172.31Q240,167.69 240,163.85Q240,160 240,160Z"/>
 </vector>

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

@@ -1,10 +0,0 @@
-<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/colorOnBackground"
-      android:pathData="M820,288.46L820,747.69Q820,778 799,799Q778,820 747.69,820L212.31,820Q182,820 161,799Q140,778 140,747.69L140,212.31Q140,182 161,161Q182,140 212.31,140L671.54,140L820,288.46ZM760,314L646,200L212.31,200Q206.92,200 203.46,203.46Q200,206.92 200,212.31L200,747.69Q200,753.08 203.46,756.54Q206.92,760 212.31,760L747.69,760Q753.08,760 756.54,756.54Q760,753.08 760,747.69L760,314ZM480,690.77Q521.54,690.77 550.77,661.54Q580,632.31 580,590.77Q580,549.23 550.77,520Q521.54,490.77 480,490.77Q438.46,490.77 409.23,520Q380,549.23 380,590.77Q380,632.31 409.23,661.54Q438.46,690.77 480,690.77ZM255.39,395.38L583.84,395.38L583.84,255.39L255.39,255.39L255.39,395.38ZM200,314L200,747.69Q200,753.08 200,756.54Q200,760 200,760L200,760Q200,760 200,756.54Q200,753.08 200,747.69L200,212.31Q200,206.92 200,203.46Q200,200 200,200L200,200L200,314Z"/>
-</vector>

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

@@ -11,8 +11,6 @@ public interface LacertaLogger {
     void trace(String tag, String message);
     void fatal(String tag, String message);
 
-    void e_code(String errorId);
-
     String buildKVMessage(KeyValueLog... logs);
     // With name
     String buildKVMessage(String name, KeyValueLog... logs);

utils/src/main/java/one/nem/lacerta/utils/impl/LacertaLoggerImpl.java

@@ -43,11 +43,6 @@ public class LacertaLoggerImpl implements LacertaLogger{
         Log.wtf(tag, message);
     }
 
-    @Override
-    public void e_code(String errorId) {
-        Log.e("ErrorReport", "An error occurred. Searchable error ID: " + errorId);
-    }
-
     @Override
     public String buildKVMessage(KeyValueLog... logs) {
         StringBuilder builder = new StringBuilder();

utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java

@@ -32,7 +32,10 @@ public class XmlMetaParserImpl implements XmlMetaParser{
 
             XmlMetaModel meta = new XmlMetaModel();
 
-            meta.setRevisionId(rootElement.getElementsByTagName("revisionId").item(0).getTextContent());
+            meta.setTitle(rootElement.getElementsByTagName("title").item(0).getTextContent());
+            meta.setAuthor(rootElement.getElementsByTagName("author").item(0).getTextContent());
+            meta.setDescription(rootElement.getElementsByTagName("description").item(0).getTextContent());
+            meta.setDefaultBranch(rootElement.getElementsByTagName("defaultBranch").item(0).getTextContent());
 
             ArrayList<XmlMetaPageModel> pages = new ArrayList<>();
             for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
@@ -61,7 +64,10 @@ public class XmlMetaParserImpl implements XmlMetaParser{
 
             Element rootElement = document.createElement("meta");
 
-            appendElement(document, rootElement, "revisionId", meta.getRevisionId());
+            appendElement(document, rootElement, "title", meta.getTitle());
+            appendElement(document, rootElement, "author", meta.getAuthor());
+            appendElement(document, rootElement, "description", meta.getDescription());
+            appendElement(document, rootElement, "defaultBranch", meta.getDefaultBranch());
 
             Element pagesElement = document.createElement("pages");
             for(XmlMetaPageModel page : meta.getPages()) {

vcs/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.com.android.library)
-    id 'com.google.dagger.hilt.android'
 }
 
 android {

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

@@ -9,8 +9,6 @@ public interface LacertaVcs {
 
     public void deletePage(int index);
 
-    public void createDocument(String documentId);
-
     // debug
     public void printLog();
 

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

@@ -52,11 +52,6 @@ public class LacertaVcsImpl implements LacertaVcs {
 
     }
 
-    @Override
-    public void createDocument(String documentId) {
-
-    }
-
     @Override
     public void printLog() {
         logger.debug(TAG, "printLog");