DocumentPathを廃止

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-01-20T07:15:21.179573376Z">
+        <DropdownSelection timestamp="2023-12-18T03:36:14.973846Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/rca/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22H7V3G7" />
             </handle>
           </Target>
         </DropdownSelection>

.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">
@@ -23,15 +22,14 @@
             <option value="$PROJECT_DIR$/feature/library" />
             <option value="$PROJECT_DIR$/feature/scan" />
             <option value="$PROJECT_DIR$/feature/search" />
-            <option value="$PROJECT_DIR$/feature/setting" />
             <option value="$PROJECT_DIR$/model" />
             <option value="$PROJECT_DIR$/processor" />
             <option value="$PROJECT_DIR$/shared" />
+            <option value="$PROJECT_DIR$/shared/icon" />
             <option value="$PROJECT_DIR$/shared/ui" />
             <option value="$PROJECT_DIR$/source" />
             <option value="$PROJECT_DIR$/utils" />
             <option value="$PROJECT_DIR$/vcs" />
-            <option value="$PROJECT_DIR$/viewer2" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />

.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">

PULL_REQUEST_TEMPLATE.md

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

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` : データモデルをまとめたモジュール
+- `model` : モデル
-- `processor` : プロセッサ（例: `DocumentProcessor` : ドキュメント処理（ドキュメントにページを追加したり更新したり）)
+  - データモデルをまとめたモジュール (WIP)
-- `shared`: 共有リソース
+  - `document` : ドキュメント
-  - `ui`: UI要素(Theme, Drawable, Colorなど)
+  - `meta` : メタデータ
-- `source` : ソース(DB/FileManagerなど)
+- `processor` : プロセッサ
-- `utils` : ユーティリティ(ちょっとしたユーティリティをまとめたモジュール)
+  - いくつかの処理をまとめたモジュール
+    - `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

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

@@ -1,12 +1,10 @@
 package one.nem.lacerta;
 
 import android.app.Application;
-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 {
@@ -14,17 +12,7 @@ public class LacertaApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        if (DynamicColors.isDynamicColorAvailable()) {
+        // DynamicColorを有効化
-            Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
+        DynamicColors.applyToActivitiesIfAvailable(this);
-            if (FeatureSwitch.Meta.disableDynamicColor) {
-                Log.d("DynamicColors", "DynamicColors is disabled by FeatureSwitch.");
-            } else {
-                DynamicColors.applyToActivitiesIfAvailable(this);
-            }
-        } else {
-            Log.d("DynamicColors", "DynamicColors is not available.");
-        }
-
     }
-
 }

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

@@ -1,200 +1,40 @@
 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.NavOptions;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.NavigationUI;
 
-import android.app.ActivityOptions;
-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;
-
 import javax.inject.Inject;
 
 @AndroidEntryPoint
-public class MainActivity extends AppCompatActivity implements FragmentNavigation {
+public class MainActivity extends AppCompatActivity {
-
-    @Inject
-    SharedPrefUtils sharedPrefUtils;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        // Debug
+        FragmentManager supportFragmentManager = getSupportFragmentManager();
+
+        NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
+        NavController navController = navHostFragment.getNavController();
         BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
 
-        // Initialize app
+        NavigationUI.setupWithNavController(bottomNavigationView, navController);
-        if (sharedPrefUtils.getIsFirstLaunch()) initializeApp();
-
-        // Init navigation
-        try {
-            FragmentManager supportFragmentManager = getSupportFragmentManager();
-            NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
-            assert navHostFragment != null;
-            NavController navController = navHostFragment.getNavController();
-            NavigationUI.setupWithNavController(bottomNavigationView, navController);
-
-            bottomNavigationView.setOnItemSelectedListener(item -> {
-                NavOptions navOptions = new NavOptions.Builder()
-                        .setLaunchSingleTop(true)
-                        .setEnterAnim(androidx.navigation.ui.R.anim.nav_default_enter_anim)
-                        .setExitAnim(androidx.navigation.ui.R.anim.nav_default_exit_anim)
-                        .setPopEnterAnim(androidx.navigation.ui.R.anim.nav_default_pop_enter_anim)
-                        .setPopExitAnim(androidx.navigation.ui.R.anim.nav_default_pop_exit_anim)
-                        .build();
-
-                navController.navigate(item.getItemId(), null, navOptions);
-                return true;
-            });
-        }
-        catch (Exception e) {
-            Log.e("Init", "Failed to init navigation");
-            Log.e("Init", "Searchable Error code: " + "894b5941-3bc0-46fe-b752-0dbc88be29a8");
-            Toast.makeText(this, "Failed to init navigation", Toast.LENGTH_LONG).show();
-            finish(); // Exit app
-        }
-
-        // Apply feature switch
-        applyFeatureSwitch(bottomNavigationView, FeatureSwitchOverride.ENABLE_SEARCH, FeatureSwitch.FeatureMaster.enableSearch, one.nem.lacerta.feature.search.R.id.feature_search_navigation);
-        applyFeatureSwitch(bottomNavigationView, FeatureSwitchOverride.ENABLE_DEBUG_MENU, FeatureSwitch.FeatureMaster.enableDebugMenu, one.nem.lacerta.feature.debug.R.id.feature_debug_navigation);
-
-
-        // Set navigation bar color
-        getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
-
-        // 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);
-            startActivity(intent, ActivityOptions.makeCustomAnimation(this, one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
-        });
 
+        Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
     }
 
-    @Override
+}
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == 1) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Toast.makeText(this, "Permission granted", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
-                Toast.makeText(this, "カメラの権限は必須です.", Toast.LENGTH_LONG).show();
-                finish(); // Exit app
-            }
-        }
-    }
-
-    private void initializeApp() {
-        Log.d("Init", "Initializing app");
-        // Set feature switch override to default value
-        sharedPrefUtils.setFeatureSwitchOverride(FeatureSwitchOverride.ENABLE_SEARCH, FeatureSwitch.FeatureMaster.enableSearch);
-        sharedPrefUtils.setFeatureSwitchOverride(FeatureSwitchOverride.ENABLE_DEBUG_MENU, FeatureSwitch.FeatureMaster.enableDebugMenu);
-
-        // Set isFirstLaunch to false
-        sharedPrefUtils.setIsFirstLaunch(false);
-    }
-
-    private void applyFeatureSwitch(BottomNavigationView bottomNavigationView, FeatureSwitchOverride featureSwitchOverride, boolean defaultValue, int menuId) {
-        boolean isEnabled = FeatureSwitch.Meta.canOverrideSwitch ? sharedPrefUtils.getFeatureSwitchOverride(featureSwitchOverride) : defaultValue;
-        if (!isEnabled) bottomNavigationView.getMenu().removeItem(menuId);
-    }
-
-    @Override
-    public void navigateToFragment(Fragment fragment) {
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.nav_host_fragment, fragment)
-                .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

@@ -18,33 +18,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/main_nav"
-        tools:layout="@layout/fragment_home_top" />
+        tools:layout="@layout/fragment_debug_menu_container" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_nav"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/colorSecondaryContainer"
-        app:itemIconTint="@color/colorOnSecondaryContainer"
-        app:itemTextColor="@color/colorOnSecondaryContainer"
-        app:itemActiveIndicatorStyle="@style/Lacerta.Custom.Indicator"
-        app:labelVisibilityMode="selected"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/bottom_nav_menu" />
+        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/menu/bottom_nav_menu.xml

@@ -4,26 +4,17 @@
     <item
         android:id="@id/feature_home_navigation"
         android:icon="@drawable/home_24px"
-        android:title="@string/home_title"/>
+        android:title="Home"/>
-
-    <item
-        android:id="@id/feature_search_navigation"
-        android:icon="@drawable/search_24px"
-        android:title="@string/search_title"/>
 
     <item
         android:id="@id/feature_library_navigation"
         android:icon="@drawable/folder_24px"
-        android:title="@string/library_title"/>
+        android:title="Library"/>
 
     <item
         android:id="@id/feature_debug_navigation"
         android:icon="@drawable/developer_mode_24px"
-        android:title="@string/debug_menu_title" />
+        android:title="Debug menu"/>
 
-    <item
-        android:id="@id/feature_setting_navigation"
-        android:icon="@drawable/settings_24px"
-        android:title="@string/setting_title"/>
 
 </menu>

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/navigation/main_nav.xml

@@ -2,7 +2,7 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/app_main_nav"
-    app:startDestination="@id/feature_home_navigation">
+    app:startDestination="@id/feature_debug_navigation">
 
     <include app:graph="@navigation/feature_debug_navigation" />
 
@@ -10,9 +10,5 @@
 
     <include app:graph="@navigation/feature_home_navigation" />
 
-    <include app:graph="@navigation/feature_search_navigation" />
-
-    <include app:graph="@navigation/feature_setting_navigation" />
-
 
 </navigation>

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,11 +1,10 @@
 plugins {
     alias(libs.plugins.com.android.library)
-    id 'com.google.dagger.hilt.android'
 }
 
 android {
     namespace 'one.nem.lacerta.component.common'
-    compileSdk 34
+    compileSdk 33
 
     defaultConfig {
         minSdk 26
@@ -33,15 +32,4 @@ dependencies {
     testImplementation libs.junit
     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')
-
-    implementation project(':vcs')
 }

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);
-
-        // 高さを画面の40%にする
-        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
-        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/LacertaSelectRevDialog.java

@@ -1,112 +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.Toast;
-
-import androidx.fragment.app.DialogFragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-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.utils.LacertaLogger;
-import one.nem.lacerta.vcs.LacertaVcs;
-import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
-
-
-@AndroidEntryPoint
-public class LacertaSelectRevDialog extends DialogFragment {
-
-    @Inject
-    LacertaVcsFactory lacertaVcsFactory;
-
-    @Inject
-    LacertaLogger logger;
-
-    String title;
-    String documentId;
-    String message;
-    String negativeButtonText;
-
-    LacertaSelectRevDialogListener listener;
-
-    public LacertaSelectRevDialog setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public LacertaSelectRevDialog setDocumentId(String documentId) {
-        this.documentId = documentId;
-        return this;
-    }
-
-    public LacertaSelectRevDialog setMessage(String message) {
-        this.message = message;
-        return this;
-    }
-
-    public LacertaSelectRevDialog setNegativeButtonText(String negativeButtonText) {
-        this.negativeButtonText = negativeButtonText;
-        return this;
-    }
-
-    public LacertaSelectRevDialog setListener(LacertaSelectRevDialogListener listener) {
-        this.listener = listener;
-        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_rev, null);
-
-        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
-        view.setMinimumHeight(height);
-
-        RecyclerView recyclerView = view.findViewById(R.id.select_rev_recycler_view);
-
-        SelectRevDialogItemAdapter adapter = new SelectRevDialogItemAdapter(revId -> {
-            if (listener != null) {
-                listener.onItemSelected(revId);
-                dismiss();
-            }
-        });
-                recyclerView.setAdapter(adapter);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        builder.setView(view);
-
-        if (this.documentId == null) {
-            logger.error("SelectRevDialog", "documentId is null");
-            logger.e_code("0296fb0c-07a3-4971-a280-bd1a61461bb7");
-            Toast.makeText(getContext(), "Sorry, something went wrong", Toast.LENGTH_SHORT).show();
-            dismiss();
-        }
-        LacertaVcs lacertaVcs = lacertaVcsFactory.create(this.documentId);
-        lacertaVcs.getRevisionHistory().thenAccept(revList -> {
-            adapter.setRevList(revList);
-            adapter.notifyDataSetChanged(); // TODO-rca:時間に応じてアニメーションをつける
-        });
-
-
-        builder.setTitle(title == null ? "Select Rev" : title);
-        builder.setMessage(message == null ? "Select Rev" : message);
-        builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
-            if (listener != null) {
-                listener.onDialogCanceled();
-                dismiss();
-            }
-        });
-
-        return builder.create();
-    }
-}

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

