リソースを切り出す準備

This reverts commit 42eb3d4c80.

.idea/gradle.xml

@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -25,7 +26,6 @@
             <option value="$PROJECT_DIR$/model" />
             <option value="$PROJECT_DIR$/processor" />
             <option value="$PROJECT_DIR$/shared" />
-            <option value="$PROJECT_DIR$/shared/icon" />
             <option value="$PROJECT_DIR$/shared/ui" />
             <option value="$PROJECT_DIR$/source" />
             <option value="$PROJECT_DIR$/utils" />

.idea/misc.xml

@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+# 概要
+<!-- PRの概要 -->
+
+# 関連Issue
+- #000 <!-- 関連するIssueを指定(なければ省略可) -->
+
+# 詳細
+<!-- 詳細 -->
+
+# 影響箇所
+<!-- 予想される影響箇所 -->
+
+# チェック
+<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
+- [ ] 機能として完成している
+  - [ ] WIP(Work in progress: 作業中)
+- [ ] 正常にビルド/起動ができる
+- [ ] 既存の機能を壊していない

app/build.gradle

@@ -59,32 +59,6 @@ dependencies {
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
 
-    // 内部モジュール
-    // Feature
-    implementation project(':feature:home')
-    implementation project(':feature:search')
-    implementation project(':feature:library')
-    implementation project(':feature:scan')
-    implementation project(':feature:debug')  // デバッグメニュー
-
-//    // Component
-//    implementation project(':component:common')
-//    implementation project(':component:scanner')
-//    implementation project(':component:viewer')
-
-//    // Data
-//    implementation project(':data:repository')
-//
-//    // Source
-//    implementation project(':data:source:database')
-//    implementation project(':data:source:preference')
-//
-    implementation project(':data')
-
-    implementation project(':shared:ui')
-
-    implementation project(':shared:icon')
-
     // Hilt (DI)
     implementation libs.com.google.dagger.hilt.android
     annotationProcessor libs.com.google.dagger.hilt.compiler
@@ -94,4 +68,13 @@ dependencies {
     implementation libs.navigation.ui
     implementation libs.navigation.dynamic.features.fragment
 
+    // Feature
+    implementation project(':feature:home')
+    implementation project(':feature:search')
+    implementation project(':feature:library')
+    implementation project(':feature:scan')
+    implementation project(':feature:debug')  // デバッグメニュー
+
+    implementation project(':data')
+    implementation project(':shared:ui')
 }

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

@@ -1,6 +1,7 @@
 package one.nem.lacerta;
 
 import android.app.Application;
+import android.util.Log;
 
 import com.google.android.material.color.DynamicColors;
 
@@ -12,7 +13,13 @@ public class LacertaApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        // DynamicColorを有効化
+        if (DynamicColors.isDynamicColorAvailable()) {
-        DynamicColors.applyToActivitiesIfAvailable(this);
+            Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
+            DynamicColors.applyToActivitiesIfAvailable(this);
+        } else {
+            Log.d("DynamicColors", "DynamicColors is not available.");
+        }
+
     }
+
 }

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

@@ -1,12 +1,15 @@
 package one.nem.lacerta;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.NavigationUI;
 
+import android.graphics.Color;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -25,16 +28,23 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        // Debug
+        // Init navigation
-        FragmentManager supportFragmentManager = getSupportFragmentManager();
+        try {
+            FragmentManager supportFragmentManager = getSupportFragmentManager();
+            NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
+            assert navHostFragment != null;
+            NavController navController = navHostFragment.getNavController();
+            BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
+            NavigationUI.setupWithNavController(bottomNavigationView, navController);
+        }
+        catch (Exception e) {
+            Log.e("Init", "Failed to init navigation");
+            Log.e("Init", "Searchable Error code: " + "894b5941-3bc0-46fe-b752-0dbc88be29a8");
+            Toast.makeText(this, "Failed to init navigation", Toast.LENGTH_LONG).show();
+            finish(); // Exit app
+        }
 
-        NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
+        // Set navigation bar color
-        NavController navController = navHostFragment.getNavController();
+        getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurfaceVariant));
-        BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
-
-        NavigationUI.setupWithNavController(bottomNavigationView, navController);
-
-        Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
     }
-
+}
-}

app/src/main/res/menu/bottom_nav_menu.xml

@@ -6,6 +6,11 @@
         android:icon="@drawable/home_24px"
         android:title="Home"/>
 
+    <item
+        android:id="@id/feature_search_navigation"
+        android:icon="@drawable/search_24px"
+        android:title="Search"/>
+
     <item
         android:id="@id/feature_library_navigation"
         android:icon="@drawable/folder_24px"
@@ -16,5 +21,4 @@
         android:icon="@drawable/developer_mode_24px"
         android:title="Debug menu"/>
 
-
 </menu>

app/src/main/res/navigation/main_nav.xml

@@ -9,6 +9,7 @@
     <include app:graph="@navigation/feature_library_navigation" />
 
     <include app:graph="@navigation/feature_home_navigation" />
+    <include app:graph="@navigation/feature_search_navigation" />
 
 
 </navigation>

component/scanner/build.gradle

@@ -30,6 +30,8 @@ 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
@@ -46,4 +48,8 @@ dependencies {
     implementation project(':processor')
 
     implementation project(':utils')
+
+    implementation project(':vcs')
+
+    implementation project(':data')
 }

