アイコンIDを追加

デバッグメニューから不要になったアイテムを削除

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuFileManagerTesterFragment.java

@@ -1,110 +0,0 @@
-package one.nem.lacerta.feature.debug;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-
-import dagger.hilt.android.AndroidEntryPoint;
-import one.nem.lacerta.source.file.FileManager;
-import one.nem.lacerta.source.file.factory.FileManagerFactory;
-
-import one.nem.lacerta.utils.repository.DeviceInfoUtils;
-
-import javax.inject.Inject;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link DebugMenuFileManagerTesterFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-@AndroidEntryPoint
-public class DebugMenuFileManagerTesterFragment extends Fragment {
-
-    public DebugMenuFileManagerTesterFragment() {
-        // Required empty public constructor
-    }
-
-    @Inject
-    FileManagerFactory fileManagerFactory;
-
-    @Inject
-    DeviceInfoUtils deviceInfoUtils;
-
-    // TODO: Rename and change types and number of parameters
-    public static DebugMenuFileManagerTesterFragment newInstance() {
-        DebugMenuFileManagerTesterFragment fragment = new DebugMenuFileManagerTesterFragment();
-        Bundle args = new Bundle();
-
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_debug_menu_file_manager_tester, container, false);
-
-        view.findViewById(R.id.button_create_directory).setOnClickListener(v -> {
-            EditText editText = view.findViewById(R.id.edit_text_dir_name);
-            String dirName = editText.getText().toString();
-
-//            FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
-//            fileManager.createDir(dirName);
-        });
-
-        view.findViewById(R.id.button_save_item).setOnClickListener(v -> {
-//            FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
-//            fileManager.createDir("test");
-//            fileManager.changeDir("test");
-//            Bitmap bitmap = Bitmap.createBitmap(1000, 1000, Bitmap.Config.ARGB_8888);
-//            // Bitmapに描画処理を行う
-//            Canvas canvas = new Canvas(bitmap);
-//            // 大きな山の形状を作成
-//            android.graphics.Path bigMountainPath = new android.graphics.Path();
-//            bigMountainPath.moveTo(100, 800); // 左下の開始点
-//            bigMountainPath.lineTo(500, 300); // 頂点
-//            bigMountainPath.lineTo(900, 800); // 右下
-//            bigMountainPath.close(); // パスを閉じる
-//
-//            // 山の描画設定
-//            Paint mountainPaint = new Paint();
-//            mountainPaint.setColor(Color.GREEN);
-//            mountainPaint.setStyle(Paint.Style.FILL);
-//
-//            // 大きな山を描画
-//            canvas.drawPath(bigMountainPath, mountainPaint);
-//
-//            // 小さな山の形状を作成
-//            android.graphics.Path smallMountainPath = new android.graphics.Path();
-//            smallMountainPath.moveTo(400, 800); // 左下の開始点
-//            smallMountainPath.lineTo(650, 400); // 頂点
-//            smallMountainPath.lineTo(900, 800); // 右下
-//            smallMountainPath.close(); // パスを閉じる
-//
-//            Paint smallMountainPaint = new Paint();
-//            smallMountainPaint.setColor(Color.parseColor("#006e54"));
-//            smallMountainPaint.setStyle(Paint.Style.FILL);
-//
-//            // 小さな山を描画
-//            canvas.drawPath(smallMountainPath, smallMountainPaint);
-//            fileManager.saveBitmapAtCurrent(bitmap, "test.png");
-        });
-
-        return view;
-    }
-}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuMetaDataFragment.java

@@ -1,39 +0,0 @@
-package one.nem.lacerta.feature.debug;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link DebugMenuMetaDataFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class DebugMenuMetaDataFragment extends Fragment {
-    public DebugMenuMetaDataFragment() {
-        // Required empty public constructor
-    }
-
-    public static DebugMenuMetaDataFragment newInstance() {
-        DebugMenuMetaDataFragment fragment = new DebugMenuMetaDataFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_debug_menu_meta_data, container, false);
-    }
-}

feature/debug/src/main/java/one/nem/lacerta/feature/debug/DebugMenuTopFragment.java