@@ -1,6 +0,0 @@
-package one.nem.lacerta.component.common;
-
-public interface LacertaSelectRevDialogInternalListener {
-
-    void onItemSelected(String revId);
-}

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

@@ -1,8 +0,0 @@
-package one.nem.lacerta.component.common;
-
-public interface LacertaSelectRevDialogListener {
-
-    void onItemSelected(String revId);
-
-    void onDialogCanceled();
-}

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/java/one/nem/lacerta/component/common/SelectRevDialogItemAdapter.java

@@ -1,66 +0,0 @@
-package one.nem.lacerta.component.common;
-
-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.util.ArrayList;
-
-import one.nem.lacerta.model.VcsRevModel;
-
-public class SelectRevDialogItemAdapter extends RecyclerView.Adapter<SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder>{
-
-    ArrayList<VcsRevModel> revList;
-
-    LacertaSelectRevDialogInternalListener listener;
-
-    public SelectRevDialogItemAdapter(LacertaSelectRevDialogInternalListener listener) {
-        this.listener = listener;
-    }
-
-    public void setRevList(ArrayList<VcsRevModel> revList) {
-        this.revList = revList;
-    }
-
-    @NonNull
-    @Override
-    public SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.common_rev_list_item, parent, false);
-        return new SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder holder, int position) {
-        VcsRevModel rev = revList.get(position);
-        holder.title.setText(rev.getCommitMessage());
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-        holder.description.setText(simpleDateFormat.format(rev.getCreatedAt()));
-        holder.revId.setText("RevID: " + rev.getId());
-
-        holder.itemView.setOnClickListener(v -> listener.onItemSelected(rev.getId()));
-    }
-
-    @Override
-    public int getItemCount() {
-        return this.revList == null ? 0 : this.revList.size();
-    }
-
-    public class SelectRevDialogItemViewHolder extends RecyclerView.ViewHolder {
-
-    TextView title;
-    TextView description;
-    TextView revId;
-
-        public SelectRevDialogItemViewHolder(@NonNull View itemView) {
-            super(itemView);
-            title = itemView.findViewById(R.id.rev_item_title);
-            description = itemView.findViewById(R.id.rev_item_detail);
-            revId = itemView.findViewById(R.id.rev_item_id);
-        }
-    }
-}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaDirPickerDialog.java

@@ -1,115 +0,0 @@
-package one.nem.lacerta.component.common.picker;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-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.component.common.R;
-import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
-import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.ListItemType;
-import one.nem.lacerta.model.PublicPath;
-
-@AndroidEntryPoint
-public class LacertaDirPickerDialog extends LacertaFilePickerDialogBase {
-
-    @Inject
-    LacertaLibrary lacertaLibrary;
-
-    // Listener
-    public interface LacertaDirPickerDialogListener {
-        void onDirSelected(String name, String dirId);
-    }
-
-    // Variables
-    LacertaDirPickerDialogListener listener;
-
-    // Setter
-    public LacertaDirPickerDialog setListener(LacertaDirPickerDialogListener listener) {
-        this.listener = listener;
-        return this;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        super.onCreateDialog(savedInstanceState);
-
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
-
-        View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
-
-        // 高さを画面の40%にする
-        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
-        view.setMinimumHeight(height);
-
-        RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
-        TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
-
-        LacertaFilePickerAdapterBase adapter = new LacertaFilePickerAdapterBase();
-        adapter.setListener(new LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener() {
-            @Override
-            public void onItemSelected(String dirId) {
-                updateList(adapter, dirId);
-                updatePublicPath(currentDirTextView, dirId);
-            }
-
-            @Override
-            public void onBackSelected(String dirId) {
-                updateList(adapter, dirId);
-                updatePublicPath(currentDirTextView, dirId);
-            }
-        });
-
-        recyclerView.setAdapter(adapter);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-
-        this.updateList(adapter, null); // ルートディレクトリのリストを表示
-
-        // Init dialog
-        builder.setTitle(this.title == null ? "フォルダを選択" : this.title);
-        builder.setMessage(this.message == null ? "フォルダを選択してください" : this.message);
-        builder.setView(view);
-        builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
-            if (listener != null) {
-                listener.onDirSelected(
-                        adapter.getCurrentPageTitle(),
-                        adapter.getCurrentId());
-            }
-        });
-        builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
-            if (listener != null) {
-                dismiss();
-            }
-        });
-
-        return builder.create();
-    }
-
-    private void updatePublicPath(TextView currentDirTextView, String folderId) {
-        lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
-            this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
-        });
-    }
-
-    private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
-        lacertaLibrary.getFolderList(folderId).thenAccept(libraryItemPage -> {
-            int currentCount = adapter.getItemCount();
-            String currentId = adapter.getCurrentId();
-//            adapter.setListItems(libraryItemPage);
-            getActivity().runOnUiThread(() -> {
-                this.updateListView(adapter, libraryItemPage, currentCount, currentId);
-            });
-        });
-    }
-}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaFilePickerAdapter.java

@@ -1,33 +0,0 @@
-package one.nem.lacerta.component.common.picker;
-
-import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
-import one.nem.lacerta.model.ListItem;
-import one.nem.lacerta.model.ListItemType;
-
-public class LacertaFilePickerAdapter extends LacertaFilePickerAdapterBase {
-
-    // Listener
-    public interface LacertaFilePickerAdapterListener extends LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener {
-        void onDocumentSelected(String documentId);
-    }
-
-    // Variables
-    LacertaFilePickerAdapterListener listener;
-
-    // Setter
-    public LacertaFilePickerAdapter setListener(LacertaFilePickerAdapterListener listener) {
-        this.listener = listener;
-        return this;
-    }
-
-    @Override
-    public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
-        super.onBindViewHolder(holder, position);
-        if (libraryItemPage.getListItems().get(position).getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
-            holder.itemView.setOnClickListener(v -> {
-                ListItem listItem = libraryItemPage.getListItems().get(position);
-                listener.onDocumentSelected(listItem.getItemId());
-            });
-        }
-    }
-}

component/common/src/main/java/one/nem/lacerta/component/common/picker/LacertaFilePickerDialog.java

@@ -1,114 +0,0 @@
-package one.nem.lacerta.component.common.picker;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-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.component.common.R;
-import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
-import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.ListItemType;
-
-@AndroidEntryPoint
-public class LacertaFilePickerDialog extends LacertaFilePickerDialogBase {
-
-    @Inject
-    LacertaLibrary lacertaLibrary;
-
-    // Listener
-    public interface LacertaFilePickerDialogListener {
-        void onFileSelected(String name, String fileId);
-    }
-
-    // Variables
-    LacertaFilePickerDialogListener listener;
-
-    // Setter
-    public LacertaFilePickerDialog setListener(LacertaFilePickerDialogListener listener) {
-        this.listener = listener;
-        return this;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        super.onCreateDialog(savedInstanceState);
-
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
-
-        View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
-
-        // 高さを画面の40%にする
-        int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
-        view.setMinimumHeight(height);
-
-        RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
-        TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
-
-        LacertaFilePickerAdapter adapter = new LacertaFilePickerAdapter();
-        adapter.setListener(new LacertaFilePickerAdapter.LacertaFilePickerAdapterListener() {
-            @Override
-            public void onItemSelected(String dirId) {
-                updateList(adapter, dirId);
-                updatePublicPath(currentDirTextView, dirId);
-            }
-
-            @Override
-            public void onBackSelected(String dirId) {
-                updateList(adapter, dirId);
-                updatePublicPath(currentDirTextView, dirId);
-            }
-
-            @Override
-            public void onDocumentSelected(String documentId) {
-                if (listener != null) {
-                    dismiss();
-                    listener.onFileSelected(documentId, documentId);
-                }
-            }
-        });
-
-        recyclerView.setAdapter(adapter);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-
-        this.updateList(adapter, null); // ルートディレクトリのリストを表示
-
-        // Init dialog
-        builder.setTitle(this.title == null ? "ファイルを選択" : this.title);
-        builder.setMessage(this.message == null ? "ファイルを選択してください" : this.message);
-        builder.setView(view);
-        builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
-            dismiss();
-        });
-
-        return builder.create();
-    }
-
-    private void updatePublicPath(TextView currentDirTextView, String folderId) {
-        lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
-            this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
-        });
-    }
-
-    private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
-        lacertaLibrary.getLibraryPage(folderId, 100).thenAccept(libraryItemPage -> { // TODO-rca: 100 is a magic number
-            int currentCount = adapter.getItemCount();
-            String currentId = adapter.getCurrentId();
-//            adapter.setListItems(libraryItemPage);
-            getActivity().runOnUiThread(() -> {
-                this.updateListView(adapter, libraryItemPage, currentCount, currentId);
-            });
-        });
-    }
-
-}

component/common/src/main/java/one/nem/lacerta/component/common/picker/base/LacertaFilePickerAdapterBase.java

