Works

.idea/gradle.xml

@@ -4,7 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -31,7 +30,6 @@
             <option value="$PROJECT_DIR$/source" />
             <option value="$PROJECT_DIR$/utils" />
             <option value="$PROJECT_DIR$/vcs" />
-            <option value="$PROJECT_DIR$/viewer2" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />

.idea/misc.xml

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

README.md

@@ -1,10 +1,8 @@
 # Lacerta
-学習に便利な機能とGit-like VCSを持ったドキュメントスキャナ (Work In Progress)
-(グループワーク)
-
+WIP
 ## モジュール設計
-![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)
@@ -13,28 +11,45 @@
 ### モジュール一覧
 - `component` : コンポーネント
   - `common` : 共通コンポーネント
-  - `scanner` : スキャナー 
+    - UIの中で共通で使う要素(メニューアイテムとか)
+  - `scanner` : スキャナー
+    - スキャナーの実装
   - `viewer` : ビューワー
-- `data` : UIからデータを取得/保存するためのラッパーモジュール
+    - ドキュメントビューワーの実装
+- `data` : データ
+  - UIからデータを取得/保存するためのラッパーモジュール
+  - `Document` : ドキュメント関係
+    - WIP(JavaDocを参照してください, 余裕があったら追記します)
 - `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
   - `common`: 共通機能
+    - 設定画面とか、どこからでも呼ばれうる画面
   - `debug`: デバッグメニュー
   - `home`: ホーム画面
   - `library`: ライブラリ画面
-  - `scan`: スキャン画面 (廃止予定)
+  - `scan`: スキャン画面
   - `search`: 検索画面
-- `model` : データモデルをまとめたモジュール
-- `processor` : プロセッサ（例: `DocumentProcessor` : ドキュメント処理（ドキュメントにページを追加したり更新したり）)
-- `shared`: 共有リソース
-  - `ui`: UI要素(Theme, Drawable, Colorなど)
-- `source` : ソース(DB/FileManagerなど)
-- `utils` : ユーティリティ(ちょっとしたユーティリティをまとめたモジュール)
+- `model` : モデル
+  - データモデルをまとめたモジュール (WIP)
+  - `document` : ドキュメント
+  - `meta` : メタデータ
+- `processor` : プロセッサ
+  - いくつかの処理をまとめたモジュール
+    - `DocumentProcessor` : ドキュメント処理（ドキュメントにページを追加したり更新したり） 
+- `shared` : 
+  - 共有リソース
+- `source` : ソース
+  - (バックエンドが使うのでとりあえず後回し、フロントから直接操作することは絶対にありません)
+- `utils` : ユーティリティ
+  - ちょっとしたユーティリティをまとめたモジュール
+  - `LacertaLogger` : ロガー
+  - `XmlMetaParser` : XMLメタデータパーサー(フロントから直接操作することは絶対にありません)
+
 
 ## コーディング規則/推奨(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,6 +82,4 @@ 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_temp_round"
+        android:icon="@mipmap/ic_launcher"
         android:name=".LacertaApplication"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"

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

@@ -6,7 +6,6 @@ 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 {
@@ -16,11 +15,7 @@ public class LacertaApplication extends Application {
 
         if (DynamicColors.isDynamicColorAvailable()) {
             Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
-            if (FeatureSwitch.Meta.disableDynamicColor) {
-                Log.d("DynamicColors", "DynamicColors is disabled by FeatureSwitch.");
-            } else {
-                DynamicColors.applyToActivitiesIfAvailable(this);
-            }
+            DynamicColors.applyToActivitiesIfAvailable(this);
         } else {
             Log.d("DynamicColors", "DynamicColors is not available.");
         }

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

@@ -1,37 +1,26 @@
 package one.nem.lacerta;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 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;
-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;
-
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.lacerta.utils.repository.SharedPrefUtils;
 
@@ -79,27 +68,35 @@ 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);
+        // Set app bar color
+        AppBarLayout appBarLayout = 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
+                    getWindow().setStatusBarColor(ContextCompat.getColor(getApplicationContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
+                } else if (verticalOffset == 0) {
+                    // Expanded
+                    getWindow().setStatusBarColor(ContextCompat.getColor(getApplicationContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
+                } else {
+                    // Somewhere in between
+                    // Here you can add a color transition if you want
+                }
+            }
         });
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
     }
 
-    @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
-            }
-        }
+    // Public
+    public void setActionBarTitle(String title) {
+        getSupportActionBar().setTitle(title);
+    }
+
+    public void setActionBarBackButton(boolean isEnabled) {
+        getSupportActionBar().setDisplayHomeAsUpEnabled(isEnabled);
     }
 
     private void initializeApp() {
@@ -124,61 +121,4 @@ public class MainActivity extends AppCompatActivity implements FragmentNavigatio
                 .addToBackStack(null)
                 .commit();
     }
-
-    @Override
-    public void navigateToFragment(Fragment fragment, boolean addToBackStack) {
-        if (addToBackStack) {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.nav_host_fragment, fragment)
-                    .addToBackStack(null)
-                    .commit();
-        } else {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.nav_host_fragment, fragment)
-                    .commit();
-        }
-    }
-
-    @Override
-    public void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack) {
-        if (clearBackStack) {
-            getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        }
-        if (addToBackStack) {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.nav_host_fragment, fragment)
-                    .addToBackStack(null)
-                    .commit();
-        } else {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.nav_host_fragment, fragment)
-                    .commit();
-        }
-    }
-
-    public void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack) {
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-
-        // get the current fragment
-        Fragment currentFragment = getSupportFragmentManager().getPrimaryNavigationFragment();
-
-        // hide the current fragment
-        if (currentFragment != null) {
-            transaction.hide(currentFragment);
-        }
-
-        // Add the new fragment
-        transaction.add(R.id.nav_host_fragment, fragment);
-
-        // Add the transaction to the back stack if needed
-        if (addToBackStack) {
-            transaction.addToBackStack(null);
-        }
-
-        // Commit the transaction
-        transaction.commit();
-
-        // Update the primary navigation fragment
-        getSupportFragmentManager().beginTransaction().setPrimaryNavigationFragment(fragment).commit();
-    }
 }

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

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

@@ -1,24 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/Theme.Lacerta"
-    tools:context=".MainActivity">
+    android:background="@color/colorSurface">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
+        app:layout_constraintBottom_toTopOf="@id/bottom_nav"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/main_nav"
-        tools:layout="@layout/fragment_home_top" />
+        app:layout_constraintTop_toTopOf="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"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:background="@color/colorSurface"
+                android:fitsSystemWindows="true"
+                android:minHeight="?attr/actionBarSize"
+                app:collapsedTitleGravity="start|center_vertical"
+                app:contentScrim="@color/colorSecondaryContainer"
+                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="HOGE" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.fragment.app.FragmentContainerView
+
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:defaultNavHost="true"
+            app:navGraph="@navigation/main_nav"
+            tools:layout="@layout/fragment_home_top"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_nav"
@@ -34,17 +71,4 @@
         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

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

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

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

component/common/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.com.android.library)
-    id 'com.google.dagger.hilt.android'
 }
 
 android {
@@ -34,12 +33,5 @@ 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/LacertaCreateTagDialog.java

@@ -1,87 +0,0 @@
-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.EditText;
-
-import androidx.fragment.app.DialogFragment;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-public class LacertaCreateTagDialog extends DialogFragment {
-
-    private String title;
-
-    private String message;
-
-    private String positiveButtonText;
-
-    private String negativeButtonText;
-
-    private LacertaCreateTagDialogListener listener;
-
-    // Setter
-
-    public LacertaCreateTagDialog setListener(LacertaCreateTagDialogListener listener) {
-        this.listener = listener;
-        return this;
-    }
-
-    public LacertaCreateTagDialog setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public LacertaCreateTagDialog setMessage(String message) {
-        this.message = message;
-        return this;
-    }
-
-    public LacertaCreateTagDialog setPositiveButtonText(String positiveButtonText) {
-        this.positiveButtonText = positiveButtonText;
-        return this;
-    }
-
-    public LacertaCreateTagDialog setNegativeButtonText(String negativeButtonText) {
-        this.negativeButtonText = negativeButtonText;
-        return this;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
-        LayoutInflater inflater = requireActivity().getLayoutInflater();
-        View view = inflater.inflate(R.layout.lacerta_dialog_create_tag, null);
-
-        // TextEdit
-        EditText tag_name_edit_text = view.findViewById(R.id.tag_name_edit_text);
-        com.google.android.material.textfield.TextInputLayout tag_name_text_input_layout = view.findViewById(R.id.tag_name_text_input_layout);
-        tag_name_text_input_layout.setHint("タグの名前");
-        EditText tag_color_edit_text = view.findViewById(R.id.tag_color_edit_text);
-        com.google.android.material.textfield.TextInputLayout tag_color_text_input_layout = view.findViewById(R.id.tag_color_text_input_layout);
-        tag_color_text_input_layout.setHint("タグの色(カラーコード)");
-
-        builder.setTitle(this.title == null ? "Create new tag" : this.title);
-
-        // Button
-        builder.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, which) -> {
-            String tag_name = tag_name_edit_text.getText().toString();
-            String tag_color = tag_color_edit_text.getText().toString();
-            if (listener != null) {
-                listener.onPositiveClick(tag_name, tag_color);
-            }
-        });
-        builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
-            if (listener != null) {
-                listener.onNegativeClick();
-            }
-        });
-
-        builder.setView(view);
-        return builder.create();
-    }
-
-
-}

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

@@ -1,8 +0,0 @@
-package one.nem.lacerta.component.common;
-
-public interface LacertaCreateTagDialogListener {
-
-    void onPositiveClick(String tag_name, String tag_color);
-
-    void onNegativeClick();
-}

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

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

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

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

@@ -1,100 +0,0 @@
-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_create_tag.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tag_name_text_input_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingHorizontal="16dp"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/tag_name_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tag_color_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">
-
-        <!-- todo: add color picker -->
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/tag_color_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-</LinearLayout>

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

@@ -1,20 +0,0 @@
-<?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,20 +1,19 @@
 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;
@@ -29,11 +28,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
@@ -96,14 +95,6 @@ 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);
@@ -128,12 +119,11 @@ 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, "Work in progress", Toast.LENGTH_SHORT).show();
-//            insertToExistDocument();
-//            return true;
+        } else if (item.getItemId() == R.id.action_insert_exist) {
+            // 既存ドキュメントに挿入
+            Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
+            insertToExistDocument();
+            return true;
         } else if (item.getItemId() == android.R.id.home) {
             finish();
             return true;
@@ -149,6 +139,7 @@ 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/description_24px"-->
-<!--        android:title="Insert"-->
-<!--        app:showAsAction="ifRoom"/>-->
+    <item
+        android:id="@+id/action_insert_exist"
+        android:icon="@drawable/ic_baseline_add_24"
+        android:title="Save"
+        app:showAsAction="ifRoom"/>
 </menu>

component/viewer/build.gradle

@@ -54,8 +54,4 @@ dependencies {
 
     implementation project(':model')
 
-    implementation project(':vcs')
-
-    implementation project(':component:common')
-
 }

component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkFragment.java

@@ -1,73 +0,0 @@
-package one.nem.lacerta.component.viewer.BookMark;
-
-import android.os.Bundle;
-import android.view.GestureDetector;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import androidx.fragment.app.Fragment;
-
-import java.util.UUID;
-
-import javax.inject.Inject;
-
-import one.nem.lacerta.component.viewer.R;
-
-// BookMarkFragment.java
-public class BookMarkFragment extends Fragment {
-
-    @Inject
-    BookmarkRepository bookmarkRepository;
-
-    private GestureDetector gestureDetector;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_bookmark, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
-            @Override
-            public boolean onDoubleTap(MotionEvent e) {
-                // ダブルタップが検出された時の処理
-                handleDoubleTap();
-                return true;
-            }
-        });
-
-        // ブックマークボタンがダブルタップされた時の処理
-        view.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                return gestureDetector.onTouchEvent(event);
-            }
-        });
-    }
-
-    private void handleDoubleTap() {
-        // ダブルタップが検出された時の処理
-        // ブックマークを作成
-        String pageId = "current_page_id";
-        String title = "current_page_title";
-
-        Bookmark bookmark = new Bookmark(
-                UUID.randomUUID().toString(),
-                title,
-                pageId,
-                System.currentTimeMillis()
-        );
-
-        // ブックマークを保存
-        bookmarkRepository.addBookmark(bookmark);
-
-        // ユーザーに成功メッセージを表示
-        Toast.makeText(getContext(), "ダブルタップでブックマークが追加されました", Toast.LENGTH_SHORT).show();
-    }
-}

component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookMarkListFragment.java

@@ -1,48 +0,0 @@
-package one.nem.lacerta.component.viewer.BookMark;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import one.nem.lacerta.component.viewer.R;
-
-// BookMarkListFragment.java
-public class BookMarkListFragment extends Fragment {
-    @Inject
-    BookmarkRepository bookmarkRepository;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_bookmark_list, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        // ブックマーク一覧を取得
-        List<Bookmark> bookmarks = bookmarkRepository.getAllBookmarks();
-
-        // ブックマーク一覧を表示するRecyclerViewのセットアップ
-        RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
-        BookmarkAdapter adapter = new BookmarkAdapter(bookmarks, new OnBookmarkClickListener() {
-            @Override
-            public void onBookmarkClick(Bookmark selectedBookmark) {
-                // ブックマークが選択された時の処理
-                // 例: ブックマークに関連するページを表示する
-            }
-        });
-
-        recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
-        recyclerView.setAdapter(adapter);
-    }
-}

component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/Bookmark.java

@@ -1,56 +0,0 @@
-package one.nem.lacerta.component.viewer.BookMark;
-
-// Bookmark.java
-public class Bookmark {
-    private String id; // ブックマークの一意の識別子
-    private String title;
-    private String pageId; // ブックマークが参照するページの識別子
-    private long timestamp; // ブックマークが作成された時刻
-
-    public Bookmark(String id, String title, String pageId, long timestamp) {
-        this.id = id;
-        this.title = title;
-        this.pageId = pageId;
-        this.timestamp = timestamp;
-    }
-
-    public Bookmark() {
-        // Empty constructor
-    }
-
-    // Getter
-
-    public String getId() {
-        return id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getPageId() {
-        return pageId;
-    }
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    // Setter
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setPageId(String pageId) {
-        this.pageId = pageId;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-}

component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookmarkAdapter.java

@@ -1,61 +0,0 @@
-package one.nem.lacerta.component.viewer.BookMark;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import one.nem.lacerta.component.viewer.R;
-
-
-public class BookmarkAdapter extends RecyclerView.Adapter<BookmarkAdapter.BookmarkViewHolder> {
-
-    private List<Bookmark> bookmarks;
-    private OnBookmarkClickListener listener;
-
-    public BookmarkAdapter(List<Bookmark> bookmarks, OnBookmarkClickListener listener) {
-        this.bookmarks = bookmarks;
-        this.listener = listener;
-    }
-
-    @NonNull
-    @Override
-    public BookmarkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_bookmark, parent, false);
-        return new BookmarkViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull BookmarkViewHolder holder, int position) {
-        final Bookmark bookmark = bookmarks.get(position);
-
-        holder.titleTextView.setText(bookmark.getTitle());
-
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // ブックマークがクリックされたときの処理
-                listener.onBookmarkClick(bookmark);
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return bookmarks.size();
-    }
-
-    static class BookmarkViewHolder extends RecyclerView.ViewHolder {
-        TextView titleTextView;
-
-        public BookmarkViewHolder(@NonNull View itemView) {
-            super(itemView);
-            titleTextView = itemView.findViewById(R.id.titleTextView);
-        }
-    }
-}

component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/BookmarkRepository.java

@@ -1,21 +0,0 @@
-package one.nem.lacerta.component.viewer.BookMark;
-
-// BookmarkRepository.java
-import java.util.ArrayList;
-import java.util.List;
-
-public class BookmarkRepository {
-    private List<Bookmark> bookmarks = new ArrayList<>();
-
-    public List<Bookmark> getAllBookmarks() {
-        return bookmarks;
-    }
-
-    public void addBookmark(Bookmark bookmark) {
-        bookmarks.add(bookmark);
-    }
-
-    public void removeBookmark(Bookmark bookmark) {
-        bookmarks.remove(bookmark);
-    }
-}

component/viewer/src/main/java/one/nem/lacerta/component/viewer/BookMark/OnBookmarkClickListener.java

@@ -1,10 +0,0 @@
-package one.nem.lacerta.component.viewer.BookMark;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-// OnBookmarkClickListener.java
-public interface OnBookmarkClickListener {
-    void onBookmarkClick(Bookmark selectedBookmark);
-}

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

@@ -0,0 +1,88 @@
+package one.nem.lacerta.component.viewer;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import 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);
+
+        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;
+    }
+}

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

@@ -1,93 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-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;
-
-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(RevSelectListener revSelectListener) {
-        this.revSelectListener = revSelectListener;
-    }
-
-    public void setRevModels(ArrayList<VcsRevModel> revModels) {
-        this.revModels = revModels;
-    }
-
-
-    @NonNull
-    @Override
-    public RevAdapter.RevViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.viewer_rev_list_item, parent, false);
-        return new RevAdapter.RevViewHolder(view);
-    }
-
-    @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(simpleDateFormat.format(revModel.getCreatedAt()));
-        } else {
-            //        holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + 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
-    public int getItemCount() {
-        if (revModels == null) {
-            return 0;
-        } else {
-            return revModels.size();
-        }
-    }
-
-    class RevViewHolder extends RecyclerView.ViewHolder {
-
-        TextView title;
-
-        TextView detail;
-
-        TextView revId;
-
-        public RevViewHolder(@NonNull View itemView) {
-            super(itemView);
-
-            title = itemView.findViewById(R.id.rev_item_title);
-            detail = itemView.findViewById(R.id.rev_item_detail);
-            revId = itemView.findViewById(R.id.rev_item_id);
-        }
-    }
-}

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

@@ -1,239 +0,0 @@
-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,6 +2,7 @@ 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;
@@ -9,6 +10,12 @@ 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;
 
@@ -28,7 +35,6 @@ public class ViewerMainActivity extends AppCompatActivity {
     // Variables
     private static final String TAG = "ViewerMainActivity";
     String documentId;
-    String documentName;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,7 +50,6 @@ 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");
@@ -53,9 +58,8 @@ public class ViewerMainActivity extends AppCompatActivity {
             finish();
         }
 
-        // Navigation
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
-                .commit();
+                .replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
+                .commitNow();
     }
 }

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

@@ -1,102 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.utils.LacertaLogger;
-import one.nem.lacerta.vcs.LacertaVcs;
-import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link ViewerVcsRevListFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class ViewerVcsRevListFragment extends Fragment {
-
-    @Inject
-    LacertaVcsFactory lacertaVcsFactory;
-
-    @Inject
-    LacertaLogger logger;
-
-    LacertaVcs lacertaVcs;
-
-    private String documentId;
-    private String documentName;
-
-    public ViewerVcsRevListFragment() {
-        // Required empty public constructor
-    }
-
-    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;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_viewer_vcs_rev_list, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        // Init arg
-        if (getArguments() != null) {
-            this.documentId = getArguments().getString("documentId");
-            logger.debug("ViewerVcsRevListFragment", "documentId: " + this.documentId);
-        }
-
-        // Init vcs
-        lacertaVcs = lacertaVcsFactory.create(this.documentId);
-
-        // Init view
-        RecyclerView recyclerView = view.findViewById(R.id.rev_list);
-
-        // Init adapter
-        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);
-
-        // Set layout manager
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        lacertaVcs.getRevisionHistory().thenAccept(revModels -> {
-            logger.debug("ViewerVcsRevListFragment", "revModels.size(): " + revModels.size());
-            getActivity().runOnUiThread(() -> {
-                revAdapter.setRevModels(revModels);
-                revAdapter.notifyDataSetChanged();
-            });
-        });
-    }
-}

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

@@ -1,5 +0,0 @@
-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.ViewerListFragment"
+        android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:defaultNavHost="true"

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

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

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorSurface">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    <!-- item_bookmark.xml -->
-    <TextView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/titleTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"/>
-
-</FrameLayout>

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

@@ -37,16 +37,6 @@
 
             </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/layout/fragment_viewer_vcs_rev_list.xml

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

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

@@ -11,7 +11,6 @@
         android:layout_height="wrap_content"
         android:elevation="8dp"
         android:adjustViewBounds="true"
-        android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="24dp"
-    android:paddingVertical="16dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/item_text_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/rev_item_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:layout_marginEnd="8dp"
-            android:text="Placeholder Title"
-            android:textColor="@color/colorOnSurface"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/rev_item_detail"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:text="2023/01/01 00:00:00 - hogehoge"
-            android:textColor="@color/colorOnSurfaceSecondary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
-
-        <TextView
-            android:id="@+id/rev_item_id"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="12sp"
-            android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
-            android:textColor="@color/colorOnSurfaceSecondary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_open_vcs_rev_list"
-        android:title="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

@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/component_viewer_navigation"
-    app:startDestination="@id/viewerListFragment">
+    app:startDestination="@id/componentViewerTopFragment">
 
     <fragment
-        android:id="@+id/viewerListFragment"
-        android:name="one.nem.lacerta.component.viewer.ViewerListFragment"
-        android:label="ComponentViewerTopFragment" >
-        <action
-            android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"
-            app:destination="@id/viewerVcsRevListFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/viewerVcsRevListFragment"
-        android:name="one.nem.lacerta.component.viewer.ViewerVcsRevListFragment"
-        android:label="fragment_viewer_vcs_rev_list"
-        tools:layout="@layout/fragment_viewer_vcs_rev_list" />
+        android:id="@+id/componentViewerTopFragment"
+        android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
+        android:label="ComponentViewerTopFragment" />
 </navigation>

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

@@ -6,7 +6,6 @@ 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;
 
@@ -19,15 +18,9 @@ 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

@@ -7,9 +7,7 @@ import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
 
 import one.nem.lacerta.model.LibraryItemPage;
-import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
-import one.nem.lacerta.model.document.tag.DocumentTag;
 
 public interface LacertaLibrary {
 
@@ -17,30 +15,13 @@ public interface LacertaLibrary {
     CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit);
     CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset);
 
-    // Get Library Page
+    // Get Library page
+    CompletableFuture<LibraryItemPage> getLibraryPage(int limit);
+    CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset);
     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);
+    CompletableFuture<String> createFolder(String path, String name);
 
-    // Get Public Path
-    CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
-
-
-    // Tag
-    CompletableFuture<ArrayList<DocumentTag>> getTagList();
-
-    CompletableFuture<Void> createTag(DocumentTag tag);
-
-    CompletableFuture<Void> updateTag(DocumentTag tag);
-
-    CompletableFuture<Void> deleteTag(String tagId);
-
-    CompletableFuture<Void> addTagToDocument(String documentId, String tagId);
-
-    CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId);
 }

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

@@ -1,7 +1,5 @@
 package one.nem.lacerta.data.impl;
 
-import androidx.room.Update;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -78,9 +76,11 @@ public class DocumentImpl implements Document {
             documentEntity.id = meta.getId();
             documentEntity.title = meta.getTitle();
             documentEntity.author = meta.getAuthor();
+            documentEntity.defaultBranch = meta.getDefaultBranch();
             documentEntity.updatedAt = meta.getUpdatedAt();
             documentEntity.createdAt = meta.getCreatedAt();
-            documentEntity.parentId = meta.getParentId();
+            documentEntity.publicPath = meta.getPath().getStringPath();
+            documentEntity.tagIds = meta.getTagIds();
 
             database.documentDao().insert(documentEntity);
 
@@ -101,33 +101,17 @@ public class DocumentImpl implements Document {
         meta.setId(UUID.randomUUID().toString());
         meta.setTitle("New Document");
         meta.setAuthor("author");
+        meta.setDefaultBranch("master");
         meta.setUpdatedAt(new Date());
         meta.setCreatedAt(new Date());
-        meta.setParentId(null);
+        meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
+        meta.setTags(new ArrayList<>());
         return createDocument(meta);
     }
 
     @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;
         });
     }
@@ -140,19 +124,6 @@ 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(() -> {
@@ -164,9 +135,11 @@ public class DocumentImpl implements Document {
             meta.setId(documentEntity.id);
             meta.setTitle(documentEntity.title);
             meta.setAuthor(documentEntity.author);
+            meta.setDefaultBranch(documentEntity.defaultBranch);
             meta.setUpdatedAt(documentEntity.updatedAt);
             meta.setCreatedAt(documentEntity.createdAt);
-            meta.setParentId(documentEntity.parentId);
+            meta.setPath(new PublicPath().resolve(documentEntity.publicPath));
+            meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
 
             DocumentDetail detail = new DocumentDetail();
 
@@ -180,34 +153,6 @@ 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,15 +1,10 @@
 package one.nem.lacerta.data.impl;
 
-import android.nfc.Tag;
-
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -21,14 +16,10 @@ import one.nem.lacerta.model.ListItem;
 import one.nem.lacerta.model.ListItemType;
 import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
-import one.nem.lacerta.model.document.tag.DocumentTag;
 import one.nem.lacerta.source.database.LacertaDatabase;
 import one.nem.lacerta.source.database.common.DateTypeConverter;
 import one.nem.lacerta.source.database.entity.DocumentEntity;
 import one.nem.lacerta.source.database.entity.FolderEntity;
-import one.nem.lacerta.source.database.entity.TagEntity;
-import one.nem.lacerta.source.database.entity.ToxiDocumentTagEntity;
-import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
 
 public class LacertaLibraryImpl implements LacertaLibrary {
@@ -45,6 +36,13 @@ 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<>();
@@ -66,35 +64,95 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         return null; // TODO-rca: Implement
     }
 
+    // Internal
+    private CompletableFuture<List<FolderEntity>> getFolderEntitiesByPublicPath(String publicPath) {
+        return CompletableFuture.supplyAsync(() -> {
+            return database.folderDao().findByPublicPathWithLimit(publicPath, 10); // TODO-rca: ハードコーディングやめる
+        });
+    }
+
+    private CompletableFuture<List<DocumentEntity>> getDocumentEntitiesByPublicPath(String publicPath) {
+        return CompletableFuture.supplyAsync(() -> {
+            return database.documentDao().findByPublicPathWithLimit(publicPath, 10); // TODO-rca: ハードコーディングやめる
+        });
+    }
+
+    @Override
+    public CompletableFuture<LibraryItemPage> getLibraryPage(int limit) {
+        return CompletableFuture.supplyAsync(() -> {
+
+            // 5秒フリーズさせる
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            LibraryItemPage libraryItemPage = new LibraryItemPage();
+
+            List<FolderEntity> folderEntities = getFolderEntitiesByPublicPath("/").join();
+            logger.debug("LacertaLibraryImpl", "folderEntities.size(): " + folderEntities.size());
+            List<DocumentEntity> documentEntities = getDocumentEntitiesByPublicPath("/").join();
+            logger.debug("LacertaLibraryImpl", "documentEntities.size(): " + documentEntities.size());
+
+            ArrayList<ListItem> listItems = new ArrayList<>();
+            for (FolderEntity folderEntity : folderEntities) {
+                logger.debug("LacertaLibraryImpl", "folderEntity.name: " + folderEntity.name);
+                ListItem listItem = new ListItem();
+                listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
+                listItem.setTitle(folderEntity.name);
+                listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
+                listItem.setItemId(folderEntity.id);
+                listItems.add(listItem);
+            }
+            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.setItemId(documentEntity.id);
+                listItems.add(listItem);
+            }
+
+            libraryItemPage.setPageTitle("/");
+            libraryItemPage.setPageId("root");
+            libraryItemPage.setListItems(listItems);
+
+            logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+
+            return libraryItemPage;
+        });
+    }
+
+    @Override
+    public CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset) {
+        return CompletableFuture.supplyAsync(() -> {
+            return null;
+        });
+    }
+
     @Override
     public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) {
         return CompletableFuture.supplyAsync(() -> {
             LibraryItemPage libraryItemPage = new LibraryItemPage();
 
-            List<FolderEntity> folderEntities;
-            List<DocumentEntity> documentEntities;
-
-            if (pageId == null) { // When root folder
-                libraryItemPage.setPageTitle("ライブラリ");
-                libraryItemPage.setPageId(null);
-                libraryItemPage.setParentId(null);
-
-                folderEntities = database.folderDao().findRootFolders();
-                documentEntities = database.documentDao().findRootDocuments();
-            } else {
-                FolderEntity folderEntity = database.folderDao().findById(pageId);
-                if (folderEntity == null) {
-                    logger.warn("LacertaLibraryImpl", pageId + " is not found.");
-                    return null;
-                }
-                libraryItemPage.setPageTitle(folderEntity.name);
-                libraryItemPage.setPageId(folderEntity.id);
-                libraryItemPage.setParentId(folderEntity.parentId);
-
-                folderEntities = database.folderDao().findByParentId(pageId);
-                documentEntities = database.documentDao().findByParentId(pageId);
+            FolderEntity folderEntity = database.folderDao().findById(pageId);
+            if (folderEntity == null) {
+                return null;
             }
 
+            PublicPath publicPath = new PublicPath().parse(folderEntity.publicPath);
+
+            String resolvedPublicPath = publicPath.resolve(folderEntity.name).getStringPath();
+
+            logger.debug("LacertaLibraryImpl", "Resolved publicPath: " + resolvedPublicPath);
+
+            List<FolderEntity> folderEntities = getFolderEntitiesByPublicPath(resolvedPublicPath).join();
+            logger.debug("LacertaLibraryImpl", "folderEntities.size(): " + folderEntities.size());
+            List<DocumentEntity> documentEntities = getDocumentEntitiesByPublicPath(resolvedPublicPath).join();
+            logger.debug("LacertaLibraryImpl", "documentEntities.size(): " + documentEntities.size());
+
             ArrayList<ListItem> listItems = new ArrayList<>();
             for (FolderEntity childFolderEntity : folderEntities) {
                 logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
@@ -106,18 +164,18 @@ 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(simpleDateFormat.format(documentEntity.updatedAt));
+//                listItem.setDescription(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").format(documentEntity.updatedAt.toInstant()));
                 listItem.setItemId(documentEntity.id);
                 listItems.add(listItem);
             }
 
+            libraryItemPage.setPageTitle(folderEntity.name);
+            libraryItemPage.setPageId(folderEntity.id);
             libraryItemPage.setListItems(listItems);
 
             logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
@@ -133,194 +191,24 @@ 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(() -> {
+
+            FolderEntity parentFolderEntity = database.folderDao().findById(parentId);
+            PublicPath publicPath;
+            if (parentFolderEntity == null) {
+                publicPath = new PublicPath().resolve("/");
+            } else {
+                publicPath = new PublicPath().resolve(parentFolderEntity.publicPath);
+            }
+
             FolderEntity folderEntity = new FolderEntity();
             folderEntity.id = UUID.randomUUID().toString();
             folderEntity.name = name;
-            folderEntity.parentId = parentId;
+            folderEntity.publicPath = publicPath.getStringPath();
             database.folderDao().insert(folderEntity);
             return folderEntity.id;
         });
     }
-
-    @Override
-    public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
-        return CompletableFuture.supplyAsync(() -> {
-            if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
-                DocumentEntity documentEntity = database.documentDao().findById(itemId);
-                if (documentEntity == null) {
-                    logger.warn("LacertaLibraryImpl", itemId + " is not found.");
-                    return null;
-                }
-                PublicPath publicPath = recursiveResolve(documentEntity.parentId);
-                publicPath.resolve(documentEntity.title);
-                return publicPath;
-            } else if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
-                FolderEntity folderEntity = database.folderDao().findById(itemId);
-                if (folderEntity == null) {
-                    return null;
-                }
-                return recursiveResolve(folderEntity.id);
-            } else {
-                logger.warn("LacertaLibraryImpl", "Unknown ListItemType: " + itemType);
-                return null;
-            }
-        });
-    }
-
-    // Converter
-    private DocumentTag convertTagEntityToDocumentTag(TagEntity tagEntity) {
-        DocumentTag documentTag = new DocumentTag();
-        documentTag.setId(tagEntity.id);
-        documentTag.setName(tagEntity.tagName);
-        documentTag.setColor(tagEntity.color);
-        return documentTag;
-    }
-
-    private TagEntity convertDocumentTagToTagEntity(DocumentTag documentTag) {
-        TagEntity tagEntity = new TagEntity();
-        tagEntity.id = documentTag.getId();
-        tagEntity.tagName = documentTag.getName();
-        tagEntity.color = documentTag.getColor();
-        return tagEntity;
-    }
-
-    @Override
-    public CompletableFuture<ArrayList<DocumentTag>> getTagList() {
-        return CompletableFuture.supplyAsync(() -> {
-            List<TagEntity> tagEntities = database.tagDao().findAll();
-            logger.debug("LacertaLibraryImpl", "Database Query: Get TagEntity List (Size: " + tagEntities.size() + ")");
-            ArrayList<DocumentTag> documentTags = new ArrayList<>();
-            for (TagEntity tagEntity : tagEntities) {
-                documentTags.add(convertTagEntityToDocumentTag(tagEntity));
-            }
-            return documentTags;
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> createTag(DocumentTag tag) {
-        return CompletableFuture.supplyAsync(() -> {
-            TagEntity tagEntity = convertDocumentTagToTagEntity(tag);
-            if (Objects.isNull(tagEntity.id) || tagEntity.id.isEmpty()) {
-                tagEntity.id = UUID.randomUUID().toString();
-            }
-            database.tagDao().insert(tagEntity);
-            logger.debug("LacertaLibraryImpl", "Database Query: Inserted TagEntity (" + tag.getId() + ")");
-            return null;
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> updateTag(DocumentTag tag) {
-        return CompletableFuture.supplyAsync(() -> {
-            TagEntity tagEntity = convertDocumentTagToTagEntity(tag);
-            database.tagDao().update(tagEntity);
-            logger.debug("LacertaLibraryImpl", "Database Query: Updated TagEntity (" + tag.getId() + ")");
-            return null;
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> deleteTag(String tagId) {
-        return CompletableFuture.supplyAsync(() -> {
-            database.tagDao().deleteById(tagId);
-            logger.debug("LacertaLibraryImpl", "Database Query: Deleted TagEntity (" + tagId + ")");
-            return null;
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> addTagToDocument(String documentId, String tagId) {
-        return CompletableFuture.supplyAsync(() -> {
-            ToxiDocumentTagEntity toxiDocumentTagEntity = new ToxiDocumentTagEntity();
-            toxiDocumentTagEntity.documentId = documentId;
-            toxiDocumentTagEntity.tagId = tagId;
-            database.toxiDocumentTagDao().insert(toxiDocumentTagEntity);
-            logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentTagEntity");
-            return null;
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId) {
-        return CompletableFuture.supplyAsync(() -> {
-            database.toxiDocumentTagDao().deleteByDocumentIdAndTagId(documentId, tagId);
-            logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentTagEntity");
-            return null;
-        });
-    }
-
-    /**
-     * 再帰的にパスを解決する
-     *
-     * @param folderId
-     * @return
-     */
-    private PublicPath recursiveResolve(String folderId) {
-        String current = folderId;
-        boolean continueFlag = true;
-        ArrayList<String> folderNames = new ArrayList<>();
-        while (continueFlag) {
-            FolderEntity folderEntity = database.folderDao().findById(current);
-            if (folderEntity == null) { // 存在しないフォルダIDが指定された場合
-                continueFlag = false;
-            } else {
-                folderNames.add(folderEntity.name);
-                current = folderEntity.parentId;
-                if (current == null) { // ルートフォルダに到達した場合
-                    continueFlag = false;
-                }
-            }
-        }
-
-        // フォルダ名を逆順にしてListに変換
-        Collections.reverse(folderNames);
-        List<String> folderNamesReversed = new ArrayList<>(folderNames);
-
-        return new PublicPath(folderNamesReversed);
-    }
 }

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

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

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

@@ -4,24 +4,40 @@ 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 android.widget.Toast;
 
+
+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.core.view.MenuProvider;
+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.utils.FeatureSwitch;
+import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.document.DocumentMeta;
+
 
 
 /**
@@ -35,8 +51,6 @@ public class HomeTopFragment extends Fragment {
     @Inject
     LacertaLibrary lacertaLibrary;
 
-    private ListItemAdapter listItemAdapter;
-
     public HomeTopFragment() {
         // Required empty public constructor
     }
@@ -59,92 +73,52 @@ public class HomeTopFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_home_top, container, false);
 
-        // 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));
+//        setHasOptionsMenu(true);
+        Toolbar toolbar = view.findViewById(R.id.home_toolbar);
+        toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
+        toolbar.setNavigationOnClickListener(v -> {
+            Toast.makeText(getContext(), "Works!!!!!!!!!!!!", Toast.LENGTH_SHORT).show();
+        });
+        toolbar.inflateMenu(R.menu.drawer_menu);
+        toolbar.setOnMenuItemClickListener(item -> {
+            if (item.getItemId() == R.id.item_placeholder) {
+                Toast.makeText(getContext(), "Works!", Toast.LENGTH_SHORT).show();
+                return true;
             }
+            return false;
         });
         return view;
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
-
-        Toolbar toolbar = view.findViewById(R.id.home_toolbar);
-        toolbarSetup(toolbar, false, "ホーム");
-
-        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 -> {
-            if (listItems == null) {
-                return;
-            }
-            this.listItemAdapter.setListItems(listItems);
-            getActivity().runOnUiThread(() -> {
-                Log.d("HomeTopFragment", "onViewCreated: " + listItems.size());
-                if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
-                    this.listItemAdapter.notifyDataSetChanged();
-                } else {
-                    // IndexOutOfBoundsExceptionを吐くことがあったので いったん
-                    this.listItemAdapter.notifyItemRangeInserted(0, listItems.size() - 1);
-                }
-            });
-        });
-    }
-
-    /**
-     * 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);
-        });
-    }
+//    @Override
+//    public void onViewCreated(View view, Bundle savedInstanceState) {
+//        super.onViewCreated(view, savedInstanceState);
+//
+//        RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
+//
+//
+//        ListItemAdapter listItemAdapter = new ListItemAdapter(documentId -> {
+//            Log.d("HomeTopFragment", "onViewCreated: " + documentId);
+//            Intent intent = new Intent(getContext(), ViewerMainActivity.class);
+//            intent.putExtra("documentId", documentId);
+//            startActivity(intent);
+//        });
+//        recyclerView.setAdapter(listItemAdapter);
+//        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+//
+//        lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
+//            listItemAdapter.setListItems(listItems);
+//            getActivity().runOnUiThread(() -> {
+//                listItemAdapter.notifyItemRangeInserted(0, listItems.size());
+//            });
+//        });
+//    }
+//
+//    @Override
+//    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+//        inflater.inflate(R.menu.drawer_menu, menu);
+//        super.onCreateOptionsMenu(menu, inflater);
+//    }
 }
 
 

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

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

feature/library/build.gradle

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

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

@@ -1,9 +1,5 @@
 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,29 +1,26 @@
 package one.nem.lacerta.feature.library;
 
-import android.content.Intent;
+import android.app.AlertDialog;
 import android.os.Bundle;
 
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
+import androidx.annotation.NonNull;
 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.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import android.widget.Toast;
 
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.component.viewer.ViewerMainActivity;
 import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.LibraryItemPage;
-import one.nem.lacerta.utils.FeatureSwitch;
+import one.nem.lacerta.model.FragmentNavigation;
 import one.nem.lacerta.utils.LacertaLogger;
 
 
@@ -35,15 +32,8 @@ import one.nem.lacerta.utils.LacertaLogger;
 @AndroidEntryPoint
 public class LibraryPageFragment extends Fragment {
 
-    // Variables
-    // このインスタンスで表示されているページ
-    LibraryItemPage libraryItemPage;
-
-    // Arguments
-    String folderId;
-    String title;
-    String parentId;
-
+    // Param
+    private String folderId;
 
     @Inject
     LacertaLibrary lacertaLibrary;
@@ -53,26 +43,15 @@ public class LibraryPageFragment extends Fragment {
 
     ListItemAdapter listItemAdapter;
 
+    int currentTotalItemCount = 0;
+
     public LibraryPageFragment() {
         // Required empty public constructor
     }
-
-    public static LibraryPageFragment newInstance(String folderId, String title, String parentId) {
+    public static LibraryPageFragment newInstance(String folderId) {
         LibraryPageFragment fragment = new LibraryPageFragment();
         Bundle args = new Bundle();
         args.putString("folderId", folderId);
-        args.putString("title", title);
-        args.putString("publicPath", parentId);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    public static LibraryPageFragment newInstance(String folderId) { // Back action
-        LibraryPageFragment fragment = new LibraryPageFragment();
-        Bundle args = new Bundle();
-        args.putString("folderId", folderId);
-        args.putString("title", null);
-        args.putString("publicPath", null);
         fragment.setArguments(args);
         return fragment;
     }
@@ -81,8 +60,6 @@ public class LibraryPageFragment extends Fragment {
         LibraryPageFragment fragment = new LibraryPageFragment();
         Bundle args = new Bundle();
         args.putString("folderId", null);
-        args.putString("title", null);
-        args.putString("publicPath", null);
         fragment.setArguments(args);
         return fragment;
     }
@@ -98,17 +75,8 @@ public class LibraryPageFragment extends Fragment {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_library_top, container, false);
 
-        // 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));
-            }
-        });
+        setHasOptionsMenu(true);
+
         return view;
     }
 
@@ -116,162 +84,103 @@ public class LibraryPageFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        if (getArguments() != null) {
-            this.folderId = getArguments().getString("folderId"); // Required
-            if (getArguments().getString("title") == null && getArguments().getString("publicPath") == null) {
-                this.libraryItemPage = new LibraryItemPage();
-            } else {
-                this.title = getArguments().getString("title");
-                this.parentId = getArguments().getString("publicPath");
-            }
-        } else {
-            logger.debug("LibraryTopFragment", "getArguments() is null(maybe root)");
-            this.libraryItemPage = new LibraryItemPage();
-        }
-
-        // Toolbar Setup
-        toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
-
-        // RecyclerView Setup
-
         RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
+
         this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
             @Override
             public void onFolderSelected(String folderId, String folderName) {
                 logger.debug("LibraryTopFragment", "Folder selected! folderId: " + folderId + ", folderName: " + folderName);
-//                // 画面遷移
-//                FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
-//                // folderId: 推移先で表示するフォルダのID, folderName: 推移先で表示するフォルダの名前, parentId: このフラグメントで表示しているフォルダのID(推移先の親)
-//                fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, libraryItemPage != null ? libraryItemPage.getParentId() : null), false);
-                Bundle bundle = new Bundle();
-                bundle.putString("folderId", folderId);
-                bundle.putString("title", folderName);
-                bundle.putString("publicPath", libraryItemPage != null ? libraryItemPage.getParentId() : null);
-                try {
-                    Navigation.findNavController(requireView()).navigate(R.id.action_feature_library_top_fragment_self, bundle);
-                } catch (IllegalStateException e) {
-                    logger.error("LibraryTopFragment", "IllegalStateException: " + e.getMessage());
-                }
+                // 画面遷移
+                FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
+                assert fragmentNavigation != null;
+                fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId));
             }
 
             @Override
             public void onDocumentSelected(String documentId, String documentName) {
-                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);
+                Toast.makeText(getContext(), "Document selected! documentId: " + documentId + ", documentName: " + documentName, Toast.LENGTH_SHORT).show();
             }
         });
-
         recyclerView.setAdapter(listItemAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-        // Get library page and update RecyclerView items
-        lacertaLibrary.getLibraryPage(this.folderId, 10).thenAccept(libraryItemPage -> {
-            this.libraryItemPage = libraryItemPage;
+        if (getArguments() != null) {
+            this.folderId = getArguments().getString("folderId");
+        }
 
-            if (this.parentId == null) {
-                this.parentId = libraryItemPage.getParentId();
-            }
-            if (this.title == null) {
-                this.title = libraryItemPage.getPageTitle();
-                // Toolbar init again
-                toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
-            }
-
-            logger.debug("LibraryTopFragment", "Item selected! Total item page: " + this.libraryItemPage.getListItems().size());
-            if (!FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
-                getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える？
-                    listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
+        if (this.folderId == null) { // Root
+            lacertaLibrary.getLibraryPage(10).thenAccept(libraryItemPage -> {
+                logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+                listItemAdapter.setLibraryItemPage(libraryItemPage);
+                getActivity().runOnUiThread(() -> {
+                    // ActionBarのタイトルを変更する
+                    getActivity().setTitle("ライブラリ");
+                    // ActionBarに戻るボタンを非表示にする
+//                    getActivity().getActionBar().setDisplayHomeAsUpEnabled(false);
+                    listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
                 });
-            }
-            listItemAdapter.setLibraryItemPage(this.libraryItemPage);
-            getActivity().runOnUiThread(() -> {
-                if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
-                    listItemAdapter.notifyDataSetChanged();
-                } else {
-                    listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
-                }
+                this.currentTotalItemCount = libraryItemPage.getListItems().size();
             });
-        });
+        } else { // Root以外
+            lacertaLibrary.getLibraryPage(this.folderId, 10).thenAccept(libraryItemPage -> {
+                logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
+                listItemAdapter.setLibraryItemPage(libraryItemPage);
+                getActivity().runOnUiThread(() -> {
+                    // ActionBarのタイトルを変更する
+                    getActivity().setTitle(libraryItemPage.getPageTitle());
+                    // ActionBarに戻るボタンを表示する
+//                    getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
+                    listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
+                });
+                this.currentTotalItemCount = libraryItemPage.getListItems().size();
+            });
+        }
     }
 
-    /**
-     * Currentにフォルダを作成する
-     */
-    private void createFolder(String pageId) {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
-        builder.setTitle("フォルダの作成");
-        builder.setMessage("フォルダ名を入力してください");
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        inflater.inflate(R.menu.dir_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
 
-        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 -> {
+    // Selected
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == R.id.menu_item_create_new_folder) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            builder.setTitle("フォルダの作成");
+            builder.setMessage("フォルダ名を入力してください");
+            final android.widget.EditText input = new android.widget.EditText(getContext());
+            input.setText("フォルダ名");
+            builder.setView(input);
+            builder.setPositiveButton("作成", (dialog, which) -> {
+                lacertaLibrary.createFolder(null, input.getText().toString()).thenAccept(folderId -> {
+                    logger.debug("LibraryTopFragment", "folderId: " + folderId);
+                });
                 // Refresh
-                updateItem(pageId);
+                updateItem();
             });
-        });
-        builder.setNegativeButton("キャンセル", (dialog, which) -> {
-            dialog.cancel();
-        });
-
-        builder.show();
+            builder.setNegativeButton("キャンセル", (dialog, which) -> {
+                dialog.cancel();
+            });
+            builder.show();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
     }
 
-    /**
-     * RecyclerViewのアイテムを更新する
-     */
-    private void updateItem(String pageId) {
-        lacertaLibrary.getLibraryPage(pageId, 10).thenAccept(libraryItemPage -> {
-            this.libraryItemPage = libraryItemPage;
+    private void updateItem() {
+        lacertaLibrary.getLibraryPage(10).thenAccept(libraryItemPage -> {
             logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
             getActivity().runOnUiThread(() -> {
-                listItemAdapter.notifyItemRangeRemoved(0, libraryItemPage.getListItems().size() - 1);
+                listItemAdapter.notifyItemRangeRemoved(0, this.currentTotalItemCount - 1);
             });
             listItemAdapter.setLibraryItemPage(libraryItemPage);
             getActivity().runOnUiThread(() -> {
                 listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
             });
-        });
-    }
-
-    /**
-     * 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.getMenu().clear();
-            toolbar.inflateMenu(R.menu.dir_menu);
-            toolbar.setOnMenuItemClickListener(item -> {
-                if (item.getItemId() == R.id.menu_item_create_new_folder) {
-                    createFolder(this.folderId);
-                    return true;
-                } else {
-                    return false;
-                }
-            });
+            this.currentTotalItemCount = libraryItemPage.getListItems().size();
         });
     }
 }

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

@@ -1,5 +1,6 @@
 package one.nem.lacerta.feature.library;
 
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,6 +10,8 @@ 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/layout/fragment_library_top.xml

@@ -1,50 +1,11 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorSurface">
+    android:layout_height="match_parent">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/library_item_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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/library_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:layout_collapseMode="pin"
-                    app:title="HOGE" />
-
-            </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/library_item_recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        android:layout_height="match_parent" />
 
 </FrameLayout>

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/create_new_folder_24px"
-        android:title="@string/create_new_folder"
-        app:showAsAction="never"/>
+        android:icon="@drawable/developer_mode_24px"
+        android:title="@string/app_name"
+        app:showAsAction="ifRoom"/> <!-- TODO-rca: change this -->
 
 </menu>

feature/library/src/main/res/navigation/feature_library_navigation.xml

@@ -8,15 +8,5 @@
         android:id="@+id/feature_library_top_fragment"
         android:name="one.nem.lacerta.feature.library.LibraryPageFragment"
         android:label="fragment_library_top"
-        tools:layout="@layout/fragment_library_top" >
-        <action
-            android:id="@+id/action_feature_library_top_fragment_self"
-            app:destination="@id/feature_library_top_fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/feature_library_top_fragment"
-            app:popUpToInclusive="false"/>
-    </fragment>
+        tools:layout="@layout/fragment_library_top" />
 </navigation>

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

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

feature/setting/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.com.android.library)
-    id 'com.google.dagger.hilt.android'
 }
 
 android {
@@ -46,14 +45,4 @@ dependencies {
     // shared
     implementation project(':shared:ui')
 
-    implementation project(':component:common')
-
-    implementation project(':data')
-
-    implementation project(':model')
-
-    // 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,12 +2,8 @@ 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;
@@ -22,11 +18,6 @@ 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();
@@ -36,14 +27,15 @@ public class SettingScanPageFragment extends Fragment {
     }
 
     @Override
-    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);
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, 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);
     }
-
 }

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

@@ -1,148 +0,0 @@
-package one.nem.lacerta.setting;
-
-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 javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.component.common.LacertaCreateTagDialog;
-import one.nem.lacerta.component.common.LacertaCreateTagDialogListener;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.document.tag.DocumentTag;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link SettingTagManageFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class SettingTagManageFragment extends Fragment {
-
-    @Inject
-    LacertaLibrary lacertaLibrary;
-
-    private RecyclerView recyclerView;
-
-    private TagListItemAdapter adapter;
-
-    public SettingTagManageFragment() {
-        // Required empty public constructor
-    }
-
-    public static SettingTagManageFragment newInstance() {
-        SettingTagManageFragment fragment = new SettingTagManageFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_setting_tag_manage, container, false);
-
-        // Toolbar
-        Toolbar toolbar = view.findViewById(R.id.tag_manage_toolbar);
-        toolbarSetup(toolbar, true, "タグ管理");
-
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        this.recyclerView = view.findViewById(R.id.tag_item_recycler_view);
-        this.adapter = new TagListItemAdapter((tagId, tagName, tagColor) -> {
-            Toast.makeText(getContext(), "Tag Clicked", Toast.LENGTH_SHORT).show();
-        });
-
-        recyclerView.setAdapter(adapter);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        updateTagList();
-    }
-
-    /**
-     * タグリストを更新する
-     */
-    private void updateTagList() {
-        lacertaLibrary.getTagList().thenAccept(documentTags -> {
-            int currentTagCount = this.adapter.getItemCount();
-            this.adapter.setDocumentTags(documentTags);
-            if (currentTagCount != this.adapter.getItemCount()) {
-                this.adapter.notifyItemRangeRemoved(0, currentTagCount);
-                this.adapter.notifyItemRangeInserted(0, this.adapter.getItemCount());
-            }
-        });
-    }
-
-    /**
-     * 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.getMenu().clear();
-            toolbar.inflateMenu(R.menu.setting_tag_manage_menu);
-            toolbar.setOnMenuItemClickListener(item -> {
-                if (item.getItemId() == R.id.setting_tag_manage_menu_add) {
-                    Toast.makeText(getContext(), "Add Clicked", Toast.LENGTH_SHORT).show();
-                    LacertaCreateTagDialog dialog = new LacertaCreateTagDialog();
-                    dialog.setListener(new LacertaCreateTagDialogListener() {
-                        @Override
-                        public void onPositiveClick(String tagName, String tagColor) {
-                            Toast.makeText(getContext(), "Positive Clicked", Toast.LENGTH_SHORT).show();
-                            DocumentTag newTag = new DocumentTag();
-                            newTag.setName(tagName);
-                            newTag.setColor(tagColor);
-                            lacertaLibrary.createTag(newTag).join();
-                            updateTagList();
-                        }
-
-                        @Override
-                        public void onNegativeClick() {
-                            Toast.makeText(getContext(), "Negative Clicked", Toast.LENGTH_SHORT).show();
-                            updateTagList();
-                        }
-                    });
-                    dialog.show(getParentFragmentManager(), "create_tag_dialog");
-                    return true;
-                } else {
-                    return false;
-                }
-            });
-        });
-    }
-}

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

@@ -1,16 +1,15 @@
 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 com.google.android.material.appbar.AppBarLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import java.util.ArrayList;
 
@@ -74,15 +73,6 @@ public class SettingTopFragment extends Fragment {
                 )
         );
 
-        settingListItems.add(
-                new SettingListItem(
-                        "タグ管理", // TODO-rca: リソースに移動
-                        "タグの追加・編集・削除", // TODO-rca: リソースに移動
-                        ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.sell_24px),
-                        R.id.action_settingTopFragment_to_settingTagManageFragment
-                )
-        );
-
         settingListItems.add(
                 new SettingListItem(
                         getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_title),
@@ -97,17 +87,6 @@ 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/java/one/nem/lacerta/setting/TagListItemAdapter.java

@@ -1,69 +0,0 @@
-package one.nem.lacerta.setting;
-
-import android.graphics.Color;
-import android.media.Image;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-
-import one.nem.lacerta.model.document.tag.DocumentTag;
-
-public class TagListItemAdapter extends RecyclerView.Adapter<TagListItemAdapter.TagListItemViewHolder> {
-
-    ArrayList<DocumentTag> documentTags;
-
-    TagListItemSelectListener listener;
-
-    public TagListItemAdapter(TagListItemSelectListener listener) {
-        this.listener = listener;
-    }
-
-    public void setDocumentTags(ArrayList<DocumentTag> documentTags) {
-        this.documentTags = documentTags;
-    }
-
-    @NonNull
-    @Override
-    public TagListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.tag_list_full_item, parent, false);
-        return new TagListItemViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull TagListItemViewHolder holder, int position) {
-        DocumentTag documentTag = documentTags.get(position);
-
-        holder.tag_name.setText(documentTag.getName());
-        try {
-            holder.tag_icon.setColorFilter(Color.parseColor(documentTag.getColor()));
-        } catch (Exception e) {
-            holder.tag_name.setText("Sorry, Parse Error occurred");
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return documentTags == null ? 0 : documentTags.size();
-    }
-
-    public static class TagListItemViewHolder extends RecyclerView.ViewHolder {
-
-        ImageView tag_icon;
-        TextView tag_name;
-
-        public TagListItemViewHolder(@NonNull View itemView) {
-            super(itemView);
-
-            tag_icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.tag_icon);
-            tag_name = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.tag_name);
-
-        }
-    }
-}

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

@@ -1,6 +0,0 @@
-package one.nem.lacerta.setting;
-
-public interface TagListItemSelectListener {
-
-    void onTagListItemSelect(String tagId, String tagName, String tagColor);
-}

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

@@ -1,79 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorSurface">
+    tools:context=".SettingAboutPageFragment">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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>
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
 
 </FrameLayout>

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

@@ -1,79 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorSurface">
+    tools:context=".SettingDataPageFragment">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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>
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
 
 </FrameLayout>

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

@@ -1,79 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorSurface">
+    tools:context=".SettingDisplayPageFragment">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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>
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
 
 </FrameLayout>

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

@@ -1,79 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorSurface">
+    tools:context=".SettingScanPageFragment">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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>
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
 
 </FrameLayout>

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

@@ -1,50 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorSurface">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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/tag_manage_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.recyclerview.widget.RecyclerView
-            android:id="@+id/tag_item_recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>           app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</FrameLayout>

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

@@ -1,50 +1,11 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorSurface">
+    android:layout_height="match_parent">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/setting_item_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.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_title" />
-
-            </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/setting_item_recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        android:layout_height="match_parent" />
 
 </FrameLayout>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/setting_tag_manage_menu_add"
-        android:icon="@drawable/outline_developer_mode_24"
-        android:title="@string/placeholder"
-        app:showAsAction="ifRoom"/>
-</menu>

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

@@ -37,9 +37,6 @@
             app:exitAnim="@anim/slide_to_left"
             app:popEnterAnim="@anim/slide_from_left"
             app:popExitAnim="@anim/slide_to_right" />
-        <action
-            android:id="@+id/action_settingTopFragment_to_settingTagManageFragment"
-            app:destination="@id/settingTagManageFragment" />
     </fragment>
     <fragment
         android:id="@+id/settingAboutPageFragment"
@@ -61,8 +58,4 @@
         android:name="one.nem.lacerta.setting.SettingScanPageFragment"
         android:label="fragment_setting_scan_page"
         tools:layout="@layout/fragment_setting_scan_page" />
-    <fragment
-        android:id="@+id/settingTagManageFragment"
-        android:name="one.nem.lacerta.setting.SettingTagManageFragment"
-        android:label="SettingTagManageFragment" />
 </navigation>

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

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

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

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

lacerta/.gitignore

@@ -1 +0,0 @@
-/build

lacerta/build.gradle

@@ -1,39 +0,0 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    namespace 'com.example.lacerta'
-    compileSdk 33
-
-    defaultConfig {
-        applicationId "com.example.lacerta"
-        minSdk 26
-        targetSdk 33
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}

lacerta/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

lacerta/src/androidTest/java/com/example/lacerta/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.example.lacerta;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.example.lacerta", appContext.getPackageName());
-    }
-}

lacerta/src/main/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Lacerta"></application>
-
-</manifest>

lacerta/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

lacerta/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

lacerta/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

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

lacerta/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

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