Compare commits

..
Author SHA1 Message Date
r-ca 1fb37a0317 iroiro 2024-01-29 04:31:38 +09:00
r-ca 57d1c7809c Iroiro 2024-01-29 04:31:14 +09:00
r-ca 4158faf453 コンストラクタインジェクションに変更 2024-01-29 04:26:22 +09:00
r-ca beef661e3b WIP 2024-01-29 04:24:01 +09:00
r-ca 8329769028 コメント解除 2024-01-29 04:23:41 +09:00
r-ca 49ac5c2ddc 依存関係追加 2024-01-29 04:18:33 +09:00
r-ca 5645cf64b6 失敗したら終了するように 2024-01-29 04:17:46 +09:00
r-ca d76d0a02e2 スキャンがキャンセルされたら終了するように 2024-01-29 04:17:31 +09:00
r-ca 719769c045 Singleモード追加 2024-01-29 04:17:01 +09:00
r-ca b0a0682561 修正 2024-01-29 04:13:59 +09:00
r-ca 3c75a04a5f 引数で最大撮影枚数を指定できるように 2024-01-29 04:13:04 +09:00
ろむねこ 0a0a4b56b9 Merge pull request #124 from lacerta-doc/add_edit_meta_dialog
結合したドキュメントの名前を変えられるように, タグをドキュメントに付与/剥奪できるように
2024-01-29 02:51:32 +09:00
r-ca d393087ff6 編集に追従してタブのタイトルも正しく変わるように 2024-01-29 02:49:04 +09:00
r-ca d691ee0126 タブタイトル更新メソッド作成 2024-01-29 02:44:15 +09:00
r-ca e85c8a7ed0 Getter追加 2024-01-29 02:43:11 +09:00
r-ca c44fd3ae8b Revert "Revert "Adapterをインタンス変数に持たせるように""
This reverts commit 1a2cf77f62.
2024-01-29 02:40:55 +09:00
r-ca 1a2cf77f62 Revert "Adapterをインタンス変数に持たせるように"
This reverts commit 19f6eb1683.
2024-01-29 02:39:30 +09:00
r-ca 19f6eb1683 Adapterをインタンス変数に持たせるように 2024-01-29 02:38:47 +09:00
r-ca f673954bef リネームできるように 2024-01-29 02:37:16 +09:00
r-ca 6fdef14eec タイトルキャッシュ更新メソッド追加 2024-01-29 02:16:03 +09:00
r-ca dcfb22f6a0 findByParentIdAndChildId追加 2024-01-29 02:15:00 +09:00
r-ca f2bbfca36c ミス修正 2024-01-29 02:09:54 +09:00
r-ca 972487fec1 Combinedなドキュメントの名前を変更できるように 2024-01-29 02:06:51 +09:00
r-ca 1fd992fb4a Getter追加 2024-01-29 02:03:55 +09:00
r-ca 8b1af8e2d7 コメント追加 2024-01-29 02:02:58 +09:00
r-ca 53ae1dadb8 リファクタリング 2024-01-29 02:02:01 +09:00
r-ca 7bcb2f07ab リファクタリング 2024-01-29 02:01:18 +09:00
r-ca da78f5eef1 Adapterの変更に追従, StreamAPIに変更 2024-01-29 02:00:32 +09:00
r-ca fcdb7c838b 不足していたSetterを追加 2024-01-29 01:59:44 +09:00
r-ca 7086582fad getItemCountでインスタンス変数の中身を軽くチェックするように 2024-01-29 01:56:57 +09:00
r-ca 9084613e38 FragmentではなくTargetIdを持つように変更 2024-01-29 01:55:06 +09:00
r-ca c849fdae2e WIP 2024-01-29 01:43:18 +09:00
r-ca 6d73bede6b メタデータ編集ダイアログ実装WIP 2024-01-29 01:41:28 +09:00
r-ca 74784a76d3 ログ追加 2024-01-29 01:39:16 +09:00
r-ca 4e17c5636c デバッグログ削除 2024-01-29 01:39:06 +09:00
r-ca 331a520be0 正常に切り替えできるように 2024-01-29 01:38:52 +09:00
r-ca 0735c90d5e 修正 2024-01-29 01:33:14 +09:00
r-ca ea345c45e4 StreamAPIで書き直し 2024-01-29 01:29:50 +09:00
r-ca 50f00411ca PositiveButtonを押されたときに更新するようにした 2024-01-29 01:18:29 +09:00
r-ca 1e0ba33519 applyTagListToDocument実装 2024-01-29 01:17:46 +09:00
r-ca b32ce60ad8 レイアウト修正 2024-01-29 01:14:00 +09:00
r-ca 55ceb2838e レイアウト修正 2024-01-29 01:13:35 +09:00
r-ca bbc8674c0b レイアウト修正 2024-01-29 01:13:10 +09:00
r-ca 4ed8d96caa 修正 2024-01-29 01:12:51 +09:00
r-ca 141c91e1d7 WIP 2024-01-29 01:07:54 +09:00
r-ca 68dddbabee WIP 2024-01-29 01:07:41 +09:00
r-ca efdf9c1fea 修正 2024-01-29 01:03:14 +09:00
r-ca a13f6e28ec WIP 2024-01-29 01:02:43 +09:00
r-ca fa4f074871 修正 2024-01-29 00:52:44 +09:00
r-ca 3715627c07 イベントをContainerまで伝達させるように 2024-01-29 00:47:34 +09:00
r-ca 8542869a63 選択肢のテキストが指定されていない場合の既定値を定義 2024-01-29 00:45:10 +09:00
r-ca d66546a567 CheckBoxの変化に応じてインスタンス変数のTagListを変化させるように 2024-01-29 00:44:02 +09:00
r-ca f2f4c77016 登録されているタグ一覧の取得を切り出し 2024-01-29 00:40:06 +09:00
r-ca 9a4d3a1310 非同期実行に変更 2024-01-29 00:38:03 +09:00
r-ca bf58f25cd5 AppliedTagをクラス変数で持つように 2024-01-29 00:35:51 +09:00
r-ca 04e0c9c05a Inflateするレイアウトを間違えていたので修正 2024-01-29 00:32:54 +09:00
r-ca 4770977e66 CheckBoxのId変更 2024-01-29 00:32:17 +09:00
r-ca d794bb97b6 メニューアイテムのイベント実装(テスト) 2024-01-29 00:28:03 +09:00
r-ca 0d5c3c4337 メニューアイテム追加 2024-01-29 00:26:20 +09:00
r-ca 67a8f42ef1 コンストラクタ追加 2024-01-29 00:25:30 +09:00
r-ca 79a64c3108 ダイアログ実装WIP 2024-01-29 00:25:20 +09:00
r-ca 6847af9b9a コールバックにタグを使うように 2024-01-29 00:23:18 +09:00
r-ca d562447777 拡張モデルを使うようにアダプタを修正 2024-01-29 00:14:02 +09:00
r-ca 425616c335 コメント 2024-01-29 00:12:28 +09:00
r-ca dcd10b7d2b Dialogで使う拡張モデルを作成 2024-01-29 00:12:02 +09:00
r-ca 1515e53484 Adapter実装 WIP 2024-01-29 00:06:28 +09:00
r-ca 8ca05fe454 ダイアログ内容レイアウト作成 2024-01-28 23:57:03 +09:00
r-ca 33766fbe18 ApplyTagListItem作成 仮 2024-01-28 23:56:26 +09:00
ろむねこ 5e0310beb2 Merge pull request #123 from lacerta-doc/add_tag_chip
タグ関係 WIP
2024-01-28 23:33:44 +09:00
16 changed files with 603 additions and 33 deletions

