Update README.md

README.md

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

app/build.gradle

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

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

@@ -10,7 +10,6 @@ import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.NavigationUI;
 
-import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
@@ -18,14 +17,12 @@ 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;
@@ -77,13 +74,6 @@ public class MainActivity extends AppCompatActivity implements FragmentNavigatio
         // Set status bar color
         getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
 
-        // Fab
-        findViewById(R.id.scanFab).setOnClickListener(v -> {
-            Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
-            Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
-            startActivity(intent);
-        });
-
     }
     private void initializeApp() {
         Log.d("Init", "Initializing app");

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

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

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

@@ -3,13 +3,16 @@ package one.nem.lacerta.component.scanner;
 import android.app.ProgressDialog;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import androidx.activity.EdgeToEdge;
+import androidx.annotation.AnimatorRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
@@ -25,11 +28,11 @@ import java.util.concurrent.CompletableFuture;
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.data.Document;
 import one.nem.lacerta.model.document.DocumentDetail;
 import one.nem.lacerta.model.document.DocumentMeta;
 import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
 import one.nem.lacerta.utils.LacertaLogger;
+import one.nem.lacerta.data.Document;
 import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
 
 @AndroidEntryPoint
@@ -118,7 +121,7 @@ public class ScannerManagerActivity extends AppCompatActivity {
             return true;
         } else if (item.getItemId() == R.id.action_insert_exist) {
             // 既存ドキュメントに挿入
-            Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
             insertToExistDocument();
             return true;
         } else if (item.getItemId() == android.R.id.home) {
@@ -136,6 +139,7 @@ public class ScannerManagerActivity extends AppCompatActivity {
             if (this.croppedImages.isEmpty()) {
                 logger.debug(TAG, "this.resultImages is empty");
                 logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
+                // TODO-rca: なんかする
             } else {
                 logger.debug(TAG, "this.resultImages is not empty");
                 updateResultView(this.croppedImages);

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

@@ -1,6 +1,5 @@
 package one.nem.lacerta.component.viewer;
 
-import android.app.AlertDialog;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 
@@ -24,7 +23,6 @@ import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.lacerta.data.Document;
 import one.nem.lacerta.model.document.DocumentDetail;
 import one.nem.lacerta.model.document.page.Page;
-import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
 
 /**
@@ -44,17 +42,15 @@ public class ComponentViewerTopFragment extends Fragment {
     private static final String TAG = "ComponentViewerTopFragment";
 
     private String documentId;
-    private String documentName;
 
     public ComponentViewerTopFragment() {
         // Required empty public constructor
     }
 
-    public static ComponentViewerTopFragment newInstance(String documentId, String documentName) {
+    public static ComponentViewerTopFragment newInstance(String documentId) {
         ComponentViewerTopFragment fragment = new ComponentViewerTopFragment();
         Bundle args = new Bundle();
         args.putString("documentId", documentId);
-        args.putString("documentName", documentName);
         fragment.setArguments(args);
         return fragment;
     }
@@ -64,7 +60,6 @@ public class ComponentViewerTopFragment extends Fragment {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             documentId = getArguments().getString("documentId");
-            documentName = getArguments().getString("documentName");
         }
     }
 
@@ -76,7 +71,7 @@ public class ComponentViewerTopFragment extends Fragment {
 
         // Toolbar
         Toolbar toolbar = view.findViewById(R.id.toolbar);
-        toolbarSetup(toolbar, true, this.documentName == null ? "Document" : this.documentName);
+        toolbarSetup(toolbar, true, "Revision List");
 
         RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -85,14 +80,12 @@ public class ComponentViewerTopFragment extends Fragment {
         });
         recyclerView.setAdapter(viewerBodyAdapter);
 
-        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);
             });
         });
 
@@ -111,8 +104,9 @@ public class ComponentViewerTopFragment extends Fragment {
             if (showBackButton) {
                 toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
                 toolbar.setNavigationOnClickListener(v -> {
-                    // Stop Activity
-                    getActivity().finish();
+                    //this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
+                    // Back
+                    Navigation.findNavController(requireView()).popBackStack();
                 });
             } else {
                 toolbar.setNavigationIcon(null);
@@ -126,49 +120,6 @@ public class ComponentViewerTopFragment extends Fragment {
                             .replace(R.id.nav_host_fragment, ViewerVcsRevListFragment.newInstance(documentId))
                             .commit();
                     return true;
-                } else if (item.getItemId() == R.id.action_rename) {
-                    // TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
-                    AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                    builder.setTitle("ファイル名の変更");
-                    builder.setMessage("ファイル名を入力してください");
-                    final android.widget.EditText input = new android.widget.EditText(getContext());
-                    input.setText(documentName);
-                    builder.setView(input);
-                    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に合わせたカスタムダイアログにする
-                    AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                    builder.setTitle("ファイルの削除");
-                    builder.setMessage("ファイルを削除しますか？");
-                    builder.setPositiveButton("削除", (dialog, which) -> {
-                        document.deleteDocument(documentId).thenAccept(aVoid -> {
-                            getActivity().runOnUiThread(() -> {
-                                // Stop Activity
-                                getActivity().finish();
-                            });
-                        });
-                    });
-                    builder.setNegativeButton("キャンセル", (dialog, which) -> {
-                        dialog.cancel();
-                    });
-                    builder.show();
-                    return true;
-                } else if (item.getItemId() == R.id.action_move) {
-                    Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
-                    return true;
                 } else {
                     return false;
                 }

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

@@ -35,7 +35,6 @@ public class ViewerMainActivity extends AppCompatActivity {
     // Variables
     private static final String TAG = "ViewerMainActivity";
     String documentId;
-    String documentName;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,7 +50,6 @@ public class ViewerMainActivity extends AppCompatActivity {
         Intent intent = getIntent();
         try {
             documentId = intent.getStringExtra("documentId");
-            documentName = intent.getStringExtra("documentName");
         }
         catch (Exception e) {
             logger.error(TAG, "Failed to get documentId from intent");
@@ -62,7 +60,7 @@ public class ViewerMainActivity extends AppCompatActivity {
 
         // Navigation
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId, documentName))
+                .replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
                 .commit();
     }
 }

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

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

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

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

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

@@ -18,8 +18,6 @@ public interface Document {
 
     CompletableFuture<DocumentDetail> createDocument();
 
-    CompletableFuture<Void> renameDocument(String documentId, String name);
-
     CompletableFuture<Void> deleteDocument(String documentId);
 
     CompletableFuture<Void> updateDocument(DocumentDetail detail);

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

@@ -1,7 +1,5 @@
 package one.nem.lacerta.data.impl;
 
-import androidx.room.Update;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -114,11 +112,6 @@ public class DocumentImpl implements Document {
     @Override
     public CompletableFuture<Void> deleteDocument(String documentId) {
         return CompletableFuture.supplyAsync(() -> {
-            DocumentEntity documentEntity = database.documentDao().findById(documentId);
-            if (documentEntity == null) {
-                throw new IllegalArgumentException("documentId is not found");
-            }
-            database.documentDao().delete(documentEntity);
             return null;
         });
     }
@@ -131,19 +124,6 @@ public class DocumentImpl implements Document {
         });
     }
 
-    @Override
-    public CompletableFuture<Void> renameDocument(String documentId, String name) {
-        return CompletableFuture.supplyAsync(() -> {
-            DocumentEntity documentEntity = database.documentDao().findById(documentId);
-            if (documentEntity == null) {
-                throw new IllegalArgumentException("documentId is not found");
-            }
-            documentEntity.title = name;
-            database.documentDao().update(documentEntity);
-            return null;
-        });
-    }
-
     @Override
     public CompletableFuture<DocumentDetail> getDocument(String documentId) {
         return CompletableFuture.supplyAsync(() -> {

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

@@ -1,7 +1,6 @@
 package one.nem.lacerta.data.impl;
 
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39,6 +38,13 @@ public class LacertaLibraryImpl implements LacertaLibrary {
     @Override
     public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit) {
         return CompletableFuture.supplyAsync(() -> {
+            // 5秒フリーズさせる
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
             List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
 
             ArrayList<ListItem> listItems = new ArrayList<>();
@@ -100,14 +106,12 @@ public class LacertaLibraryImpl implements LacertaLibrary {
                 listItems.add(listItem);
             }
 
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:");
-
             for (DocumentEntity documentEntity : documentEntities) {
                 logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
                 ListItem listItem = new ListItem();
                 listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
                 listItem.setTitle(documentEntity.title);
-                listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
+//                listItem.setDescription(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm").format(documentEntity.updatedAt.toInstant()));
                 listItem.setItemId(documentEntity.id);
                 listItems.add(listItem);
             }

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

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

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

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

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

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

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

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

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

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

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

@@ -40,7 +40,6 @@ import one.nem.lacerta.data.LacertaLibrary;
 import one.nem.lacerta.model.FragmentNavigation;
 import one.nem.lacerta.model.LibraryItemPage;
 import one.nem.lacerta.model.PublicPath;
-import one.nem.lacerta.utils.FeatureSwitch;
 import one.nem.lacerta.utils.LacertaLogger;
 
 
@@ -200,18 +199,12 @@ public class LibraryPageFragment extends Fragment {
             }
 
             logger.debug("LibraryTopFragment", "Item selected! Total item page: " + this.libraryItemPage.getListItems().size());
-            if (!FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
-                getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える？
-                    listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
-                });
-            }
+            getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える？
+                listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
+            });
             listItemAdapter.setLibraryItemPage(this.libraryItemPage);
             getActivity().runOnUiThread(() -> {
-                if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
-                    listItemAdapter.notifyDataSetChanged();
-                } else {
-                    listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
-                }
+                listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
             });
         });
     }
@@ -276,7 +269,6 @@ public class LibraryPageFragment extends Fragment {
                 toolbar.setNavigationIcon(null);
             }
             toolbar.setTitle(title);
-            toolbar.getMenu().clear();
             toolbar.inflateMenu(R.menu.dir_menu);
             toolbar.setOnMenuItemClickListener(item -> {
                 if (item.getItemId() == R.id.menu_item_create_new_folder) {

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

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

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

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

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

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

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

@@ -17,16 +17,16 @@ import android.view.ViewGroup;
  * Use the {@link SettingScanPageFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class SettingScanPageFragment extends Fragment {
+public class SettingScanPageFragment extends PreferenceFragmentCompat {
 
     public SettingScanPageFragment() {
         // Required empty public constructor
     }
-//
-//    @Override
-//    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
-////        addPreferencesFromResource(R.xml.scan_preferences);
-//    }
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        addPreferencesFromResource(R.xml.scan_preferences);
+    }
 
     public static SettingScanPageFragment newInstance() {
         SettingScanPageFragment fragment = new SettingScanPageFragment();
@@ -35,15 +35,4 @@ public class SettingScanPageFragment extends Fragment {
         return fragment;
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-    }
-
 }

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

@@ -1,15 +1,16 @@
 package one.nem.lacerta.setting;
 
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import java.util.ArrayList;
 
 import one.nem.lacerta.setting.model.SettingListItem;

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

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

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

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

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

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

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

@@ -39,40 +39,11 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <FrameLayout
+            android:id="@+id/setting_scan_page_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" >
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:padding="32dp"
-                android:background="@drawable/rounded_secondary_container" >
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Work in Progress..."
-                    android:textSize="24sp"
-                    android:textColor="@color/colorOnSurfaceSecondary"/>
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="実装中..."
-                    android:textSize="16sp"
-                    android:textColor="@color/colorOnSurfaceSecondary"/>
-
-            </LinearLayout>
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

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

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

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

@@ -20,6 +20,7 @@ import javax.xml.transform.stream.StreamResult;
 import dagger.assisted.Assisted;
 import dagger.assisted.AssistedInject;
 import one.nem.lacerta.source.file.FileManager;
+
 import one.nem.lacerta.utils.LacertaLogger;
 import one.nem.lacerta.utils.Store;
 

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

@@ -6,16 +6,6 @@ public class FeatureSwitch {
         public static boolean canOverrideSwitch = false;
     }
 
-    public static class RecyclerView {
-        public static boolean useSimpleNotifyMethod = true;
-    }
-
-    public static class Viewer {
-        public static boolean showOriginalImage = false;
-        public static int maxImageSize = 1024;
-        public static boolean showProgressBarWhenLoading = true;
-    }
-
     public static class FeatureMaster {
         public static boolean enableSearch = false;
         public static boolean enableDebugMenu = true;

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

@@ -1,6 +1,5 @@
 package one.nem.lacerta.vcs.impl;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -137,7 +136,6 @@ public class LacertaVcsImpl implements LacertaVcs {
                 vcsRevModel.setId(vcsRevEntity.id);
                 vcsRevModel.setDocumentId(vcsRevEntity.documentId);
                 vcsRevModel.setBranchName(vcsRevEntity.branchName);
-                vcsRevModel.setCreatedAt(vcsRevEntity.createdAt);
                 vcsRevModel.setCommitMessage(vcsRevEntity.commitMessage);
                 vcsRevModel.setLogIds(vcsRevEntity.logIds);
                 vcsRevModels.add(vcsRevModel);