新しい実装にあわせて修正

This reverts commit 5c165b96d3.

README.md

@@ -1,8 +1,10 @@
 # Lacerta
-WIP
+学習に便利な機能とGit-like VCSを持ったドキュメントスキャナ (Work In Progress)
+(グループワーク)
+
 ## モジュール設計
+![Untitled Diagram(2)(1) drawio(1)](https://github.com/lacerta-doc/Lacerta/assets/66072112/f9b9c40f-bed0-4ade-95c1-50e28df68f35)
 
-![Untitled Diagram(2)](https://github.com/lacerta-doc/Lacerta/assets/66072112/9daabaca-5cdc-49f8-ac66-196c588a47c9)
 
 ## メモ
 - アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px)
@@ -11,45 +13,28 @@ WIP
 ### モジュール一覧
 - `component` : コンポーネント
   - `common` : 共通コンポーネント
-    - UIの中で共通で使う要素(メニューアイテムとか)
-  - `scanner` : スキャナー
-    - スキャナーの実装
+  - `scanner` : スキャナー 
   - `viewer` : ビューワー
-    - ドキュメントビューワーの実装
-- `data` : データ
-  - UIからデータを取得/保存するためのラッパーモジュール
-  - `Document` : ドキュメント関係
-    - WIP(JavaDocを参照してください, 余裕があったら追記します)
+- `data` : UIからデータを取得/保存するためのラッパーモジュール
 - `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
   - `common`: 共通機能
-    - 設定画面とか、どこからでも呼ばれうる画面
   - `debug`: デバッグメニュー
   - `home`: ホーム画面
   - `library`: ライブラリ画面
-  - `scan`: スキャン画面
+  - `scan`: スキャン画面 (廃止予定)
   - `search`: 検索画面
-- `model` : モデル
-  - データモデルをまとめたモジュール (WIP)
-  - `document` : ドキュメント
-  - `meta` : メタデータ
-- `processor` : プロセッサ
-  - いくつかの処理をまとめたモジュール
-    - `DocumentProcessor` : ドキュメント処理（ドキュメントにページを追加したり更新したり） 
-- `shared` : 
-  - 共有リソース
-- `source` : ソース
-  - (バックエンドが使うのでとりあえず後回し、フロントから直接操作することは絶対にありません)
-- `utils` : ユーティリティ
-  - ちょっとしたユーティリティをまとめたモジュール
-  - `LacertaLogger` : ロガー
-  - `XmlMetaParser` : XMLメタデータパーサー(フロントから直接操作することは絶対にありません)
-
+- `model` : データモデルをまとめたモジュール
+- `processor` : プロセッサ（例: `DocumentProcessor` : ドキュメント処理（ドキュメントにページを追加したり更新したり）)
+- `shared`: 共有リソース
+  - `ui`: UI要素(Theme, Drawable, Colorなど)
+- `source` : ソース(DB/FileManagerなど)
+- `utils` : ユーティリティ(ちょっとしたユーティリティをまとめたモジュール)
 
 ## コーディング規則/推奨(WIP)
-### 規則
 - `// TODO`コメントには任意のsuffixを付ける
   - 全員が同じ`// TODO:`を使っていると検索がむずかしくなるため
   - (例: `// TODO-rca:`)
-### 推奨
-- マジックナンバーは控える(必要な場合もあるので)
-
+ 
+## Thanks for
+- [SDA-SE/document-scanner-android](https://github.com/SDA-SE/document-scanner-android)
+- 

app/build.gradle

@@ -82,4 +82,6 @@ dependencies {
     implementation project(':model')
 
     implementation project(':utils')
+
+    implementation project(':component:scanner')
 }

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher_temp_round"
         android:name=".LacertaApplication"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"

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

@@ -6,6 +6,7 @@ import android.util.Log;
 import com.google.android.material.color.DynamicColors;
 
 import dagger.hilt.android.HiltAndroidApp;
+import one.nem.lacerta.utils.FeatureSwitch;
 
 @HiltAndroidApp
 public class LacertaApplication extends Application {
@@ -15,7 +16,11 @@ public class LacertaApplication extends Application {
 
         if (DynamicColors.isDynamicColorAvailable()) {
             Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
-            DynamicColors.applyToActivitiesIfAvailable(this);
+            if (FeatureSwitch.Meta.disableDynamicColor) {
+                Log.d("DynamicColors", "DynamicColors is disabled by FeatureSwitch.");
+            } else {
+                DynamicColors.applyToActivitiesIfAvailable(this);
+            }
         } else {
             Log.d("DynamicColors", "DynamicColors is not available.");
         }

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

@@ -1,5 +1,6 @@
 package one.nem.lacerta;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
@@ -10,6 +11,8 @@ import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.NavigationUI;
 
+import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
@@ -17,12 +20,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import one.nem.lacerta.component.scanner.ScannerManagerActivity;
 import one.nem.lacerta.model.FragmentNavigation;
 import one.nem.lacerta.model.pref.FeatureSwitchOverride;
 import one.nem.lacerta.utils.FeatureSwitch;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 
 import java.io.NotActiveException;
@@ -74,7 +79,29 @@ public class MainActivity extends AppCompatActivity implements FragmentNavigatio
         // Set status bar color
         getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
 
+        // Fab
+        findViewById(R.id.scanFab).setOnClickListener(v -> {
+            Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
+            Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
+            startActivity(intent);
+        });
+
     }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 1) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(this, "Permission granted", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, "カメラの権限は必須です.", Toast.LENGTH_LONG).show();
+                finish(); // Exit app
+            }
+        }
+    }
+
     private void initializeApp() {
         Log.d("Init", "Initializing app");
         // Set feature switch override to default value

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

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#5F4769">
+  <group android:scaleX="0.377"
+      android:scaleY="0.377"
+      android:translateX="7.476"
+      android:translateY="7.476">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
+  </group>
+</vector>

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

@@ -34,4 +34,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/bottom_nav_menu" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/scanFab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="32dp"
+        android:clickable="true"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@drawable/ic_baseline_add_24" />
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

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

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

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

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

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

component/common/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.com.android.library)
+    id 'com.google.dagger.hilt.android'
 }
 
 android {
@@ -33,5 +34,12 @@ dependencies {
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
 
+    // Hilt (DI)
+    implementation libs.com.google.dagger.hilt.android
+    annotationProcessor libs.com.google.dagger.hilt.compiler
+
     implementation project(':shared:ui')
+    implementation project(':utils')
+    implementation project(':model')
+    implementation project(':data')
 }

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

@@ -0,0 +1,163 @@
+package one.nem.lacerta.component.common;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.model.ListItemType;
+import one.nem.lacerta.utils.LacertaLogger;
+
+@AndroidEntryPoint
+public class LacertaSelectDirDialog extends DialogFragment {
+
+    @Inject
+    LacertaLibrary lacertaLibrary;
+
+    @Inject
+    LacertaLogger logger;
+
+    private LacertaSelectDirDialogListener listener;
+
+    private String title;
+
+    private String message;
+
+    private String positiveButtonText;
+
+    private String negativeButtonText;
+
+    private SelectDirDialogItemAdapter adapter;
+
+    private RecyclerView recyclerView;
+
+    private TextView current_dir_text_view;
+
+    // Setter
+
+    public LacertaSelectDirDialog setListener(LacertaSelectDirDialogListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    public LacertaSelectDirDialog setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public LacertaSelectDirDialog setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public LacertaSelectDirDialog setPositiveButtonText(String positiveButtonText) {
+        this.positiveButtonText = positiveButtonText;
+        return this;
+    }
+
+    public LacertaSelectDirDialog setNegativeButtonText(String negativeButtonText) {
+        this.negativeButtonText = negativeButtonText;
+        return this;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+        super.onCreateDialog(savedInstanceState);
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
+        LayoutInflater inflater = requireActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.lacerta_dialog_select_dir, null);
+
+        // 高さを画面の60%にする
+        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.6);
+        view.setMinimumHeight(height);
+
+        this.recyclerView = view.findViewById(R.id.select_dir_recycler_view);
+        this.current_dir_text_view = view.findViewById(R.id.current_dir_text_view);
+
+        this.adapter = new SelectDirDialogItemAdapter(new LacertaSelectDirDialogInternalEventListener() {
+            @Override
+            public void onDirSelected(String name, String itemId) {
+                showRecyclerViewItem(itemId);
+            }
+
+            @Override
+            public void onBackSelected(String parentId) {
+                showRecyclerViewItem(parentId);
+            }
+        });
+
+        this.recyclerView.setAdapter(this.adapter);
+        builder.setView(view);
+
+        showRecyclerViewItem(null); // get root folder
+
+        builder.setTitle(this.title == null ? "Select a directory" : this.title);
+        builder.setMessage(this.message == null ? "Select a directory" : this.message);
+        builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
+            if (listener != null) {
+                listener.onDirSelected(
+                        adapter.getCurrentPageTitle() == null ? null : adapter.getCurrentPageTitle(),
+                        adapter.getCurrentId() == null ? null : adapter.getCurrentId());
+            }
+        });
+        builder.setNegativeButton(this.negativeButtonText == null ? "Cancel" : this.negativeButtonText, (dialog, which) -> {
+            if (listener != null) {
+                listener.onCanceled();
+            }
+        });
+        return builder.create();
+    }
+
+    private void showRecyclerViewItem(String targetDirId) {
+        lacertaLibrary.getPublicPath(targetDirId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
+            getActivity().runOnUiThread(() -> {
+                if (publicPath != null) {
+                    current_dir_text_view.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPathの実装を修正する
+                } else {
+                    current_dir_text_view.setText("/");
+                }
+            });
+        });
+        lacertaLibrary.getFolderList(targetDirId).thenAccept(libraryItemPage -> {
+            getActivity().runOnUiThread(() -> {
+                int currentCount = adapter.getItemCount();
+                String currentDirId = adapter.getCurrentId();
+                if (currentDirId == null) {
+                    // Rootが関わる推移 (Rootからの推移)
+                    adapter.setListItems(libraryItemPage);
+                    adapter.notifyItemRangeRemoved(0, currentCount);
+                    adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
+                } else if (libraryItemPage.getPageId() == null) {
+                    // Rootが関わる推移 (Rootへの推移)
+                    adapter.setListItems(libraryItemPage);
+                    adapter.notifyItemRangeRemoved(0, currentCount);
+                    adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
+                } else if (libraryItemPage.getPageId() != null) {
+                    // Rootが関わらない推移
+                    adapter.setListItems(libraryItemPage);
+                    adapter.notifyItemRangeRemoved(1, currentCount);
+                    adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
+                } else {
+                    // その他の遷移(安全側に倒すため全アイテム更新)
+                    logger.warn("LacertaSelectDirDialog", "Unknown transition.");
+                    logger.warn("LacertaSelectDirDialog", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
+                    adapter.setListItems(libraryItemPage);
+                    adapter.notifyItemRangeRemoved(0, currentCount);
+                    adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
+                }
+            });
+        });
+    }
+}

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