@@ -1,110 +0,0 @@
-package one.nem.lacerta.component.common.picker.base;
-
-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 LacertaFilePickerAdapterBase extends RecyclerView.Adapter<LacertaFilePickerAdapterBase.LacertaFilePickerViewHolder> {
-
-    // Listener
-    public interface LacertaFilePickerAdapterListener {
-        void onItemSelected(String dirId);
-        void onBackSelected(String dirId);
-    }
-
-    protected LibraryItemPage libraryItemPage;
-
-    protected LacertaFilePickerAdapterListener listener;
-
-    // Empty constructor
-    public LacertaFilePickerAdapterBase() {
-    }
-
-    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));
-        }
-    }
-
-    public void setListener(LacertaFilePickerAdapterListener listener) {
-        this.listener = listener;
-    }
-
-    @NonNull
-    @Override
-    public LacertaFilePickerViewHolder 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 LacertaFilePickerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(LacertaFilePickerViewHolder 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.onItemSelected(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 LacertaFilePickerViewHolder extends RecyclerView.ViewHolder {
-
-        TextView title;
-        TextView description;
-
-        ImageView icon;
-
-
-        public LacertaFilePickerViewHolder(@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/java/one/nem/lacerta/component/common/picker/base/LacertaFilePickerDialogBase.java

@@ -1,88 +0,0 @@
-package one.nem.lacerta.component.common.picker.base;
-
-import android.widget.TextView;
-
-import androidx.fragment.app.DialogFragment;
-
-import javax.inject.Inject;
-
-import one.nem.lacerta.model.LibraryItemPage;
-import one.nem.lacerta.model.ListItemType;
-import one.nem.lacerta.model.PublicPath;
-import one.nem.lacerta.utils.LacertaLogger;
-
-public class LacertaFilePickerDialogBase extends DialogFragment {
-    @Inject
-    LacertaLogger logger;
-
-    // Variables
-    protected String title;
-    protected String message;
-    protected String positiveButtonText;
-    protected String negativeButtonText;
-
-    // Setter
-    public LacertaFilePickerDialogBase setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public LacertaFilePickerDialogBase setMessage(String message) {
-        this.message = message;
-        return this;
-    }
-
-    public LacertaFilePickerDialogBase setPositiveButtonText(String positiveButtonText) {
-        this.positiveButtonText = positiveButtonText;
-        return this;
-    }
-
-    public LacertaFilePickerDialogBase setNegativeButtonText(String negativeButtonText) {
-        this.negativeButtonText = negativeButtonText;
-        return this;
-    }
-
-    // Methods
-
-    protected void updatePathTextView(TextView currentDirTextView, PublicPath publicPath, ListItemType listItemType) {
-        if (publicPath == null) {
-            currentDirTextView.setText("/");
-        } else {
-            if (listItemType == ListItemType.ITEM_TYPE_FOLDER) {
-                currentDirTextView.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
-            } else {
-                currentDirTextView.setText("/" + publicPath.parent().getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
-            }
-        }
-    }
-
-    protected void updateListView(LacertaFilePickerAdapterBase adapter, LibraryItemPage libraryItemPage, int currentCount, String currentDirId) {
-        if (currentCount == 0) {
-            // 初回表示
-            adapter.setListItems(libraryItemPage);
-            adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
-        } else 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("FilePickerDialogBase", "Unknown transition.");
-            logger.warn("FilePickerDialogBase", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
-            adapter.setListItems(libraryItemPage);
-            adapter.notifyItemRangeRemoved(0, currentCount);
-            adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
-        }
-    }
-}

component/common/src/main/res/layout/common_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="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:layout_marginEnd="8dp"
-            android:text="Placeholder Title"
-            android:textColor="@color/colorOnSurface"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/rev_item_detail"
-            android:layout_width="match_parent"
-            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="match_parent"
-            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/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/common/src/main/res/layout/lacerta_dialog_select_rev.xml

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

component/scanner/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace 'one.nem.lacerta.component.scanner'
-    compileSdk 34
+    compileSdk 33
 
     defaultConfig {
         minSdk 26
@@ -30,8 +30,6 @@ dependencies {
 
     implementation libs.androidx.appcompat
     implementation libs.com.google.android.material
-    implementation libs.androidx.activity
-    implementation libs.androidx.constraintlayout
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
@@ -48,8 +46,4 @@ dependencies {
     implementation project(':processor')
 
     implementation project(':utils')
-
-    implementation project(':vcs')
-
-    implementation project(':data')
 }

component/scanner/src/main/AndroidManifest.xml

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

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

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

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

@@ -1,229 +0,0 @@
-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.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import androidx.activity.EdgeToEdge;
-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;
-
-import com.google.android.material.appbar.MaterialToolbar;
-import com.websitebeaver.documentscanner.DocumentScanner;
-
-import java.util.ArrayList;
-import java.util.Objects;
-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.vcs.factory.LacertaVcsFactory;
-
-@AndroidEntryPoint
-public class ScannerManagerActivity extends AppCompatActivity {
-
-    String TAG = "ScannerManagerActivity";
-
-    @Inject
-    LacertaLogger logger;
-
-    @Inject
-    Document document;
-
-    @Inject
-    DocumentProcessorFactory documentProcessorFactory;
-
-    @Inject
-    LacertaVcsFactory lacertaVcsFactory;
-
-    // Variables
-    private ArrayList<Bitmap> croppedImages = new ArrayList<>();
-
-    View view;
-
-    DocumentScanner documentScanner = new DocumentScanner(
-            this,
-            (croppedImageResults) -> {
-                logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
-                ArrayList<Bitmap> croppedImages = new ArrayList<>();
-                for (String result : croppedImageResults) {
-                    croppedImages.add(BitmapFactory.decodeFile(result));
-                }
-                processResult(croppedImages);
-                return null;
-            },
-            (errorMessage) -> {
-                // an error happened
-                logger.error(TAG, "Error: " + errorMessage);
-                logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
-                return null;
-            },
-            () -> {
-                // user canceled document scan
-                logger.debug(TAG, "User canceled document scan");
-                return null;
-            },
-            null,
-            null,
-            null
-    );
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_scanner_manager);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-
-
-
-        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);
-
-        documentScanner.startScan();
-        // Init
-
-        this.view = findViewById(R.id.main); // TODO-rca:なんとかする
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(android.view.Menu menu) {
-        getMenuInflater().inflate(R.menu.scanner_result_toolbar, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(android.view.MenuItem item) {
-        if (item.getItemId() == R.id.action_save_new) {
-            // 新ドキュメントとして保存
-            Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
-            saveNewDocument();
-            return true;
-//        }
-//        else if (item.getItemId() == R.id.action_insert_exist) {
-//            // 既存ドキュメントに挿入
-//            Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
-//            insertToExistDocument();
-//            return true;
-        } else if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void processResult(ArrayList<Bitmap> resultImages) {
-        logger.debug(TAG, "processResult");
-
-        if (resultImages.isEmpty()) {
-            logger.debug(TAG, "resultImages(arg) is empty");
-            if (this.croppedImages.isEmpty()) {
-                logger.debug(TAG, "this.resultImages is empty");
-                logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
-            } else {
-                logger.debug(TAG, "this.resultImages is not empty");
-                updateResultView(this.croppedImages);
-            }
-        } else {
-            logger.debug(TAG, "resultImages(arg) is not empty");
-            updateResultView(resultImages);
-            this.croppedImages = resultImages;
-        }
-
-    }
-
-    private void saveNewDocument() {
-        logger.debug(TAG, "saveNewDocument");
-        // Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
-        ProgressDialog dialog = new ProgressDialog(this);
-        dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
-        dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        dialog.setCancelable(false);
-        dialog.show();
-        DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
-        document.createDocument(documentMeta).thenAccept((documentDetail) -> {
-            Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
-            croppedImages.toArray(bitmaps);
-            logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
-            addPagesToDocumentDetail(documentDetail, bitmaps).join();
-            document.updateDocument(documentDetail).join();
-            dialog.dismiss();
-            finish();
-        });
-
-    }
-
-    private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
-        return CompletableFuture.runAsync(() -> {
-            try {
-                document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
-                lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
-            } catch (Exception e) {
-                logger.error(TAG, "Error: " + e.getMessage());
-                logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
-            }
-        });
-    }
-
-    private void insertToExistDocument() {
-        logger.debug(TAG, "insertToExistDocument");
-        // TODO-rca: 実装
-    }
-
-    private void updateResultView(ArrayList<Bitmap> resultImages) {
-        logger.debug(TAG, "updateResultView");
-
-        LinearLayout resultView = findViewById(R.id.result_list_container);
-        ImageView selectedImage = findViewById(R.id.selected_image);
-        resultView.removeAllViews();
-
-        for (Bitmap resultImage : resultImages) {
-            View resultImageView = getLayoutInflater().inflate(R.layout.result_image_container_item, null);
-            ImageView imageView = resultImageView.findViewById(R.id.result_image);
-            imageView.setImageBitmap(resultImage);
-            imageView.setOnClickListener(v -> {
-
-                selectedImage.setImageBitmap(resultImage);
-
-                for (int i = 0; i < resultView.getChildCount(); i++) {
-                    View child = resultView.getChildAt(i).findViewById(R.id.result_image);
-                    child.setSelected(false);
-                }
-
-                v.setSelected(true);
-            });
-
-            resultView.addView(resultImageView);
-        }
-    }
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

component/viewer/build.gradle

@@ -1,11 +1,10 @@
 plugins {
     alias(libs.plugins.com.android.library)
-    id 'com.google.dagger.hilt.android'
 }
 
 android {
     namespace 'one.nem.lacerta.component.viewer'
-    compileSdk 34
+    compileSdk 33
 
     defaultConfig {
         minSdk 26
@@ -30,37 +29,7 @@ dependencies {
 
     implementation libs.androidx.appcompat
     implementation libs.com.google.android.material
-    implementation libs.androidx.activity
-    implementation libs.androidx.constraintlayout
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
-
-    // Navigation
-    implementation libs.navigation.fragment
-    implementation libs.navigation.ui
-    implementation libs.navigation.dynamic.features.fragment
-
-    // DI
-    implementation libs.com.google.dagger.hilt.android
-    annotationProcessor libs.com.google.dagger.hilt.compiler
-
-    // shared
-    implementation project(':shared:ui')
-
-    implementation project(':utils')
-
-    implementation project(':data')
-
-    implementation project(':model')
-
-    implementation project(':vcs')
-
-    implementation project(':component:common')
-
-    // TODO-rca: バージョンカタログに切り出す
-    implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
-
-    // ViewPager2
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
 }

component/viewer/src/main/AndroidManifest.xml

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

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/ItemClickListener.java

@@ -1,5 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-public interface ItemClickListener {
-    void onItemClick(String fileName); // DEBUG
-}

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/ViewerBodyAdapter.java

@@ -1,66 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import android.graphics.Bitmap;
-import android.media.Image;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-
-import one.nem.lacerta.model.document.page.Page;
-
-public class ViewerBodyAdapter extends RecyclerView.Adapter<ViewerBodyAdapter.ViewHolder>{
-
-    ArrayList<Page> pages;
-
-    ItemClickListener listener;
-
-    public ViewerBodyAdapter(ArrayList<Page> pages, ItemClickListener listener){
-        this.pages = pages;
-        this.listener = listener;
-    }
-
-    public ViewerBodyAdapter(ItemClickListener listener){
-        this.pages = new ArrayList<>();
-        this.listener = listener;
-    }
-
-    public void setPages(ArrayList<Page> pages){
-        this.pages = pages;
-    }
-
-    @NonNull
-    @Override
-    public ViewerBodyAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = View.inflate(parent.getContext(), R.layout.viewer_body_list_item, null);
-        return new ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
-        Bitmap bitmap = pages.get(position).getBitmap();
-        holder.image.setImageBitmap(bitmap);
-        holder.itemView.setOnClickListener(v -> {
-
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return pages.size();
-    }
-
-    public class ViewHolder extends RecyclerView.ViewHolder{
-
-        ImageView image;
-
-        public ViewHolder(@NonNull View itemView) {
-            super(itemView);
-            image = itemView.findViewById(R.id.imageView);
-        }
-    }
-}

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

@@ -1,123 +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 android.widget.Toast;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.utils.LacertaLogger;
-import one.nem.lacerta.vcs.LacertaVcs;
-import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link ViewerBodyFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class ViewerBodyFragment extends Fragment {
-
-    @Inject
-    Document document;
-
-    @Inject
-    LacertaLibrary lacertaLibrary;
-
-    @Inject
-    LacertaLogger logger;
-
-    @Inject
-    LacertaVcsFactory lacertaVcsFactory;
-
-    // Variables
-    private String documentId;
-    private String documentName;
-    private String revisionId;
-
-    public ViewerBodyFragment() {
-        // Required empty public constructor
-    }
-
-    public static ViewerBodyFragment newInstance(String documentId, String documentName) {
-        ViewerBodyFragment fragment = new ViewerBodyFragment();
-        Bundle args = new Bundle();
-        args.putString("documentId", documentId);
-        args.putString("documentName", documentName);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    public static ViewerBodyFragment newInstance(String documentId, String documentName, String revisionId) {
-        ViewerBodyFragment fragment = new ViewerBodyFragment();
-        Bundle args = new Bundle();
-        args.putString("documentId", documentId);
-        args.putString("documentName", documentName);
-        args.putString("revisionId", revisionId);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            documentId = getArguments().getString("documentId");
-            documentName = getArguments().getString("documentName");
-            revisionId = getArguments().getString("revisionId");
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_viewer_body, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        logger.debug("ViewerBodyFragment", "ViewerBodyFragment.onViewCreated");
-
-        RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
-            Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
-            // TODO-rca: なにか処理をもたせる
-        });
-        recyclerView.setAdapter(viewerBodyAdapter);
-
-        loadDocument(viewerBodyAdapter, documentId, revisionId);
-    }
-
-    private void loadDocument(ViewerBodyAdapter adapter, String documentId, String revisionId) {
-        if (revisionId == null) { // load latest revision
-            document.getDocument(documentId).thenAccept(document -> {
-                getActivity().runOnUiThread(() -> {
-                    adapter.setPages(document.getPages());
-                    adapter.notifyDataSetChanged();
-                });
-            });
-        } else { // load specified revision
-            LacertaVcs vcs = lacertaVcsFactory.create(documentId);
-            document.getDocumentPageListByFileNameList(documentId, vcs.getDocumentPagePathListRev(revisionId).join()).thenAccept(documentPageList -> {
-                getActivity().runOnUiThread(() -> {
-                    adapter.setPages(documentPageList);
-                    adapter.notifyDataSetChanged();
-                });
-            });
-        }
-    }
-}

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

@@ -1,243 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import android.os.Bundle;
-
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager2.widget.ViewPager2;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.document.page.Page;
-import one.nem.lacerta.model.pref.ToxiDocumentModel;
-import one.nem.lacerta.utils.LacertaLogger;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link ViewerContainerFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class ViewerContainerFragment extends Fragment {
-
-    // Inject
-
-    @Inject
-    LacertaLogger logger;
-
-    @Inject
-    LacertaLibrary lacertaLibrary;
-
-    @Inject
-    Document document;
-
-    // Variables
-    private String documentId;
-    private String documentName;
-    private boolean hasCombined = false;
-
-    public ViewerContainerFragment() {
-        // Required empty public constructor
-    }
-
-    public static ViewerContainerFragment newInstance(String documentId, String documentName, boolean hasCombined) {
-        ViewerContainerFragment fragment = new ViewerContainerFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        args.putString("documentId", documentId);
-        args.putString("documentName", documentName);
-        args.putBoolean("hasCombined", hasCombined);
-        return fragment;
-    }
-
-    public static ViewerContainerFragment newInstance(String documentId, String documentName) {
-        ViewerContainerFragment fragment = new ViewerContainerFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        args.putString("documentId", documentId);
-        args.putString("documentName", documentName);
-        args.putBoolean("hasCombined", false);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null){
-            documentId = getArguments().getString("documentId");
-            documentName = getArguments().getString("documentName");
-            hasCombined = getArguments().getBoolean("hasCombined");
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_viewer_container, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        // Init view pager
-        ViewPager2 viewPager = view.findViewById(R.id.view_pager);
-
-        // Init view pager adapter
-        ViewerViewPagerAdapter viewerViewPagerAdapter = new ViewerViewPagerAdapter(requireActivity());
-        viewPager.setAdapter(viewerViewPagerAdapter);
-
-        // Init tab layout
-        TabLayout tabLayout = view.findViewById(R.id.tab_layout);
-
-        // Init toolbar
-        Toolbar toolbar = view.findViewById(R.id.toolbar);
-        initToolbar(toolbar, true, documentName);
-
-        if (this.hasCombined) {
-            logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
-            lacertaLibrary.getCombinedDocumentToxiList(documentId).thenAccept(combinedDocumentToxiList -> {
-                logger.debug("ViewerContainerFragment", "combinedDocumentToxiList: " + combinedDocumentToxiList.size());
-                for (ToxiDocumentModel toxiDocumentModel : combinedDocumentToxiList) {
-                    logger.debug("ViewerContainerFragment", "titleCache: " + toxiDocumentModel.getTitleCache());
-                    viewerViewPagerAdapter
-                            .addFragment(ViewerBodyFragment.newInstance(toxiDocumentModel.getChildDocumentId(), toxiDocumentModel.getTitleCache()),
-                                    toxiDocumentModel.getTitleCache());
-                }
-                viewerViewPagerAdapter.notifyItemRangeChanged(0, combinedDocumentToxiList.size());
-            });
-        } else {
-            logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
-            tabLayout.setVisibility(View.GONE);
-            viewerViewPagerAdapter.addFragment(ViewerBodyFragment.newInstance(documentId, documentName), documentName);
-            viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
-        }
-
-        // Attach tab layout to view pager
-        new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
-            View customView = LayoutInflater.from(getContext()).inflate(R.layout.viewer_custom_tab, null);
-
-            TextView textView = customView.findViewById(R.id.tab_title);
-            textView.setText(viewerViewPagerAdapter.getTabTitle(position));
-
-            ImageButton imageButton = customView.findViewById(R.id.tab_modify);
-            imageButton.setOnClickListener(v -> {
-                Toast.makeText(getContext(), "Working!, Index:" + position, Toast.LENGTH_SHORT).show();
-            });
-
-            tab.setCustomView(customView);
-        }).attach();
-    }
-
-    /**
-     * Toolbarをinitする
-     *
-     * @param toolbar Toolbar
-     * @param showCloseButton Closeボタンを表示するかどうか
-     * @param title タイトル
-     */
-    private void initToolbar(Toolbar toolbar, boolean showCloseButton, String title) {
-        getActivity().runOnUiThread(() -> {
-            // Close button
-            if (showCloseButton) {
-                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
-                toolbar.setNavigationOnClickListener(v -> {
-                    getActivity().finish();
-                });
-            } else {
-                toolbar.setNavigationIcon(null);
-            }
-
-            // Title
-            toolbar.setTitle(title);
-
-            // Menu
-            toolbar.inflateMenu(R.menu.viewer_menu);
-            toolbar.setOnMenuItemClickListener(item -> {
-                if (item.getItemId() == R.id.action_open_vcs_rev_list) {
-                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
-                    return true;
-                } else if (item.getItemId() == R.id.action_rename) {
-                    renameDocument();
-                    return true;
-                } else if (item.getItemId() == R.id.action_delete) {
-                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
-                    return true;
-                } else if (item.getItemId() == R.id.action_move) {
-                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
-                    return true;
-                } else if (item.getItemId() == R.id.action_combine) {
-                    combineDocument();
-                    return true;
-                } else {
-                    return false;
-                }
-            });
-        });
-    }
-
-    private void combineDocument() {
-        LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
-        lacertaFilePickerDialog.setListener((fileName, selectedId) -> {
-            lacertaLibrary.combineDocument(documentId, selectedId).thenAccept(aVoid -> {
-                getActivity().runOnUiThread(() -> {
-                    Toast.makeText(getContext(), "結合しました", Toast.LENGTH_SHORT).show();
-                    getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
-                });
-            });
-        });
-        lacertaFilePickerDialog
-                .setTitle("ファイルの結合")
-                .setMessage("結合するファイルを選択してください")
-                .setNegativeButtonText("キャンセル")
-                .show(getChildFragmentManager(), "LacertaFilePickerDialog");
-    }
-
-    /**
-     * ドキュメント名を変更する
-     */
-    private void renameDocument() {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
-        builder.setTitle("ファイル名の変更");
-        builder.setMessage("ファイル名を入力してください");
-
-        View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
-        TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
-        TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
-        textInputEditText.setText(documentName);
-        textInputLayout.setHint("ファイル名");
-        builder.setView(view);
-
-        builder.setPositiveButton("変更", (dialog, which) -> {
-            document.renameDocument(documentId, textInputEditText.getText().toString()).thenAccept(aVoid -> {
-                getActivity().runOnUiThread(() -> {
-                    this.documentName = textInputEditText.getText().toString();
-                    // TODO-rca: Toolbarのタイトルも変更する
-                });
-            });
-        });
-        builder.setNegativeButton("キャンセル", (dialog, which) -> {
-            dialog.cancel();
-        });
-
-        builder.show();
-    }
-}

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

@@ -1,282 +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.component.common.LacertaSelectRevDialog;
-import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
-import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
-import one.nem.lacerta.component.common.picker.LacertaFilePickerAdapter;
-import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
-import one.nem.lacerta.data.Document;
-import one.nem.lacerta.data.LacertaLibrary;
-import one.nem.lacerta.model.ListItemType;
-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
-    LacertaLibrary lacertaLibrary;
-
-    @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, null);
-
-        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);
-                });
-            }).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
-                updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath());
-            });
-        } 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);
-                    });
-                });
-            }).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
-                updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath()); // TODO-rca: リビジョンの場合はリビジョン名を表示する?
-            });
-        }
-
-        return view;
-    }
-
-    /**
-     * Toolbarのサブタイトルを更新
-     * @param subtitle サブタイトル
-     */
-    private void updateToolbarSubtitle(Toolbar toolbar, String subtitle) {
-        getActivity().runOnUiThread(() -> {
-            toolbar.setSubtitle(subtitle);
-        });
-    }
-
-    /**
-     * ToolbarをInitする
-     *
-     * @param toolbar Toolbar
-     * @param showCloseButton 戻るボタンを表示するか
-     * @param title タイトル
-     */
-    private void toolbarSetup(Toolbar toolbar, boolean showCloseButton, String title, String Subtitle) {
-        getActivity().runOnUiThread(() -> {
-            if (showCloseButton) {
-                toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
-                toolbar.setNavigationOnClickListener(v -> {
-                    // Stop Activity
-                    getActivity().finish();
-                });
-            } else {
-                toolbar.setNavigationIcon(null);
-            }
-            toolbar.setTitle(title);
-            if (Subtitle != null) toolbar.setSubtitle(Subtitle);
-            toolbar.inflateMenu(R.menu.viewer_menu);
-            toolbar.setOnMenuItemClickListener(item -> {
-                if (item.getItemId() == R.id.action_open_vcs_rev_list) {
-                    LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
-                    lacertaSelectRevDialog.setDocumentId(this.documentId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
-                    lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
-                        @Override
-                        public void onItemSelected(String revId) {
-                            getParentFragmentManager().beginTransaction()
-                                    .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName, revisionId))
-                                    .commit();
-                        }
-
-                        @Override
-                        public void onDialogCanceled() {
-                            logger.debug(TAG, "Canceled");
-                        }
-                    });
-                    lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
-                    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) {
-                    LacertaDirPickerDialog lacertaDirPickerDialog = new LacertaDirPickerDialog();
-                    lacertaDirPickerDialog.setListener((name, dirId) -> {
-                        logger.debug(TAG, "Selected dir: " + name + ", " + dirId);
-                        document.moveDocument(documentId, dirId).thenAccept(aVoid -> {
-                            getActivity().runOnUiThread(() -> {
-                                // Stop Activity
-                                getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
-                            });
-                        });
-                    });
-                    lacertaDirPickerDialog.setTitle("ファイルの移動")
-                            .setMessage("ファイルを移動するフォルダを選択してください。")
-                            .setPositiveButtonText("移動")
-                            .setNegativeButtonText("キャンセル");
-                    lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
-                    return true;
-                } else if(item.getItemId() == R.id.action_combine) {
-                    LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
-                    lacertaFilePickerDialog.setListener((name, fileId) -> {
-                        lacertaLibrary.combineDocument(documentId, fileId).thenAccept(aVoid -> {
-                            getActivity().runOnUiThread(() -> {
-                                // Stop Activity
-                                getActivity().finish(); // TODO-rca: 終了せずにUIを更新したい
-                            });
-                        });
-                    });
-                    lacertaFilePickerDialog.setTitle("ファイルの結合")
-                            .setMessage("結合するファイルを選択してください。")
-                            .setNegativeButtonText("キャンセル");
-                    lacertaFilePickerDialog.show(getParentFragmentManager(), "select_file_dialog");
-                    return true;
-                } else {
-                    return false;
-                }
-            });
-        });
-    }
-}

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