No files matched your search

@@ -0,0 +1,83 @@
package one.nem.lacerta.component.common;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
import one.nem.lacerta.model.document.tag.DocumentTag;
public class LacertaApplyTagAdapter extends RecyclerView.Adapter<LacertaApplyTagAdapter.LacertaApplyTagViewHolder>{
// Listener
public interface LacertaApplyTagDialogListener {
void itemChecked(View view, String tagId);
void itemUnchecked(View view, String tagId);
}
// Variables
private ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList;
private LacertaApplyTagDialogListener listener;
// Setter
public LacertaApplyTagAdapter setListener(LacertaApplyTagDialogListener listener) {
this.listener = listener;
return this;
}
public LacertaApplyTagAdapter setDocumentTagArrayList(ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList) {
this.documentTagArrayList = documentTagArrayList;
return this;
}
// Empty constructor
public LacertaApplyTagAdapter() {
}
@NonNull
@Override
public LacertaApplyTagAdapter.LacertaApplyTagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.apply_tag_list_item, parent, false);
return new LacertaApplyTagAdapter.LacertaApplyTagViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull LacertaApplyTagAdapter.LacertaApplyTagViewHolder holder, int position) {
DocumentTagApplyTagDialogExtendedModel documentTag = documentTagArrayList.get(position);
if (holder.checkBox == null) {
Log.d("LacertaApplyTagAdapter", "onBindViewHolder: holder.checkBox is null");
}
holder.checkBox.setText(documentTag.getName());
holder.checkBox.setChecked(documentTag.getIsChecked());
holder.checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked) {
listener.itemChecked(buttonView, documentTag.getId());
} else {
listener.itemUnchecked(buttonView, documentTag.getId());
}
});
}
@Override
public int getItemCount() {
return documentTagArrayList == null ? 0 : documentTagArrayList.size();
}
public class LacertaApplyTagViewHolder extends RecyclerView.ViewHolder {
CheckBox checkBox;
public LacertaApplyTagViewHolder(@NonNull View itemView) {
super(itemView);
checkBox = itemView.findViewById(R.id.tag_check_box);
}
}
}
@@ -0,0 +1,184 @@
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.CheckBox;
import android.widget.Checkable;
import android.widget.EditText;
import android.widget.Toast;
import androidx.fragment.app.DialogFragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.stream.Collectors;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.document.tag.DocumentTag;
import one.nem.lacerta.utils.LacertaLogger;
@AndroidEntryPoint
public class LacertaApplyTagDialog extends DialogFragment {
@Inject
LacertaLogger logger;
@Inject
LacertaLibrary lacertaLibrary;
// Listener
public interface LacertaApplyTagDialogListener {
void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags);
void onDialogNegativeClick();
}
// Variables
private String title;
private String message;
private String positiveButtonText;
private String negativeButtonText;
private String documentId;
private LacertaApplyTagDialogListener listener;
private ArrayList<DocumentTag> registeredTags;
private ArrayList<DocumentTag> appliedTags;
// Setter
public LacertaApplyTagDialog setListener(LacertaApplyTagDialogListener listener) {
this.listener = listener;
return this;
}
public LacertaApplyTagDialog setTitle(String title) {
this.title = title;
return this;
}
public LacertaApplyTagDialog setMessage(String message) {
this.message = message;
return this;
}
public LacertaApplyTagDialog setPositiveButtonText(String positiveButtonText) {
this.positiveButtonText = positiveButtonText;
return this;
}
public LacertaApplyTagDialog setNegativeButtonText(String negativeButtonText) {
this.negativeButtonText = negativeButtonText;
return this;
}
public LacertaApplyTagDialog setDocumentId(String documentId) {
this.documentId = documentId;
return this;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
LayoutInflater inflater = requireActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.lacerta_dialog_apply_tag, null);
// RecyclerView
RecyclerView recyclerView = view.findViewById(R.id.apply_tag_list);
LacertaApplyTagAdapter lacertaApplyTagAdapter = new LacertaApplyTagAdapter();
lacertaApplyTagAdapter.setListener(new LacertaApplyTagAdapter.LacertaApplyTagDialogListener() {
@Override
public void itemChecked(View view, String tagId) {
applyChangeToVariable(true, tagId);
}
@Override
public void itemUnchecked(View view, String tagId) {
applyChangeToVariable(false, tagId);
}
});
recyclerView.setAdapter(lacertaApplyTagAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
getDocumentTagArrayList(documentId).thenAccept(documentTagArrayList -> {
lacertaApplyTagAdapter.setDocumentTagArrayList(documentTagArrayList);
lacertaApplyTagAdapter.notifyDataSetChanged(); // TODO-rca: アニメーション
});
// Set the dialog title
builder.setTitle(title)
.setMessage(message)
.setView(view)
.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, id) -> {
// Send the positive button event back to the host activity
listener.onDialogPositiveClick(this.appliedTags);
})
.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, id) -> {
// Send the negative button event back to the host activity
listener.onDialogNegativeClick();
});
return builder.create();
}
private void applyChangeToVariable(boolean isChecked, String tagId) {
if (isChecked) {
this.registeredTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.add(tag));
} else {
this.appliedTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.remove(tag));
}
}
private CompletableFuture<ArrayList<DocumentTagApplyTagDialogExtendedModel>> getDocumentTagArrayList(String documentId) {
return CompletableFuture.supplyAsync(() -> {
ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
setRegisteredTagList().thenRun(() -> setAppliedTagList(documentId).join()).thenAccept(Void -> {
logger.debug("getDocumentTagArrayList", "this.registeredTags.size(): " + this.registeredTags.size());
logger.debug("getDocumentTagArrayList", "this.appliedTags.size(): " + this.appliedTags.size());
documentTagArrayList.addAll(this.registeredTags.stream().map(tag -> {
DocumentTagApplyTagDialogExtendedModel documentTag = new DocumentTagApplyTagDialogExtendedModel(
new DocumentTag(tag.getId(), tag.getName(), tag.getColor()),
this.appliedTags.stream().anyMatch(appliedTag -> appliedTag.getId().equals(tag.getId()))
);
return documentTag;
}).collect(Collectors.toCollection(ArrayList::new)));
}).join();
return documentTagArrayList;
});
}
private CompletableFuture<Void> setRegisteredTagList() {
return CompletableFuture.runAsync(() -> {
this.registeredTags = new ArrayList<>();
this.lacertaLibrary.getTagList().thenAccept(documentTagList -> {
for (int i = 0; i < documentTagList.size(); i++) {
this.registeredTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
}
}).join();
});
}
private CompletableFuture<Void> setAppliedTagList(String documentId) {
return CompletableFuture.runAsync(() -> {
this.appliedTags = new ArrayList<>();
this.lacertaLibrary.getAppliedTagList(documentId).thenAccept(documentTagList -> {
for (int i = 0; i < documentTagList.size(); i++) {
this.appliedTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
}
}).join();
});
}
}
@@ -0,0 +1,4 @@
package one.nem.lacerta.component.common;
public class LacertaEditMetaDialog {
}
@@ -0,0 +1,31 @@
package one.nem.lacerta.component.common.model;
import one.nem.lacerta.model.document.tag.DocumentTag;
// TODO-rca: クラス名が長すぎ
/**
* DocumentTagを設定するダイアログで使うための拡張モデル
* チェックボックスの状態を保持するように
*/
public class DocumentTagApplyTagDialogExtendedModel extends DocumentTag {
private boolean isChecked;
public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag) {
super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
}
public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag, boolean isChecked) {
super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
this.isChecked = isChecked;
}
public boolean getIsChecked() {
return isChecked;
}
public void setIsChecked(boolean checked) {
isChecked = checked;
}
}
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/tag_check_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:text="CheckBox" />
</LinearLayout>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/apply_tag_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/title_text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingHorizontal="16dp"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tag_name_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
+2
View File
@@ -52,4 +52,6 @@ dependencies {
implementation project(':vcs')
implementation project(':data')
implementation project(':component:common')
}
@@ -2,6 +2,7 @@ package one.nem.lacerta.component.scanner;
import android.Manifest;
import android.app.ProgressDialog;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -29,7 +30,9 @@ import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
@@ -53,9 +56,25 @@ public class ScannerManagerActivity extends AppCompatActivity {
@Inject
LacertaVcsFactory lacertaVcsFactory;
// @Inject
// public ScannerManagerActivity(LacertaLogger logger, Document document, LacertaLibrary lacertaLibrary, DocumentProcessorFactory documentProcessorFactory, LacertaVcsFactory lacertaVcsFactory) {
// this.logger = logger;
// this.document = document;
// this.lacertaLibrary = lacertaLibrary;
// this.documentProcessorFactory = documentProcessorFactory;
// this.lacertaVcsFactory = lacertaVcsFactory;
// }
@Inject
public ScannerManagerActivity() {
// Required empty public constructor
}
// Variables
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
private boolean single = false;
View view;
DocumentScanner documentScanner = new DocumentScanner(
@@ -85,6 +104,36 @@ public class ScannerManagerActivity extends AppCompatActivity {
null
);
DocumentScanner documentScannerSingle = new DocumentScanner( // TODO-rca: ひどすぎるのでなんとかする
this,
(croppedImageResults) -> {
logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
ArrayList<Bitmap> croppedImages = new ArrayList<>();
for (String result : croppedImageResults) {
croppedImages.add(BitmapFactory.decodeFile(result));
}
processResult(croppedImages);
return null;
},
(errorMessage) -> {
// an error happened
logger.error(TAG, "Error: " + errorMessage);
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
finish();
return null;
},
() -> {
// user canceled document scan
logger.debug(TAG, "User canceled document scan");
finish();
return null;
},
null,
null,
1
);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -108,11 +157,21 @@ public class ScannerManagerActivity extends AppCompatActivity {
setSupportActionBar(toolbar);
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
Intent intent = getIntent();
Bundle bundle = intent.getExtras();
if (bundle != null) {
this.single = bundle.getBoolean("single", false);
}
if (this.single) {
documentScanner = documentScannerSingle;
}
documentScanner.startScan();
// Init
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
}
@Override
@@ -125,15 +184,13 @@ public class ScannerManagerActivity extends AppCompatActivity {
public boolean onOptionsItemSelected(android.view.MenuItem item) {
if (item.getItemId() == R.id.action_save_new) {
// 新ドキュメントとして保存
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
saveNewDocument();
return true;
// }
// else if (item.getItemId() == R.id.action_insert_exist) {
// // 既存ドキュメントに挿入
// Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
// insertToExistDocument();
// return true;
}
else if (item.getItemId() == R.id.action_insert_exist) {
// 既存ドキュメントに挿入
insertToExistDocument();
return true;
} else if (item.getItemId() == android.R.id.home) {
finish();
return true;
@@ -174,7 +231,7 @@ public class ScannerManagerActivity extends AppCompatActivity {
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
croppedImages.toArray(bitmaps);
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
addPagesToDocumentDetail(documentDetail, bitmaps).join();
addPagesToDocumentDetail(documentDetail, bitmaps, null).join();
document.updateDocument(documentDetail).join();
dialog.dismiss();
finish();
@@ -182,11 +239,11 @@ public class ScannerManagerActivity extends AppCompatActivity {
}
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps, String commitMessage) {
return CompletableFuture.runAsync(() -> {
try {
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(commitMessage == null ? "Update" : commitMessage);
} catch (Exception e) {
logger.error(TAG, "Error: " + e.getMessage());
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
@@ -196,7 +253,19 @@ public class ScannerManagerActivity extends AppCompatActivity {
private void insertToExistDocument() {
logger.debug(TAG, "insertToExistDocument");
// TODO-rca: 実装
LacertaFilePickerDialog dialog = new LacertaFilePickerDialog();
dialog.setListener(((name, fileId) -> {
document.getDocument(fileId).thenAccept((documentDetail) -> {
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
croppedImages.toArray(bitmaps);
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
addPagesToDocumentDetail(documentDetail, bitmaps, "ページを追加").join();
document.updateDocument(documentDetail).join();
finish();
});
}));
dialog.setTitle("追加するドキュメントを選択");
dialog.show(getSupportFragmentManager(), "LacertaFilePickerDialog");
}
private void updateResultView(ArrayList<Bitmap> resultImages) {
@@ -6,9 +6,9 @@
android:icon="@drawable/save_24px"
android:title="Save"
app:showAsAction="ifRoom"/>
<!-- <item-->
<!-- android:id="@+id/action_insert_exist"-->
<!-- android:icon="@drawable/description_24px"-->
<!-- android:title="Insert"-->
<!-- app:showAsAction="ifRoom"/>-->
<item
android:id="@+id/action_insert_exist"
android:icon="@drawable/description_24px"
android:title="Insert"
app:showAsAction="ifRoom"/>
</menu>
@@ -19,13 +19,18 @@ import com.google.android.material.tabs.TabLayoutMediator;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import java.util.ArrayList;
import java.util.stream.Collectors;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.common.LacertaApplyTagDialog;
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.document.page.Page;
import one.nem.lacerta.model.document.tag.DocumentTag;
import one.nem.lacerta.model.pref.ToxiDocumentModel;
import one.nem.lacerta.utils.LacertaLogger;
@@ -52,6 +57,7 @@ public class ViewerContainerFragment extends Fragment {
private String documentId;
private String documentName;
private boolean hasCombined = false;
private ViewerViewPagerAdapter viewerViewPagerAdapter;
public ViewerContainerFragment() {
// Required empty public constructor
@@ -102,7 +108,7 @@ public class ViewerContainerFragment extends Fragment {
ViewPager2 viewPager = view.findViewById(R.id.view_pager);
// Init view pager adapter
ViewerViewPagerAdapter viewerViewPagerAdapter = new ViewerViewPagerAdapter(requireActivity());
this.viewerViewPagerAdapter = new ViewerViewPagerAdapter(requireActivity());
viewPager.setAdapter(viewerViewPagerAdapter);
// Init tab layout
@@ -112,22 +118,24 @@ public class ViewerContainerFragment extends Fragment {
Toolbar toolbar = view.findViewById(R.id.toolbar);
initToolbar(toolbar, true, documentName);
if (this.hasCombined) {
// Get document page
if (this.hasCombined) { // 結合親の場合
logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
lacertaLibrary.getCombinedDocumentToxiList(documentId).thenAccept(combinedDocumentToxiList -> {
logger.debug("ViewerContainerFragment", "combinedDocumentToxiList: " + combinedDocumentToxiList.size());
for (ToxiDocumentModel toxiDocumentModel : combinedDocumentToxiList) {
logger.debug("ViewerContainerFragment", "titleCache: " + toxiDocumentModel.getTitleCache());
viewerViewPagerAdapter
.addFragment(ViewerBodyFragment.newInstance(toxiDocumentModel.getChildDocumentId(), toxiDocumentModel.getTitleCache()),
toxiDocumentModel.getTitleCache());
}
viewerViewPagerAdapter.setFragmentTargetIdList(
combinedDocumentToxiList.stream().map(ToxiDocumentModel::getChildDocumentId).collect(Collectors.toCollection(ArrayList::new)));
viewerViewPagerAdapter.setFragmentTitleList(
combinedDocumentToxiList.stream().map(ToxiDocumentModel::getTitleCache).collect(Collectors.toCollection(ArrayList::new)));
viewerViewPagerAdapter.notifyItemRangeChanged(0, combinedDocumentToxiList.size());
});
} else {
} else { // それ以外の場合
logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
tabLayout.setVisibility(View.GONE);
viewerViewPagerAdapter.addFragment(ViewerBodyFragment.newInstance(documentId, documentName), documentName);
viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}});
viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
}
@@ -140,13 +148,54 @@ public class ViewerContainerFragment extends Fragment {
ImageButton imageButton = customView.findViewById(R.id.tab_modify);
imageButton.setOnClickListener(v -> {
Toast.makeText(getContext(), "Working!, Index:" + position, Toast.LENGTH_SHORT).show();
renameCombinedDocument(
this.documentId,
viewerViewPagerAdapter.getFragmentTargetId(position),
viewerViewPagerAdapter.getFragmentTitle(position),
position);
});
tab.setCustomView(customView);
}).attach();
}
private void renameCombinedDocument(String parentId, String childId, String current, int position) { // TODO-rca: 無理やりpositionを渡してるのでなんとかする
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
builder.setTitle("アイテム名の変更");
builder.setMessage("アイテム名を入力してください");
View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
textInputEditText.setText(current);
textInputLayout.setHint("アイテム名");
builder.setView(view);
builder.setPositiveButton("変更", (dialog, which) -> {
document.renameDocument(childId, textInputEditText.getText().toString()).thenCombine(
lacertaLibrary.updateTitleCache(parentId, childId, textInputEditText.getText().toString()), (aVoid, aVoid2) -> {
getActivity().runOnUiThread(() -> {
Toast.makeText(getContext(), "変更しました", Toast.LENGTH_SHORT).show();
updateTabTitle(position, textInputEditText.getText().toString());
dialog.dismiss();
});
return null;
});
});
builder.setNegativeButton("キャンセル", (dialog, which) -> {
dialog.cancel();
});
builder.show();
}
private void updateTabTitle(int position, String title) {
ArrayList<String> fragmentTitleList = viewerViewPagerAdapter.getFragmentTitleList();
fragmentTitleList.set(position, title);
viewerViewPagerAdapter.setFragmentTitleList(fragmentTitleList);
viewerViewPagerAdapter.notifyItemChanged(position);
}
/**
* Toolbarをinitする
*
@@ -187,6 +236,9 @@ public class ViewerContainerFragment extends Fragment {
} else if (item.getItemId() == R.id.action_combine) {
combineDocument();
return true;
} else if (item.getItemId() == R.id.action_apply_tag) {
applyTag();
return true;
} else {
return false;
}
@@ -194,6 +246,33 @@ public class ViewerContainerFragment extends Fragment {
});
}
private void applyTag() {
LacertaApplyTagDialog lacertaApplyTagDialog = new LacertaApplyTagDialog();
lacertaApplyTagDialog
.setTitle("タグの適用")
.setMessage("タグを適用するファイルを選択してください")
.setNegativeButtonText("キャンセル")
.setDocumentId(documentId)
.setListener(new LacertaApplyTagDialog.LacertaApplyTagDialogListener() {
@Override
public void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags) {
logger.debug("ViewerContainerFragment", "Dialog Result: appliedTags: " + appliedTags.size());
lacertaLibrary.applyTagListToDocument(documentId, appliedTags).thenAccept(aVoid -> {
getActivity().runOnUiThread(() -> {
Toast.makeText(getContext(), "タグを適用しました", Toast.LENGTH_SHORT).show();
lacertaApplyTagDialog.dismiss();
});
});
}
@Override
public void onDialogNegativeClick() {
lacertaApplyTagDialog.dismiss();
}
})
.show(getChildFragmentManager(), "LacertaApplyTagDialog");
}
private void combineDocument() {
LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
lacertaFilePickerDialog.setListener((fileName, selectedId) -> {
@@ -13,13 +13,17 @@ import java.util.ArrayList;
public class ViewerViewPagerAdapter extends FragmentStateAdapter {
// Variables
private ArrayList<Fragment> fragmentArrayList = new ArrayList<>();
private ArrayList<String> fragmentTargetIdList = new ArrayList<>();
private ArrayList<String> fragmentTitleList = new ArrayList<>();
// Setter
public void addFragment(Fragment fragment, String title){
fragmentArrayList.add(fragment);
fragmentTitleList.add(title);
public void setFragmentTargetIdList(ArrayList<String> fragmentTargetIdList) {
this.fragmentTargetIdList = fragmentTargetIdList;
}
public void setFragmentTitleList(ArrayList<String> fragmentTitleList) {
this.fragmentTitleList = fragmentTitleList;
}
public ViewerViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
@@ -29,16 +33,40 @@ public class ViewerViewPagerAdapter extends FragmentStateAdapter {
@NonNull
@Override
public Fragment createFragment(int position) {
return fragmentArrayList.get(position);
return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position));
}
@Override
public int getItemCount() {
return fragmentArrayList == null ? 0 : fragmentArrayList.size();
if (fragmentTargetIdList == null || fragmentTitleList == null) {
return 0;
} else if (fragmentTargetIdList.size() != fragmentTitleList.size()) {
throw new IllegalStateException("fragmentTargetIdList.size() != fragmentTitleList.size()");
} else {
return fragmentTargetIdList.size();
}
}
@Nullable
public CharSequence getTabTitle(int position) {
return fragmentTitleList.get(position);
}
// Getter
public String getFragmentTargetId(int position) {
return fragmentTargetIdList.get(position);
}
public String getFragmentTitle(int position) {
return fragmentTitleList.get(position);
}
public ArrayList<String> getFragmentTargetIdList() {
return fragmentTargetIdList;
}
public ArrayList<String> getFragmentTitleList() {
return fragmentTitleList;
}
}
@@ -20,4 +20,12 @@
android:id="@+id/action_combine"
android:title="結合" />
<item
android:id="@+id/action_edit_meta"
android:title="メタデータ編集" />
<item
android:id="@+id/action_apply_tag"
android:title="タグの管理" />
</menu>
@@ -45,12 +45,16 @@ public interface LacertaLibrary {
CompletableFuture<Void> addTagToDocument(String documentId, String tagId);
CompletableFuture<Void> applyTagListToDocument(String documentId, ArrayList<DocumentTag> tagList);
CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId);
// Combined Document
CompletableFuture<Void> combineDocument(String parentId, String childId);
CompletableFuture<Void> updateTitleCache(String parentId, String childId, String titleCache);
CompletableFuture<Void> uncombineDocument(String parentId, String childId);
// CompletableFuture<Void> combineDocument(String parentId, ArrayList<String> childIdList);
@@ -321,6 +321,20 @@ public class LacertaLibraryImpl implements LacertaLibrary {
});
}
@Override
public CompletableFuture<Void> applyTagListToDocument(String documentId, ArrayList<DocumentTag> tagArrayList) {
return CompletableFuture.supplyAsync(() -> { // TODO-rca: 必要なものだけInsertするべき, 時間があれば...
// 一旦全てのタグを削除
database.toxiDocumentTagDao().deleteByDocumentId(documentId);
logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentTagEntity");
// タグを追加
for (DocumentTag documentTag : tagArrayList) {
addTagToDocument(documentId, documentTag.getId());
}
return null;
});
}
@Override
public CompletableFuture<Void> removeTagFromDocument(String documentId, String tagId) {
return CompletableFuture.supplyAsync(() -> {
@@ -375,6 +389,21 @@ public class LacertaLibraryImpl implements LacertaLibrary {
logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentEntity");
}
@Override
public CompletableFuture<Void> updateTitleCache(String parentId, String documentId, String titleCache) {
return CompletableFuture.supplyAsync(() -> {
ToxiDocumentEntity toxiDocumentEntity = database.toxiDocumentDao().findByParentIdAndChildId(parentId, documentId);
if (toxiDocumentEntity == null) {
logger.warn("LacertaLibraryImpl", "ToxiDocumentEntity is not found.");
return null;
}
toxiDocumentEntity.titleCache = titleCache;
database.toxiDocumentDao().update(toxiDocumentEntity);
logger.debug("LacertaLibraryImpl", "Database Query: Updated ToxiDocumentEntity");
return null;
});
}
@Override
public CompletableFuture<Void> uncombineDocument(String parentId, String childId) {
return CompletableFuture.supplyAsync(() -> {
@@ -15,6 +15,9 @@ public interface ToxiDocumentDao {
@Query("SELECT * FROM toxi_document WHERE parent_document_id = :parentId AND is_active = 1 ORDER BY `order` ASC")
List<ToxiDocumentEntity> findByParentId(String parentId);
@Query("SELECT * FROM toxi_document WHERE parent_document_id = :parentId AND child_document_id = :childId AND is_active = 1")
ToxiDocumentEntity findByParentIdAndChildId(String parentId, String childId);
@Insert
void insert(ToxiDocumentEntity toxiDocument);