@@ -0,0 +1,6 @@
+package one.nem.lacerta.component.common;
+
+public interface LacertaSelectDirDialogInternalEventListener {
+    void onDirSelected(String name, String itemId);
+    void onBackSelected(String parentId);
+}

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

@@ -0,0 +1,7 @@
+package one.nem.lacerta.component.common;
+
+public interface LacertaSelectDirDialogListener {
+
+    void onDirSelected(String name, String itemId);
+    void onCanceled();
+}

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

@@ -0,0 +1,100 @@
+package one.nem.lacerta.component.common;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import one.nem.lacerta.model.LibraryItemPage;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItemType;
+
+public class SelectDirDialogItemAdapter extends RecyclerView.Adapter<SelectDirDialogItemAdapter.SelectDirDialogItemViewHolder> {
+
+
+    private LibraryItemPage libraryItemPage;
+    LacertaSelectDirDialogInternalEventListener listener;
+
+    public SelectDirDialogItemAdapter(LacertaSelectDirDialogInternalEventListener listener) {
+        this.listener = listener;
+    }
+
+    public void setListItems(LibraryItemPage libraryItemPage) {
+        this.libraryItemPage = libraryItemPage;
+        if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
+            this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
+        }
+    }
+
+    @NonNull
+    @Override
+    public SelectDirDialogItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
+        return new SelectDirDialogItemViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(SelectDirDialogItemViewHolder holder, int position) {
+        ListItem listItem = libraryItemPage.getListItems().get(position);
+        holder.title.setText(listItem.getTitle());
+        holder.description.setText(listItem.getDescription());
+        holder.icon.setImageResource(listItem.getItemType().getIconId());
+        if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
+            holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
+        } else {
+            holder.itemView.setOnClickListener(v -> listener.onDirSelected(listItem.getTitle(), listItem.getItemId()));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
+    }
+
+    public String getCurrentId() {
+        if (this.libraryItemPage == null) {
+            return null;
+        } else {
+            if (this.libraryItemPage.getPageId() == null) {
+                return null;
+            } else {
+                return this.libraryItemPage.getPageId();
+            }
+        }
+    }
+
+    public String getCurrentPageTitle() {
+        if (this.libraryItemPage == null) {
+            return null;
+        } else {
+            if (this.libraryItemPage.getPageId() == null) {
+                return null;
+            } else {
+                return this.libraryItemPage.getPageTitle();
+            }
+        }
+    }
+
+    public static class SelectDirDialogItemViewHolder extends RecyclerView.ViewHolder {
+
+        TextView title;
+        TextView description;
+
+        ImageView icon;
+
+
+        public SelectDirDialogItemViewHolder(@NonNull View itemView) {
+            super(itemView);
+
+            title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
+            description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
+            icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
+            description.setVisibility(View.GONE); // 暫定
+
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/current_dir_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/select_dir_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+</LinearLayout>

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

@@ -1,19 +1,20 @@
 package one.nem.lacerta.component.scanner;
 
+import android.Manifest;
 import android.app.ProgressDialog;
+import android.content.pm.PackageManager;
 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.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -28,11 +29,11 @@ import java.util.concurrent.CompletableFuture;
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.data.Document;
 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
@@ -95,6 +96,14 @@ public class ScannerManagerActivity extends AppCompatActivity {
             return insets;
         });
 
+
+
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, 1); // TODO-rca: リクエストコードを定数にする
+        }
+
+
         MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
@@ -119,11 +128,12 @@ public class ScannerManagerActivity extends AppCompatActivity {
             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() == R.id.action_insert_exist) {
+//            // 既存ドキュメントに挿入
+//            Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
+//            insertToExistDocument();
+//            return true;
         } else if (item.getItemId() == android.R.id.home) {
             finish();
             return true;
@@ -139,7 +149,6 @@ public class ScannerManagerActivity extends AppCompatActivity {
             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);

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

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

component/viewer/build.gradle

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

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

@@ -1,129 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import android.graphics.Bitmap;
-import android.os.Bundle;
-
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.navigation.Navigation;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import java.util.ArrayList;
-import java.util.concurrent.CompletableFuture;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.model.document.DocumentDetail;
-import one.nem.lacerta.model.document.page.Page;
-import one.nem.lacerta.utils.LacertaLogger;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link ComponentViewerTopFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class ComponentViewerTopFragment extends Fragment {
-
-    @Inject
-    Document document;
-
-    @Inject
-    LacertaLogger logger;
-
-    private static final String TAG = "ComponentViewerTopFragment";
-
-    private String documentId;
-
-    public ComponentViewerTopFragment() {
-        // Required empty public constructor
-    }
-
-    public static ComponentViewerTopFragment newInstance(String documentId) {
-        ComponentViewerTopFragment fragment = new ComponentViewerTopFragment();
-        Bundle args = new Bundle();
-        args.putString("documentId", documentId);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            documentId = getArguments().getString("documentId");
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
-
-        // Toolbar
-        Toolbar toolbar = view.findViewById(R.id.toolbar);
-        toolbarSetup(toolbar, true, "Revision List");
-
-        RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
-            Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
-        });
-        recyclerView.setAdapter(viewerBodyAdapter);
-
-        document.getDocument(documentId).thenAccept(documentDetail -> {
-            ArrayList<Page> pages = documentDetail.getPages();
-            logger.debug(TAG, "pages.size(): " + pages.size());
-            viewerBodyAdapter.setPages(pages);
-            getActivity().runOnUiThread(() -> {
-                viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
-            });
-        });
-
-        return view;
-    }
-
-    /**
-     * ToolbarをInitする
-     *
-     * @param toolbar Toolbar
-     * @param showBackButton 戻るボタンを表示するか
-     * @param title タイトル
-     */
-    private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
-        getActivity().runOnUiThread(() -> {
-            if (showBackButton) {
-                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
-                toolbar.setNavigationOnClickListener(v -> {
-                    //this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
-                    // Back
-                    Navigation.findNavController(requireView()).popBackStack();
-                });
-            } else {
-                toolbar.setNavigationIcon(null);
-            }
-            toolbar.setTitle(title);
-            toolbar.inflateMenu(R.menu.viewer_menu);
-            toolbar.setOnMenuItemClickListener(item -> {
-                if (item.getItemId() == R.id.action_open_vcs_rev_list) {
-                    // Open vcs rev list
-                    getParentFragmentManager().beginTransaction()
-                            .replace(R.id.nav_host_fragment, ViewerVcsRevListFragment.newInstance(documentId))
-                            .commit();
-                    return true;
-                } else {
-                    return false;
-                }
-            });
-        });
-    }
-}

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