@@ -1,77 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.Toast;
-
-import androidx.activity.EdgeToEdge;
-import androidx.activity.OnBackPressedCallback;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.utils.LacertaLogger;
-
-@AndroidEntryPoint
-public class ViewerMainActivity extends AppCompatActivity {
-
-    @Inject
-    LacertaLogger logger;
-
-    @Inject
-    public ViewerMainActivity() {
-    }
-
-    // Variables
-    private static final String TAG = "ViewerMainActivity";
-    String documentId;
-    String documentName;
-    boolean hasCombined = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_viewer_main);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-
-//        // Transition
-//        overridePendingTransition(one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim);
-
-        Intent intent = getIntent();
-        try {
-            documentId = intent.getStringExtra("documentId");
-            documentName = intent.getStringExtra("documentName");
-            hasCombined = intent.getBooleanExtra("hasCombined", false);
-        }
-        catch (Exception e) {
-            logger.error(TAG, "Failed to get documentId from intent");
-            logger.error(TAG, "Searchable Error code: " + "f64c21a2-391f-4c40-92f6-183da459de21");
-            Toast.makeText(this, "Failed to get documentId from intent", Toast.LENGTH_LONG).show();
-            finish();
-        }
-
-        // Navigation
-//        getSupportFragmentManager().beginTransaction()
-//                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
-//                .commit();
-        if (hasCombined) {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName, hasCombined))
-                    .commit();
-        } else {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName))
-                    .commit();
-        }
-    }
-
-}

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/ViewerViewPagerAdapter.java