@@ -48,10 +48,8 @@ public class DebugMenuTopFragment extends Fragment {
         recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
         List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
 
-        debugMenuListItems.add(new DebugMenuListItem("Meta Data", "View meta data", R.id.action_debugMenuTopFragment_to_debugMenuMetaDataFragment, true));
         debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
         debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
-        debugMenuListItems.add(new DebugMenuListItem("File Manager", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuFileManagerTesterFragment, true));
 
         DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
         recyclerView.setAdapter(adapter);

feature/debug/src/main/res/layout/fragment_debug_menu_file_manager_tester.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".DebugMenuFileManagerTesterFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <EditText
-            android:id="@+id/edit_text_dir_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-        <Button
-            android:id="@+id/button_create_directory"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Create dir" />
-        <Button
-            android:id="@+id/button_dir_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="List item in current" />
-
-        <Button
-            android:id="@+id/button_save_item"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Save Test Image" />
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/debug/src/main/res/layout/fragment_debug_menu_meta_data.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".DebugMenuMetaDataFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-
-
-
-</FrameLayout>

feature/debug/src/main/res/navigation/feature_debug_internal_navigation.xml

@@ -10,24 +10,13 @@
         android:name="one.nem.lacerta.feature.debug.DebugMenuTopFragment"
         android:label="fragment_debug_menu_top"
         tools:layout="@layout/fragment_debug_menu_top" >
-        <action
-            android:id="@+id/action_debugMenuTopFragment_to_debugMenuMetaDataFragment"
-            app:destination="@id/debugMenuMetaDataFragment" />
         <action
             android:id="@+id/action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment"
             app:destination="@id/debugMenuDocumentTesterTopFragment" />
         <action
             android:id="@+id/action_debugMenuTopFragment_to_scannerDataManagerStubFragment"
             app:destination="@id/scannerDataManagerStubFragment" />
-        <action
-            android:id="@+id/action_debugMenuTopFragment_to_debugMenuFileManagerTesterFragment"
-            app:destination="@id/debugMenuFileManagerTesterFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/debugMenuMetaDataFragment"
-        android:name="one.nem.lacerta.feature.debug.DebugMenuMetaDataFragment"
-        android:label="fragment_debug_menu_meta_data"
-        tools:layout="@layout/fragment_debug_menu_meta_data" />
     <fragment
         android:id="@+id/debugMenuDocumentTesterTopFragment"
         android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
@@ -54,9 +43,4 @@
         android:id="@+id/scannerDataManagerStubFragment"
         android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
         android:label="ScannerDataManagerStubFragment" />
-    <fragment
-        android:id="@+id/debugMenuFileManagerTesterFragment"
-        android:name="one.nem.lacerta.feature.debug.DebugMenuFileManagerTesterFragment"
-        android:label="fragment_debug_menu_file_manager_tester"
-        tools:layout="@layout/fragment_debug_menu_file_manager_tester" />
 </navigation>

model/build.gradle

@@ -36,4 +36,6 @@ dependencies {
     // JGit
     implementation 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
 
+    implementation project(":shared:ui")
+
 }

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

@@ -0,0 +1,41 @@
+package one.nem.lacerta.model;
+
+import android.graphics.drawable.Drawable;
+
+public class ListItem {
+
+    // Properties
+
+    String title;
+    String description;
+    ListItemType itemType;
+    String itemId;
+
+    // Constructor
+
+    public ListItem(String title, String description, ListItemType itemType, String itemId) {
+        this.title = title;
+        this.description = description;
+        this.itemType = itemType;
+        this.itemId = itemId;
+    }
+
+    // Getter
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public ListItemType getItemType() {
+        return itemType;
+    }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+}

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

@@ -0,0 +1,17 @@
+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);
+
+    private int iconId;
+
+    ListItemType(int iconId) {
+        this.iconId = iconId;
+    }
+
+    public int getIconId() {
+        return iconId;
+    }
+}

model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaModel.java

@@ -70,35 +70,4 @@ public class XmlMetaModel {
         this.pages = pages;
     }
 
-    // Public Methods
-
-    public void addPage(XmlMetaPageModel page) {
-        this.pages.add(page);
-    }
-
-    public void addPageAfterIndex(int index, XmlMetaPageModel page) {
-        this.pages.add(index, page);
-
-        //Update index
-        this.updateIndex();
-    }
-
-    public void removePage(XmlMetaPageModel page) {
-        this.pages.remove(page);
-    }
-
-    public void removePageAtIndex(int index) {
-        this.pages.remove(index);
-
-        //Update index
-        this.updateIndex();
-    }
-
-    // Internal Methods
-    private void updateIndex() { // TODO-rca: 効率悪そう
-        for (int i = 0; i < this.pages.size(); i++) {
-            this.pages.get(i).setIndex(i);
-        }
-    }
-
 }

model/src/main/java/one/nem/lacerta/model/document/internal/XmlMetaPageModel.java