@@ -8,9 +8,11 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 
+import one.nem.lacerta.component.viewer.model.RevSelectListener;
 import one.nem.lacerta.model.VcsRevModel;
 import one.nem.lacerta.utils.FeatureSwitch;
 
@@ -18,11 +20,14 @@ public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
 
     private ArrayList<VcsRevModel> revModels;
 
+    private RevSelectListener revSelectListener;
+
     public RevAdapter(ArrayList<VcsRevModel> revModels) {
         this.revModels = revModels;
     }
 
-    public RevAdapter() {
+    public RevAdapter(RevSelectListener revSelectListener) {
+        this.revSelectListener = revSelectListener;
     }
 
     public void setRevModels(ArrayList<VcsRevModel> revModels) {
@@ -40,16 +45,24 @@ public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
     @Override
     public void onBindViewHolder(@NonNull RevAdapter.RevViewHolder holder, int position) {
         VcsRevModel revModel = revModels.get(position);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
         holder.title.setText(revModel.getCommitMessage());
         if (FeatureSwitch.Vcs.disableBranchDisplay) {
 //            holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()));
-            holder.detail.setText("DateTimePlaceholder");
+            holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt()));
         } else {
             //        holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + revModel.getBranchName());
-            holder.detail.setText("DateTimePlaceholder" + " " + revModel.getBranchName());
+            holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt())+ " " + revModel.getBranchName());
         }
         holder.revId.setText("RevID: " + revModel.getId());
 
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                revSelectListener.onRevSelect(revModel.getId());
+            }
+        });
+
     }
 
     @Override

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

@@ -0,0 +1,239 @@
+package one.nem.lacerta.component.viewer;
+
+import android.os.Bundle;
+
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.lacerta.component.common.LacertaSelectDirDialog;
+import one.nem.lacerta.component.common.LacertaSelectDirDialogListener;
+import one.nem.lacerta.data.Document;
+import one.nem.lacerta.model.document.page.Page;
+import one.nem.lacerta.utils.FeatureSwitch;
+import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.vcs.LacertaVcs;
+import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link ViewerListFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+@AndroidEntryPoint
+public class ViewerListFragment extends Fragment {
+
+    @Inject
+    Document document;
+
+    @Inject
+    LacertaLogger logger;
+
+    @Inject
+    LacertaVcsFactory lacertaVcsFactory;
+
+    private static final String TAG = "ComponentViewerTopFragment";
+
+    private String documentId;
+    private String documentName;
+    private String revisionId;
+
+    public ViewerListFragment() {
+        // Required empty public constructor
+    }
+
+    public static ViewerListFragment newInstance(String documentId, String documentName) {
+        ViewerListFragment fragment = new ViewerListFragment();
+        Bundle args = new Bundle();
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public static ViewerListFragment newInstance(String documentId, String documentName, String revisionId) {
+        ViewerListFragment fragment = new ViewerListFragment();
+        Bundle args = new Bundle();
+        args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
+        args.putString("revisionId", revisionId);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            documentId = getArguments().getString("documentId");
+            documentName = getArguments().getString("documentName");
+            revisionId = getArguments().getString("revisionId");
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
+
+        // Toolbar
+        Toolbar toolbar = view.findViewById(R.id.toolbar);
+        toolbarSetup(toolbar, true, this.documentName == null ? "Document" : this.documentName);
+
+        RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
+            Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
+        });
+        recyclerView.setAdapter(viewerBodyAdapter);
+
+        if (revisionId == null) {
+            logger.debug(TAG, "revisionId is empty, loading latest revision");
+            if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
+            document.getDocument(documentId).thenAccept(documentDetail -> {
+                ArrayList<Page> pages = documentDetail.getPages();
+                logger.debug(TAG, "pages.size(): " + pages.size());
+                viewerBodyAdapter.setPages(pages);
+                getActivity().runOnUiThread(() -> {
+                    viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
+                    if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
+                });
+            });
+        } else {
+            logger.debug(TAG, "revisionId: " + revisionId);
+            if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
+            LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
+            lacertaVcs.getDocumentPagePathListRev(revisionId).thenAccept(documentPathList -> {
+                logger.debug(TAG, "documentPathList.size(): " + documentPathList.size());
+                document.getDocumentPageListByFileNameList(documentId, documentPathList).thenAccept(pages -> {
+                    logger.debug(TAG, "pages.size(): " + pages.size());
+                    viewerBodyAdapter.setPages(pages);
+                    getActivity().runOnUiThread(() -> {
+                        viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
+                        if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
+                    });
+                });
+            });
+        }
+
+        return view;
+    }
+
+    /**
+     * ToolbarをInitする
+     *
+     * @param toolbar Toolbar
+     * @param showBackButton 戻るボタンを表示するか
+     * @param title タイトル
+     */
+    private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
+        getActivity().runOnUiThread(() -> {
+            if (showBackButton) {
+                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
+                toolbar.setNavigationOnClickListener(v -> {
+                    // Stop Activity
+                    getActivity().finish();
+                });
+            } else {
+                toolbar.setNavigationIcon(null);
+            }
+            toolbar.setTitle(title);
+            toolbar.inflateMenu(R.menu.viewer_menu);
+            toolbar.setOnMenuItemClickListener(item -> {
+                if (item.getItemId() == R.id.action_open_vcs_rev_list) {
+                    // Open vcs rev list
+                    getParentFragmentManager().beginTransaction()
+                            .replace(R.id.nav_host_fragment, ViewerVcsRevListFragment.newInstance(documentId, documentName))
+                            .commit();
+                    return true;
+                } else if (item.getItemId() == R.id.action_rename) {
+
+                    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
+                    builder.setTitle("ファイル名の変更");
+
+                    View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
+                    final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
+                    final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
+                    inputLayout.setHint("ファイル名");
+
+                    builder.setView(view);
+
+                    builder.setPositiveButton("変更", (dialog, which) -> {
+                        document.renameDocument(documentId, input.getText().toString()).thenAccept(aVoid -> {
+                            getActivity().runOnUiThread(() -> {
+                                toolbar.setTitle(input.getText().toString());
+                                documentName = input.getText().toString();
+                            });
+                        });
+                    });
+                    builder.setNegativeButton("キャンセル", (dialog, which) -> {
+                        dialog.cancel();
+                    });
+
+                    builder.show();
+                    return true;
+                } else if (item.getItemId() == R.id.action_delete) {
+                    // TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
+                    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
+                    builder.setTitle("ファイルの削除");
+                    builder.setMessage("ファイルを削除しますか？");
+                    builder.setPositiveButton("削除", (dialog, which) -> {
+                        document.deleteDocument(documentId).thenAccept(aVoid -> {
+                            getActivity().runOnUiThread(() -> {
+                                // Stop Activity
+                                getActivity().finish();
+                            });
+                        });
+                    });
+                    builder.setNegativeButton("キャンセル", (dialog, which) -> {
+                        dialog.cancel();
+                    });
+                    builder.show();
+                    return true;
+                } else if (item.getItemId() == R.id.action_move) {
+//                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
+                    LacertaSelectDirDialog lacertaSelectDirDialog = new LacertaSelectDirDialog();
+                    lacertaSelectDirDialog.setListener(new LacertaSelectDirDialogListener() {
+                        @Override
+                        public void onDirSelected(String name, String itemId) {
+                            logger.debug(TAG, "Selected dir: " + name + ", " + itemId);
+                            document.moveDocument(documentId, itemId).thenAccept(aVoid -> {
+                                getActivity().runOnUiThread(() -> {
+                                    // Stop Activity
+                                    getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
+                                });
+                            });
+                        }
+
+                        @Override
+                        public void onCanceled() {
+                            logger.debug(TAG, "Canceled");
+                        }
+                    });
+                    lacertaSelectDirDialog.setTitle("ファイルの移動")
+                                    .setMessage("ファイルを移動するフォルダを選択してください。")
+                                    .setPositiveButtonText("移動")
+                                    .setNegativeButtonText("キャンセル");
+                    lacertaSelectDirDialog.show(getParentFragmentManager(), "select_dir_dialog");
+                    return true;
+                } else {
+                    return false;
+                }
+            });
+        });
+    }
+}

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