@@ -1,44 +0,0 @@
-package one.nem.lacerta.component.viewer;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
-
-import java.util.ArrayList;
-
-public class ViewerViewPagerAdapter extends FragmentStateAdapter {
-
-    // Variables
-    private ArrayList<Fragment> fragmentArrayList = new ArrayList<>();
-    private ArrayList<String> fragmentTitleList = new ArrayList<>();
-
-    // Setter
-    public void addFragment(Fragment fragment, String title){
-        fragmentArrayList.add(fragment);
-        fragmentTitleList.add(title);
-    }
-
-    public ViewerViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
-        super(fragmentActivity);
-    }
-
-    @NonNull
-    @Override
-    public Fragment createFragment(int position) {
-        return fragmentArrayList.get(position);
-    }
-
-    @Override
-    public int getItemCount() {
-        return fragmentArrayList == null ? 0 : fragmentArrayList.size();
-    }
-
-    @Nullable
-    public CharSequence getTabTitle(int position) {
-        return fragmentTitleList.get(position);
-    }
-}

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/java/one/nem/lacerta/component/viewer/model/ViewerBodyListItem.java

@@ -1,20 +0,0 @@
-package one.nem.lacerta.component.viewer.model;
-
-import android.graphics.Bitmap;
-
-public class ViewerBodyListItem {
-
-    Bitmap image;
-
-    public ViewerBodyListItem(Bitmap image) {
-        this.image = image;
-    }
-
-    public Bitmap getImage() {
-        return image;
-    }
-
-    public void setImage(Bitmap image) {
-        this.image = image;
-    }
-}

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

@@ -1,21 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ViewerMainActivity">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="one.nem.lacerta.component.viewer.ViewerListFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,61 +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.SubtitleCollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                app:contentScrim="@color/colorSecondaryContainer"
-                android:background="@color/colorSurface"
-                android:layout_width="match_parent"
-                android:layout_height="160dp"
-                android:fitsSystemWindows="true"
-                android:minHeight="?attr/actionBarSize"
-                app:collapsedTitleGravity="start|center_vertical"
-                app:expandedTitleGravity="start|bottom"
-                app:expandedTitleMarginBottom="16dp"
-                app:expandedTitleMarginStart="16dp"
-                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:layout_collapseMode="pin"
-                    app:title="Title" />
-
-            </com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
-
-
-            <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
-            android:id="@+id/body_recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="16dp"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</FrameLayout>

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

@@ -1,15 +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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".ViewerBodyFragment">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-</FrameLayout>

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

@@ -1,66 +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.SubtitleCollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                app:contentScrim="@color/colorSecondaryContainer"
-                android:background="@color/colorSurface"
-                android:layout_width="match_parent"
-                android:layout_height="160dp"
-                android:fitsSystemWindows="true"
-                android:minHeight="?attr/actionBarSize"
-                app:collapsedTitleGravity="start|center_vertical"
-                app:expandedTitleGravity="start|bottom"
-                app:expandedTitleMarginBottom="16dp"
-                app:expandedTitleMarginStart="16dp"
-                app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:layout_collapseMode="pin"
-                    app:title="Title" />
-
-            </com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
-
-            <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tab_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:tabMode="scrollable"
-                />
-
-            <ProgressBar
-                android:id="@+id/loading_progress_bar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                android:background="@color/colorSurface"
-                android:visibility="gone" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/view_pager"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</FrameLayout>

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

@@ -1,20 +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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        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"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/backgrounds/scenic" />
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,25 +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="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="16dp">
-
-    <TextView
-        android:id="@+id/tab_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TAB TITLE"
-        android:textSize="16sp"
-        android:layout_gravity="center"/>
-
-    <ImageButton
-        android:id="@+id/tab_modify"
-        android:layout_marginStart="8dp"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:background="@android:color/transparent"
-        android:src="@drawable/more_vert_24px"
-        android:layout_gravity="center_vertical" />
-</LinearLayout>

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,23 +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="移動" />
-
-    <item
-        android:id="@+id/action_combine"
-        android:title="結合" />
-
-</menu>

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

@@ -1,21 +0,0 @@
-<?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">
-
-    <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" />
-</navigation>

component/viewer/src/main/res/values/strings.xml

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

data/build.gradle

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

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

@@ -2,11 +2,9 @@ package one.nem.lacerta.data;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
-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;
 
@@ -15,19 +13,34 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
  */
 public interface Document {
 
-    CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta);
+    ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
 
-    CompletableFuture<DocumentDetail> createDocument();
+    ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
 
-    CompletableFuture<Void> renameDocument(String documentId, String name);
+    /**
+     * 更新の新しいドキュメントから順に並べてlimit件取得する
+     * @param limit 取得する上限数
+     */
+    ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
 
-    CompletableFuture<Void> deleteDocument(String documentId);
+    /**
+     * 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
+     * @param limit 取得する上限数
+     * @param offset 取得するオフセット
+     */
+    ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset);
 
-    CompletableFuture<Void> moveDocument(String documentId, String parentId);
+    /**
+     * ドキュメントIDからDocumentDetailを取得する
+     * @param id ドキュメントID
+     */
+    DocumentDetail getDocumentDetail(String id);
 
-    CompletableFuture<Void> updateDocument(DocumentDetail detail);
+    /**
+     * DocumentMetaからDocumentDetailを取得する
+     * @param meta DocumentMeta
+     */
+    DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように
 
-    CompletableFuture<DocumentDetail> getDocument(String documentId);
+    DocumentDetail createDocumentByMeta(DocumentMeta meta);
-
-    CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList);
 }

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

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

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

@@ -1,59 +1,22 @@
 package one.nem.lacerta.data;
 
-import java.util.ArrayList;
-import java.util.concurrent.CompletableFuture;
-
-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;
-import one.nem.lacerta.model.pref.ToxiDocumentModel;
 
 public interface LacertaLibrary {
 
     // Get History
-    CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit);
+    LibraryItemPage getRecentDocument(int limit);
-    CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset);
+    LibraryItemPage getRecentDocument(int limit, int offset);
 
-    // Get Library Page
+    // Get Library page
-    CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
+    LibraryItemPage getLibraryPage(int limit);
-    CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
+    LibraryItemPage getLibraryPage(int limit, int offset);
+    LibraryItemPage getLibraryPage(String pageId, int limit);
+    LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
 
-    // Get Folder List
+    // GetDocument
-    CompletableFuture<LibraryItemPage> getFolderList(String parentId);
+    DocumentDetail getDocumentDetailById(String id);
-
-    // Create Folder
-    CompletableFuture<String> createFolder(String parentId, 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);
-
-    // Combined Document
-
-    CompletableFuture<Void> combineDocument(String parentId, String childId);
-
-    CompletableFuture<Void> uncombineDocument(String parentId, String childId);
-
-//    CompletableFuture<Void> combineDocument(String parentId, ArrayList<String> childIdList);
-//
-//    CompletableFuture<Void> uncombineDocument(String parentId, ArrayList<String> childIdList);
-
-    CompletableFuture<ArrayList<ToxiDocumentModel>> getCombinedDocumentToxiList(String parentId);
 }

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

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

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

@@ -1,280 +1,139 @@
 package one.nem.lacerta.data.impl;
 
-import androidx.room.Update;
-
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 
-// Hilt
 import javax.inject.Inject;
 
-// Lacerta/data
 import one.nem.lacerta.data.Document;
 
-// Lacerta/model
-import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.model.document.DocumentDetail;
 
-// Lacerta/source
+import one.nem.lacerta.model.document.path.DocumentPath;
-import one.nem.lacerta.model.document.internal.XmlMetaModel;
+import one.nem.lacerta.model.document.tag.DocumentTag;
-import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
-import one.nem.lacerta.model.document.page.Page;
 import one.nem.lacerta.source.database.LacertaDatabase;
+
 import one.nem.lacerta.source.database.entity.DocumentEntity;
+import one.nem.lacerta.source.database.entity.LibraryEntity;
+import one.nem.lacerta.source.database.entity.TagEntity;
 
-// Lacerta/utils
+import one.nem.lacerta.source.jgit.JGitRepository;
-import one.nem.lacerta.source.file.FileManager;
-import one.nem.lacerta.source.file.factory.FileManagerFactory;
-import one.nem.lacerta.utils.LacertaLogger;
-
-// Lacerta/vcs
-import one.nem.lacerta.utils.XmlMetaParser;
 import one.nem.lacerta.utils.repository.DeviceInfoUtils;
