リファクタ

component/common/build.gradle

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

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

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

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

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

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

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

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

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

component/common/src/main/res/layout/lacerta_dialog_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/viewer/build.gradle

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

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

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

@@ -12,7 +12,6 @@ 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;
 
@@ -20,14 +19,11 @@ 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) {
+    public RevAdapter() {
-        this.revSelectListener = revSelectListener;
     }
 
     public void setRevModels(ArrayList<VcsRevModel> revModels) {
@@ -56,13 +52,6 @@ public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
         }
         holder.revId.setText("RevID: " + revModel.getId());
 
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                revSelectListener.onRevSelect(revModel.getId());
-            }
-        });
-
     }
 
     @Override

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

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

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

@@ -2,6 +2,7 @@ package one.nem.lacerta.component.viewer;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.activity.EdgeToEdge;
@@ -9,6 +10,12 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
+import androidx.navigation.ui.NavigationUI;
+
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import javax.inject.Inject;
 
@@ -55,7 +62,7 @@ public class ViewerMainActivity extends AppCompatActivity {
 
         // Navigation
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
+                .replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId, documentName))
                 .commit();
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -123,19 +123,6 @@ public class DocumentImpl implements Document {
         });
     }
 
-    @Override
-    public CompletableFuture<Void> moveDocument(String documentId, String parentId) {
-        return CompletableFuture.supplyAsync(() -> {
-            DocumentEntity documentEntity = database.documentDao().findById(documentId);
-            if (documentEntity == null) {
-                throw new IllegalArgumentException("documentId is not found");
-            }
-            documentEntity.parentId = parentId;
-            database.documentDao().update(documentEntity);
-            return null;
-        });
-    }
-
     @Override
     public CompletableFuture<Void> updateDocument(DocumentDetail detail) {
         return CompletableFuture.supplyAsync(() -> {
@@ -186,34 +173,6 @@ public class DocumentImpl implements Document {
         });
     }
 
-    @Override
-    public CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList) {
-        return CompletableFuture.supplyAsync(() -> {
-            ArrayList<Page> pages = new ArrayList<>();
-            FileManager fileManager;
-            try {
-                fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId).resolve("raw");
-            } catch (IOException e) {
-                logger.error(TAG, "FileManager resolve error");
-                logger.trace(TAG, e.getMessage());
-                logger.e_code("1210ae5b-dd2f-42ef-bc15-40b9a9bbdb16");
-                return null;
-            }
-
-            fileNameList.forEach(fileName -> {
-                try {
-                    pages.add(new Page(fileName, fileManager.loadBitmap(fileName)));
-                } catch (IOException e) {
-                    logger.error(TAG, "Bitmap decode error");
-                    logger.trace(TAG, e.getMessage());
-                    logger.e_code("6f9ba0dc-ac63-401c-8f50-a2bd9ff5cb91");
-                }
-            });
-
-            return pages;
-        });
-    }
-
     private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) {
         return CompletableFuture.supplyAsync(() -> {
             FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());

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

@@ -127,47 +127,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
         });
     }
 