@@ -2,7 +2,6 @@ package one.nem.lacerta.component.viewer;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.Toast;
 
 import androidx.activity.EdgeToEdge;
@@ -10,12 +9,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
-import androidx.fragment.app.FragmentManager;
-import androidx.navigation.NavController;
-import androidx.navigation.fragment.NavHostFragment;
-import androidx.navigation.ui.NavigationUI;
-
-import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import javax.inject.Inject;
 
@@ -35,6 +28,7 @@ public class ViewerMainActivity extends AppCompatActivity {
     // Variables
     private static final String TAG = "ViewerMainActivity";
     String documentId;
+    String documentName;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -50,6 +44,7 @@ public class ViewerMainActivity extends AppCompatActivity {
         Intent intent = getIntent();
         try {
             documentId = intent.getStringExtra("documentId");
+            documentName = intent.getStringExtra("documentName");
         }
         catch (Exception e) {
             logger.error(TAG, "Failed to get documentId from intent");
@@ -60,7 +55,7 @@ public class ViewerMainActivity extends AppCompatActivity {
 
         // Navigation
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
+                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
                 .commit();
     }
 }

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

@@ -34,15 +34,17 @@ public class ViewerVcsRevListFragment extends Fragment {
     LacertaVcs lacertaVcs;
 
     private String documentId;
+    private String documentName;
 
     public ViewerVcsRevListFragment() {
         // Required empty public constructor
     }
 
-    public static ViewerVcsRevListFragment newInstance(String documentId) {
+    public static ViewerVcsRevListFragment newInstance(String documentId, String documentName) {
         ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
         Bundle args = new Bundle();
         args.putString("documentId", documentId);
+        args.putString("documentName", documentName);
         fragment.setArguments(args);
         return fragment;
     }
@@ -66,17 +68,22 @@ public class ViewerVcsRevListFragment extends Fragment {
         // Init arg
         if (getArguments() != null) {
             this.documentId = getArguments().getString("documentId");
-            logger.debug("ViewerVcsRevListFragment", "documentId: " + documentId);
+            logger.debug("ViewerVcsRevListFragment", "documentId: " + this.documentId);
         }
 
         // Init vcs
-        lacertaVcs = lacertaVcsFactory.create(documentId);
+        lacertaVcs = lacertaVcsFactory.create(this.documentId);
 
         // Init view
         RecyclerView recyclerView = view.findViewById(R.id.rev_list);
 
         // Init adapter
-        RevAdapter revAdapter = new RevAdapter();
+        RevAdapter revAdapter = new RevAdapter(revisionId -> {
+            logger.debug("ViewerVcsRevListFragment", "Selected revisionId: " + revisionId);
+            getParentFragmentManager().beginTransaction()
+                    .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(this.documentId, this.documentName, revisionId))
+                    .commit();
+        });
 
         // Set adapter
         recyclerView.setAdapter(revAdapter);

component/viewer/src/main/java/one/nem/lacerta/component/viewer/model/RevSelectListener.java

@@ -0,0 +1,5 @@
+package one.nem.lacerta.component.viewer.model;
+
+public interface RevSelectListener {
+    void onRevSelect(String revisionId);
+}

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

@@ -9,7 +9,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
-        android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
+        android:name="one.nem.lacerta.component.viewer.ViewerListFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:defaultNavHost="true"

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

@@ -37,6 +37,16 @@
 
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
+
+            <ProgressBar
+                android:id="@+id/loading_progress_bar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:indeterminate="true"
+                android:background="@color/colorSurface"
+                android:visibility="gone" />
+
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView

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

@@ -4,4 +4,16 @@
         android:id="@+id/action_open_vcs_rev_list"
         android:title="Open VCS Rev List" />
 
+    <item
+        android:id="@+id/action_rename"
+        android:title="リネーム" />
+
+    <item
+        android:id="@+id/action_delete"
+        android:title="削除" />
+
+    <item
+        android:id="@+id/action_move"
+        android:title="移動" />
+
 </menu>

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

@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/component_viewer_navigation"
-    app:startDestination="@id/componentViewerTopFragment">
+    app:startDestination="@id/viewerListFragment">
 
     <fragment
-        android:id="@+id/componentViewerTopFragment"
-        android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
+        android:id="@+id/viewerListFragment"
+        android:name="one.nem.lacerta.component.viewer.ViewerListFragment"
         android:label="ComponentViewerTopFragment" >
         <action
             android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"

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

@@ -6,6 +6,7 @@ import java.util.concurrent.CompletableFuture;
 
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.page.Page;
 import one.nem.lacerta.model.document.path.DocumentPath;
 import one.nem.lacerta.model.document.tag.DocumentTag;
 
@@ -18,9 +19,15 @@ public interface Document {
 
     CompletableFuture<DocumentDetail> createDocument();
 
+    CompletableFuture<Void> renameDocument(String documentId, String name);
+
     CompletableFuture<Void> deleteDocument(String documentId);
 
+    CompletableFuture<Void> moveDocument(String documentId, String parentId);
+
     CompletableFuture<Void> updateDocument(DocumentDetail detail);
 
     CompletableFuture<DocumentDetail> getDocument(String documentId);
+
+    CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList);
 }

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

@@ -20,6 +20,9 @@ public interface LacertaLibrary {
     CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
     CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
 
+    // Get Folder List
+    CompletableFuture<LibraryItemPage> getFolderList(String parentId);
+
     // Create Folder
     CompletableFuture<String> createFolder(String parentId, String name);
 

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

@@ -1,5 +1,7 @@
 package one.nem.lacerta.data.impl;
 
+import androidx.room.Update;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -112,6 +114,24 @@ public class DocumentImpl implements Document {
     @Override
     public CompletableFuture<Void> deleteDocument(String documentId) {
         return CompletableFuture.supplyAsync(() -> {
+            DocumentEntity documentEntity = database.documentDao().findById(documentId);
+            if (documentEntity == null) {
+                throw new IllegalArgumentException("documentId is not found");
+            }
+            database.documentDao().delete(documentEntity);
+            return null;
+        });
+    }
+
+    @Override
+    public CompletableFuture<Void> moveDocument(String documentId, String parentId) {
+        return CompletableFuture.supplyAsync(() -> {
+            DocumentEntity documentEntity = database.documentDao().findById(documentId);
+            if (documentEntity == null) {
+                throw new IllegalArgumentException("documentId is not found");
+            }
+            documentEntity.parentId = parentId;
+            database.documentDao().update(documentEntity);
             return null;
         });
     }
@@ -124,6 +144,19 @@ public class DocumentImpl implements Document {
         });
     }
 
+    @Override
+    public CompletableFuture<Void> renameDocument(String documentId, String name) {
+        return CompletableFuture.supplyAsync(() -> {
+            DocumentEntity documentEntity = database.documentDao().findById(documentId);
+            if (documentEntity == null) {
+                throw new IllegalArgumentException("documentId is not found");
+            }
+            documentEntity.title = name;
+            database.documentDao().update(documentEntity);
+            return null;
+        });
+    }
+
     @Override
     public CompletableFuture<DocumentDetail> getDocument(String documentId) {
         return CompletableFuture.supplyAsync(() -> {
@@ -153,6 +186,34 @@ public class DocumentImpl implements Document {
         });
     }
 
+    @Override
+    public CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList) {
+        return CompletableFuture.supplyAsync(() -> {
+            ArrayList<Page> pages = new ArrayList<>();
+            FileManager fileManager;
+            try {
+                fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId).resolve("raw");
+            } catch (IOException e) {
+                logger.error(TAG, "FileManager resolve error");
+                logger.trace(TAG, e.getMessage());
+                logger.e_code("1210ae5b-dd2f-42ef-bc15-40b9a9bbdb16");
+                return null;
+            }
+
+            fileNameList.forEach(fileName -> {
+                try {
+                    pages.add(new Page(fileName, fileManager.loadBitmap(fileName)));
+                } catch (IOException e) {
+                    logger.error(TAG, "Bitmap decode error");
+                    logger.trace(TAG, e.getMessage());
+                    logger.e_code("6f9ba0dc-ac63-401c-8f50-a2bd9ff5cb91");
+                }
+            });
+
+            return pages;
+        });
+    }
+
     private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) {
         return CompletableFuture.supplyAsync(() -> {
             FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());

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

@@ -1,6 +1,7 @@
 package one.nem.lacerta.data.impl;
 
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38,13 +39,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
     @Override
     public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit) {
         return CompletableFuture.supplyAsync(() -> {
-            // 5秒フリーズさせる
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
             List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
 
             ArrayList<ListItem> listItems = new ArrayList<>();
@@ -106,12 +100,14 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                 listItems.add(listItem);
             }
 
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:");
+
             for (DocumentEntity documentEntity : documentEntities) {
                 logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
                 ListItem listItem = new ListItem();
                 listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
                 listItem.setTitle(documentEntity.title);
-//                listItem.setDescription(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").format(documentEntity.updatedAt.toInstant()));
+                listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
                 listItem.setItemId(documentEntity.id);
                 listItems.add(listItem);
             }
@@ -131,6 +127,47 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         });
     }
 
+    @Override
+    public CompletableFuture<LibraryItemPage> getFolderList(String targetDirId) {
+        return CompletableFuture.supplyAsync(() -> {
+            LibraryItemPage libraryItemPage = new LibraryItemPage();
+
+            List<FolderEntity> folderEntities;
+            if (targetDirId == null) { // When root folder
+                folderEntities = database.folderDao().findRootFolders();
+                libraryItemPage.setParentId(null);
+                libraryItemPage.setPageId(null);
+                libraryItemPage.setPageTitle("ライブラリ");
+            } else {
+                folderEntities = database.folderDao().findByParentId(targetDirId);
+                FolderEntity folderEntity = database.folderDao().findById(targetDirId);
+                if (folderEntity == null) {
+                    logger.warn("LacertaLibraryImpl", targetDirId + " is not found.");
+                    return null;
+                }
+                libraryItemPage.setParentId(folderEntity.parentId);
+                libraryItemPage.setPageId(folderEntity.id);
+                libraryItemPage.setPageTitle(folderEntity.name);
+            }
+
+            ArrayList<ListItem> listItems = new ArrayList<>();
+            for (FolderEntity childFolderEntity : folderEntities) {
+                logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
+                ListItem listItem = new ListItem();
+                listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
+                listItem.setTitle(childFolderEntity.name);
+                listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
+                listItem.setItemId(childFolderEntity.id);
+                listItems.add(listItem);
+            }
+
+
+            libraryItemPage.setListItems(listItems);
+
+            return libraryItemPage;
+        });
+    }
+
     @Override
     public CompletableFuture<String> createFolder(String parentId, String name) {
         return CompletableFuture.supplyAsync(() -> {

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

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

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

@@ -4,38 +4,24 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.lacerta.component.viewer.ViewerMainActivity;
-import one.nem.lacerta.data.Document;
 import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.ListItem;
-import one.nem.lacerta.model.document.DocumentMeta;
-
+import one.nem.lacerta.utils.FeatureSwitch;
 
 
 /**
@@ -49,6 +35,8 @@ public class HomeTopFragment extends Fragment {
     @Inject
     LacertaLibrary lacertaLibrary;
 
+    private ListItemAdapter listItemAdapter;
+
     public HomeTopFragment() {
         // Required empty public constructor
     }
@@ -71,7 +59,17 @@ public class HomeTopFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_home_top, container, false);
 
-        setHasOptionsMenu(true);
+        // Set status bar color
+        AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
+        appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
+            if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
+                // Collapsed
+                getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
+            } else if (verticalOffset == 0) {
+                // Expanded
+                getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
+            }
+        });
         return view;
     }
 
@@ -81,28 +79,71 @@ public class HomeTopFragment extends Fragment {
 
         RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
 
+        Toolbar toolbar = view.findViewById(R.id.home_toolbar);
+        toolbarSetup(toolbar, false, "ホーム");
 
-        ListItemAdapter listItemAdapter = new ListItemAdapter(documentId -> {
-            Log.d("HomeTopFragment", "onViewCreated: " + documentId);
-            Intent intent = new Intent(getContext(), ViewerMainActivity.class);
-            intent.putExtra("documentId", documentId);
-            startActivity(intent);
+        this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
+            @Override
+            public void onDocumentSelect(String documentId, String documentName) {
+                Intent intent = new Intent(getContext(), ViewerMainActivity.class);
+                Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
+                intent.putExtra("documentId", documentId);
+                intent.putExtra("documentName", documentName);
+                startActivity(intent);
+            }
         });
         recyclerView.setAdapter(listItemAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
+        updateList();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        updateList();
+    }
+
+    private void updateList() {
         lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
-            listItemAdapter.setListItems(listItems);
+            if (listItems == null) {
+                return;
+            }
+            this.listItemAdapter.setListItems(listItems);
             getActivity().runOnUiThread(() -> {
-                listItemAdapter.notifyItemRangeInserted(0, listItems.size());
+                Log.d("HomeTopFragment", "onViewCreated: " + listItems.size());
+                if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
+                    this.listItemAdapter.notifyDataSetChanged();
+                } else {
+                    // IndexOutOfBoundsExceptionを吐くことがあったので いったん
+                    this.listItemAdapter.notifyItemRangeInserted(0, listItems.size() - 1);
+                }
             });
         });
     }
 
-    @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.drawer_menu, menu);
-        super.onCreateOptionsMenu(menu, inflater);
+    /**
+     * ToolbarをInitする
+     *
+     * @param toolbar Toolbar
+     * @param showBackButton 戻るボタンを表示するか
+     * @param title タイトル
+     */
+    private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
+        getActivity().runOnUiThread(() -> {
+            if (showBackButton) {
+                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
+                toolbar.setNavigationOnClickListener(v -> {
+                    //this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
+                    // Back
+                    Navigation.findNavController(requireView()).popBackStack();
+                });
+            } else {
+                toolbar.setNavigationIcon(null);
+            }
+            toolbar.setTitle(title);
+        });
     }
 }
 

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

@@ -46,15 +46,17 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
         holder.description.setText(listItem.getDescription());
 
         holder.itemView.setOnClickListener( v -> {
-            Intent intent = new Intent(v.getContext(), ViewerMainActivity.class);
-            intent.putExtra("documentId", listItem.getItemId());
-            v.getContext().startActivity(intent);
+            listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle());
         });
     }
 
     @Override
     public int getItemCount() {
-        return listItems.size();
+        if (listItems == null) {
+            return 0;
+        } else {
+            return listItems.size();
+        }
     }
 
     public static class ListItemViewHolder extends RecyclerView.ViewHolder{

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

@@ -29,7 +29,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
+                    android:id="@+id/home_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
                     app:layout_collapseMode="pin"

feature/library/build.gradle

@@ -53,5 +53,7 @@ dependencies {
 
     implementation project(':utils')
 
+    implementation project(':component:viewer')
+
 
 }

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

@@ -1,5 +1,9 @@
 package one.nem.lacerta.feature.library;
 
+/*
+Currently, this file is not used in the app.
+ */
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;

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

@@ -1,10 +1,8 @@
 package one.nem.lacerta.feature.library;
 
-import android.app.AlertDialog;
+import android.content.Intent;
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -13,33 +11,19 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
-
-import org.w3c.dom.Text;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
+import one.nem.lacerta.component.viewer.ViewerMainActivity;
 import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.FragmentNavigation;
 import one.nem.lacerta.model.LibraryItemPage;
-import one.nem.lacerta.model.PublicPath;
+import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
 
 
@@ -116,19 +100,13 @@ public class LibraryPageFragment extends Fragment {
 
         // Set status bar color
         AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
-        appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
-                    // Collapsed
-                    getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
-                } else if (verticalOffset == 0) {
-                    // Expanded
-                    getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
-                } else {
-                    // Somewhere in between
-                    // Here you can add a color transition if you want
-                }
+        appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
+            if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
+                // Collapsed
+                getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
+            } else if (verticalOffset == 0) {
+                // Expanded
+                getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
             }
         });
         return view;