-import one.nem.lacerta.vcs.LacertaVcs;
-import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 
-public class DocumentImpl implements Document {
+public class DocumentImpl implements Document{
 
-    String TAG = getClass().getSimpleName();
+    private LacertaDatabase database;
 
     @Inject
-    LacertaLogger logger;
+    public DocumentImpl(LacertaDatabase database) {
+        this.database = database;
+    }
 
     @Inject
-    LacertaDatabase database;
+    JGitRepository jGitRepository;
-
-    @Inject
-    LacertaVcsFactory vcsFactory;
-
-    @Inject
-    FileManagerFactory fileManagerFactory;
 
     @Inject
     DeviceInfoUtils deviceInfoUtils;
 
-    @Inject
-    XmlMetaParser xmlMetaParser;
-
-    @Inject
-    public DocumentImpl() {
-        // Init
-//        logger.debug(TAG, "called");
-    }
-
-
     @Override
-    public CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta) {
+    public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
-        return CompletableFuture.supplyAsync(() -> {
+        ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
-            DocumentDetail detail = new DocumentDetail();
+        List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
-            detail.setMeta(meta);
-            detail.setPages(new ArrayList<>());
-            // Create DocumentEntity
-            DocumentEntity documentEntity = new DocumentEntity();
-            documentEntity.id = meta.getId();
-            documentEntity.title = meta.getTitle();
-            documentEntity.author = meta.getAuthor();
-            documentEntity.updatedAt = meta.getUpdatedAt();
-            documentEntity.createdAt = meta.getCreatedAt();
-            documentEntity.parentId = meta.getParentId();
-            documentEntity.isCombineChild = meta.getIsCombineChild();
-            documentEntity.isCombineParent = meta.getIsCombineParent();
 
-            database.documentDao().insert(documentEntity);
+        for (DocumentEntity documentEntity : documentEntities) {
+            // タグ取得
+            // TODO-rca: 切り出すべきかも？
+            List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
+            ArrayList<DocumentTag> documentTags = new ArrayList<>();
+            for (TagEntity tagEntity : tagEntities) {
+                documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
+            }
 
-            // Vcs
+            // 組み立て処理
-            LacertaVcs vcs = vcsFactory.create(meta.getId());
+            // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？
-            vcs.createDocument(meta.getId());
+            DocumentMeta documentMeta = new DocumentMeta();
+            documentMeta.setId(documentEntity.id);
+            documentMeta.setTitle(documentEntity.title);
+            documentMeta.setCreatedAt(documentEntity.createdAt);
+            documentMeta.setUpdatedAt(documentEntity.updatedAt);
+            documentMeta.setTags(documentTags);
 
-            // XmlMeta
+            documentMetas.add(documentMeta);
-            updateXmlMeta(detail).join();
+        }
 
-            return detail;
+        return documentMetas;
-        });
     }
 
     @Override
-    public CompletableFuture<DocumentDetail> createDocument() {
+    public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
-        DocumentMeta meta = new DocumentMeta();
+        return null; // TODO-rca: 実装する
-        meta.setId(UUID.randomUUID().toString());
-        meta.setTitle("New Document");
-        meta.setAuthor("author");
-        meta.setUpdatedAt(new Date());
-        meta.setCreatedAt(new Date());
-        meta.setParentId(null);
-        meta.setIsCombineChild(false);
-        meta.setIsCombineParent(false);
-        return createDocument(meta);
     }
 
     @Override
-    public CompletableFuture<Void> deleteDocument(String documentId) {
+    public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
-        return CompletableFuture.supplyAsync(() -> {
+//        ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
-            DocumentEntity documentEntity = database.documentDao().findById(documentId);
+//        database.documentDao().
-            if (documentEntity == null) {
+        // TODO-rca: 履歴取得するDao実装する
-                throw new IllegalArgumentException("documentId is not found");
+        return null;
-            }
-            database.documentDao().delete(documentEntity);
-            return null;
-        });
     }
 
     @Override
-    public CompletableFuture<Void> moveDocument(String documentId, String parentId) {
+    public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
-        return CompletableFuture.supplyAsync(() -> {
+        return null;
-            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;
-        });
     }
 
     @Override
-    public CompletableFuture<Void> updateDocument(DocumentDetail detail) {
+    public DocumentDetail getDocumentDetail(String id) {
-        return CompletableFuture.supplyAsync(() -> {
+        DocumentDetail documentDetail = new DocumentDetail();
-            updateXmlMeta(detail).join();
+        DocumentEntity documentEntity = database.documentDao().findById(id);
-            return null;
+
-        });
+        // タグ取得
+        // TODO-rca: 切り出すべきかも？
+        List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
+        ArrayList<DocumentTag> documentTags = new ArrayList<>();
+        for (TagEntity tagEntity : tagEntities) {
+            documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
+        }
+
+        // パス取得
+        // TODO-rca: 切り出すべきかも？
+        LibraryEntity libraryEntity = database.libraryDao().findById(id);
+        DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path);
+
+        // リポジトリ取得
+        documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング
+
+        // 組み立て処理
+        // 可読性が終わるのでコンストラクタはつかわないほうがいいかも？
+        DocumentMeta documentMeta = new DocumentMeta();
+        documentMeta.setId(documentEntity.id);
+        documentMeta.setTitle(documentEntity.title);
+        documentMeta.setCreatedAt(documentEntity.createdAt);
+        documentMeta.setUpdatedAt(documentEntity.updatedAt);
+        documentMeta.setTags(documentTags);
+
+        documentDetail.setMeta(documentMeta);
+        documentDetail.setAuthor(documentEntity.author);
+        documentDetail.setDefaultBranch(documentEntity.defaultBranch);
+
+        return documentDetail;
     }
 
     @Override
-    public CompletableFuture<Void> renameDocument(String documentId, String name) {
+    public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) {
-        return CompletableFuture.supplyAsync(() -> {
+        return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする（処理を切り分ける？）
-            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) {
+    public DocumentDetail createDocumentByMeta(DocumentMeta meta) {
-        return CompletableFuture.supplyAsync(() -> {
+        DocumentDetail documentDetail = new DocumentDetail();
-            DocumentEntity documentEntity = database.documentDao().findById(documentId);
-            if (documentEntity == null) {
-                throw new IllegalArgumentException("documentId is not found");
-            }
-            DocumentMeta meta = new DocumentMeta();
-            meta.setId(documentEntity.id);
-            meta.setTitle(documentEntity.title);
-            meta.setAuthor(documentEntity.author);
-            meta.setUpdatedAt(documentEntity.updatedAt);
-            meta.setCreatedAt(documentEntity.createdAt);
-            meta.setParentId(documentEntity.parentId);
 
-            DocumentDetail detail = new DocumentDetail();
+        documentDetail.setMeta(meta);
+        documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする
+        documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする？
 
-            getPagesByXmlMeta(documentId).thenCompose(xmlMetaPageModels -> getPagesByXmlMetaPageModel(documentId, xmlMetaPageModels)).thenAccept(pages -> {
+        return documentDetail;
-                logger.debug(TAG, "pages: " + pages.size());
-                detail.setMeta(meta);
-                detail.setPages(pages);
-            }).join();
-
-            return detail;
-        });
-    }
-
-    @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());
-            try {
-                ArrayList<XmlMetaPageModel> xmlMetaPageModels = xmlMetaParser.deserialize(fileManager.resolve(documentId).loadXml("meta.xml")).getPages();
-                // Debug
-                logger.debug(TAG, "xmlMetaPageModels: " + xmlMetaPageModels.size());
-                for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
-                    logger.debug(TAG, "\txmlMetaPageModel: " + xmlMetaPageModel.getFilename());
-                }
-                return xmlMetaPageModels;
-            } catch (IOException e) {
-                logger.error(TAG, "DocumentMeta parse error");
-                logger.trace(TAG, e.getMessage());
-                logger.e_code("db18c04a-1625-4871-9e4e-918d805568ac");
-            }
-            return null;
-        });
-    }
-
-    private CompletableFuture<ArrayList<Page>> getPagesByXmlMetaPageModel(String documentId, ArrayList<XmlMetaPageModel> xmlMetaPageModels) {
-        return CompletableFuture.supplyAsync(() -> {
-            ArrayList<Page> pages = new ArrayList<>();
-            FileManager fileManager;
-            try {
-                fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId);
-            } catch (IOException e) {
-                logger.error(TAG, "FileManager resolve error");
-                logger.trace(TAG, e.getMessage());
-                logger.e_code("2235e8ee-4177-46f8-af6b-084381b202e6");
-                return null;
-            }
-            for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
-                try {
-                    pages.add(new Page(xmlMetaPageModel.getFilename(), fileManager.resolve("raw").loadBitmap(xmlMetaPageModel.getFilename())));
-                } catch (IOException e) {
-                    logger.error(TAG, "Bitmap decode error");
-                    logger.trace(TAG, e.getMessage());
-                    logger.e_code("3bba8c8f-90fb-4a24-a726-7ea201929f8b");
-                    return null;
-                }
-            }
-            return pages;
-        });
-    }
-
-    private CompletableFuture<Void> updateXmlMeta(DocumentDetail documentDetail) {
-        return CompletableFuture.supplyAsync(() -> {
-            // TODO-rca: リビジョンIDを検証する, 挿入する
-            FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
-            ArrayList<XmlMetaPageModel> xmlMetaPageModels = new ArrayList<>();
-            for (Page page : documentDetail.getPages()) {
-                xmlMetaPageModels.add(new XmlMetaPageModel(page.getFileName()));
-            }
-            try {
-                fileManager.createDirectoryIfNotExist(documentDetail.getMeta().getId()).resolve(documentDetail.getMeta().getId())
-                        .createFileIfNotExist("meta.xml").resolve("meta.xml").saveXml(xmlMetaParser.serialize(new XmlMetaModel("revisionId_PLACEHOLDER", xmlMetaPageModels)));
-            } catch (IOException e) {
-                logger.error(TAG, "DocumentMeta serialize error");
-                logger.trace(TAG, e.getMessage());
-                logger.e_code("e3b4d0c9-5b7e-4b7e-9e9a-5b8b8b8b8b8b");
-            }
-            return null;
-        });
     }
 }

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

@@ -1,417 +1,42 @@
 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.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-import javax.inject.Inject;
-
 import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.LibraryItemPage;
-import one.nem.lacerta.model.ListItem;
-import one.nem.lacerta.model.ListItemType;
-import one.nem.lacerta.model.PublicPath;
 import one.nem.lacerta.model.document.DocumentDetail;