component/scanner/src/main/AndroidManifest.xml

@@ -1,4 +1,10 @@
 <?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/ScannerManagerActivity.java

@@ -0,0 +1,204 @@
+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.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
+import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
+
+@AndroidEntryPoint
+public class ScannerManagerActivity extends AppCompatActivity {
+
+    String TAG = "ScannerManagerActivity";
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    Document document;
+
+    @Inject
+    DocumentProcessorFactory documentProcessorFactory;
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
+
+    // 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");
+        DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
+        DocumentDetail documentDetail = document.createDocument(documentMeta);
+        Bitmap[] bitmaps = new Bitmap[this.croppedImages.size()];
+        this.croppedImages.toArray(bitmaps);
+        try {
+            documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps);
+            Toast.makeText(this, "Saved.", Toast.LENGTH_SHORT).show();
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).printLog(); // Debug
+            lacertaVcsFactory.create(documentDetail.getMeta().getId()).printRev(); // Debug
+            finish();
+        } catch (Exception e) {
+            logger.error(TAG, "Error: " + e.getMessage());
+            logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
+        }
+    }
+
+    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

@@ -0,0 +1,95 @@
+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

@@ -0,0 +1,16 @@
+<?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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android: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/fragment_scanner_manager.xml

@@ -0,0 +1,17 @@
+<?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=".ScannerManagerFragment">
+
+    <Button
+        android:id="@+id/button_intent_scanner_manager_activity"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,6 @@
+<?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

@@ -0,0 +1,16 @@
+<?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

@@ -0,0 +1,14 @@
+<?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/src/main/java/one/nem/lacerta/data/LacertaLibrary.java

@@ -1,5 +1,8 @@
 package one.nem.lacerta.data;
 
+import java.util.ArrayList;
+
+import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
 
 import one.nem.lacerta.model.LibraryItemPage;