@@ -178,7 +156,11 @@ public class LibraryPageFragment extends Fragment {
 
             @Override
             public void onDocumentSelected(String documentId, String documentName) {
-                Toast.makeText(getContext(), "Document selected! documentId: " + documentId + ", documentName: " + documentName, Toast.LENGTH_SHORT).show();
+                Intent intent = new Intent(getContext(), ViewerMainActivity.class);
+                logger.debug("LibraryTopFragment", "Document selected! documentId: " + documentId + ", documentName: " + documentName);
+                intent.putExtra("documentId", documentId);
+                intent.putExtra("documentName", documentName);
+                startActivity(intent);
             }
         });
 
@@ -199,12 +181,18 @@ public class LibraryPageFragment extends Fragment {
             }
 
             logger.debug("LibraryTopFragment", "Item selected! Total item page: " + this.libraryItemPage.getListItems().size());
-            getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える？
-                listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
-            });
+            if (!FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
+                getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える？
+                    listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
+                });
+            }
             listItemAdapter.setLibraryItemPage(this.libraryItemPage);
             getActivity().runOnUiThread(() -> {
-                listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
+                if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
+                    listItemAdapter.notifyDataSetChanged();
+                } else {
+                    listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
+                }
             });
         });
     }
@@ -213,13 +201,17 @@ public class LibraryPageFragment extends Fragment {
      * Currentにフォルダを作成する
      */
     private void createFolder(String pageId) {
-        // TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
-        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
         builder.setTitle("フォルダの作成");
         builder.setMessage("フォルダ名を入力してください");
-        final android.widget.EditText input = new android.widget.EditText(getContext());
-        input.setText("フォルダ名");
-        builder.setView(input);
+
+        View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
+        final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
+        final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
+        inputLayout.setHint("フォルダ名");
+
+        builder.setView(view);
+
         builder.setPositiveButton("作成", (dialog, which) -> {
             lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
                 // Refresh
@@ -229,6 +221,7 @@ public class LibraryPageFragment extends Fragment {
         builder.setNegativeButton("キャンセル", (dialog, which) -> {
             dialog.cancel();
         });
+
         builder.show();
     }
 
@@ -269,6 +262,7 @@ public class LibraryPageFragment extends Fragment {
                 toolbar.setNavigationIcon(null);
             }
             toolbar.setTitle(title);
+            toolbar.getMenu().clear();
             toolbar.inflateMenu(R.menu.dir_menu);
             toolbar.setOnMenuItemClickListener(item -> {
                 if (item.getItemId() == R.id.menu_item_create_new_folder) {

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

@@ -1,6 +1,5 @@
 package one.nem.lacerta.feature.library;
 
-import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,8 +9,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.ArrayList;
-
 import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;

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

@@ -4,8 +4,8 @@
 
     <item
         android:id="@+id/menu_item_create_new_folder"
-        android:icon="@drawable/developer_mode_24px"
-        android:title="@string/app_name"
-        app:showAsAction="ifRoom"/> <!-- TODO-rca: change this -->
+        android:icon="@drawable/create_new_folder_24px"
+        android:title="@string/create_new_folder"
+        app:showAsAction="never"/>
 
 </menu>

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

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Library</string>
+    <string name="create_new_folder">新しいフォルダを作成</string>
 </resources>

feature/setting/build.gradle

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

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

@@ -2,8 +2,12 @@ package one.nem.lacerta.setting;
 
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceFragmentCompat;
 
+import android.preference.PreferenceFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +22,11 @@ public class SettingScanPageFragment extends Fragment {
     public SettingScanPageFragment() {
         // Required empty public constructor
     }
+//
+//    @Override
+//    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+////        addPreferencesFromResource(R.xml.scan_preferences);
+//    }
 
     public static SettingScanPageFragment newInstance() {
         SettingScanPageFragment fragment = new SettingScanPageFragment();
@@ -27,15 +36,14 @@ public class SettingScanPageFragment extends Fragment {
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
     }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
 }

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

@@ -1,15 +1,16 @@
 package one.nem.lacerta.setting;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import com.google.android.material.appbar.AppBarLayout;
 
 import java.util.ArrayList;
 
@@ -87,6 +88,17 @@ public class SettingTopFragment extends Fragment {
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setAdapter(new ListItemAdapter(settingListItems));
 
+        // Set status bar color
+        AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
+        appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
+            if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
+                // Collapsed
+                getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
+            } else if (verticalOffset == 0) {
+                // Expanded
+                getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
+            }
+        });
         return view;
     }
 }

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

@@ -1,14 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingAboutPageFragment">
+    android:background="@color/colorSurface">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                app:contentScrim="@color/colorSecondaryContainer"
+                android:background="@color/colorSurface"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:expandedTitleGravity="start|bottom"
+                app:expandedTitleMarginBottom="16dp"
+                app:expandedTitleMarginStart="16dp"
+                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/setting_top_about_title" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:padding="32dp"
+                android:background="@drawable/rounded_secondary_container" >
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Work in Progress..."
+                    android:textSize="24sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="実装中..."
+                    android:textSize="16sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+            </LinearLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>

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

@@ -1,14 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingDataPageFragment">
+    android:background="@color/colorSurface">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                app:contentScrim="@color/colorSecondaryContainer"
+                android:background="@color/colorSurface"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:expandedTitleGravity="start|bottom"
+                app:expandedTitleMarginBottom="16dp"
+                app:expandedTitleMarginStart="16dp"
+                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/setting_top_data_title" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:padding="32dp"
+                android:background="@drawable/rounded_secondary_container" >
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Work in Progress..."
+                    android:textSize="24sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="実装中..."
+                    android:textSize="16sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+            </LinearLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>

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

@@ -1,14 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingDisplayPageFragment">
+    android:background="@color/colorSurface">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                app:contentScrim="@color/colorSecondaryContainer"
+                android:background="@color/colorSurface"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:expandedTitleGravity="start|bottom"
+                app:expandedTitleMarginBottom="16dp"
+                app:expandedTitleMarginStart="16dp"
+                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/setting_top_display_title" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:padding="32dp"
+                android:background="@drawable/rounded_secondary_container" >
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Work in Progress..."
+                    android:textSize="24sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="実装中..."
+                    android:textSize="16sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+            </LinearLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>

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

@@ -1,14 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SettingScanPageFragment">
+    android:background="@color/colorSurface">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                app:contentScrim="@color/colorSecondaryContainer"
+                android:background="@color/colorSurface"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:expandedTitleGravity="start|bottom"
+                app:expandedTitleMarginBottom="16dp"
+                app:expandedTitleMarginStart="16dp"
+                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/setting_top_scan_title" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:padding="32dp"
+                android:background="@drawable/rounded_secondary_container" >
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Work in Progress..."
+                    android:textSize="24sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="実装中..."
+                    android:textSize="16sp"
+                    android:textColor="@color/colorOnSurfaceSecondary"/>
+
+            </LinearLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </FrameLayout>

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

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

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

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

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

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

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

@@ -3,7 +3,8 @@ package one.nem.lacerta.model;
 public enum ListItemType {
 
     ITEM_TYPE_FOLDER(one.nem.lacerta.shared.ui.R.drawable.folder_24px),
-    ITEM_TYPE_DOCUMENT(one.nem.lacerta.shared.ui.R.drawable.description_24px);
+    ITEM_TYPE_DOCUMENT(one.nem.lacerta.shared.ui.R.drawable.description_24px),
+    ITEM_TYPE_ACTION_BACK(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
 
     private int iconId;
 

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

@@ -0,0 +1,64 @@
+package one.nem.lacerta.model;
+
+import java.util.Date;
+
+public class VcsLogModel {
+
+    String id;
+    String documentId;
+    String branchName;
+    String action;
+    Date createdAt;
+
+    public VcsLogModel(String id, String documentId, String branchName, String action, Date createdAt) {
+        this.id = id;
+        this.documentId = documentId;
+        this.branchName = branchName;
+        this.action = action;
+        this.createdAt = createdAt;
+    }
+
+    // Empty constructor
+    public VcsLogModel() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getDocumentId() {
+        return documentId;
+    }
+
+    public String getBranchName() {
+        return branchName;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setDocumentId(String documentId) {
+        this.documentId = documentId;
+    }
+
+    public void setBranchName(String branchName) {
+        this.branchName = branchName;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+}

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

@@ -74,18 +74,24 @@ public class DocumentProcessorImpl implements DocumentProcessor{
         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(this.documentDetail.getPages().size(), filename);
 
-        lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
+        try {
+            Page page = new Page();
+            page.setFileName(filename);
+            page.setBitmap(bitmap);
+            this.documentDetail.getPages().add(page);
 
-        this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
-
-        logger.info("addNewPageToLast", "finished");
-        logger.info("addNewPageToLast", "filename: " + filename);
+            this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
 
+            logger.info("addNewPageToLast", "finished");
+            logger.info("addNewPageToLast", "filename: " + filename);
+        } catch (Exception e) {
+            logger.error("addNewPageToLast", "failed: Unknown error");
+            logger.e_code("d9191286-6092-40b3-80ed-9239106a8c65");
+            // Recover (Undo latest action)
+            lacertaVcs.undo();
+        }
         return this;
     }
 

shared/ui/build.gradle

@@ -32,4 +32,5 @@ dependencies {
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
+
 }

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/colorOnSurface"
+      android:pathData="M570,630L630,630L630,550L710,550L710,490L630,490L630,410L570,410L570,490L490,490L490,550L570,550L570,630ZM172.31,780Q142,780 121,759Q100,738 100,707.69L100,252.31Q100,222 121,201Q142,180 172.31,180L391.92,180L471.92,260L787.69,260Q818,260 839,281Q860,302 860,332.31L860,707.69Q860,738 839,759Q818,780 787.69,780L172.31,780ZM172.31,720L787.69,720Q793.08,720 796.54,716.54Q800,713.08 800,707.69L800,332.31Q800,326.92 796.54,323.46Q793.08,320 787.69,320L447.39,320L367.39,240L172.31,240Q166.92,240 163.46,243.46Q160,246.92 160,252.31L160,707.69Q160,713.08 163.46,716.54Q166.92,720 172.31,720ZM160,720Q160,720 160,716.54Q160,713.08 160,707.69L160,252.31Q160,246.92 160,243.46Q160,240 160,240L160,240L160,320L160,320Q160,320 160,323.46Q160,326.92 160,332.31L160,707.69Q160,713.08 160,716.54Q160,720 160,720L160,720Z"/>
+</vector>

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

@@ -28,7 +28,7 @@
 
         <TextView
             android:id="@+id/item_title"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="16sp"
             android:layout_marginEnd="8dp"
@@ -39,7 +39,7 @@
 
         <TextView
             android:id="@+id/item_description"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="14sp"
             android:text="Placeholder Description"

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

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

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

@@ -19,6 +19,14 @@
     <string name="setting_top_scan_title">スキャン</string>
     <string name="setting_top_scan_description">画質, 保存先</string>
 
+    <string name="setting_scan_quality_title">画質</string>
+    <string name="setting_scan_quality_png_quality_title">PNG画質</string>
+    <string name="setting_scan_quality_png_quality_description">PNG画質を設定します. 画質が高いほどファイルサイズが大きくなります.</string>
+
+    <string name="setting_scan_default_title">保存先</string>
+    <string name="setting_scan_default_document_name">新規ドキュメントのデフォルトタイトル</string>
+    <string name="setting_scan_default_folder_name">新規フォルダのデフォルト名</string>
+
     <string name="setting_top_display_title">表示</string>
     <string name="setting_top_display_description">テーマ, フォントサイズ</string>
 
@@ -31,4 +39,6 @@
     <!-- common -->
 
     <string name="placeholder">Placeholder(TODO: Replace)</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

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

@@ -19,7 +19,7 @@ import one.nem.lacerta.source.database.dao.LibraryDao;
 import one.nem.lacerta.source.database.dao.VcsRevDao;
 import one.nem.lacerta.source.database.dao.VcsLogDao;
 
-@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 5)
+@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();

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

@@ -52,4 +52,11 @@ public interface VcsLogDao {
 
     @Update
     void updateAll(List<VcsLogEntity> vcsLogs);
+
+    // Delete
+    @Query("DELETE FROM vcs_log WHERE id = :id")
+    void deleteById(String id);
+
+    @Query("DELETE FROM vcs_log WHERE id = (SELECT id FROM vcs_log WHERE document_id = :documentId ORDER BY created_at DESC LIMIT 1)")
+    void deleteLatestByDocumentId(String documentId);
 }

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

@@ -21,7 +21,7 @@ public interface VcsRevDao {
     @Query("SELECT * FROM vcs_rev WHERE id IN (:ids)")
     List<VcsRevEntity> findByIds(List<String> ids);
 
-    @Query("SELECT * FROM vcs_rev WHERE document_id = :documentId")
+    @Query("SELECT * FROM vcs_rev WHERE document_id = :documentId ORDER BY created_at ASC")
     List<VcsRevEntity> findByDocumentId(String documentId);
 
     @Query("SELECT * FROM vcs_rev WHERE document_id = :documentId ORDER BY created_at DESC LIMIT 1")

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

@@ -40,6 +40,12 @@ public class VcsLogEntity {
     @ColumnInfo(name = "created_at")
     public Date createdAt;
 
+    /**
+     * アクションタイプ
+     */
+    @ColumnInfo(name = "action_type")
+    public String actionType;
+
     /**
      * 発生アクション
      */

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

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

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

@@ -4,6 +4,19 @@ public class FeatureSwitch {
 
     public static class Meta {
         public static boolean canOverrideSwitch = false;
+
+        public static boolean disableDynamicColor = false;
+    }
+
+    public static class RecyclerView {
+        public static boolean useSimpleNotifyMethod = true;
+    }
+
+    public static class Viewer {
+        // TODO-rca: 実装
+        public static boolean showOriginalImage = false;
+        public static int maxImageSize = 1024;
+        public static boolean showProgressBarWhenLoading = true;
     }
 
     public static class FeatureMaster {
@@ -16,6 +29,7 @@ public class FeatureSwitch {
     }
 
     public static class Setting {
+        // TODO-rca: 実装
         public static boolean showDisplayMenu = false;
         public static boolean showDataMenu = false;
         public static boolean showScanMenu = false;

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

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

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

@@ -3,7 +3,9 @@ package one.nem.lacerta.vcs;
 import java.util.ArrayList;
 import java.util.concurrent.CompletableFuture;
 
+import one.nem.lacerta.model.VcsLogModel;
 import one.nem.lacerta.model.VcsRevModel;
+import one.nem.lacerta.model.document.DocumentDetail;
 
 public interface LacertaVcs {
 
@@ -14,12 +16,20 @@ public interface LacertaVcs {
 
     public void deletePage(int index);
 
+    public void undo();
+
     public void createDocument(String documentId);
 
     public void generateRevisionAtCurrent(String message);
 
     public CompletableFuture<ArrayList<VcsRevModel>> getRevisionHistory();
 
+    public CompletableFuture<ArrayList<VcsLogModel>> getLogHistory();
+
+    public CompletableFuture<ArrayList<VcsLogModel>> getLogHistoryInRev(String revId);
+
+    public CompletableFuture<ArrayList<String>> getDocumentPagePathListRev(String revId);
+
 
     // debug
     public void printLog();

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

@@ -5,10 +5,9 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
-import javax.inject.Inject;
-
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
+import one.nem.lacerta.model.VcsLogModel;
 import one.nem.lacerta.model.VcsRevModel;
 import one.nem.lacerta.source.database.LacertaDatabase;
 import one.nem.lacerta.source.database.entity.VcsLogEntity;
@@ -17,7 +16,9 @@ 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.DeletePage;
 import one.nem.lacerta.vcs.model.action.InsertPage;
+import one.nem.lacerta.vcs.model.action.UpdatePage;
 
 public class LacertaVcsImpl implements LacertaVcs {
 
@@ -56,6 +57,7 @@ public class LacertaVcsImpl implements LacertaVcs {
         vcsLogEntity.documentId = documentId;
         vcsLogEntity.branchName = "master";
         vcsLogEntity.createdAt = new java.util.Date();
+        vcsLogEntity.actionType = ActionType.INSERT_PAGE.getValue();
         vcsLogEntity.action = JsonUtils.toJson(insertPage);
         database.vcsLogDao().insert(vcsLogEntity);
     }
@@ -65,6 +67,11 @@ public class LacertaVcsImpl implements LacertaVcs {
 
     }
 
+    @Override
+    public void undo() {
+        database.vcsLogDao().deleteLatestByDocumentId(documentId);
+    }
+
     @Override
     public void createDocument(String documentId) {
         logger.debug(TAG, "createDocument");
@@ -74,7 +81,8 @@ public class LacertaVcsImpl implements LacertaVcs {
         vcsLogEntity.documentId = documentId;
         vcsLogEntity.branchName = "master";
         vcsLogEntity.createdAt = new java.util.Date();
-        vcsLogEntity.action = "ph-createDocument";
+        vcsLogEntity.actionType = ActionType.CREATE_DOCUMENT.getValue();
+        vcsLogEntity.action = "";
         database.vcsLogDao().insert(vcsLogEntity);
     }
 
@@ -136,6 +144,7 @@ public class LacertaVcsImpl implements LacertaVcs {
                 vcsRevModel.setId(vcsRevEntity.id);
                 vcsRevModel.setDocumentId(vcsRevEntity.documentId);
                 vcsRevModel.setBranchName(vcsRevEntity.branchName);
+                vcsRevModel.setCreatedAt(vcsRevEntity.createdAt);
                 vcsRevModel.setCommitMessage(vcsRevEntity.commitMessage);
                 vcsRevModel.setLogIds(vcsRevEntity.logIds);
                 vcsRevModels.add(vcsRevModel);
@@ -145,6 +154,108 @@ public class LacertaVcsImpl implements LacertaVcs {
         });
     }
 
+    @Override
+    public CompletableFuture<ArrayList<VcsLogModel>> getLogHistory() {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<ArrayList<VcsLogModel>> getLogHistoryInRev(String revId) {
+        return CompletableFuture.supplyAsync(() -> {
+            logger.debug(TAG, "getLogHistoryInRev");
+            ArrayList<VcsLogModel> vcsLogModels = new ArrayList<>();
+
+            VcsRevEntity vcsRevEntity = database.vcsRevDao().findById(revId);
+            ArrayList<VcsLogEntity> vcsLogEntities = getLogInRevAsync(vcsRevEntity).join(); // TODO-rca: リファクタリング
+            vcsLogEntities.forEach(vcsLogEntity -> {
+                VcsLogModel vcsLogModel = new VcsLogModel();
+                vcsLogModel.setId(vcsLogEntity.id);
+                vcsLogModel.setDocumentId(vcsLogEntity.documentId);
+                vcsLogModel.setBranchName(vcsLogEntity.branchName);
+                vcsLogModel.setCreatedAt(vcsLogEntity.createdAt);
+                vcsLogModel.setAction(vcsLogEntity.action);
+                vcsLogModels.add(vcsLogModel);
+            });
+
+            return vcsLogModels;
+        });
+    }
+
+    private CompletableFuture<ArrayList<VcsRevEntity>> getRevBeforeTargetIdAsync(String revId){
+        return CompletableFuture.supplyAsync(() -> {
+            ArrayList<VcsRevEntity> vcsRevEntities = new ArrayList<>(database.vcsRevDao().findByDocumentId(this.documentId));
+            ArrayList<VcsRevEntity> vcsRevEntitiesBeforeTarget = new ArrayList<>();
+            vcsRevEntities.forEach(vcsRevEntity -> {
+                if(vcsRevEntity.id.equals(revId)){
+                    vcsRevEntitiesBeforeTarget.add(vcsRevEntity);
+                    return;
+                }
+                vcsRevEntitiesBeforeTarget.add(vcsRevEntity);
+            });
+            logger.debug(TAG, "getRevBeforeTargetIdAsync finished\nResult size: " + vcsRevEntitiesBeforeTarget.size());
+            return vcsRevEntitiesBeforeTarget;
+        });
+    }
+
+    private CompletableFuture<ArrayList<VcsLogEntity>> getLogInRevsAsync(ArrayList<VcsRevEntity> vcsRevEntities){
+        return CompletableFuture.supplyAsync(() -> {
+            List<String> logIds = new ArrayList<>();
+            vcsRevEntities.forEach(vcsRevEntity -> {
+                logIds.addAll(vcsRevEntity.logIds);
+            });
+            // TODO-rca: ソートしないといけないかも（順番が保証されているわけではない + 順番が変わるとほぼ確実に壊れる）
+            ArrayList<VcsLogEntity> vcsLogEntities = new ArrayList<>(database.vcsLogDao().findByIds(logIds));
+            logger.debug(TAG, "getLogInRevsAsync finished\nResult size: " + vcsLogEntities.size());
+            return vcsLogEntities;
+        });
+    }
+
+    private CompletableFuture<ArrayList<VcsLogEntity>> getLogInRevAsync(VcsRevEntity revEntity) {
+        return CompletableFuture.supplyAsync(() -> {
+            ArrayList<VcsLogEntity> vcsLogEntities = new ArrayList<>(database.vcsLogDao().findByIds(revEntity.logIds));
+            logger.debug(TAG, "getLogInRevAsync finished\nResult size: " + vcsLogEntities.size());
+            return vcsLogEntities;
+        });
+    }
+
+    @Override
+    public CompletableFuture<ArrayList<String>> getDocumentPagePathListRev(String revId) {
+        return CompletableFuture.supplyAsync(() -> {
+            logger.debug(TAG, "getDocumentPagePathListRev");
+            ArrayList<VcsLogEntity> vcsLogEntities = getRevBeforeTargetIdAsync(revId).thenCompose(this::getLogInRevsAsync).join();
+
+            ArrayList<String> fileNameList = new ArrayList<>();
+            for(VcsLogEntity vcsLogEntity : vcsLogEntities){
+                logger.debug(TAG, "getDocumentPagePathListRev: processing " + vcsLogEntity.id + "(Type: " + vcsLogEntity.actionType + ")");
+                if (vcsLogEntity.actionType.equals(ActionType.INSERT_PAGE.getValue())){
+                    InsertPage insertPage = (InsertPage) JsonUtils.fromJson(vcsLogEntity.action, ActionType.INSERT_PAGE);
+                    logger.debug(TAG, "getDocumentPagePathListRev: Inserting " + insertPage.getFileName() + " at " + insertPage.getIndex());
+                    if (fileNameList.size() <= insertPage.getIndex()) {
+                        logger.debug(TAG, "Index out of range, appending");
+                        fileNameList.add(insertPage.getFileName());
+                    } else {
+                        fileNameList.add(insertPage.getIndex(), insertPage.getFileName());
+                    }
+                } else if (vcsLogEntity.actionType.equals(ActionType.UPDATE_PAGE.getValue())){
+                    UpdatePage updatePage = (UpdatePage) JsonUtils.fromJson(vcsLogEntity.action, ActionType.UPDATE_PAGE);
+                    logger.debug(TAG, "getDocumentPagePathListRev: Updating " + updatePage.getFileName() + " at " + updatePage.getIndex());
+                    fileNameList.set(updatePage.getIndex(), updatePage.getFileName());
+                } else if (vcsLogEntity.actionType.equals(ActionType.DELETE_PAGE.getValue())){
+                    DeletePage deletePage = (DeletePage) JsonUtils.fromJson(vcsLogEntity.action, ActionType.DELETE_PAGE);
+                    logger.debug(TAG, "getDocumentPagePathListRev: Deleting " + deletePage.getIndex());
+                    fileNameList.remove(deletePage.getIndex());
+                } else if (vcsLogEntity.actionType.equals(ActionType.CREATE_DOCUMENT.getValue())) {
+                    // Ignore
+                    logger.debug(TAG, "getDocumentPagePathListRev: Ignored action type: " + vcsLogEntity.actionType);
+                } else {
+                    logger.error(TAG, "getDocumentPagePathListRev: Unknown action type");
+                }
+            }
+
+            return fileNameList;
+        });
+    }
+
     @Override
     public void printLog() {
         logger.debug(TAG, "printLog");