-import one.nem.lacerta.model.document.tag.DocumentTag;
-import one.nem.lacerta.model.pref.ToxiDocumentModel;
-import one.nem.lacerta.source.database.LacertaDatabase;
-import one.nem.lacerta.source.database.common.DateTypeConverter;
-import one.nem.lacerta.source.database.entity.DocumentEntity;
-import one.nem.lacerta.source.database.entity.FolderEntity;
-import one.nem.lacerta.source.database.entity.TagEntity;
-import one.nem.lacerta.source.database.entity.ToxiDocumentEntity;
-import one.nem.lacerta.source.database.entity.ToxiDocumentTagEntity;
-import one.nem.lacerta.utils.FeatureSwitch;
-import one.nem.lacerta.utils.LacertaLogger;
 
 public class LacertaLibraryImpl implements LacertaLibrary {
-
+    @Override
-    LacertaLogger logger;
+    public LibraryItemPage getRecentDocument(int limit) {
-    LacertaDatabase database;
+        return null;
-
-    @Inject
-    public LacertaLibraryImpl(LacertaLogger logger, LacertaDatabase database) {
-        this.logger = logger;
-        this.database = database;
     }
 
     @Override
-    public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit) {
+    public LibraryItemPage getRecentDocument(int limit, int offset) {
-        return CompletableFuture.supplyAsync(() -> {
+        return null;
-            List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
-
-            ArrayList<ListItem> listItems = new ArrayList<>();
-            for (DocumentEntity documentEntity : documentEntities) {
-                ListItem listItem = new ListItem();
-                listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
-                listItem.setTitle(documentEntity.title);
-                listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
-                listItem.setItemId(documentEntity.id);
-                listItem.setHasCombined(documentEntity.isCombineParent);
-                listItems.add(listItem);
-            }
-
-            return listItems;
-        });
     }
 
     @Override
-    public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset) {
+    public LibraryItemPage getLibraryPage(int limit) {
-        return null; // TODO-rca: Implement
+        return null;
     }
 
     @Override
-    public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) {
+    public LibraryItemPage getLibraryPage(int limit, int offset) {
-        return CompletableFuture.supplyAsync(() -> {
+        return null;
-            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);
-            }
-
-            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);
-                listItem.setHasCombined(false);
-                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.setItemId(documentEntity.id);
-                listItem.setHasCombined(documentEntity.isCombineParent);
-                listItems.add(listItem);
-            }
-
-            libraryItemPage.setListItems(listItems);
-
-            logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
-
-            return libraryItemPage;
-        });
     }
 
     @Override
-    public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset) {
+    public LibraryItemPage getLibraryPage(String pageId, int limit) {
-        return CompletableFuture.supplyAsync(() -> {
+        return null;
-            return null;
-        });
     }
 
     @Override
-    public CompletableFuture<LibraryItemPage> getFolderList(String targetDirId) {
+    public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
-        return CompletableFuture.supplyAsync(() -> {
+        return null;
-            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);
-                listItem.setHasCombined(false);
-                listItems.add(listItem);
-            }
-
-
-            libraryItemPage.setListItems(listItems);
-
-            return libraryItemPage;
-        });
     }
 
     @Override