-    @Override
-    public CompletableFuture<LibraryItemPage> getFolderList(String targetDirId) {
-        return CompletableFuture.supplyAsync(() -> {
-            LibraryItemPage libraryItemPage = new LibraryItemPage();
-
-            List<FolderEntity> folderEntities;
-            if (targetDirId == null) { // When root folder
-                folderEntities = database.folderDao().findRootFolders();
-                libraryItemPage.setParentId(null);
-                libraryItemPage.setPageId(null);
-                libraryItemPage.setPageTitle("ライブラリ");
-            } else {
-                folderEntities = database.folderDao().findByParentId(targetDirId);
-                FolderEntity folderEntity = database.folderDao().findById(targetDirId);
-                if (folderEntity == null) {
-                    logger.warn("LacertaLibraryImpl", targetDirId + " is not found.");
-                    return null;
-                }
-                libraryItemPage.setParentId(folderEntity.parentId);
-                libraryItemPage.setPageId(folderEntity.id);
-                libraryItemPage.setPageTitle(folderEntity.name);
-            }
-
-            ArrayList<ListItem> listItems = new ArrayList<>();
-            for (FolderEntity childFolderEntity : folderEntities) {
-                logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
-                ListItem listItem = new ListItem();
-                listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
-                listItem.setTitle(childFolderEntity.name);
-                listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
-                listItem.setItemId(childFolderEntity.id);
-                listItems.add(listItem);
-            }
-
-
-            libraryItemPage.setListItems(listItems);
-
-            return libraryItemPage;
-        });
-    }
-
     @Override
     public CompletableFuture<String> createFolder(String parentId, String name) {
         return CompletableFuture.supplyAsync(() -> {

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

@@ -82,15 +82,12 @@ public class HomeTopFragment extends Fragment {
         Toolbar toolbar = view.findViewById(R.id.home_toolbar);
         toolbarSetup(toolbar, false, "ホーム");
 
-        this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
+        this.listItemAdapter = new ListItemAdapter((documentId, documentName) -> {
-            @Override
-            public void onDocumentSelect(String documentId, String documentName) {
             Intent intent = new Intent(getContext(), ViewerMainActivity.class);
             Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
             intent.putExtra("documentId", documentId);
             intent.putExtra("documentName", documentName);
             startActivity(intent);
-            }
         });
         recyclerView.setAdapter(listItemAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -135,8 +132,6 @@ public class HomeTopFragment extends Fragment {
             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 {

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

@@ -1,8 +1,11 @@
 package one.nem.lacerta.feature.library;
 
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -11,18 +14,34 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+
+import org.w3c.dom.Text;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.lacerta.component.viewer.ViewerMainActivity;
+import one.nem.lacerta.data.Document;
 import one.nem.lacerta.data.LacertaLibrary;
+import one.nem.lacerta.model.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;
 
@@ -201,17 +220,13 @@ public class LibraryPageFragment extends Fragment {
      * Currentにフォルダを作成する
      */
     private void createFolder(String pageId) {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
+        // 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());
-        View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
+        input.setText("フォルダ名");
-        final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
+        builder.setView(input);
-        final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
-        inputLayout.setHint("フォルダ名");
-
-        builder.setView(view);
-
         builder.setPositiveButton("作成", (dialog, which) -> {
             lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
                 // Refresh
@@ -221,7 +236,6 @@ public class LibraryPageFragment extends Fragment {
         builder.setNegativeButton("キャンセル", (dialog, which) -> {
             dialog.cancel();
         });
-
         builder.show();
     }
 

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

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

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

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

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

@@ -74,24 +74,18 @@ public class DocumentProcessorImpl implements DocumentProcessor{
         logger.debug("addNewPageToLast", "called");
         String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
 
-        lacertaVcs.insertPage(this.documentDetail.getPages().size(), filename);
-
-        try {
         Page page = new Page();
         page.setFileName(filename);
         page.setBitmap(bitmap);
         this.documentDetail.getPages().add(page);
 
+        lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
+
         this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
 
         logger.info("addNewPageToLast", "finished");
         logger.info("addNewPageToLast", "filename: " + filename);
-        } catch (Exception e) {
+
-            logger.error("addNewPageToLast", "failed: Unknown error");
-            logger.e_code("d9191286-6092-40b3-80ed-9239106a8c65");
-            // Recover (Undo latest action)
-            lacertaVcs.undo();
-        }
         return this;
     }
 

shared/ui/build.gradle

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

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

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

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

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

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

@@ -39,6 +39,4 @@
     <!-- common -->
 
     <string name="placeholder">Placeholder(TODO: Replace)</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

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

@@ -19,7 +19,7 @@ import one.nem.lacerta.source.database.dao.LibraryDao;
 import one.nem.lacerta.source.database.dao.VcsRevDao;
 import one.nem.lacerta.source.database.dao.VcsLogDao;
 
-@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 4)
+@Database(entities = {TagEntity.class, DocumentEntity.class, LibraryEntity.class, VcsRevEntity.class, VcsLogEntity.class, FolderEntity.class}, version = 5)
 public abstract class LacertaDatabase extends RoomDatabase {
     public abstract TagDao tagDao();
     public abstract DocumentDao documentDao();

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

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

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

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

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

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

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

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

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

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