@@ -8,8 +11,8 @@ import one.nem.lacerta.model.document.DocumentDetail;
 public interface LacertaLibrary {
 
     // Get History
-    LibraryItemPage getRecentDocument(int limit);
+    ArrayList<ListItem> getRecentDocument(int limit);
-    LibraryItemPage getRecentDocument(int limit, int offset);
+    ArrayList<ListItem> getRecentDocument(int limit, int offset);
 
     // Get Library page
     LibraryItemPage getLibraryPage(int limit);

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

@@ -2,33 +2,29 @@ package one.nem.lacerta.data.impl;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 
+// Hilt
 import javax.inject.Inject;
 
+// Lacerta/data
 import one.nem.lacerta.data.Document;
 
+// Lacerta/model
 import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.DocumentDetail;
 
-import one.nem.lacerta.model.document.path.DocumentPath;
+// Lacerta/source
-import one.nem.lacerta.model.document.tag.DocumentTag;
 import one.nem.lacerta.source.database.LacertaDatabase;
-
 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;
+// Lacerta/utils
-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;
+// Lacerta/vcs
 import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 
 public class DocumentImpl implements Document {
@@ -42,13 +38,13 @@ public class DocumentImpl implements Document {
     LacertaDatabase database;
 
     @Inject
-    LacertaVcs vcs;
+    LacertaVcsFactory vcsFactory;
 
 
     @Inject
     public DocumentImpl() {
         // Init
-        logger.debug(TAG, "called");
+//        logger.debug(TAG, "called");
     }
 
 
@@ -74,6 +70,7 @@ public class DocumentImpl implements Document {
         database.documentDao().insert(documentEntity);
 
         // Vcs
+        LacertaVcs vcs = vcsFactory.create(meta.getId());
         vcs.createDocument(meta.getId());
 
         return detail;

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

@@ -1,18 +1,48 @@
 package one.nem.lacerta.data.impl;
 
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
 import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.LibraryItemPage;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItemType;
 import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.source.database.LacertaDatabase;
+import one.nem.lacerta.source.database.common.DateTypeConverter;
+import one.nem.lacerta.source.database.entity.DocumentEntity;
+import one.nem.lacerta.utils.LacertaLogger;
 
 public class LacertaLibraryImpl implements LacertaLibrary {
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    LacertaDatabase database;
+
     @Override
-    public LibraryItemPage getRecentDocument(int limit) {
+    public ArrayList<ListItem> getRecentDocument(int limit) {
-        return null;
+        List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
+
+        ArrayList<ListItem> listItems = new ArrayList<>();
+        for (DocumentEntity documentEntity : documentEntities) {
+            ListItem listItem = new ListItem();
+            listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
+            listItem.setTitle(documentEntity.title);
+            listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
+            listItem.setItemId(documentEntity.id);
+            listItems.add(listItem);
+        }
+        return listItems;
     }
 
     @Override
-    public LibraryItemPage getRecentDocument(int limit, int offset) {
+    public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
-        return null;
+        return null; // TODO-rca: Implement
     }
 
     @Override

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

@@ -148,8 +148,8 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
      * @return ページオブジェクト
      */
     @Override
-    public LibraryItemPage getRecentDocument(int limit) {
+    public ArrayList<ListItem> getRecentDocument(int limit) {
-        return getRecentDocumentPage(limit);
+        return getRecentDocumentPage(limit).getListItems();
     }
 
     /**
@@ -159,8 +159,8 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
      * @return ページオブジェクト
      */
     @Override
-    public LibraryItemPage getRecentDocument(int limit, int offset) {
+    public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
-        return getRecentDocumentPage(limit);
+        return getRecentDocumentPage(limit).getListItems();
     }
 
     /**

feature/debug/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=".DebugMenuContainerActivity"
-            android:exported="false" />
-    </application>
-
 </manifest>

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

@@ -57,13 +57,13 @@ public class DebugMenuLibraryItemListPageFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
 
-        LibraryItemPage libraryItemPage = lacertaLibrary.getRecentDocument(10);
+        ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10);
-        for (ListItem listItem : libraryItemPage.getListItems()) {
+        for (ListItem listItem : listItems) {
             System.out.println(listItem.getTitle());
         }
 
         RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
-        recyclerView.setAdapter(new ItemAdapter(libraryItemPage.getListItems()));
+        recyclerView.setAdapter(new ItemAdapter(listItems));
 
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 

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

@@ -49,7 +49,8 @@ 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("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, 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_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/list_item_debug_menu.xml

@@ -23,4 +23,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
 
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -22,6 +22,9 @@
         <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"
@@ -68,4 +71,8 @@
         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/home/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'com.google.dagger.hilt.android'
     id 'com.android.library'
 }
 
@@ -29,6 +30,8 @@ dependencies {
 
     implementation libs.androidx.appcompat
     implementation libs.com.google.android.material
+    implementation project(path: ':feature:debug')
+    implementation project(path: ':utils')
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
@@ -38,6 +41,18 @@ dependencies {
     implementation libs.navigation.ui
     implementation libs.navigation.dynamic.features.fragment
 
+    // DI
+    implementation libs.com.google.dagger.hilt.android
+    annotationProcessor libs.com.google.dagger.hilt.compiler
+
     // shared
     implementation project(':shared:ui')
+
+    // DI
+    implementation project(':data')
+
+    //model
+    implementation project(':model')
+
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
 }

feature/home/src/androidTest/java/one/nem/lacerta/feature/home/ExampleInstrumentedTest.java

@@ -22,5 +22,7 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
         assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName());
+
+
     }
 }

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

@@ -1,20 +1,40 @@
 package one.nem.lacerta.feature.home;
 
 import android.os.Bundle;
-
+import android.util.Log;
-import androidx.fragment.app.Fragment;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+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.data.LacertaLibrary;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.document.DocumentMeta;
+
+
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link HomeTopFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
+@AndroidEntryPoint
 public class HomeTopFragment extends Fragment {
 
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
     private static final String ARG_PARAM1 = "param1";
@@ -46,12 +66,15 @@ public class HomeTopFragment extends Fragment {
         return fragment;
     }
 
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             mParam1 = getArguments().getString(ARG_PARAM1);
             mParam2 = getArguments().getString(ARG_PARAM2);
+
+
         }
     }
 
@@ -59,6 +82,42 @@ public class HomeTopFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_home_top, container, false);
+        View view = inflater.inflate(R.layout.fragment_home_top, container, false);
-    }
+
-}
+//        List<DocumentMeta> metas = document.getAllDocumentMetas(100);
+
+        ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(100);
+
+        Log.d("docs", Integer.toString(listItems.size()));
+
+        RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        MyAdapter myAdapter = new MyAdapter(listItems);
+
+        recyclerView.setAdapter(myAdapter);
+
+        return view;
+
+
+        }
+String pageTitle;
+    String pageId;
+    ArrayList listItems;
+
+    String title;
+    String description;
+
+    String itemId;
+
+
+
+}
+
+
+
+
+
+
+

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

@@ -0,0 +1,70 @@
+package one.nem.lacerta.feature.home;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.document.DocumentMeta;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyAdapterViewHolder> {
+
+    ArrayList<ListItem> listItems;
+
+    public MyAdapter(ArrayList<ListItem> listItems) {
+        this.listItems = listItems;
+    }
+
+    @NonNull
+    @Override
+    public MyAdapterViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_home_document, parent, false);
+        return new MyAdapterViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MyAdapterViewHolder holder, int position) {
+
+
+        holder.title.setText(listItems.get(position).getTitle());
+        holder.description.setText(listItems.get(position).getDescription());
+
+
+
+
+
+
+
+
+    }
+
+
+    @Override
+    public int getItemCount() {
+        return listItems.size();
+    }
+
+    public class MyAdapterViewHolder extends RecyclerView.ViewHolder {
+
+        TextView title;
+
+        TextView description;
+
+        public MyAdapterViewHolder(@NonNull View itemView) {
+            super(itemView);
+
+            title = itemView.findViewById(R.id.debug_menu_item_title);
+            description = itemView.findViewById(R.id.debug_menu_item_description);
+
+
+        }
+    }
+}
+

feature/home/src/main/res/layout/fragment_home_top.xml

@@ -3,12 +3,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".HomeTopFragment">
+    tools:context=".HomeTopFragment"
+    tools:ignore="ExtraText">
+
 
     <!-- TODO: Update blank fragment layout -->
-    <TextView
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/item_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent">
-        android:text="@string/hello_blank_fragment" />
+
+
+    </androidx.recyclerview.widget.RecyclerView>
 
 </FrameLayout>

feature/home/src/main/res/layout/list_item_home_document.xml

@@ -0,0 +1,36 @@
+<?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:padding="16dp">
+
+    <TextView
+        android:id="@+id/debug_menu_item_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/debug_menu_item_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
+
+    <TextView
+        android:id="@+id/debug_menu_item_updated_at_home"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:text="Updated at: aaaaaaaaaa"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

feature/home/src/main/res/values/ids.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="my_recycler_view" type="id" />
+    <item name="TITLE" type="id" />
+    <item name="textView" type="id" />
+</resources>

feature/home/src/main/res/values/refs.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

feature/home/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <resources>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="textview">TextView</string>
 </resources>

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

@@ -25,6 +25,8 @@ import one.nem.lacerta.data.Document;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.tag.DocumentTag;
 
+
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link LibraryTopFragment#newInstance} factory method to

feature/search/build.gradle

@@ -27,9 +27,17 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation libs.androidx.appcompat
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation libs.com.google.android.material
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation libs.junit
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation libs.androidx.test.ext.junit
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation libs.androidx.test.espresso.core
+
+    // Navigation
+    implementation libs.navigation.fragment
+    implementation libs.navigation.ui
+    implementation libs.navigation.dynamic.features.fragment
+
+    // shared
+    implementation project(':shared:ui')
 }

feature/search/src/main/java/one/nem/lacerta/feature/search/SearchTopFragment.java

@@ -0,0 +1,142 @@
+package one.nem.lacerta.feature.search;
+
+import android.app.LauncherActivity;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.SearchView;
+
+import java.util.ArrayList;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link SearchTopFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class SearchTopFragment extends Fragment {
+    private static final String TAG = SearchTopFragment.class.getSimpleName();
+    private final SearchTopFragment self = this;
+
+    private SearchView searchView;
+    private String searchWord;
+
+    // TODO: Rename parameter arguments, choose names that match
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+
+    // TODO: Rename and change types of parameters
+    private String mParam1;
+    private String mParam2;
+
+    public SearchTopFragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment SearchTopFragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static SearchTopFragment newInstance(String param1, String param2) {
+        SearchTopFragment fragment = new SearchTopFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_search_top, container, false);
+    }
+
+
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+
+
+
+        this.searchView.setIconifiedByDefault(true);
+
+
+        this.searchView.setSubmitButtonEnabled(false);
+
+
+        if (!this.searchWord.equals("")) {
+
+            this.searchView.setQuery(this.searchWord, false);
+        } else {
+            String queryHint = self.getResources().getString(R.string.hello_blank_fragment);
+
+            this.searchView.setQueryHint(queryHint);
+        }
+        this.searchView.setOnQueryTextListener(self.onQueryTextListener);
+    }
+
+    private final SearchView.OnQueryTextListener onQueryTextListener = new SearchView.OnQueryTextListener() {
+        @Override
+        public boolean onQueryTextSubmit(String query) {
+
+            return self.setSearchWord(searchWord);
+        }
+
+        @Override
+        public boolean onQueryTextChange(String query) {
+
+            return false;
+        }
+    };
+    private boolean setSearchWord(String query) {
+
+
+        if (searchWord != null && !searchWord.equals("")) {
+
+            this.searchWord = searchWord;
+        }
+
+        this.searchView.setIconified(false);
+
+        this.searchView.onActionViewCollapsed();
+
+        this.searchView.clearFocus();
+        return false;
+    }
+}
+
+
+
+
+    interface LacertaSearch {
+        ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit);
+
+        ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit, int offset);
+    }
+
+
+

feature/search/src/main/res/layout/fragment_search_top.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:context=".SearchTopFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/Search_tool_bar"
+        android:layout_width="match_parent"
+        android:layout_height="69dp"
+        android:background="#E4E8EA"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:title="" />
+
+    <SearchView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</FrameLayout>

feature/search/src/main/res/navigation/feature_search_navigation.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/feature_search_navigation"
+    app:startDestination="@id/searchTopFragment">
+
+    <fragment
+        android:id="@+id/searchTopFragment"
+        android:name="one.nem.lacerta.feature.search.SearchTopFragment"
+        android:label="fragment_search_top"
+        tools:layout="@layout/fragment_search_top" />
+</navigation>

feature/search/src/main/res/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+</resources>

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

@@ -73,4 +73,6 @@ public class DocumentDetail {
         this.pages = pages;
     }
 
-}
+
+    }
+

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

@@ -48,6 +48,17 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
     public DocumentMeta() {
     }
 
+    public DocumentMeta(String title) {
+        this.id = UUID.randomUUID().toString();
+        this.title = title;
+        this.tags = new ArrayList<>();
+        this.author = ""; // TODO-rca: 作者のデフォルト値を設定できるようにする
+        this.defaultBranch = "main"; // TODO-rca: デフォルトブランチのデフォルト値を設定できるようにする
+        this.path = new PublicPath().getRoot();
+        this.updatedAt = new Date();
+        this.createdAt = new Date();
+    }
+
     public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
         this.id = UUID.randomUUID().toString();
         this.title = title;

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

@@ -3,27 +3,30 @@ package one.nem.lacerta.processor.impl;
 import android.graphics.Bitmap;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.UUID;
 
+// Hilt
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
-import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
-import one.nem.lacerta.processor.DocumentProcessor;
 
+// Lacerta/model
 import one.nem.lacerta.model.document.DocumentDetail;
-
 import one.nem.lacerta.model.document.internal.XmlMetaModel;
-
 import one.nem.lacerta.model.document.page.Page;
 
+// Lacerta/processor
+import one.nem.lacerta.processor.DocumentProcessor;
+
+// Lacerta/source
 import one.nem.lacerta.source.file.FileManager;
 import one.nem.lacerta.source.file.factory.FileManagerFactory;
 
+// Lacerta/utils
 import one.nem.lacerta.utils.LacertaLogger;
-
 import one.nem.lacerta.utils.XmlMetaParser;
 import one.nem.lacerta.utils.repository.DeviceInfoUtils;
+
+// Lacerta/vcs
 import one.nem.lacerta.vcs.LacertaVcs;
 import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 

settings.gradle

@@ -30,5 +30,4 @@ include ':source'
 include ':model'
 include ':processor'
 include ':shared:ui'
-include ':shared:icon'
 include ':vcs'

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/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="@android:color/white"
+      android:fillColor="@color/colorOnBackground"
       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

@@ -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/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>

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

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

shared/ui/src/main/res/values-night-v27/themes.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Base.Theme.Lacerta" parent="Theme.Material3.DayNight.NoActionBar">
+
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorOnPrimary">@color/colorOnPrimary</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorOnSecondary">@color/colorOnSecondary</item>
+        <item name="colorSurface">@color/colorSurface</item>
+        <item name="colorOnSurface">@color/colorOnSurface</item>
+        <item name="colorSurfaceVariant">@color/colorSurfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/colorOnSurfaceVariant</item>
+        <item name="colorSurfaceInverse">@color/colorSurfaceInverse</item>
+        <item name="colorOnSurfaceInverse">@color/colorOnSurfaceInverse</item>
+        <item name="colorPrimaryInverse">@color/colorPrimaryInverse</item>
+        <item name="colorPrimaryContainer">@color/colorPrimaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/colorOnPrimaryContainer</item>
+        <item name="colorSecondaryContainer">@color/colorSecondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colorOnSecondaryContainer</item>
+        <item name="colorTertiary">@color/colorTertiary</item>
+        <item name="colorOnTertiary">@color/colorOnTertiary</item>
+        <item name="colorTertiaryContainer">@color/colorTertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/colorOnTertiaryContainer</item>
+        <item name="colorError">@color/colorError</item>
+        <item name="colorOnError">@color/colorOnError</item>
+        <item name="colorErrorContainer">@color/colorErrorContainer</item>
+        <item name="colorOnErrorContainer">@color/colorOnErrorContainer</item>
+        <item name="colorOutline">@color/colorOutline</item>
+        <item name="colorOnBackground">@color/colorOnBackground</item>
+
+        <item name="android:windowLightNavigationBar">false</item>
+
+    </style>
+</resources>

shared/ui/src/main/res/values-v27/themes.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Base.Theme.Lacerta" parent="Theme.Material3.DayNight.NoActionBar">
+
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorOnPrimary">@color/colorOnPrimary</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorOnSecondary">@color/colorOnSecondary</item>
+        <item name="colorSurface">@color/colorSurface</item>
+        <item name="colorOnSurface">@color/colorOnSurface</item>
+        <item name="colorSurfaceVariant">@color/colorSurfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/colorOnSurfaceVariant</item>
+        <item name="colorSurfaceInverse">@color/colorSurfaceInverse</item>
+        <item name="colorOnSurfaceInverse">@color/colorOnSurfaceInverse</item>
+        <item name="colorPrimaryInverse">@color/colorPrimaryInverse</item>
+        <item name="colorPrimaryContainer">@color/colorPrimaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/colorOnPrimaryContainer</item>
+        <item name="colorSecondaryContainer">@color/colorSecondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colorOnSecondaryContainer</item>
+        <item name="colorTertiary">@color/colorTertiary</item>
+        <item name="colorOnTertiary">@color/colorOnTertiary</item>
+        <item name="colorTertiaryContainer">@color/colorTertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/colorOnTertiaryContainer</item>
+        <item name="colorError">@color/colorError</item>
+        <item name="colorOnError">@color/colorOnError</item>
+        <item name="colorErrorContainer">@color/colorErrorContainer</item>
+        <item name="colorOnErrorContainer">@color/colorOnErrorContainer</item>
+        <item name="colorOutline">@color/colorOutline</item>
+        <item name="colorOnBackground">@color/colorOnBackground</item>
+
+        <item name="android:windowLightNavigationBar">true</item>
+
+    </style>
+</resources>

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

@@ -28,6 +28,7 @@
         <item name="colorOutline">@color/colorOutline</item>
         <item name="colorOnBackground">@color/colorOnBackground</item>
 
+        <item name="android:windowLightNavigationBar">true</item>
 
     </style>
 

source/build.gradle

@@ -47,4 +47,7 @@ dependencies {
     // Utils モジュール
     implementation project(':utils')
 
+    // Model
+    implementation project(':model')
+
 }

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

@@ -4,6 +4,8 @@ import androidx.room.Database;
 import androidx.room.RoomDatabase;
 
 // Entities
+import one.nem.lacerta.source.database.dao.FolderDao;
+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;
@@ -17,11 +19,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}, version = 2)
+@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 4)
 public abstract class LacertaDatabase extends RoomDatabase {
     public abstract TagDao tagDao();
     public abstract DocumentDao documentDao();
     public abstract LibraryDao libraryDao();
     public abstract VcsRevDao vcsRevDao();
     public abstract VcsLogDao vcsLogDao();
+    public abstract FolderDao folderDao();
 }

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

@@ -28,6 +28,12 @@ public interface DocumentDao {
     @Query("SELECT * FROM Document WHERE id IN (:ids)")
     List<DocumentEntity> findByIds(List<String> ids);
 
+    @Query("SELECT * FROM Document WHERE public_path = :publicPath LIMIT :limit")
+    List<DocumentEntity> findByPublicPathWithLimit(String publicPath, int limit);
+
+    @Query("SELECT * FROM Document ORDER BY created_at DESC LIMIT :limit")
+    List<DocumentEntity> getRecentDocument(int limit);
+
     // Insert
     @Insert
     void insert(DocumentEntity document);

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

@@ -0,0 +1,23 @@
+package one.nem.lacerta.source.database.dao;
+
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Query;
+
+import one.nem.lacerta.source.database.entity.FolderEntity;
+
+@Dao
+public interface FolderDao {
+
+    @Query("SELECT * FROM Folder WHERE id = :id")
+    FolderEntity findById(String id);
+
+    @Query("SELECT * FROM Folder WHERE public_path = :publicPath")
+    FolderEntity findByPublicPath(String publicPath);
+
+    @Insert
+    void insert(FolderEntity folderEntity);
+
+    @Insert
+    void insertAll(FolderEntity... folderEntities);
+}

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

@@ -3,6 +3,7 @@ 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;
 
@@ -24,6 +25,14 @@ public interface VcsLogDao {
     @Query("SELECT * FROM vcs_log WHERE document_id = :documentId")
     List<VcsLogEntity> findByDocumentId(String documentId);
 
+    @Query("SELECT * FROM vcs_log WHERE document_id = :documentId AND is_included = :isIncluded ORDER BY created_at")
+    List<VcsLogEntity> findByDocumentIdAndIncluded(String documentId, boolean isIncluded);
+
+    @Query("SELECT * FROM vcs_log WHERE document_id = :documentId AND branch_name = :branchName")
+    List<VcsLogEntity> findByDocumentIdAndBranchName(String documentId, String branchName);
+
+    @Query("SELECT * FROM vcs_log WHERE document_id = :documentId AND branch_name = :branchName AND is_included = :isIncluded ORDER BY created_at")
+    List<VcsLogEntity> findByDocumentIdAndBranchNameAndIncluded(String documentId, String branchName, boolean isIncluded);
     // Insert
 
     @Insert
@@ -35,5 +44,12 @@ public interface VcsLogDao {
     @Insert
     void insert(VcsLogEntity vcsLog);
 
-    // TODO-rca: Update, Deleteが必要か検討
+    @Update
+    void update(VcsLogEntity vcsLog);
+
+    @Update
+    void updateAll(VcsLogEntity... vcsLogs);
+
+    @Update
+    void updateAll(List<VcsLogEntity> vcsLogs);
 }

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

@@ -0,0 +1,22 @@
+package one.nem.lacerta.source.database.entity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+@Entity(tableName = "folder")
+public class FolderEntity {
+
+    @PrimaryKey
+    @ColumnInfo(name = "id")
+    @NonNull
+    public String id; // フォルダID
+
+    @ColumnInfo(name = "title")
+    public String name; // フォルダ名
+
+    @ColumnInfo(name = "public_path")
+    public String publicPath; // 公開パス
+
+}

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

@@ -45,4 +45,10 @@ public class VcsLogEntity {
      */
     @ColumnInfo(name = "action")
     public String action;
+
+    /**
+     * Revに含まれてるかどうか
+     */
+    @ColumnInfo(name = "is_included")
+    public boolean isIncluded;
 }

source/src/main/java/one/nem/lacerta/source/jgit/ActionRepo.java

@@ -1,31 +0,0 @@
-package one.nem.lacerta.source.jgit;
-
-import org.eclipse.jgit.lib.Repository;
-
-public interface ActionRepo {
-
-    // リポジトリをインスタンス変数に格納
-    void setRepository(Repository repository);
-
-    // リポジトリ取得
-    Repository getRepository();
-
-    // リポジトリ名取得
-    String getRepositoryName();
-
-    // ステージングされていないファイルの一覧を取得
-    String[] getUnstagedFiles();
-
-    // ステージングされているファイルの一覧を取得
-    String[] getStagedFiles();
-
-    // ファイルをステージング
-    void stageFile(String path);
-
-    // ファイルをアンステージング
-    void unstageFile(String path);
-
-    // ステージングされているファイルをコミット
-    void commit(String message);
-
-}

source/src/main/java/one/nem/lacerta/source/jgit/JGitRepository.java

@@ -1,17 +0,0 @@
-package one.nem.lacerta.source.jgit;
-
-import org.eclipse.jgit.lib.Repository;
-
-public interface JGitRepository {
-
-    // リポジトリ取得
-    Repository getRepository(String id);
-    // リポジトリ作成
-    Repository createRepository(String id);
-    // リポジトリ削除
-    void deleteRepository(String id);
-    // リポジトリ存在確認
-    boolean repositoryExists(String id);
-
-
-}

source/src/main/java/one/nem/lacerta/source/jgit/impl/ActionRepoImpl.java

@@ -1,101 +0,0 @@
-package one.nem.lacerta.source.jgit.impl;
-
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.lib.Repository;
-
-import javax.inject.Inject;
-
-import one.nem.lacerta.source.jgit.ActionRepo;
-import one.nem.lacerta.utils.LacertaLogger;
-
-public class ActionRepoImpl implements ActionRepo{
-
-    @Inject // Inject logger
-    LacertaLogger logger;
-
-    private final String TAG = "ActionRepoImpl";
-
-    Repository repository;
-
-    Git git;
-
-    // Internal method
-    private Git getGit() {
-        if (this.git == null) {
-            logger.debug(TAG, "getGit: git is null. Creating new Git instance");
-            this.git = new Git(repository);
-        }
-        return this.git;
-    }
-
-    @Override
-    public void setRepository(Repository repository) {
-        this.repository = repository;
-    }
-
-    @Override
-    public Repository getRepository() {
-        if (repository == null) {
-            logger.warn(TAG, "getRepository: repository is null. Throwing RuntimeException");
-            throw new RuntimeException("リポジトリが設定されていません");
-        }
-        return repository;
-    }
-
-    @Override
-    public String getRepositoryName() {
-        return repository.getDirectory().getParentFile().getName();
-    }
-
-    @Override
-    public String[] getUnstagedFiles() {
-        Git git = getGit();
-        try {
-            return git.status().call().getUntracked().toArray(new String[0]);
-        } catch (Exception e) { // TODO-rca: エラーハンドリング
-            logger.error(TAG, "getUnstagedFiles: " + e.getMessage());
-            return new String[0];
-        }
-    }
-
-    @Override
-    public String[] getStagedFiles() {
-        Git git = getGit();
-        try {
-            return git.status().call().getAdded().toArray(new String[0]);
-        } catch (Exception e) { // TODO-rca: エラーハンドリング
-            logger.error(TAG, "getStagedFiles: " + e.getMessage());
-            return new String[0];
-        }
-    }
-
-    @Override
-    public void stageFile(String path) {
-        Git git = getGit();
-        try {
-            git.add().addFilepattern(path).call();
-        } catch (Exception e) { // TODO-rca: エラーハンドリング
-            logger.error(TAG, "stageFile: " + e.getMessage());
-        }
-    }
-
-    @Override
-    public void unstageFile(String path) {
-        Git git = getGit();
-        try {
-            git.reset().addPath(path).call();
-        } catch (Exception e) { // TODO-rca: エラーハンドリング
-            logger.error(TAG, "unstageFile: " + e.getMessage());
-        }
-    }
-
-    @Override
-    public void commit(String message) {
-        Git git = getGit();
-        try {
-            git.commit().setMessage(message).call();
-        } catch (Exception e) { // TODO-rca: エラーハンドリング
-            logger.error(TAG, "commit: " + e.getMessage());
-        }
-    }
-}

source/src/main/java/one/nem/lacerta/source/jgit/impl/JGitRepositoryImpl.java

@@ -1,55 +0,0 @@
-package one.nem.lacerta.source.jgit.impl;
-
-import one.nem.lacerta.source.jgit.JGitRepository;
-
-import javax.inject.Inject;
-
-import one.nem.lacerta.utils.repository.DeviceInfoUtils;
-
-import org.eclipse.jgit.lib.Repository;
-
-import org.eclipse.jgit.lib.RepositoryBuilder;
-
-public class JGitRepositoryImpl implements JGitRepository {
-
-    private final DeviceInfoUtils deviceInfoUtils;
-
-    @Inject
-    public JGitRepositoryImpl(DeviceInfoUtils deviceInfoUtils) {
-        this.deviceInfoUtils = deviceInfoUtils;
-    }
-
-    @Override
-    public Repository getRepository(String id) {
-        RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
-        repositoryBuilder.setGitDir(deviceInfoUtils.getExternalStorageDirectory().resolve(id).resolve(".git").toFile());
-        repositoryBuilder.setMustExist(true);
-        try {
-            return repositoryBuilder.build();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public Repository createRepository(String id) {
-        RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
-        repositoryBuilder.setGitDir(deviceInfoUtils.getExternalStorageDirectory().resolve(id).resolve(".git").toFile());
-        repositoryBuilder.setMustExist(false);
-        try {
-            return repositoryBuilder.build();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public void deleteRepository(String id) {
-        // TODO-rca: 未実装
-    }
-
-    @Override
-    public boolean repositoryExists(String id) {
-        return false; // TODO-rca: 未実装
-    }
-}

source/src/main/java/one/nem/lacerta/source/jgit/module/JGitRepositoryModule.java

@@ -1,15 +0,0 @@
-package one.nem.lacerta.source.jgit.module;
-
-import dagger.Binds;
-import dagger.Module;
-import dagger.hilt.InstallIn;
-import dagger.hilt.components.SingletonComponent;
-import one.nem.lacerta.source.jgit.JGitRepository;
-
-@Module
-@InstallIn(SingletonComponent.class)
-abstract public class JGitRepositoryModule {
-
-    @Binds
-    public abstract JGitRepository bindManageRepo(one.nem.lacerta.source.jgit.impl.JGitRepositoryImpl manageRepoImpl);
-}

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

@@ -11,6 +11,8 @@ 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,6 +43,11 @@ 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();

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

@@ -11,7 +11,12 @@ public interface LacertaVcs {
 
     public void createDocument(String documentId);
 
+    public void generateRevisionAtCurrent(String message);
+
+
     // debug
     public void printLog();
 
+    public void printRev();
+
 }

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

@@ -1,5 +1,7 @@
 package one.nem.lacerta.vcs.impl;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 import javax.inject.Inject;
@@ -8,8 +10,12 @@ import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
 import one.nem.lacerta.source.database.LacertaDatabase;
 import one.nem.lacerta.source.database.entity.VcsLogEntity;
+import one.nem.lacerta.source.database.entity.VcsRevEntity;
 import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.vcs.ActionType;
 import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.internal.JsonUtils;
+import one.nem.lacerta.vcs.model.action.InsertPage;
 
 public class LacertaVcsImpl implements LacertaVcs {
 
@@ -38,12 +44,17 @@ public class LacertaVcsImpl implements LacertaVcs {
     @Override
     public void insertPage(int index, String fileName) {
         logger.debug(TAG, "insertPage");
+
+        // InsertPage
+        InsertPage insertPage = new InsertPage(index, fileName);
+        insertPage.setActionType(ActionType.INSERT_PAGE);
+
         VcsLogEntity vcsLogEntity = new VcsLogEntity();
         vcsLogEntity.id = UUID.randomUUID().toString();
         vcsLogEntity.documentId = documentId;
         vcsLogEntity.branchName = "master";
         vcsLogEntity.createdAt = new java.util.Date();
-        vcsLogEntity.action = "placeholder";
+        vcsLogEntity.action = JsonUtils.toJson(insertPage);
         database.vcsLogDao().insert(vcsLogEntity);
     }
 
@@ -54,7 +65,61 @@ public class LacertaVcsImpl implements LacertaVcs {
 
     @Override
     public void createDocument(String documentId) {
+        logger.debug(TAG, "createDocument");
 
+        VcsLogEntity vcsLogEntity = new VcsLogEntity();
+        vcsLogEntity.id = UUID.randomUUID().toString();
+        vcsLogEntity.documentId = documentId;
+        vcsLogEntity.branchName = "master";
+        vcsLogEntity.createdAt = new java.util.Date();
+        vcsLogEntity.action = "ph-createDocument";
+        database.vcsLogDao().insert(vcsLogEntity);
+    }
+
+    // Internal
+    private ArrayList<VcsLogEntity> getNonIncludedVcsLogEntities() {
+        return new ArrayList<>(database.vcsLogDao().findByDocumentIdAndIncluded(documentId, false));
+    }
+
+    private ArrayList<VcsLogEntity> getNonIncludedVcsLogEntities(String branchName) {
+        return new ArrayList<>(database.vcsLogDao().findByDocumentIdAndBranchNameAndIncluded(documentId, branchName, false));
+    }
+
+    private void setIncludedVcsLogEntities(ArrayList<VcsLogEntity> vcsLogEntities) {
+        vcsLogEntities.forEach(vcsLogEntity -> {
+            vcsLogEntity.isIncluded = true;
+            database.vcsLogDao().update(vcsLogEntity);
+        });
+
+        logger.debug(TAG, "setIncludedVcsLogEntities updated: " + vcsLogEntities.size() + " entities");
+    }
+
+    @Override
+    public void generateRevisionAtCurrent(String message) {
+        logger.debug(TAG, "generateRevisionAtCurrent");
+        // TODO-rca: ブランチを考慮する
+
+        ArrayList<VcsLogEntity> vcsLogEntities = getNonIncludedVcsLogEntities();
+
+        ArrayList<String> logIds = new ArrayList<>();
+        vcsLogEntities.forEach(vcsLogEntity -> {
+            logIds.add(vcsLogEntity.id);
+        });
+
+        VcsRevEntity vcsRevEntity = new VcsRevEntity();
+        vcsRevEntity.id = UUID.randomUUID().toString();
+        vcsRevEntity.documentId = documentId;
+        vcsRevEntity.branchName = "master";
+        vcsRevEntity.createdAt = new java.util.Date();
+        vcsRevEntity.commitMessage = message;
+        vcsRevEntity.logIds = logIds;
+
+        database.vcsRevDao().insert(vcsRevEntity);
+
+        setIncludedVcsLogEntities(vcsLogEntities);
+
+        logger.debug(TAG, "generateRevisionAtCurrent finished");
+        logger.debug(TAG, "New revision inserted: " + vcsRevEntity.id);
     }
 
     @Override
@@ -62,6 +127,19 @@ public class LacertaVcsImpl implements LacertaVcs {
         logger.debug(TAG, "printLog");
         database.vcsLogDao().findAll().forEach(vcsLog -> {
             logger.debug(TAG, vcsLog.id);
+            logger.debug(TAG, vcsLog.documentId + " " + vcsLog.branchName);
+            logger.debug(TAG, vcsLog.action);
+        });
+    }
+
+    @Override
+    public void printRev() {
+        logger.debug(TAG, "printRev");
+        database.vcsRevDao().findAll().forEach(vcsRev -> {
+            logger.debug(TAG, vcsRev.id);
+            logger.debug(TAG, vcsRev.documentId + " " + vcsRev.branchName);
+            logger.debug(TAG, vcsRev.commitMessage);
+            logger.debug(TAG, vcsRev.logIds.toString());
         });
     }
 }