@@ -2,7 +2,6 @@ package one.nem.lacerta.model.document.internal;
 
 public class XmlMetaPageModel {
 
-    int index;
     String filename;
 
     // Constructor
@@ -10,27 +9,18 @@ public class XmlMetaPageModel {
     public XmlMetaPageModel() {
     }
 
-    public XmlMetaPageModel(int index, String filename) {
-        this.index = index;
+    public XmlMetaPageModel(String filename) {
         this.filename = filename;
     }
 
     // Getter
 
-    public int getIndex() {
-        return index;
-    }
-
     public String getFilename() {
         return filename;
     }
 
     // Setter
 
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
     public void setFilename(String filename) {
         this.filename = filename;
     }

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

@@ -102,11 +102,10 @@ public class DocumentProcessorImpl implements DocumentProcessor{
 
         XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
         xmlMetaPageModel.setFilename(filename);
-        xmlMetaPageModel.setIndex(xmlMetaModel.getPages().size() + 1);
         xmlMetaModel.getPages().add(xmlMetaPageModel);
 
         logger.info("addNewPageToLast", "finished");
-        logger.info("addNewPageToLast", "filename: " + filename + ", index: " + xmlMetaPageModel.getIndex());
+        logger.info("addNewPageToLast", "filename: " + filename);
     }
 
     @Override
@@ -118,19 +117,6 @@ public class DocumentProcessorImpl implements DocumentProcessor{
         } // TODO-rca: 効率悪いので改善する
     }
 
-    // Internal
-    // Indexを振り直す
-    private ArrayList<XmlMetaPageModel> reIndexPages(ArrayList<XmlMetaPageModel> pages) {
-        logger.debug("reIndexPages", "called"); // TODO-rca: 効率化
-        ArrayList<XmlMetaPageModel> newPages = new ArrayList<>();
-        for (int i = 0; i < pages.size(); i++) {
-            XmlMetaPageModel xmlMetaPageModel = pages.get(i);
-            xmlMetaPageModel.setIndex(i + 1);
-            newPages.add(xmlMetaPageModel);
-        }
-        return newPages;
-    }
-
     @Override
     public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception {
         logger.debug("addNewPageAfterIndex", "called");
@@ -140,9 +126,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{
 
         XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
         xmlMetaPageModel.setFilename(filename);
-        xmlMetaPageModel.setIndex(index + 1);
         xmlMetaModel.getPages().add(index, xmlMetaPageModel);
-        xmlMetaModel.setPages(reIndexPages(xmlMetaModel.getPages()));
     }
 
     @Override
@@ -154,9 +138,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{
 
         XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
         xmlMetaPageModel.setFilename(filename);
-        xmlMetaPageModel.setIndex(index);
         xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel);
-        xmlMetaModel.setPages(reIndexPages(xmlMetaModel.getPages()));
     }
 
     @Override

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M330,710L630,710L630,650L330,650L330,710ZM330,550L630,550L630,490L330,490L330,550ZM252.31,860Q222,860 201,839Q180,818 180,787.69L180,172.31Q180,142 201,121Q222,100 252.31,100L570,100L780,310L780,787.69Q780,818 759,839Q738,860 707.69,860L252.31,860ZM540,340L540,160L252.31,160Q247.69,160 243.85,163.85Q240,167.69 240,172.31L240,787.69Q240,792.31 243.85,796.15Q247.69,800 252.31,800L707.69,800Q712.31,800 716.15,796.15Q720,792.31 720,787.69L720,340L540,340ZM240,160L240,160L240,340L240,340L240,160L240,340L240,340L240,787.69Q240,792.31 240,796.15Q240,800 240,800L240,800Q240,800 240,796.15Q240,792.31 240,787.69L240,172.31Q240,167.69 240,163.85Q240,160 240,160Z"/>
+</vector>

utils/src/main/java/one/nem/lacerta/utils/impl/XmlMetaParserImpl.java

@@ -41,7 +41,6 @@ public class XmlMetaParserImpl implements XmlMetaParser{
             for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
                 Element pageElement = (Element) rootElement.getElementsByTagName("page").item(i);
                 XmlMetaPageModel page = new XmlMetaPageModel();
-                page.setIndex(Integer.parseInt(pageElement.getElementsByTagName("index").item(0).getTextContent()));
                 page.setFilename(pageElement.getElementsByTagName("filename").item(0).getTextContent());
                 pages.add(page);
             }
@@ -73,7 +72,6 @@ public class XmlMetaParserImpl implements XmlMetaParser{
             Element pagesElement = document.createElement("pages");
             for(XmlMetaPageModel page : meta.getPages()) {
                 Element pageElement = document.createElement("page");
-                appendElement(document, pageElement, "index", String.valueOf(page.getIndex()));
                 appendElement(document, pageElement, "filename", page.getFilename());
                 pagesElement.appendChild(pageElement);
             }