-    public CompletableFuture<String> createFolder(String parentId, String name) {
+    public DocumentDetail getDocumentDetailById(String id) {
-        return CompletableFuture.supplyAsync(() -> {
+        return null;
-            FolderEntity folderEntity = new FolderEntity();
-            folderEntity.id = UUID.randomUUID().toString();
-            folderEntity.name = name;
-            folderEntity.parentId = parentId;
-            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;
-        });
-    }
-
-    @Override
-    public CompletableFuture<Void> combineDocument(String targetId1, String tagetId2) {
-        return CompletableFuture.supplyAsync(() -> {
-            DocumentEntity target1DocumentEntity = database.documentDao().findById(targetId1);
-            DocumentEntity target2DocumentEntity = database.documentDao().findById(tagetId2);
-            if (target1DocumentEntity == null || target2DocumentEntity == null) {
-                logger.warn("LacertaLibraryImpl", "DocumentEntity is not found.");
-                return null;
-            }
-            target1DocumentEntity.isCombineChild = true;
-            target2DocumentEntity.isCombineChild = true;
-            database.documentDao().update(target1DocumentEntity);
-            database.documentDao().update(target2DocumentEntity);
-            logger.debug("LacertaLibraryImpl", "Database Query: Updated DocumentEntity");
-
-            DocumentEntity parentDocumentEntity = new DocumentEntity();
-            parentDocumentEntity.id = UUID.randomUUID().toString();
-            parentDocumentEntity.title = target1DocumentEntity.title + "(Combined)";
-            parentDocumentEntity.parentId = target1DocumentEntity.parentId;
-            parentDocumentEntity.author = target1DocumentEntity.author; // TODO-rca: Target1とTarget2の作者が異なる場合の処理
-            // CombinedなDocumentはいま作成された と考える
-            parentDocumentEntity.createdAt = new Date();
-            parentDocumentEntity.updatedAt = new Date();
-            parentDocumentEntity.isCombineParent = true;
-            parentDocumentEntity.isCombineChild = false;
-            database.documentDao().insert(parentDocumentEntity);
-            logger.debug("LacertaLibraryImpl", "Database Query: Inserted DocumentEntity");
-
-            insertCombineDocumentToxi(parentDocumentEntity.id, target1DocumentEntity.id, target1DocumentEntity.title);
-            insertCombineDocumentToxi(parentDocumentEntity.id, target2DocumentEntity.id, target2DocumentEntity.title);
-            return null;
-        });
-    }
-
-    private void insertCombineDocumentToxi(String parentId, String childId, String titleCache) {
-        ToxiDocumentEntity toxiDocumentEntity = new ToxiDocumentEntity();
-        toxiDocumentEntity.parentDocumentId = parentId;
-        toxiDocumentEntity.childDocumentId = childId;
-        toxiDocumentEntity.order = 0; // TODO-rca: 並び順の概念をもたせる
-        toxiDocumentEntity.isActive = true; // TODO-rca: タブから非表示にできるようにする
-        toxiDocumentEntity.titleCache = titleCache;
-        database.toxiDocumentDao().insert(toxiDocumentEntity);
-        logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentEntity");
-    }
-
-    @Override
-    public CompletableFuture<Void> uncombineDocument(String parentId, String childId) {
-        return CompletableFuture.supplyAsync(() -> {
-            DocumentEntity parentDocumentEntity = database.documentDao().findById(parentId);
-            DocumentEntity childDocumentEntity = database.documentDao().findById(childId);
-            if (parentDocumentEntity == null || childDocumentEntity == null) {
-                logger.warn("LacertaLibraryImpl", "DocumentEntity is not found.");
-                return null;
-            }
-            parentDocumentEntity.isCombineParent = false;
-            childDocumentEntity.isCombineChild = false;
-            database.documentDao().update(parentDocumentEntity);
-            database.documentDao().update(childDocumentEntity);
-            logger.debug("LacertaLibraryImpl", "Database Query: Updated DocumentEntity");
-
-            database.toxiDocumentDao().deleteByParentIdAndChildId(parentId, childId);
-            logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentEntity");
-            return null;
-        });
-    }
-
-    @Override
-    public CompletableFuture<ArrayList<ToxiDocumentModel>> getCombinedDocumentToxiList(String parentId) {
-        return CompletableFuture.supplyAsync(() -> {
-            List<ToxiDocumentEntity> toxiDocumentEntities = database.toxiDocumentDao().findByParentId(parentId);
-            ArrayList<ToxiDocumentModel> toxiDocumentModels = new ArrayList<>();
-            for (ToxiDocumentEntity toxiDocumentEntity : toxiDocumentEntities) {
-                ToxiDocumentModel toxiDocumentModel = new ToxiDocumentModel();
-                toxiDocumentModel.setParentDocumentId(toxiDocumentEntity.parentDocumentId);
-                toxiDocumentModel.setChildDocumentId(toxiDocumentEntity.childDocumentId);
-                toxiDocumentModel.setOrder(toxiDocumentEntity.order);
-                toxiDocumentModel.setActive(toxiDocumentEntity.isActive);
-                toxiDocumentModel.setTitleCache(toxiDocumentEntity.titleCache);
-                toxiDocumentModels.add(toxiDocumentModel);
-            }
-            return toxiDocumentModels;
-        });
-    }
-
-    /**
-     * 再帰的にパスを解決する
-     *
-     * @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);
     }
 }

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

@@ -1,219 +1,219 @@
-//package one.nem.lacerta.data.impl;
+package one.nem.lacerta.data.impl;
-//
+
-//import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.data.LacertaLibrary;
-//import one.nem.lacerta.model.LibraryItemPage;
+import one.nem.lacerta.model.LibraryItemPage;
-//import one.nem.lacerta.model.ListItem;
+import one.nem.lacerta.model.ListItem;
-//import one.nem.lacerta.model.ListItemType;
+import one.nem.lacerta.model.ListItemType;
-//import one.nem.lacerta.model.document.DocumentDetail;
+import one.nem.lacerta.model.document.DocumentDetail;
-//
+
-//import one.nem.lacerta.model.document.DocumentMeta;
+import one.nem.lacerta.model.document.DocumentMeta;
-//import one.nem.lacerta.model.document.path.DocumentPath;
+import one.nem.lacerta.model.document.path.DocumentPath;
-//import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.utils.LacertaLogger;
-//
+
-//import com.github.javafaker.DateAndTime;
+import com.github.javafaker.DateAndTime;
-//import com.github.javafaker.Faker;
+import com.github.javafaker.Faker;
-//
+
-//import java.text.DateFormat;
+import java.text.DateFormat;
-//import java.util.ArrayList;
+import java.util.ArrayList;
-//import java.util.Objects;
+import java.util.Objects;
-//import java.util.UUID;
+import java.util.UUID;
-//
+
-//import javax.inject.Inject;
+import javax.inject.Inject;
-//
+
-///**
+/**
-// * LacertaLibraryのスタブ実装
+ * LacertaLibraryのスタブ実装
-// */
+ */
-//public class LacertaLibraryStubImpl implements LacertaLibrary {
+public class LacertaLibraryStubImpl implements LacertaLibrary {
-//
+
-//    LacertaLogger logger;
+    LacertaLogger logger;
-//
+
-//    Faker faker;
+    Faker faker;
-//
+
-//    @Inject
+    @Inject
-//    public LacertaLibraryStubImpl(LacertaLogger logger) {
+    public LacertaLibraryStubImpl(LacertaLogger logger) {
-//        faker = new Faker(); // Init Faker
+        faker = new Faker(); // Init Faker
-//        this.logger = logger;
+        this.logger = logger;
-//        logger.debug("LibraryStub", "Initialized");
+        logger.debug("LibraryStub", "Initialized");
-//    }
+    }
-//
+
-//    // Internal Methods
+    // Internal Methods
-//
+
-//    // Generate Stub Data
+    // Generate Stub Data
-//    private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
+    private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
-//        logger.debug("LibraryStub", "generateStubLibraryItemPage");
+        logger.debug("LibraryStub", "generateStubLibraryItemPage");
-//        ArrayList<ListItem> listItems = new ArrayList<>();
+        ArrayList<ListItem> listItems = new ArrayList<>();
-//        int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
+        int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
-//        int folderTotal;
+        int folderTotal;
-//        // フォルダ数の抽選
+        // フォルダ数の抽選
-//        if (itemTotal > 4) {
+        if (itemTotal > 4) {
-//            folderTotal = faker.number().numberBetween(1, itemTotal - 2);
+            folderTotal = faker.number().numberBetween(1, itemTotal - 2);
-//        }
+        }
-//        else {
+        else {
-//            if (itemTotal > 2) {
+            if (itemTotal > 2) {
-//                folderTotal = 1;
+                folderTotal = 1;
-//            }
+            }
-//            else { // ドキュメント数がゼロにならないように
+            else { // ドキュメント数がゼロにならないように
-//                folderTotal = 0;
+                folderTotal = 0;
-//            }
+            }
-//        }
+        }
-//        int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
+        int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
-//        logger.debug("LibraryStub", "itemTotal: " + itemTotal);
+        logger.debug("LibraryStub", "itemTotal: " + itemTotal);
-//        logger.debug("LibraryStub", "folderTotal: " + folderTotal);
+        logger.debug("LibraryStub", "folderTotal: " + folderTotal);
-//        logger.debug("LibraryStub", "documentTotal: " + documentTotal);
+        logger.debug("LibraryStub", "documentTotal: " + documentTotal);
-//
+
-//        // フォルダを生成
+        // フォルダを生成
-//        for (int i = 0; i < folderTotal; i++) {
+        for (int i = 0; i < folderTotal; i++) {
-//            listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
+            listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
-//        }
+        }
-//        // ドキュメントを生成
+        // ドキュメントを生成
-//        for (int i = 0; i < documentTotal; i++) {
+        for (int i = 0; i < documentTotal; i++) {
-//            listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
+            listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
-//        }
+        }
-//
+
-//        LibraryItemPage libraryItemPage = new LibraryItemPage();
+        LibraryItemPage libraryItemPage = new LibraryItemPage();
-//        libraryItemPage.setListItems(listItems);
+        libraryItemPage.setListItems(listItems);
-//        if (pageId == null) {
+        if (pageId == null) {
-//            libraryItemPage.setPageId(UUID.randomUUID().toString());
+            libraryItemPage.setPageId(UUID.randomUUID().toString());
-//        } else {
+        } else {
-//            libraryItemPage.setPageId(pageId);
+            libraryItemPage.setPageId(pageId);
-//        }
+        }
-//        libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
+        libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
-//
+
-//        return libraryItemPage;
+        return libraryItemPage;
-//    }
+    }
-//
+
-//    private ListItem generateStubListItem(ListItemType itemType) {
+    private ListItem generateStubListItem(ListItemType itemType) {
-//        if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
+        if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
-//            ListItem listItem = new ListItem();
+            ListItem listItem = new ListItem();
-//            listItem.setTitle("FakeFolder" + faker.number().digits(3));
+            listItem.setTitle("FakeFolder" + faker.number().digits(3));
-//            listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
+            listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
-//            listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
+            listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
-//            listItem.setItemId(UUID.randomUUID().toString());
+            listItem.setItemId(UUID.randomUUID().toString());
-//            return listItem;
+            return listItem;
-//        } else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
+        } else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
-//            ListItem listItem = new ListItem();
+            ListItem listItem = new ListItem();
-//            listItem.setTitle("FakeDocument" + faker.book().title());
+            listItem.setTitle("FakeDocument" + faker.book().title());
-//            listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
+            listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
-//            listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
+            listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
-//            listItem.setItemId(UUID.randomUUID().toString());
+            listItem.setItemId(UUID.randomUUID().toString());
-//            return listItem;
+            return listItem;
-//        } else {
+        } else {
-//            return null;
+            return null;
-//        }
+        }
-//    }
+    }
-//
+
-//    private LibraryItemPage getRecentDocumentPage(int limit) {
+    private LibraryItemPage getRecentDocumentPage(int limit) {
-//        int itemTotal = faker.number().numberBetween(1, limit);
+        int itemTotal = faker.number().numberBetween(1, limit);
-//        ArrayList<ListItem> listItems = new ArrayList<>();
+        ArrayList<ListItem> listItems = new ArrayList<>();
-//        for (int i = 0; i < itemTotal; i++) {
+        for (int i = 0; i < itemTotal; i++) {
-//            listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
+            listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
-//        }
+        }
-//        // DescriptionからDateを抽出して新しい順にソート
+        // DescriptionからDateを抽出して新しい順にソート
-//        listItems.sort((a, b) -> {
+        listItems.sort((a, b) -> {
-//            String aDate = a.getDescription().substring(11);
+            String aDate = a.getDescription().substring(11);
-//            String bDate = b.getDescription().substring(11);
+            String bDate = b.getDescription().substring(11);
-//            return bDate.compareTo(aDate);
+            return bDate.compareTo(aDate);
-//        });
+        });
-//        LibraryItemPage libraryItemPage = new LibraryItemPage();
+        LibraryItemPage libraryItemPage = new LibraryItemPage();
-//        libraryItemPage.setListItems(listItems);
+        libraryItemPage.setListItems(listItems);
-//        libraryItemPage.setPageId(UUID.randomUUID().toString());
+        libraryItemPage.setPageId(UUID.randomUUID().toString());
-//        libraryItemPage.setPageTitle("RecentDocument");
+        libraryItemPage.setPageTitle("RecentDocument");
-//        return libraryItemPage;
+        return libraryItemPage;
-//    }
+    }
-//
+
-//    private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
+    private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
-//
+
-//        if (Objects.isNull(id)) {
+        if (Objects.isNull(id)) {
-//            throw new IllegalArgumentException("id is null");
+            throw new IllegalArgumentException("id is null");
-//        }
+        }
-//
+
-//        DocumentMeta documentMeta = new DocumentMeta();
+        DocumentMeta documentMeta = new DocumentMeta();
-//        documentMeta.setId(id);
+        documentMeta.setId(id);
-//        documentMeta.setTitle("FakeDocument" + faker.book().title());
+        documentMeta.setTitle("FakeDocument" + faker.book().title());
-//        documentMeta.setCreatedAt(faker.date().birthday());
+        documentMeta.setCreatedAt(faker.date().birthday());
-//        documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする？
+        documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする？
-//        ArrayList<String> tagIds = new ArrayList<>();
+        ArrayList<String> tagIds = new ArrayList<>();
-//
+
-//        DocumentDetail documentDetail = new DocumentDetail();
+        DocumentDetail documentDetail = new DocumentDetail();
-//        documentDetail.setMeta(documentMeta);
+        documentDetail.setMeta(documentMeta);
-////        documentDetail.setPath(null); // TODO-rca: なんとかする
+        documentDetail.setPath(null); // TODO-rca: なんとかする
-////        documentDetail.setAuthor(faker.name().fullName());
+        documentDetail.setAuthor(faker.name().fullName());
-////        documentDetail.setRepository(null); // TODO-rca: なんとかする
+        documentDetail.setRepository(null); // TODO-rca: なんとかする
-//        return documentDetail;
+        return documentDetail;
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * 履歴ページを取得する
+     * 履歴ページを取得する
-//     * @param limit 取得するアイテム数
+     * @param limit 取得するアイテム数
-//     * @return ページオブジェクト
+     * @return ページオブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public ArrayList<ListItem> getRecentDocument(int limit) {
+    public LibraryItemPage getRecentDocument(int limit) {
-//        return getRecentDocumentPage(limit).getListItems();
+        return getRecentDocumentPage(limit);
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * 履歴ページを取得する
+     * 履歴ページを取得する
-//     * @param limit 取得するアイテム数
+     * @param limit 取得するアイテム数
-//     * @param offset 取得するアイテムのオフセット
+     * @param offset 取得するアイテムのオフセット
-//     * @return ページオブジェクト
+     * @return ページオブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
+    public LibraryItemPage getRecentDocument(int limit, int offset) {
-//        return getRecentDocumentPage(limit).getListItems();
+        return getRecentDocumentPage(limit);
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * ライブラリページを取得する
+     * ライブラリページを取得する
-//     * @param limit 取得するアイテム数
+     * @param limit 取得するアイテム数
-//     * @return ページオブジェクト
+     * @return ページオブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public LibraryItemPage getLibraryPage(int limit) {
+    public LibraryItemPage getLibraryPage(int limit) {
-//        return generateStubLibraryItemPage(limit, null);
+        return generateStubLibraryItemPage(limit, null);
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * ライブラリページを取得する
+     * ライブラリページを取得する
-//     * @param limit 取得するアイテム数
+     * @param limit 取得するアイテム数
-//     * @param offset 取得するアイテムのオフセット
+     * @param offset 取得するアイテムのオフセット
-//     * @return ページオブジェクト
+     * @return ページオブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public LibraryItemPage getLibraryPage(int limit, int offset) {
+    public LibraryItemPage getLibraryPage(int limit, int offset) {
-//        return generateStubLibraryItemPage(limit, null);
+        return generateStubLibraryItemPage(limit, null);
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * ライブラリページを取得する
+     * ライブラリページを取得する
-//     * @param pageId ページID
+     * @param pageId ページID
-//     * @param limit 取得するアイテム数
+     * @param limit 取得するアイテム数
-//     * @return ページオブジェクト
+     * @return ページオブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public LibraryItemPage getLibraryPage(String pageId, int limit) {
+    public LibraryItemPage getLibraryPage(String pageId, int limit) {
-//        return generateStubLibraryItemPage(limit, pageId);
+        return generateStubLibraryItemPage(limit, pageId);
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * ライブラリページを取得する
+     * ライブラリページを取得する
-//     * @param pageId ページID
+     * @param pageId ページID
-//     * @param limit 取得するアイテム数
+     * @param limit 取得するアイテム数
-//     * @param offset 取得するアイテムのオフセット
+     * @param offset 取得するアイテムのオフセット
-//     * @return ページオブジェクト
+     * @return ページオブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
+    public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
-//        return generateStubLibraryItemPage(limit, pageId);
+        return generateStubLibraryItemPage(limit, pageId);
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * ドキュメント詳細を取得する
+     * ドキュメント詳細を取得する
-//     * @param id ドキュメントID
+     * @param id ドキュメントID
-//     * @return ドキュメント詳細オブジェクト
+     * @return ドキュメント詳細オブジェクト
-//     */
+     */
-//    @Override
+    @Override
-//    public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
+    public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
-//        return generateStubDocumentDetail(id);
+        return generateStubDocumentDetail(id);
-//    }
+    }
-//}
+}

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

@@ -30,10 +30,9 @@ public class LacertaSearchStubImpl implements LacertaSearch {
      */
     @Override
     public ArrayList<ListItem> autoSearch(String query, int limit) {
-//        logger.debug("SearchStub", "autoSearch");
+        logger.debug("SearchStub", "autoSearch");
-//        logger.debug("SearchStub", "query: " + query);
+        logger.debug("SearchStub", "query: " + query);
-//        return library.getLibraryPage(limit).getListItems();
+        return library.getLibraryPage(limit).getListItems();
-        return null;
     }
 
     /**
@@ -45,9 +44,8 @@ public class LacertaSearchStubImpl implements LacertaSearch {
      */
     @Override
     public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
-//        logger.debug("SearchStub", "autoSearch");
+        logger.debug("SearchStub", "autoSearch");
-//        logger.debug("SearchStub", "query: " + query);
+        logger.debug("SearchStub", "query: " + query);
-//        return library.getLibraryPage(limit, offset).getListItems();
+        return library.getLibraryPage(limit, offset).getListItems();
-        return null;
     }
 }

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

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