Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8449c8ea87 |
No files matched your search
@@ -4,7 +4,6 @@
|
|||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="testRunner" value="GRADLE" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleJvm" value="jbr-17" />
|
<option name="gradleJvm" value="jbr-17" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
@@ -31,7 +30,6 @@
|
|||||||
<option value="$PROJECT_DIR$/source" />
|
<option value="$PROJECT_DIR$/source" />
|
||||||
<option value="$PROJECT_DIR$/utils" />
|
<option value="$PROJECT_DIR$/utils" />
|
||||||
<option value="$PROJECT_DIR$/vcs" />
|
<option value="$PROJECT_DIR$/vcs" />
|
||||||
<option value="$PROJECT_DIR$/viewer2" />
|
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
<option name="resolveExternalAnnotations" value="false" />
|
<option name="resolveExternalAnnotations" value="false" />
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ android {
|
|||||||
|
|
||||||
// ベータ, Internal, Release問わず毎回インクリメントする
|
// ベータ, Internal, Release問わず毎回インクリメントする
|
||||||
// https://developer.android.com/studio/publish/versioning#versioningsettings
|
// https://developer.android.com/studio/publish/versioning#versioningsettings
|
||||||
versionCode 2
|
versionCode 1
|
||||||
versionName "0.2.0"
|
versionName "0.1.0"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,10 +17,10 @@
|
|||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||||
android:fullBackupContent="@xml/backup_rules"
|
android:fullBackupContent="@xml/backup_rules"
|
||||||
android:icon="@mipmap/ic_launcher_final"
|
android:icon="@mipmap/ic_launcher_temp_round"
|
||||||
android:name=".LacertaApplication"
|
android:name=".LacertaApplication"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher_final_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.Lacerta"
|
android:theme="@style/Theme.Lacerta"
|
||||||
tools:targetApi="31">
|
tools:targetApi="31">
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 5.9 KiB |
@@ -8,11 +8,9 @@ import androidx.fragment.app.Fragment;
|
|||||||
import androidx.fragment.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
import androidx.fragment.app.FragmentTransaction;
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
import androidx.navigation.NavController;
|
import androidx.navigation.NavController;
|
||||||
import androidx.navigation.NavOptions;
|
|
||||||
import androidx.navigation.fragment.NavHostFragment;
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
import androidx.navigation.ui.NavigationUI;
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
import android.app.ActivityOptions;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
@@ -62,19 +60,6 @@ public class MainActivity extends AppCompatActivity implements FragmentNavigatio
|
|||||||
assert navHostFragment != null;
|
assert navHostFragment != null;
|
||||||
NavController navController = navHostFragment.getNavController();
|
NavController navController = navHostFragment.getNavController();
|
||||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||||
|
|
||||||
bottomNavigationView.setOnItemSelectedListener(item -> {
|
|
||||||
NavOptions navOptions = new NavOptions.Builder()
|
|
||||||
.setLaunchSingleTop(true)
|
|
||||||
.setEnterAnim(androidx.navigation.ui.R.anim.nav_default_enter_anim)
|
|
||||||
.setExitAnim(androidx.navigation.ui.R.anim.nav_default_exit_anim)
|
|
||||||
.setPopEnterAnim(androidx.navigation.ui.R.anim.nav_default_pop_enter_anim)
|
|
||||||
.setPopExitAnim(androidx.navigation.ui.R.anim.nav_default_pop_exit_anim)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
navController.navigate(item.getItemId(), null, navOptions);
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
Log.e("Init", "Failed to init navigation");
|
Log.e("Init", "Failed to init navigation");
|
||||||
@@ -98,8 +83,7 @@ public class MainActivity extends AppCompatActivity implements FragmentNavigatio
|
|||||||
findViewById(R.id.scanFab).setOnClickListener(v -> {
|
findViewById(R.id.scanFab).setOnClickListener(v -> {
|
||||||
Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
|
||||||
Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
|
Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
|
||||||
// startActivity(intent);
|
startActivity(intent);
|
||||||
startActivity(intent, ActivityOptions.makeCustomAnimation(this, one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportWidth="960"
|
|
||||||
android:viewportHeight="960"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<group android:scaleX="0.37"
|
|
||||||
android:scaleY="0.37"
|
|
||||||
android:translateX="302.4"
|
|
||||||
android:translateY="302.4">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M92.12,225.15L92.12,51.92L265.15,51.92L265.15,107.88L148.08,107.88L148.08,225.15L92.12,225.15ZM812.12,225.15L812.12,107.88L694.85,107.88L694.85,51.92L868.08,51.92L868.08,225.15L812.12,225.15ZM92.12,907.88L92.12,734.85L148.08,734.85L148.08,851.92L265.15,851.92L265.15,907.88L92.12,907.88ZM694.85,907.88L694.85,851.92L812.12,851.92L812.12,734.85L868.08,734.85L868.08,907.88L694.85,907.88ZM268.08,719.61Q268.08,724.42 271.83,728.17Q275.58,731.92 280.39,731.92L679.81,731.92Q684.42,731.92 688.27,728.17Q692.12,724.42 692.12,719.61L692.12,240.19Q692.12,235.58 688.27,231.73Q684.42,227.88 679.81,227.88L280.39,227.88Q275.58,227.88 271.83,231.73Q268.08,235.58 268.08,240.19L268.08,719.61ZM280.39,787.88Q251.74,787.88 231.93,768.07Q212.12,748.26 212.12,719.61L212.12,240.19Q212.12,211.76 231.93,191.84Q251.74,171.92 280.39,171.92L679.81,171.92Q708.24,171.92 728.16,191.84Q748.08,211.76 748.08,240.19L748.08,719.61Q748.08,748.26 728.16,768.07Q708.24,787.88 679.81,787.88L280.39,787.88ZM372.12,387.88L588.08,387.88L588.08,331.92L372.12,331.92L372.12,387.88ZM372.12,507.88L588.08,507.88L588.08,451.92L372.12,451.92L372.12,507.88ZM372.12,627.88L588.08,627.88L588.08,571.92L372.12,571.92L372.12,627.88ZM268.08,719.61L268.08,240.19Q268.08,235.58 268.08,231.73Q268.08,227.88 268.08,227.88L268.08,227.88Q268.08,227.88 268.08,231.73Q268.08,235.58 268.08,240.19L268.08,719.61Q268.08,724.42 268.08,728.17Q268.08,731.92 268.08,731.92L268.08,731.92Q268.08,731.92 268.08,728.17Q268.08,724.42 268.08,719.61Z"/>
|
|
||||||
</group>
|
|
||||||
</vector>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@color/ic_launcher_final_background"/>
|
|
||||||
<foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@color/ic_launcher_final_background"/>
|
|
||||||
<foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
|
Before Width: | Height: | Size: 888 B |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 728 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="ic_launcher_final_background">#B8D3C3</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
alias(libs.plugins.com.android.library)
|
alias(libs.plugins.com.android.library)
|
||||||
id 'com.google.dagger.hilt.android'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@@ -34,14 +33,5 @@ dependencies {
|
|||||||
androidTestImplementation libs.androidx.test.ext.junit
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
androidTestImplementation libs.androidx.test.espresso.core
|
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(':shared:ui')
|
||||||
implementation project(':utils')
|
|
||||||
implementation project(':model')
|
|
||||||
implementation project(':data')
|
|
||||||
|
|
||||||
implementation project(':vcs')
|
|
||||||
}
|
}
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,184 +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.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();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.EditText;
|
|
||||||
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
public class LacertaCreateTagDialog extends DialogFragment {
|
|
||||||
|
|
||||||
private String title;
|
|
||||||
|
|
||||||
private String message;
|
|
||||||
|
|
||||||
private String positiveButtonText;
|
|
||||||
|
|
||||||
private String negativeButtonText;
|
|
||||||
|
|
||||||
private LacertaCreateTagDialogListener listener;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
|
|
||||||
public LacertaCreateTagDialog setListener(LacertaCreateTagDialogListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaCreateTagDialog setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaCreateTagDialog setMessage(String message) {
|
|
||||||
this.message = message;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaCreateTagDialog setPositiveButtonText(String positiveButtonText) {
|
|
||||||
this.positiveButtonText = positiveButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaCreateTagDialog setNegativeButtonText(String negativeButtonText) {
|
|
||||||
this.negativeButtonText = negativeButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
|
||||||
View view = inflater.inflate(R.layout.lacerta_dialog_create_tag, null);
|
|
||||||
|
|
||||||
// TextEdit
|
|
||||||
EditText tag_name_edit_text = view.findViewById(R.id.tag_name_edit_text);
|
|
||||||
com.google.android.material.textfield.TextInputLayout tag_name_text_input_layout = view.findViewById(R.id.tag_name_text_input_layout);
|
|
||||||
tag_name_text_input_layout.setHint("タグの名前");
|
|
||||||
EditText tag_color_edit_text = view.findViewById(R.id.tag_color_edit_text);
|
|
||||||
com.google.android.material.textfield.TextInputLayout tag_color_text_input_layout = view.findViewById(R.id.tag_color_text_input_layout);
|
|
||||||
tag_color_text_input_layout.setHint("タグの色(カラーコード)");
|
|
||||||
|
|
||||||
builder.setTitle(this.title == null ? "Create new tag" : this.title);
|
|
||||||
|
|
||||||
// Button
|
|
||||||
builder.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, which) -> {
|
|
||||||
String tag_name = tag_name_edit_text.getText().toString();
|
|
||||||
String tag_color = tag_color_edit_text.getText().toString();
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onPositiveClick(tag_name, tag_color);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onNegativeClick();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.setView(view);
|
|
||||||
return builder.create();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
public interface LacertaCreateTagDialogListener {
|
|
||||||
|
|
||||||
void onPositiveClick(String tag_name, String tag_color);
|
|
||||||
|
|
||||||
void onNegativeClick();
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
public class LacertaEditMetaDialog {
|
|
||||||
}
|
|
||||||
@@ -1,163 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class LacertaSelectDirDialog extends DialogFragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
private LacertaSelectDirDialogListener listener;
|
|
||||||
|
|
||||||
private String title;
|
|
||||||
|
|
||||||
private String message;
|
|
||||||
|
|
||||||
private String positiveButtonText;
|
|
||||||
|
|
||||||
private String negativeButtonText;
|
|
||||||
|
|
||||||
private SelectDirDialogItemAdapter adapter;
|
|
||||||
|
|
||||||
private RecyclerView recyclerView;
|
|
||||||
|
|
||||||
private TextView current_dir_text_view;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
|
|
||||||
public LacertaSelectDirDialog setListener(LacertaSelectDirDialogListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectDirDialog setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectDirDialog setMessage(String message) {
|
|
||||||
this.message = message;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectDirDialog setPositiveButtonText(String positiveButtonText) {
|
|
||||||
this.positiveButtonText = positiveButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectDirDialog setNegativeButtonText(String negativeButtonText) {
|
|
||||||
this.negativeButtonText = negativeButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
|
|
||||||
super.onCreateDialog(savedInstanceState);
|
|
||||||
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
|
||||||
View view = inflater.inflate(R.layout.lacerta_dialog_select_dir, null);
|
|
||||||
|
|
||||||
// 高さを画面の40%にする
|
|
||||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
|
||||||
view.setMinimumHeight(height);
|
|
||||||
|
|
||||||
this.recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
|
||||||
this.current_dir_text_view = view.findViewById(R.id.current_dir_text_view);
|
|
||||||
|
|
||||||
this.adapter = new SelectDirDialogItemAdapter(new LacertaSelectDirDialogInternalEventListener() {
|
|
||||||
@Override
|
|
||||||
public void onDirSelected(String name, String itemId) {
|
|
||||||
showRecyclerViewItem(itemId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackSelected(String parentId) {
|
|
||||||
showRecyclerViewItem(parentId);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
this.recyclerView.setAdapter(this.adapter);
|
|
||||||
builder.setView(view);
|
|
||||||
|
|
||||||
showRecyclerViewItem(null); // get root folder
|
|
||||||
|
|
||||||
builder.setTitle(this.title == null ? "Select a directory" : this.title);
|
|
||||||
builder.setMessage(this.message == null ? "Select a directory" : this.message);
|
|
||||||
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onDirSelected(
|
|
||||||
adapter.getCurrentPageTitle() == null ? null : adapter.getCurrentPageTitle(),
|
|
||||||
adapter.getCurrentId() == null ? null : adapter.getCurrentId());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
builder.setNegativeButton(this.negativeButtonText == null ? "Cancel" : this.negativeButtonText, (dialog, which) -> {
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onCanceled();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return builder.create();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showRecyclerViewItem(String targetDirId) {
|
|
||||||
lacertaLibrary.getPublicPath(targetDirId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
if (publicPath != null) {
|
|
||||||
current_dir_text_view.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPathの実装を修正する
|
|
||||||
} else {
|
|
||||||
current_dir_text_view.setText("/");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
lacertaLibrary.getFolderList(targetDirId).thenAccept(libraryItemPage -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
int currentCount = adapter.getItemCount();
|
|
||||||
String currentDirId = adapter.getCurrentId();
|
|
||||||
if (currentDirId == null) {
|
|
||||||
// Rootが関わる推移 (Rootからの推移)
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
} else if (libraryItemPage.getPageId() == null) {
|
|
||||||
// Rootが関わる推移 (Rootへの推移)
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
} else if (libraryItemPage.getPageId() != null) {
|
|
||||||
// Rootが関わらない推移
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(1, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
|
|
||||||
} else {
|
|
||||||
// その他の遷移(安全側に倒すため全アイテム更新)
|
|
||||||
logger.warn("LacertaSelectDirDialog", "Unknown transition.");
|
|
||||||
logger.warn("LacertaSelectDirDialog", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
public interface LacertaSelectDirDialogInternalEventListener {
|
|
||||||
void onDirSelected(String name, String itemId);
|
|
||||||
void onBackSelected(String parentId);
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
public interface LacertaSelectDirDialogListener {
|
|
||||||
|
|
||||||
void onDirSelected(String name, String itemId);
|
|
||||||
void onCanceled();
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
import one.nem.lacerta.vcs.LacertaVcs;
|
|
||||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
|
||||||
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class LacertaSelectRevDialog extends DialogFragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaVcsFactory lacertaVcsFactory;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
String title;
|
|
||||||
String documentId;
|
|
||||||
String message;
|
|
||||||
String negativeButtonText;
|
|
||||||
|
|
||||||
LacertaSelectRevDialogListener listener;
|
|
||||||
|
|
||||||
public LacertaSelectRevDialog setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectRevDialog setDocumentId(String documentId) {
|
|
||||||
this.documentId = documentId;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectRevDialog setMessage(String message) {
|
|
||||||
this.message = message;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectRevDialog setNegativeButtonText(String negativeButtonText) {
|
|
||||||
this.negativeButtonText = negativeButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaSelectRevDialog setListener(LacertaSelectRevDialogListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
super.onCreateDialog(savedInstanceState);
|
|
||||||
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
|
||||||
View view = inflater.inflate(R.layout.lacerta_dialog_select_rev, null);
|
|
||||||
|
|
||||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
|
||||||
view.setMinimumHeight(height);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.select_rev_recycler_view);
|
|
||||||
|
|
||||||
SelectRevDialogItemAdapter adapter = new SelectRevDialogItemAdapter(revId -> {
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onItemSelected(revId);
|
|
||||||
dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
builder.setView(view);
|
|
||||||
|
|
||||||
if (this.documentId == null) {
|
|
||||||
logger.error("SelectRevDialog", "documentId is null");
|
|
||||||
logger.e_code("0296fb0c-07a3-4971-a280-bd1a61461bb7");
|
|
||||||
Toast.makeText(getContext(), "Sorry, something went wrong", Toast.LENGTH_SHORT).show();
|
|
||||||
dismiss();
|
|
||||||
}
|
|
||||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(this.documentId);
|
|
||||||
lacertaVcs.getRevisionHistory().thenAccept(revList -> {
|
|
||||||
adapter.setRevList(revList);
|
|
||||||
adapter.notifyDataSetChanged(); // TODO-rca:時間に応じてアニメーションをつける
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
builder.setTitle(title == null ? "Select Rev" : title);
|
|
||||||
builder.setMessage(message == null ? "Select Rev" : message);
|
|
||||||
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onDialogCanceled();
|
|
||||||
dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return builder.create();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
public interface LacertaSelectRevDialogInternalListener {
|
|
||||||
|
|
||||||
void onItemSelected(String revId);
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
public interface LacertaSelectRevDialogListener {
|
|
||||||
|
|
||||||
void onItemSelected(String revId);
|
|
||||||
|
|
||||||
void onDialogCanceled();
|
|
||||||
}
|
|
||||||
@@ -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); // 暫定
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.VcsRevModel;
|
|
||||||
|
|
||||||
public class SelectRevDialogItemAdapter extends RecyclerView.Adapter<SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder>{
|
|
||||||
|
|
||||||
ArrayList<VcsRevModel> revList;
|
|
||||||
|
|
||||||
LacertaSelectRevDialogInternalListener listener;
|
|
||||||
|
|
||||||
public SelectRevDialogItemAdapter(LacertaSelectRevDialogInternalListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRevList(ArrayList<VcsRevModel> revList) {
|
|
||||||
this.revList = revList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.common_rev_list_item, parent, false);
|
|
||||||
return new SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder holder, int position) {
|
|
||||||
VcsRevModel rev = revList.get(position);
|
|
||||||
holder.title.setText(rev.getCommitMessage());
|
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
|
||||||
holder.description.setText(simpleDateFormat.format(rev.getCreatedAt()));
|
|
||||||
holder.revId.setText("RevID: " + rev.getId());
|
|
||||||
|
|
||||||
holder.itemView.setOnClickListener(v -> listener.onItemSelected(rev.getId()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return this.revList == null ? 0 : this.revList.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SelectRevDialogItemViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
TextView title;
|
|
||||||
TextView description;
|
|
||||||
TextView revId;
|
|
||||||
|
|
||||||
public SelectRevDialogItemViewHolder(@NonNull View itemView) {
|
|
||||||
super(itemView);
|
|
||||||
title = itemView.findViewById(R.id.rev_item_title);
|
|
||||||
description = itemView.findViewById(R.id.rev_item_detail);
|
|
||||||
revId = itemView.findViewById(R.id.rev_item_id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.component.common.R;
|
|
||||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
|
||||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
import one.nem.lacerta.model.PublicPath;
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class LacertaDirPickerDialog extends LacertaFilePickerDialogBase {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
// Listener
|
|
||||||
public interface LacertaDirPickerDialogListener {
|
|
||||||
void onDirSelected(String name, String dirId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
LacertaDirPickerDialogListener listener;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
public LacertaDirPickerDialog setListener(LacertaDirPickerDialogListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
super.onCreateDialog(savedInstanceState);
|
|
||||||
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
|
|
||||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
|
|
||||||
|
|
||||||
// 高さを画面の40%にする
|
|
||||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
|
||||||
view.setMinimumHeight(height);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
|
||||||
TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
|
|
||||||
|
|
||||||
LacertaFilePickerAdapterBase adapter = new LacertaFilePickerAdapterBase();
|
|
||||||
adapter.setListener(new LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemSelected(String dirId) {
|
|
||||||
updateList(adapter, dirId);
|
|
||||||
updatePublicPath(currentDirTextView, dirId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackSelected(String dirId) {
|
|
||||||
updateList(adapter, dirId);
|
|
||||||
updatePublicPath(currentDirTextView, dirId);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
|
||||||
|
|
||||||
this.updateList(adapter, null); // ルートディレクトリのリストを表示
|
|
||||||
|
|
||||||
// Init dialog
|
|
||||||
builder.setTitle(this.title == null ? "フォルダを選択" : this.title);
|
|
||||||
builder.setMessage(this.message == null ? "フォルダを選択してください" : this.message);
|
|
||||||
builder.setView(view);
|
|
||||||
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
|
|
||||||
if (listener != null) {
|
|
||||||
listener.onDirSelected(
|
|
||||||
adapter.getCurrentPageTitle(),
|
|
||||||
adapter.getCurrentId());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
|
|
||||||
if (listener != null) {
|
|
||||||
dismiss();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return builder.create();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updatePublicPath(TextView currentDirTextView, String folderId) {
|
|
||||||
lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
|
||||||
this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
|
|
||||||
lacertaLibrary.getFolderList(folderId).thenAccept(libraryItemPage -> {
|
|
||||||
int currentCount = adapter.getItemCount();
|
|
||||||
String currentId = adapter.getCurrentId();
|
|
||||||
// adapter.setListItems(libraryItemPage);
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
this.updateListView(adapter, libraryItemPage, currentCount, currentId);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
|
||||||
import one.nem.lacerta.model.ListItem;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
|
|
||||||
public class LacertaFilePickerAdapter extends LacertaFilePickerAdapterBase {
|
|
||||||
|
|
||||||
// Listener
|
|
||||||
public interface LacertaFilePickerAdapterListener extends LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener {
|
|
||||||
void onDocumentSelected(String documentId);
|
|
||||||
void onCombinedDocumentSelected(String documentId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
LacertaFilePickerAdapterListener listener;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
public LacertaFilePickerAdapter setListener(LacertaFilePickerAdapterListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
|
|
||||||
super.onBindViewHolder(holder, position);
|
|
||||||
if (libraryItemPage.getListItems().get(position).getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
|
|
||||||
if (libraryItemPage.getListItems().get(position).getHasCombined()) {
|
|
||||||
holder.itemView.setOnClickListener(v -> {
|
|
||||||
listener.onCombinedDocumentSelected(libraryItemPage.getListItems().get(position).getItemId());
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
holder.itemView.setOnClickListener(v -> {
|
|
||||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
|
||||||
listener.onDocumentSelected(listItem.getItemId());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.component.common.R;
|
|
||||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
|
||||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class LacertaFilePickerDialog extends LacertaFilePickerDialogBase {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
// Listener
|
|
||||||
public interface LacertaFilePickerDialogListener {
|
|
||||||
void onFileSelected(String name, String fileId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
LacertaFilePickerDialogListener listener;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
public LacertaFilePickerDialog setListener(LacertaFilePickerDialogListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
super.onCreateDialog(savedInstanceState);
|
|
||||||
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
|
|
||||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
|
|
||||||
|
|
||||||
// 高さを画面の40%にする
|
|
||||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
|
||||||
view.setMinimumHeight(height);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
|
||||||
TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
|
|
||||||
|
|
||||||
LacertaFilePickerAdapter adapter = new LacertaFilePickerAdapter();
|
|
||||||
adapter.setListener(new LacertaFilePickerAdapter.LacertaFilePickerAdapterListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemSelected(String dirId) {
|
|
||||||
updateList(adapter, dirId);
|
|
||||||
updatePublicPath(currentDirTextView, dirId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBackSelected(String dirId) {
|
|
||||||
updateList(adapter, dirId);
|
|
||||||
updatePublicPath(currentDirTextView, dirId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDocumentSelected(String documentId) {
|
|
||||||
if (listener != null) {
|
|
||||||
dismiss();
|
|
||||||
listener.onFileSelected(documentId, documentId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCombinedDocumentSelected(String documentId) {
|
|
||||||
if (listener != null) {
|
|
||||||
LacertaFilePickerSelectDocumentDialog dialog = new LacertaFilePickerSelectDocumentDialog();
|
|
||||||
dialog.setDocumentId(documentId);
|
|
||||||
dialog.setListener(documentId1 -> {
|
|
||||||
dismiss();
|
|
||||||
listener.onFileSelected(documentId1, documentId1);
|
|
||||||
});
|
|
||||||
dialog.show(getParentFragmentManager(), "select_document_dialog");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
|
||||||
|
|
||||||
this.updateList(adapter, null); // ルートディレクトリのリストを表示
|
|
||||||
|
|
||||||
// Init dialog
|
|
||||||
builder.setTitle(this.title == null ? "ファイルを選択" : this.title);
|
|
||||||
builder.setMessage(this.message == null ? "ファイルを選択してください" : this.message);
|
|
||||||
builder.setView(view);
|
|
||||||
builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
|
|
||||||
dismiss();
|
|
||||||
});
|
|
||||||
|
|
||||||
return builder.create();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updatePublicPath(TextView currentDirTextView, String folderId) {
|
|
||||||
lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
|
||||||
this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
|
|
||||||
lacertaLibrary.getLibraryPage(folderId, 100).thenAccept(libraryItemPage -> { // TODO-rca: 100 is a magic number
|
|
||||||
int currentCount = adapter.getItemCount();
|
|
||||||
String currentId = adapter.getCurrentId();
|
|
||||||
// adapter.setListItems(libraryItemPage);
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
this.updateListView(adapter, libraryItemPage, currentCount, currentId);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker;
|
|
||||||
|
|
||||||
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 java.util.ArrayList;
|
|
||||||
|
|
||||||
import one.nem.lacerta.component.common.R;
|
|
||||||
import one.nem.lacerta.model.ListItem;
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
|
||||||
|
|
||||||
public class LacertaFilePickerSelectDocumentAdapter extends RecyclerView.Adapter<LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder>{
|
|
||||||
|
|
||||||
// Listener
|
|
||||||
public interface LacertaFilePickerSelectDocumentAdapterListener {
|
|
||||||
void onDocumentSelected(String documentId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
LacertaFilePickerSelectDocumentAdapterListener listener;
|
|
||||||
|
|
||||||
ArrayList<ListItem> listItems;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
public LacertaFilePickerSelectDocumentAdapter setListener(LacertaFilePickerSelectDocumentAdapterListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setListItems(ArrayList<ListItem> listItems) {
|
|
||||||
this.listItems = listItems;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder onCreateViewHolder(@NonNull 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 LacertaFilePickerSelectDocumentViewHolder(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder holder, int position) {
|
|
||||||
ListItem listItem = listItems.get(position);
|
|
||||||
holder.title.setText(listItem.getTitle());
|
|
||||||
holder.description.setVisibility(View.GONE);
|
|
||||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
|
||||||
holder.itemView.setOnClickListener(v -> listener.onDocumentSelected(listItem.getItemId()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return listItems == null ? 0 : listItems.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public class LacertaFilePickerSelectDocumentViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
ImageView icon;
|
|
||||||
TextView title;
|
|
||||||
TextView description;
|
|
||||||
|
|
||||||
public LacertaFilePickerSelectDocumentViewHolder(@NonNull View itemView) {
|
|
||||||
super(itemView);
|
|
||||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
|
||||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
|
||||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker;
|
|
||||||
|
|
||||||
import android.app.Dialog;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
|
|
||||||
import 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 javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.component.common.R;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.ListItem;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class LacertaFilePickerSelectDocumentDialog extends DialogFragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
// Listener
|
|
||||||
public interface LacertaFilePickerSelectDocumentDialogListener {
|
|
||||||
void onDocumentSelected(String documentId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
LacertaFilePickerSelectDocumentDialogListener listener;
|
|
||||||
|
|
||||||
String documentId;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
public LacertaFilePickerSelectDocumentDialog setListener(LacertaFilePickerSelectDocumentDialogListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaFilePickerSelectDocumentDialog setDocumentId(String documentId) {
|
|
||||||
this.documentId = documentId;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
||||||
super.onCreateDialog(savedInstanceState);
|
|
||||||
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_doc, null);
|
|
||||||
|
|
||||||
// 高さを画面の40%にする
|
|
||||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
|
||||||
view.setMinimumHeight(height);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.document_list_recycler_view);
|
|
||||||
|
|
||||||
LacertaFilePickerSelectDocumentAdapter adapter = new LacertaFilePickerSelectDocumentAdapter();
|
|
||||||
|
|
||||||
adapter.setListener(documentId -> listener.onDocumentSelected(documentId));
|
|
||||||
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
|
||||||
builder.setTitle("追加先を選択");
|
|
||||||
|
|
||||||
builder.setView(view);
|
|
||||||
|
|
||||||
lacertaLibrary.getCombinedDocumentToxiList(this.documentId).thenAccept(toxiDocumentModels -> {
|
|
||||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
|
||||||
for (ToxiDocumentModel toxiDocumentModel : toxiDocumentModels) {
|
|
||||||
listItems.add(new ListItem(toxiDocumentModel.titleCache, null, ListItemType.ITEM_TYPE_DOCUMENT, toxiDocumentModel.childDocumentId));
|
|
||||||
}
|
|
||||||
adapter.setListItems(listItems);
|
|
||||||
adapter.notifyDataSetChanged();
|
|
||||||
});
|
|
||||||
|
|
||||||
return builder.create();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,110 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker.base;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
|
||||||
import one.nem.lacerta.model.ListItem;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
|
|
||||||
public class LacertaFilePickerAdapterBase extends RecyclerView.Adapter<LacertaFilePickerAdapterBase.LacertaFilePickerViewHolder> {
|
|
||||||
|
|
||||||
// Listener
|
|
||||||
public interface LacertaFilePickerAdapterListener {
|
|
||||||
void onItemSelected(String dirId);
|
|
||||||
void onBackSelected(String dirId);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected LibraryItemPage libraryItemPage;
|
|
||||||
|
|
||||||
protected LacertaFilePickerAdapterListener listener;
|
|
||||||
|
|
||||||
// Empty constructor
|
|
||||||
public LacertaFilePickerAdapterBase() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setListItems(LibraryItemPage libraryItemPage) {
|
|
||||||
this.libraryItemPage = libraryItemPage;
|
|
||||||
if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
|
|
||||||
this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setListener(LacertaFilePickerAdapterListener listener) {
|
|
||||||
this.listener = listener;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public LacertaFilePickerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
|
||||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
|
||||||
return new LacertaFilePickerViewHolder(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
|
|
||||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
|
||||||
holder.title.setText(listItem.getTitle());
|
|
||||||
holder.description.setText(listItem.getDescription());
|
|
||||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
|
||||||
if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
|
|
||||||
holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
|
|
||||||
} else {
|
|
||||||
holder.itemView.setOnClickListener(v -> listener.onItemSelected(listItem.getItemId()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCurrentId() {
|
|
||||||
if (this.libraryItemPage == null) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
if (this.libraryItemPage.getPageId() == null) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
return this.libraryItemPage.getPageId();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCurrentPageTitle() {
|
|
||||||
if (this.libraryItemPage == null) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
if (this.libraryItemPage.getPageId() == null) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
return this.libraryItemPage.getPageTitle();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class LacertaFilePickerViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
|
|
||||||
TextView title;
|
|
||||||
TextView description;
|
|
||||||
|
|
||||||
ImageView icon;
|
|
||||||
|
|
||||||
|
|
||||||
public LacertaFilePickerViewHolder(@NonNull View itemView) {
|
|
||||||
super(itemView);
|
|
||||||
|
|
||||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
|
||||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
|
||||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
|
||||||
description.setVisibility(View.GONE); // 暫定
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
package one.nem.lacerta.component.common.picker.base;
|
|
||||||
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
import one.nem.lacerta.model.PublicPath;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
|
|
||||||
public class LacertaFilePickerDialogBase extends DialogFragment {
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
protected String title;
|
|
||||||
protected String message;
|
|
||||||
protected String positiveButtonText;
|
|
||||||
protected String negativeButtonText;
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
public LacertaFilePickerDialogBase setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaFilePickerDialogBase setMessage(String message) {
|
|
||||||
this.message = message;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaFilePickerDialogBase setPositiveButtonText(String positiveButtonText) {
|
|
||||||
this.positiveButtonText = positiveButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LacertaFilePickerDialogBase setNegativeButtonText(String negativeButtonText) {
|
|
||||||
this.negativeButtonText = negativeButtonText;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Methods
|
|
||||||
|
|
||||||
protected void updatePathTextView(TextView currentDirTextView, PublicPath publicPath, ListItemType listItemType) {
|
|
||||||
if (publicPath == null) {
|
|
||||||
currentDirTextView.setText("/");
|
|
||||||
} else {
|
|
||||||
if (listItemType == ListItemType.ITEM_TYPE_FOLDER) {
|
|
||||||
currentDirTextView.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
|
|
||||||
} else {
|
|
||||||
currentDirTextView.setText("/" + publicPath.parent().getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void updateListView(LacertaFilePickerAdapterBase adapter, LibraryItemPage libraryItemPage, int currentCount, String currentDirId) {
|
|
||||||
if (currentCount == 0) {
|
|
||||||
// 初回表示
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
} else if (currentDirId == null) {
|
|
||||||
// Rootが関わる推移 (Rootからの推移)
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
} else if (libraryItemPage.getPageId() == null) {
|
|
||||||
// Rootが関わる推移 (Rootへの推移)
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
} else if (libraryItemPage.getPageId() != null) {
|
|
||||||
// Rootが関わらない推移
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(1, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
|
|
||||||
} else {
|
|
||||||
// その他の遷移(安全側に倒すため全アイテム更新)
|
|
||||||
logger.warn("FilePickerDialogBase", "Unknown transition.");
|
|
||||||
logger.warn("FilePickerDialogBase", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
|
|
||||||
adapter.setListItems(libraryItemPage);
|
|
||||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
|
||||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="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>
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingHorizontal="24dp"
|
|
||||||
android:paddingVertical="16dp">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:id="@+id/item_text_container"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/rev_item_title"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:text="Placeholder Title"
|
|
||||||
android:textColor="@color/colorOnSurface"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/rev_item_detail"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textSize="14sp"
|
|
||||||
android:text="2023/01/01 00:00:00 - hogehoge"
|
|
||||||
android:textColor="@color/colorOnSurfaceSecondary"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/rev_item_id"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textSize="12sp"
|
|
||||||
android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
|
|
||||||
android:textColor="@color/colorOnSurfaceSecondary"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/apply_tag_list"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent" />
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/tag_name_text_input_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:paddingHorizontal="16dp"
|
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/tag_name_edit_text"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/tag_color_text_input_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:paddingHorizontal="16dp"
|
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
|
||||||
|
|
||||||
<!-- todo: add color picker -->
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:id="@+id/tag_color_edit_text"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
|
||||||
android:id="@+id/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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/document_list_recycler_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/select_rev_recycler_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent" />
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -52,6 +52,4 @@ dependencies {
|
|||||||
implementation project(':vcs')
|
implementation project(':vcs')
|
||||||
|
|
||||||
implementation project(':data')
|
implementation project(':data')
|
||||||
|
|
||||||
implementation project(':component:common')
|
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,6 @@ package one.nem.lacerta.component.scanner;
|
|||||||
|
|
||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
import android.app.ProgressDialog;
|
import android.app.ProgressDialog;
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.graphics.BitmapFactory;
|
import android.graphics.BitmapFactory;
|
||||||
@@ -30,13 +29,9 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
|
|
||||||
import one.nem.lacerta.data.Document;
|
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.DocumentDetail;
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.page.Page;
|
|
||||||
import one.nem.lacerta.processor.DocumentProcessor;
|
|
||||||
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
@@ -58,27 +53,9 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
@Inject
|
@Inject
|
||||||
LacertaVcsFactory lacertaVcsFactory;
|
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
|
// Variables
|
||||||
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||||
|
|
||||||
private boolean update = false;
|
|
||||||
private String documentId;
|
|
||||||
private int index = 0;
|
|
||||||
|
|
||||||
View view;
|
View view;
|
||||||
|
|
||||||
DocumentScanner documentScanner = new DocumentScanner(
|
DocumentScanner documentScanner = new DocumentScanner(
|
||||||
@@ -108,37 +85,6 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
null
|
null
|
||||||
);
|
);
|
||||||
|
|
||||||
DocumentScanner documentScannerUpdate = 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);
|
|
||||||
updatePage();
|
|
||||||
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
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
@@ -162,22 +108,11 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
Intent intent = getIntent();
|
|
||||||
Bundle bundle = intent.getExtras();
|
|
||||||
if (bundle != null) {
|
|
||||||
update = bundle.getBoolean("update", false);
|
|
||||||
documentId = bundle.getString("documentId");
|
|
||||||
index = bundle.getInt("index", 0);
|
|
||||||
}
|
|
||||||
if (this.update) {
|
|
||||||
documentScanner = documentScannerUpdate;
|
|
||||||
}
|
|
||||||
documentScanner.startScan();
|
documentScanner.startScan();
|
||||||
// Init
|
// Init
|
||||||
|
|
||||||
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
|
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -190,13 +125,15 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
public boolean onOptionsItemSelected(android.view.MenuItem item) {
|
public boolean onOptionsItemSelected(android.view.MenuItem item) {
|
||||||
if (item.getItemId() == R.id.action_save_new) {
|
if (item.getItemId() == R.id.action_save_new) {
|
||||||
// 新ドキュメントとして保存
|
// 新ドキュメントとして保存
|
||||||
|
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
|
||||||
saveNewDocument();
|
saveNewDocument();
|
||||||
return true;
|
return true;
|
||||||
}
|
// }
|
||||||
else if (item.getItemId() == R.id.action_insert_exist) {
|
// else if (item.getItemId() == R.id.action_insert_exist) {
|
||||||
// 既存ドキュメントに挿入
|
// // 既存ドキュメントに挿入
|
||||||
insertToExistDocument();
|
// Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
|
||||||
return true;
|
// insertToExistDocument();
|
||||||
|
// return true;
|
||||||
} else if (item.getItemId() == android.R.id.home) {
|
} else if (item.getItemId() == android.R.id.home) {
|
||||||
finish();
|
finish();
|
||||||
return true;
|
return true;
|
||||||
@@ -237,7 +174,7 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
|
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
|
||||||
croppedImages.toArray(bitmaps);
|
croppedImages.toArray(bitmaps);
|
||||||
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
|
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
|
||||||
addPagesToDocumentDetail(documentDetail, bitmaps, "Initial Commit").join();
|
addPagesToDocumentDetail(documentDetail, bitmaps).join();
|
||||||
document.updateDocument(documentDetail).join();
|
document.updateDocument(documentDetail).join();
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
finish();
|
finish();
|
||||||
@@ -245,11 +182,11 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps, String commitMessage) {
|
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
|
||||||
return CompletableFuture.runAsync(() -> {
|
return CompletableFuture.runAsync(() -> {
|
||||||
try {
|
try {
|
||||||
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
|
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
|
||||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(commitMessage == null ? "NONE" : commitMessage);
|
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error(TAG, "Error: " + e.getMessage());
|
logger.error(TAG, "Error: " + e.getMessage());
|
||||||
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
||||||
@@ -257,48 +194,9 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updatePage() {
|
|
||||||
logger.debug(TAG, "updatePage");
|
|
||||||
// Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
|
|
||||||
ProgressDialog dialog = new ProgressDialog(this);
|
|
||||||
dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
|
|
||||||
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
|
||||||
dialog.setCancelable(false);
|
|
||||||
dialog.show();
|
|
||||||
document.getDocument(documentId).thenAccept((documentDetail) -> {
|
|
||||||
DocumentProcessor documentProcessor = documentProcessorFactory.create(documentDetail);
|
|
||||||
if (croppedImages.size() != 1) {
|
|
||||||
logger.error(TAG, "croppedImages.size() != 1");
|
|
||||||
logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (croppedImages.get(0) == null) {
|
|
||||||
logger.error(TAG, "croppedImages.get(0) == null");
|
|
||||||
logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
documentProcessor.updatePageAtIndex(croppedImages.get(0), index);
|
|
||||||
document.updateDocument(documentProcessor.getDocumentDetail()).join();
|
|
||||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(index + "ページ目を更新"); // TODO-rca: メッセージを動的にする, 指定できるようにする
|
|
||||||
dialog.dismiss();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void insertToExistDocument() {
|
private void insertToExistDocument() {
|
||||||
logger.debug(TAG, "insertToExistDocument");
|
logger.debug(TAG, "insertToExistDocument");
|
||||||
LacertaFilePickerDialog dialog = new LacertaFilePickerDialog();
|
// TODO-rca: 実装
|
||||||
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) {
|
private void updateResultView(ArrayList<Bitmap> resultImages) {
|
||||||
@@ -326,8 +224,6 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
resultView.addView(resultImageView);
|
resultView.addView(resultImageView);
|
||||||
}
|
}
|
||||||
|
|
||||||
selectedImage.setImageBitmap(resultImages.get(0));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -6,9 +6,9 @@
|
|||||||
android:icon="@drawable/save_24px"
|
android:icon="@drawable/save_24px"
|
||||||
android:title="Save"
|
android:title="Save"
|
||||||
app:showAsAction="ifRoom"/>
|
app:showAsAction="ifRoom"/>
|
||||||
<item
|
<!-- <item-->
|
||||||
android:id="@+id/action_insert_exist"
|
<!-- android:id="@+id/action_insert_exist"-->
|
||||||
android:icon="@drawable/description_24px"
|
<!-- android:icon="@drawable/description_24px"-->
|
||||||
android:title="Insert"
|
<!-- android:title="Insert"-->
|
||||||
app:showAsAction="ifRoom"/>
|
<!-- app:showAsAction="ifRoom"/>-->
|
||||||
</menu>
|
</menu>
|
||||||
@@ -56,13 +56,4 @@ dependencies {
|
|||||||
|
|
||||||
implementation project(':vcs')
|
implementation project(':vcs')
|
||||||
|
|
||||||
implementation project(':component:common')
|
|
||||||
|
|
||||||
// TODO-rca: バージョンカタログに切り出す
|
|
||||||
implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
|
|
||||||
|
|
||||||
// ViewPager2
|
|
||||||
implementation "androidx.viewpager2:viewpager2:1.0.0"
|
|
||||||
|
|
||||||
implementation project(':component:scanner') // めちゃくちゃよくないけどもう正しくやってる時間がないので
|
|
||||||
}
|
}
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.BookMark;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.GestureDetector;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.MotionEvent;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import one.nem.lacerta.component.viewer.R;
|
|
||||||
|
|
||||||
// BookMarkFragment.java
|
|
||||||
public class BookMarkFragment extends Fragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
BookmarkRepository bookmarkRepository;
|
|
||||||
|
|
||||||
private GestureDetector gestureDetector;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
||||||
return inflater.inflate(R.layout.fragment_bookmark, container, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
|
|
||||||
gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onDoubleTap(MotionEvent e) {
|
|
||||||
// ダブルタップが検出された時の処理
|
|
||||||
handleDoubleTap();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// ブックマークボタンがダブルタップされた時の処理
|
|
||||||
view.setOnTouchListener(new View.OnTouchListener() {
|
|
||||||
@Override
|
|
||||||
public boolean onTouch(View v, MotionEvent event) {
|
|
||||||
return gestureDetector.onTouchEvent(event);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDoubleTap() {
|
|
||||||
// ダブルタップが検出された時の処理
|
|
||||||
// ブックマークを作成
|
|
||||||
String pageId = "current_page_id";
|
|
||||||
String title = "current_page_title";
|
|
||||||
|
|
||||||
Bookmark bookmark = new Bookmark(
|
|
||||||
UUID.randomUUID().toString(),
|
|
||||||
title,
|
|
||||||
pageId,
|
|
||||||
System.currentTimeMillis()
|
|
||||||
);
|
|
||||||
|
|
||||||
// ブックマークを保存
|
|
||||||
bookmarkRepository.addBookmark(bookmark);
|
|
||||||
|
|
||||||
// ユーザーに成功メッセージを表示
|
|
||||||
Toast.makeText(getContext(), "ダブルタップでブックマークが追加されました", Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.BookMark;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import one.nem.lacerta.component.viewer.R;
|
|
||||||
|
|
||||||
// BookMarkListFragment.java
|
|
||||||
public class BookMarkListFragment extends Fragment {
|
|
||||||
@Inject
|
|
||||||
BookmarkRepository bookmarkRepository;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
||||||
return inflater.inflate(R.layout.fragment_bookmark_list, container, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
|
|
||||||
// ブックマーク一覧を取得
|
|
||||||
List<Bookmark> bookmarks = bookmarkRepository.getAllBookmarks();
|
|
||||||
|
|
||||||
// ブックマーク一覧を表示するRecyclerViewのセットアップ
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
|
||||||
BookmarkAdapter adapter = new BookmarkAdapter(bookmarks, new OnBookmarkClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onBookmarkClick(Bookmark selectedBookmark) {
|
|
||||||
// ブックマークが選択された時の処理
|
|
||||||
// 例: ブックマークに関連するページを表示する
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.BookMark;
|
|
||||||
|
|
||||||
// Bookmark.java
|
|
||||||
public class Bookmark {
|
|
||||||
private String id; // ブックマークの一意の識別子
|
|
||||||
private String title;
|
|
||||||
private String pageId; // ブックマークが参照するページの識別子
|
|
||||||
private long timestamp; // ブックマークが作成された時刻
|
|
||||||
|
|
||||||
public Bookmark(String id, String title, String pageId, long timestamp) {
|
|
||||||
this.id = id;
|
|
||||||
this.title = title;
|
|
||||||
this.pageId = pageId;
|
|
||||||
this.timestamp = timestamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Bookmark() {
|
|
||||||
// Empty constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
// Getter
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getPageId() {
|
|
||||||
return pageId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getTimestamp() {
|
|
||||||
return timestamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPageId(String pageId) {
|
|
||||||
this.pageId = pageId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTimestamp(long timestamp) {
|
|
||||||
this.timestamp = timestamp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.BookMark;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import one.nem.lacerta.component.viewer.R;
|
|
||||||
|
|
||||||
|
|
||||||
public class BookmarkAdapter extends RecyclerView.Adapter<BookmarkAdapter.BookmarkViewHolder> {
|
|
||||||
|
|
||||||
private List<Bookmark> bookmarks;
|
|
||||||
private OnBookmarkClickListener listener;
|
|
||||||
|
|
||||||
public BookmarkAdapter(List<Bookmark> bookmarks, OnBookmarkClickListener listener) {
|
|
||||||
this.bookmarks = bookmarks;
|
|
||||||
this.listener = listener;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public BookmarkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
|
||||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_bookmark, parent, false);
|
|
||||||
return new BookmarkViewHolder(view);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(@NonNull BookmarkViewHolder holder, int position) {
|
|
||||||
final Bookmark bookmark = bookmarks.get(position);
|
|
||||||
|
|
||||||
holder.titleTextView.setText(bookmark.getTitle());
|
|
||||||
|
|
||||||
holder.itemView.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
// ブックマークがクリックされたときの処理
|
|
||||||
listener.onBookmarkClick(bookmark);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
return bookmarks.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
static class BookmarkViewHolder extends RecyclerView.ViewHolder {
|
|
||||||
TextView titleTextView;
|
|
||||||
|
|
||||||
public BookmarkViewHolder(@NonNull View itemView) {
|
|
||||||
super(itemView);
|
|
||||||
titleTextView = itemView.findViewById(R.id.titleTextView);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.BookMark;
|
|
||||||
|
|
||||||
// BookmarkRepository.java
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class BookmarkRepository {
|
|
||||||
private List<Bookmark> bookmarks = new ArrayList<>();
|
|
||||||
|
|
||||||
public List<Bookmark> getAllBookmarks() {
|
|
||||||
return bookmarks;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addBookmark(Bookmark bookmark) {
|
|
||||||
bookmarks.add(bookmark);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void removeBookmark(Bookmark bookmark) {
|
|
||||||
bookmarks.remove(bookmark);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.BookMark;
|
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
// OnBookmarkClickListener.java
|
|
||||||
public interface OnBookmarkClickListener {
|
|
||||||
void onBookmarkClick(Bookmark selectedBookmark);
|
|
||||||
}
|
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,4 @@ package one.nem.lacerta.component.viewer;
|
|||||||
|
|
||||||
public interface ItemClickListener {
|
public interface ItemClickListener {
|
||||||
void onItemClick(String fileName); // DEBUG
|
void onItemClick(String fileName); // DEBUG
|
||||||
|
|
||||||
void onItemLongClick(String fileName, int position);
|
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,6 @@ import java.text.SimpleDateFormat;
|
|||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import one.nem.lacerta.component.viewer.model.RevSelectListener;
|
|
||||||
import one.nem.lacerta.model.VcsRevModel;
|
import one.nem.lacerta.model.VcsRevModel;
|
||||||
import one.nem.lacerta.utils.FeatureSwitch;
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
|
||||||
@@ -20,14 +19,11 @@ public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
|
|||||||
|
|
||||||
private ArrayList<VcsRevModel> revModels;
|
private ArrayList<VcsRevModel> revModels;
|
||||||
|
|
||||||
private RevSelectListener revSelectListener;
|
|
||||||
|
|
||||||
public RevAdapter(ArrayList<VcsRevModel> revModels) {
|
public RevAdapter(ArrayList<VcsRevModel> revModels) {
|
||||||
this.revModels = revModels;
|
this.revModels = revModels;
|
||||||
}
|
}
|
||||||
|
|
||||||
public RevAdapter(RevSelectListener revSelectListener) {
|
public RevAdapter() {
|
||||||
this.revSelectListener = revSelectListener;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRevModels(ArrayList<VcsRevModel> revModels) {
|
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.revId.setText("RevID: " + revModel.getId());
|
||||||
|
|
||||||
holder.itemView.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
revSelectListener.onRevSelect(revModel.getId());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -44,9 +44,8 @@ public class ViewerBodyAdapter extends RecyclerView.Adapter<ViewerBodyAdapter.Vi
|
|||||||
public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
|
public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
|
||||||
Bitmap bitmap = pages.get(position).getBitmap();
|
Bitmap bitmap = pages.get(position).getBitmap();
|
||||||
holder.image.setImageBitmap(bitmap);
|
holder.image.setImageBitmap(bitmap);
|
||||||
holder.itemView.setOnLongClickListener(v -> {
|
holder.itemView.setOnClickListener(v -> {
|
||||||
listener.onItemLongClick(pages.get(position).getFileName(), position);
|
|
||||||
return true;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,167 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer;
|
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.component.scanner.ScannerManagerActivity;
|
|
||||||
import one.nem.lacerta.data.Document;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
import one.nem.lacerta.vcs.LacertaVcs;
|
|
||||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
* Use the {@link ViewerBodyFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class ViewerBodyFragment extends Fragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
Document document;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaVcsFactory lacertaVcsFactory;
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
private String documentId;
|
|
||||||
private String documentName;
|
|
||||||
private String revisionId;
|
|
||||||
|
|
||||||
public ViewerBodyFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerBodyFragment newInstance(String documentId, String documentName) {
|
|
||||||
ViewerBodyFragment fragment = new ViewerBodyFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerBodyFragment newInstance(String documentId, String documentName, String revisionId) {
|
|
||||||
ViewerBodyFragment fragment = new ViewerBodyFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
args.putString("revisionId", revisionId);
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
if (getArguments() != null) {
|
|
||||||
documentId = getArguments().getString("documentId");
|
|
||||||
documentName = getArguments().getString("documentName");
|
|
||||||
revisionId = getArguments().getString("revisionId");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
return inflater.inflate(R.layout.fragment_viewer_body, container, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
logger.debug("ViewerBodyFragment", "ViewerBodyFragment.onViewCreated");
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
|
|
||||||
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(new ItemClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemClick(String fileName) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onItemLongClick(String fileName, int position) {
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
|
||||||
builder.setTitle("ページを更新しますか?");
|
|
||||||
|
|
||||||
builder.setPositiveButton("更新", (dialog, which) -> {
|
|
||||||
// ScannerをIntent
|
|
||||||
Intent intent = new Intent(getActivity(), ScannerManagerActivity.class);
|
|
||||||
intent.putExtra("update", true);
|
|
||||||
intent.putExtra("documentId", documentId);
|
|
||||||
intent.putExtra("index", position);
|
|
||||||
startActivity(intent);
|
|
||||||
});
|
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
|
||||||
// cancel
|
|
||||||
dialog.dismiss();
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
recyclerView.setAdapter(viewerBodyAdapter);
|
|
||||||
viewerBodyAdapter.notifyDataSetChanged();
|
|
||||||
});
|
|
||||||
|
|
||||||
loadDocument(viewerBodyAdapter, documentId, revisionId);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadDocument(ViewerBodyAdapter adapter, String documentId, String revisionId) {
|
|
||||||
if (revisionId == null) { // load latest revision
|
|
||||||
document.getDocument(documentId).thenApply(document -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
adapter.setPages(document.getPages());
|
|
||||||
adapter.notifyDataSetChanged();
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
} else { // load specified revision
|
|
||||||
LacertaVcs vcs = lacertaVcsFactory.create(documentId);
|
|
||||||
// document.getDocumentPageListByFileNameList(documentId, vcs.getDocumentPagePathListRev(revisionId).join()).thenApply(documentPageList -> {
|
|
||||||
// getActivity().runOnUiThread(() -> {
|
|
||||||
// adapter.setPages(documentPageList);
|
|
||||||
// adapter.notifyDataSetChanged();
|
|
||||||
// });
|
|
||||||
// return null;
|
|
||||||
// });
|
|
||||||
|
|
||||||
ArrayList<String> fileNameList = vcs.getDocumentPagePathListRev(revisionId).join();
|
|
||||||
document.getDocumentPageListByFileNameList(documentId, fileNameList).thenApply(documentPageList -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
adapter.setPages(documentPageList);
|
|
||||||
adapter.notifyDataSetChanged();
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,439 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.viewpager2.widget.ViewPager2;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageButton;
|
|
||||||
import android.widget.PopupMenu;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
import com.google.android.material.tabs.TabLayout;
|
|
||||||
import com.google.android.material.tabs.TabLayoutMediator;
|
|
||||||
import com.google.android.material.textfield.TextInputEditText;
|
|
||||||
import com.google.android.material.textfield.TextInputLayout;
|
|
||||||
|
|
||||||
import 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.LacertaSelectRevDialog;
|
|
||||||
import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
|
|
||||||
import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
|
|
||||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
|
|
||||||
import one.nem.lacerta.data.Document;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
import one.nem.lacerta.model.document.page.Page;
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
|
||||||
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 ViewerContainerFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class ViewerContainerFragment extends Fragment {
|
|
||||||
|
|
||||||
// Inject
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
Document document;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaVcsFactory lacertaVcsFactory;
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
private String documentId;
|
|
||||||
private String documentName;
|
|
||||||
private boolean hasCombined = false;
|
|
||||||
private String revId;
|
|
||||||
private ViewerViewPagerAdapter viewerViewPagerAdapter;
|
|
||||||
|
|
||||||
public ViewerContainerFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerContainerFragment newInstance(String documentId, String documentName, boolean hasCombined) {
|
|
||||||
ViewerContainerFragment fragment = new ViewerContainerFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
fragment.setArguments(args);
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
args.putBoolean("hasCombined", hasCombined);
|
|
||||||
args.putString("revId", null);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerContainerFragment newInstance(String documentId, String documentName) {
|
|
||||||
ViewerContainerFragment fragment = new ViewerContainerFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
fragment.setArguments(args);
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
args.putBoolean("hasCombined", false);
|
|
||||||
args.putString("revId", null);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerContainerFragment newInstance(String documentId, String documentName, String revId) {
|
|
||||||
ViewerContainerFragment fragment = new ViewerContainerFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
fragment.setArguments(args);
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
args.putBoolean("hasCombined", false);
|
|
||||||
args.putString("revId", revId);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
if (getArguments() != null){
|
|
||||||
documentId = getArguments().getString("documentId");
|
|
||||||
documentName = getArguments().getString("documentName");
|
|
||||||
hasCombined = getArguments().getBoolean("hasCombined");
|
|
||||||
revId = getArguments().getString("revId");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
return inflater.inflate(R.layout.fragment_viewer_container, container, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
|
|
||||||
// Init view pager
|
|
||||||
ViewPager2 viewPager = view.findViewById(R.id.view_pager);
|
|
||||||
|
|
||||||
// Init view pager adapter
|
|
||||||
this.viewerViewPagerAdapter = new ViewerViewPagerAdapter(requireActivity());
|
|
||||||
viewPager.setAdapter(viewerViewPagerAdapter);
|
|
||||||
|
|
||||||
// Init tab layout
|
|
||||||
TabLayout tabLayout = view.findViewById(R.id.tab_layout);
|
|
||||||
|
|
||||||
// Init toolbar
|
|
||||||
Toolbar toolbar = view.findViewById(R.id.toolbar);
|
|
||||||
initToolbar(toolbar, true, documentName);
|
|
||||||
|
|
||||||
if (this.revId != null) { // Revが指定されている場合
|
|
||||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
|
|
||||||
viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
|
||||||
viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
|
||||||
viewerViewPagerAdapter.setFragmentRevisionList(new ArrayList<String>(){{add(revId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
|
||||||
viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
|
|
||||||
tabLayout.setVisibility(View.GONE);
|
|
||||||
toolbar.setSubtitle("リビジョン: " + revId);
|
|
||||||
} else {
|
|
||||||
// Get document page
|
|
||||||
if (this.hasCombined) { // 結合親の場合
|
|
||||||
// バージョンを遡る操作を非表示
|
|
||||||
toolbar.getMenu().findItem(R.id.action_open_vcs_rev_list).setVisible(false);
|
|
||||||
logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
|
|
||||||
lacertaLibrary.getCombinedDocumentToxiList(documentId).thenAccept(combinedDocumentToxiList -> {
|
|
||||||
logger.debug("ViewerContainerFragment", "combinedDocumentToxiList: " + combinedDocumentToxiList.size());
|
|
||||||
|
|
||||||
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());
|
|
||||||
toolbar.setSubtitle("結合ドキュメント");
|
|
||||||
});
|
|
||||||
} else { // それ以外の場合
|
|
||||||
logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
|
|
||||||
tabLayout.setVisibility(View.GONE);
|
|
||||||
viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
|
||||||
viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}});
|
|
||||||
viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// サブタイトルとしてパスを表示(暫定)
|
|
||||||
lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT).thenAccept(publicPath -> {
|
|
||||||
logger.debug("ViewerContainerFragment", "publicPath: " + publicPath);
|
|
||||||
toolbar.setSubtitle("/" + publicPath.parent().getStringPath());
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
// Attach tab layout to view pager
|
|
||||||
new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
|
|
||||||
View customView = LayoutInflater.from(getContext()).inflate(R.layout.viewer_custom_tab, null);
|
|
||||||
|
|
||||||
TextView textView = customView.findViewById(R.id.tab_title);
|
|
||||||
textView.setText(viewerViewPagerAdapter.getTabTitle(position));
|
|
||||||
|
|
||||||
ImageButton imageButton = customView.findViewById(R.id.tab_modify);
|
|
||||||
imageButton.setOnClickListener(v -> {
|
|
||||||
PopupMenu popupMenu = new PopupMenu(getContext(), v);
|
|
||||||
popupMenu.inflate(R.menu.viewer_tab_menu);
|
|
||||||
popupMenu.setOnMenuItemClickListener(item -> {
|
|
||||||
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
|
||||||
showRevList(viewerViewPagerAdapter.getFragmentTargetId(position), viewerViewPagerAdapter.getFragmentTitle(position));
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_rename) {
|
|
||||||
renameCombinedDocument(
|
|
||||||
documentId,
|
|
||||||
viewerViewPagerAdapter.getFragmentTargetIdList().get(position),
|
|
||||||
viewerViewPagerAdapter.getFragmentTitle(position),
|
|
||||||
position);
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_delete) {
|
|
||||||
Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
popupMenu.show();
|
|
||||||
});
|
|
||||||
|
|
||||||
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する
|
|
||||||
*
|
|
||||||
* @param toolbar Toolbar
|
|
||||||
* @param showCloseButton Closeボタンを表示するかどうか
|
|
||||||
* @param title タイトル
|
|
||||||
*/
|
|
||||||
private void initToolbar(Toolbar toolbar, boolean showCloseButton, String title) {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
// Close button
|
|
||||||
if (showCloseButton) {
|
|
||||||
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
|
|
||||||
toolbar.setNavigationOnClickListener(v -> {
|
|
||||||
getActivity().finish();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
toolbar.setNavigationIcon(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Title
|
|
||||||
toolbar.setTitle(title);
|
|
||||||
|
|
||||||
// Menu
|
|
||||||
toolbar.inflateMenu(R.menu.viewer_menu);
|
|
||||||
toolbar.setOnMenuItemClickListener(item -> {
|
|
||||||
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
|
||||||
showRevList(this.documentId, this.documentName);
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_rename) {
|
|
||||||
renameDocument();
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_delete) {
|
|
||||||
deleteDocument();
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_move) {
|
|
||||||
moveDocument();
|
|
||||||
return true;
|
|
||||||
} 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;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showRevList(String targetId, String targetName) {
|
|
||||||
LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
|
|
||||||
lacertaSelectRevDialog.setDocumentId(targetId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
|
|
||||||
lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemSelected(String revId) {
|
|
||||||
logger.debug("ViewerContainerFragment", "Dialog Result: revId: " + revId);
|
|
||||||
getParentFragmentManager().beginTransaction()
|
|
||||||
.replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(targetId, targetName, revId))
|
|
||||||
.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDialogCanceled() {
|
|
||||||
}
|
|
||||||
});
|
|
||||||
lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void moveDocument() {
|
|
||||||
LacertaDirPickerDialog lacertaDirPickerDialog = new LacertaDirPickerDialog();
|
|
||||||
lacertaDirPickerDialog.setListener((name, dirId) -> {
|
|
||||||
logger.debug("MoveDocument", "Selected dir: " + name + ", " + dirId);
|
|
||||||
document.moveDocument(documentId, dirId).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
// Stop Activity
|
|
||||||
getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
lacertaDirPickerDialog.setTitle("ファイルの移動")
|
|
||||||
.setMessage("ファイルを移動するフォルダを選択してください。")
|
|
||||||
.setPositiveButtonText("移動")
|
|
||||||
.setNegativeButtonText("キャンセル");
|
|
||||||
lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void deleteDocument() {
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
|
|
||||||
builder.setTitle("ファイルの削除");
|
|
||||||
builder.setMessage("ファイルを削除しますか?");
|
|
||||||
|
|
||||||
builder.setPositiveButton("削除", (dialog, which) -> {
|
|
||||||
document.deleteDocument(documentId).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
Toast.makeText(getContext(), "削除しました", Toast.LENGTH_SHORT).show();
|
|
||||||
getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
|
||||||
dialog.cancel();
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
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) -> {
|
|
||||||
lacertaLibrary.combineDocument(documentId, selectedId).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
Toast.makeText(getContext(), "結合しました", Toast.LENGTH_SHORT).show();
|
|
||||||
getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
lacertaFilePickerDialog
|
|
||||||
.setTitle("ファイルの結合")
|
|
||||||
.setMessage("結合するファイルを選択してください")
|
|
||||||
.setNegativeButtonText("キャンセル")
|
|
||||||
.show(getChildFragmentManager(), "LacertaFilePickerDialog");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメント名を変更する
|
|
||||||
*/
|
|
||||||
private void renameDocument() {
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
|
|
||||||
builder.setTitle("ファイル名の変更");
|
|
||||||
builder.setMessage("ファイル名を入力してください");
|
|
||||||
|
|
||||||
View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
|
|
||||||
TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
|
|
||||||
TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
|
|
||||||
textInputEditText.setText(documentName);
|
|
||||||
textInputLayout.setHint("ファイル名");
|
|
||||||
builder.setView(view);
|
|
||||||
|
|
||||||
builder.setPositiveButton("変更", (dialog, which) -> {
|
|
||||||
document.renameDocument(documentId, textInputEditText.getText().toString()).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
this.documentName = textInputEditText.getText().toString();
|
|
||||||
// TODO-rca: Toolbarのタイトルも変更する
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
|
||||||
dialog.cancel();
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,290 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.component.common.LacertaSelectDirDialog;
|
|
||||||
import one.nem.lacerta.component.common.LacertaSelectDirDialogListener;
|
|
||||||
import one.nem.lacerta.component.common.LacertaSelectRevDialog;
|
|
||||||
import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
|
|
||||||
import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
|
|
||||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerAdapter;
|
|
||||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
|
|
||||||
import one.nem.lacerta.data.Document;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.ListItemType;
|
|
||||||
import one.nem.lacerta.model.document.page.Page;
|
|
||||||
import one.nem.lacerta.utils.FeatureSwitch;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
import one.nem.lacerta.vcs.LacertaVcs;
|
|
||||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
* Use the {@link ViewerListFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class ViewerListFragment extends Fragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
Document document;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaVcsFactory lacertaVcsFactory;
|
|
||||||
|
|
||||||
private static final String TAG = "ComponentViewerTopFragment";
|
|
||||||
|
|
||||||
private String documentId;
|
|
||||||
private String documentName;
|
|
||||||
private String revisionId;
|
|
||||||
|
|
||||||
public ViewerListFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerListFragment newInstance(String documentId, String documentName) {
|
|
||||||
ViewerListFragment fragment = new ViewerListFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ViewerListFragment newInstance(String documentId, String documentName, String revisionId) {
|
|
||||||
ViewerListFragment fragment = new ViewerListFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
args.putString("documentId", documentId);
|
|
||||||
args.putString("documentName", documentName);
|
|
||||||
args.putString("revisionId", revisionId);
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
if (getArguments() != null) {
|
|
||||||
documentId = getArguments().getString("documentId");
|
|
||||||
documentName = getArguments().getString("documentName");
|
|
||||||
revisionId = getArguments().getString("revisionId");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
|
|
||||||
|
|
||||||
// Toolbar
|
|
||||||
Toolbar toolbar = view.findViewById(R.id.toolbar);
|
|
||||||
toolbarSetup(toolbar, true, this.documentName == null ? "Document" : this.documentName, null);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(new ItemClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemClick(String fileName) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onItemLongClick(String fileName, int position) {
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
recyclerView.setAdapter(viewerBodyAdapter);
|
|
||||||
|
|
||||||
if (revisionId == null) {
|
|
||||||
logger.debug(TAG, "revisionId is empty, loading latest revision");
|
|
||||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
|
|
||||||
document.getDocument(documentId).thenAccept(documentDetail -> {
|
|
||||||
ArrayList<Page> pages = documentDetail.getPages();
|
|
||||||
logger.debug(TAG, "pages.size(): " + pages.size());
|
|
||||||
viewerBodyAdapter.setPages(pages);
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
|
|
||||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
|
|
||||||
});
|
|
||||||
}).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
|
|
||||||
updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath());
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
logger.debug(TAG, "revisionId: " + revisionId);
|
|
||||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
|
|
||||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
|
|
||||||
lacertaVcs.getDocumentPagePathListRev(revisionId).thenAccept(documentPathList -> {
|
|
||||||
logger.debug(TAG, "documentPathList.size(): " + documentPathList.size());
|
|
||||||
document.getDocumentPageListByFileNameList(documentId, documentPathList).thenAccept(pages -> {
|
|
||||||
logger.debug(TAG, "pages.size(): " + pages.size());
|
|
||||||
viewerBodyAdapter.setPages(pages);
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
|
|
||||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
|
|
||||||
updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath()); // TODO-rca: リビジョンの場合はリビジョン名を表示する?
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Toolbarのサブタイトルを更新
|
|
||||||
* @param subtitle サブタイトル
|
|
||||||
*/
|
|
||||||
private void updateToolbarSubtitle(Toolbar toolbar, String subtitle) {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
toolbar.setSubtitle(subtitle);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ToolbarをInitする
|
|
||||||
*
|
|
||||||
* @param toolbar Toolbar
|
|
||||||
* @param showCloseButton 戻るボタンを表示するか
|
|
||||||
* @param title タイトル
|
|
||||||
*/
|
|
||||||
private void toolbarSetup(Toolbar toolbar, boolean showCloseButton, String title, String Subtitle) {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
if (showCloseButton) {
|
|
||||||
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
|
|
||||||
toolbar.setNavigationOnClickListener(v -> {
|
|
||||||
// Stop Activity
|
|
||||||
getActivity().finish();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
toolbar.setNavigationIcon(null);
|
|
||||||
}
|
|
||||||
toolbar.setTitle(title);
|
|
||||||
if (Subtitle != null) toolbar.setSubtitle(Subtitle);
|
|
||||||
toolbar.inflateMenu(R.menu.viewer_menu);
|
|
||||||
toolbar.setOnMenuItemClickListener(item -> {
|
|
||||||
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
|
||||||
LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
|
|
||||||
lacertaSelectRevDialog.setDocumentId(this.documentId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
|
|
||||||
lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemSelected(String revId) {
|
|
||||||
getParentFragmentManager().beginTransaction()
|
|
||||||
.replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName, revisionId))
|
|
||||||
.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDialogCanceled() {
|
|
||||||
logger.debug(TAG, "Canceled");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_rename) {
|
|
||||||
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
|
|
||||||
builder.setTitle("ファイル名の変更");
|
|
||||||
|
|
||||||
View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
|
|
||||||
final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
|
|
||||||
final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
|
|
||||||
inputLayout.setHint("ファイル名");
|
|
||||||
|
|
||||||
builder.setView(view);
|
|
||||||
|
|
||||||
builder.setPositiveButton("変更", (dialog, which) -> {
|
|
||||||
document.renameDocument(documentId, input.getText().toString()).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
toolbar.setTitle(input.getText().toString());
|
|
||||||
documentName = input.getText().toString();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
|
||||||
dialog.cancel();
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.show();
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_delete) {
|
|
||||||
// TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
|
|
||||||
builder.setTitle("ファイルの削除");
|
|
||||||
builder.setMessage("ファイルを削除しますか?");
|
|
||||||
builder.setPositiveButton("削除", (dialog, which) -> {
|
|
||||||
document.deleteDocument(documentId).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
// Stop Activity
|
|
||||||
getActivity().finish();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
|
||||||
dialog.cancel();
|
|
||||||
});
|
|
||||||
builder.show();
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.action_move) {
|
|
||||||
LacertaDirPickerDialog lacertaDirPickerDialog = new LacertaDirPickerDialog();
|
|
||||||
lacertaDirPickerDialog.setListener((name, dirId) -> {
|
|
||||||
logger.debug(TAG, "Selected dir: " + name + ", " + dirId);
|
|
||||||
document.moveDocument(documentId, dirId).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
// Stop Activity
|
|
||||||
getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
lacertaDirPickerDialog.setTitle("ファイルの移動")
|
|
||||||
.setMessage("ファイルを移動するフォルダを選択してください。")
|
|
||||||
.setPositiveButtonText("移動")
|
|
||||||
.setNegativeButtonText("キャンセル");
|
|
||||||
lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
|
|
||||||
return true;
|
|
||||||
} else if(item.getItemId() == R.id.action_combine) {
|
|
||||||
LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
|
|
||||||
lacertaFilePickerDialog.setListener((name, fileId) -> {
|
|
||||||
lacertaLibrary.combineDocument(documentId, fileId).thenAccept(aVoid -> {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
// Stop Activity
|
|
||||||
getActivity().finish(); // TODO-rca: 終了せずにUIを更新したい
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
lacertaFilePickerDialog.setTitle("ファイルの結合")
|
|
||||||
.setMessage("結合するファイルを選択してください。")
|
|
||||||
.setNegativeButtonText("キャンセル");
|
|
||||||
lacertaFilePickerDialog.show(getParentFragmentManager(), "select_file_dialog");
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,14 +2,20 @@ package one.nem.lacerta.component.viewer;
|
|||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.activity.EdgeToEdge;
|
import androidx.activity.EdgeToEdge;
|
||||||
import androidx.activity.OnBackPressedCallback;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.core.graphics.Insets;
|
import androidx.core.graphics.Insets;
|
||||||
import androidx.core.view.ViewCompat;
|
import androidx.core.view.ViewCompat;
|
||||||
import androidx.core.view.WindowInsetsCompat;
|
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;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
@@ -30,7 +36,6 @@ public class ViewerMainActivity extends AppCompatActivity {
|
|||||||
private static final String TAG = "ViewerMainActivity";
|
private static final String TAG = "ViewerMainActivity";
|
||||||
String documentId;
|
String documentId;
|
||||||
String documentName;
|
String documentName;
|
||||||
boolean hasCombined = false;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
@@ -43,14 +48,10 @@ public class ViewerMainActivity extends AppCompatActivity {
|
|||||||
return insets;
|
return insets;
|
||||||
});
|
});
|
||||||
|
|
||||||
// // Transition
|
|
||||||
// overridePendingTransition(one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim);
|
|
||||||
|
|
||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
try {
|
try {
|
||||||
documentId = intent.getStringExtra("documentId");
|
documentId = intent.getStringExtra("documentId");
|
||||||
documentName = intent.getStringExtra("documentName");
|
documentName = intent.getStringExtra("documentName");
|
||||||
hasCombined = intent.getBooleanExtra("hasCombined", false);
|
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
logger.error(TAG, "Failed to get documentId from intent");
|
logger.error(TAG, "Failed to get documentId from intent");
|
||||||
@@ -60,18 +61,8 @@ public class ViewerMainActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Navigation
|
// Navigation
|
||||||
// getSupportFragmentManager().beginTransaction()
|
getSupportFragmentManager().beginTransaction()
|
||||||
// .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
|
.replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId, documentName))
|
||||||
// .commit();
|
.commit();
|
||||||
if (hasCombined) {
|
|
||||||
getSupportFragmentManager().beginTransaction()
|
|
||||||
.replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName, hasCombined))
|
|
||||||
.commit();
|
|
||||||
} else {
|
|
||||||
getSupportFragmentManager().beginTransaction()
|
|
||||||
.replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName))
|
|
||||||
.commit();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -34,17 +34,15 @@ public class ViewerVcsRevListFragment extends Fragment {
|
|||||||
LacertaVcs lacertaVcs;
|
LacertaVcs lacertaVcs;
|
||||||
|
|
||||||
private String documentId;
|
private String documentId;
|
||||||
private String documentName;
|
|
||||||
|
|
||||||
public ViewerVcsRevListFragment() {
|
public ViewerVcsRevListFragment() {
|
||||||
// Required empty public constructor
|
// Required empty public constructor
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ViewerVcsRevListFragment newInstance(String documentId, String documentName) {
|
public static ViewerVcsRevListFragment newInstance(String documentId) {
|
||||||
ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
|
ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putString("documentId", documentId);
|
args.putString("documentId", documentId);
|
||||||
args.putString("documentName", documentName);
|
|
||||||
fragment.setArguments(args);
|
fragment.setArguments(args);
|
||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
@@ -68,22 +66,17 @@ public class ViewerVcsRevListFragment extends Fragment {
|
|||||||
// Init arg
|
// Init arg
|
||||||
if (getArguments() != null) {
|
if (getArguments() != null) {
|
||||||
this.documentId = getArguments().getString("documentId");
|
this.documentId = getArguments().getString("documentId");
|
||||||
logger.debug("ViewerVcsRevListFragment", "documentId: " + this.documentId);
|
logger.debug("ViewerVcsRevListFragment", "documentId: " + documentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Init vcs
|
// Init vcs
|
||||||
lacertaVcs = lacertaVcsFactory.create(this.documentId);
|
lacertaVcs = lacertaVcsFactory.create(documentId);
|
||||||
|
|
||||||
// Init view
|
// Init view
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.rev_list);
|
RecyclerView recyclerView = view.findViewById(R.id.rev_list);
|
||||||
|
|
||||||
// Init adapter
|
// 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
|
// Set adapter
|
||||||
recyclerView.setAdapter(revAdapter);
|
recyclerView.setAdapter(revAdapter);
|
||||||
|
|||||||
@@ -1,81 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.fragment.app.FragmentActivity;
|
|
||||||
import androidx.fragment.app.FragmentManager;
|
|
||||||
import androidx.fragment.app.FragmentPagerAdapter;
|
|
||||||
import androidx.viewpager2.adapter.FragmentStateAdapter;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
public class ViewerViewPagerAdapter extends FragmentStateAdapter {
|
|
||||||
|
|
||||||
// Variables
|
|
||||||
private ArrayList<String> fragmentTargetIdList = new ArrayList<>();
|
|
||||||
private ArrayList<String> fragmentTitleList = new ArrayList<>();
|
|
||||||
private ArrayList<String> fragmentRevisionList = new ArrayList<>();
|
|
||||||
|
|
||||||
// Setter
|
|
||||||
|
|
||||||
public void setFragmentTargetIdList(ArrayList<String> fragmentTargetIdList) {
|
|
||||||
this.fragmentTargetIdList = fragmentTargetIdList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setFragmentTitleList(ArrayList<String> fragmentTitleList) {
|
|
||||||
this.fragmentTitleList = fragmentTitleList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setFragmentRevisionList(ArrayList<String> fragmentRevisionList) {
|
|
||||||
this.fragmentRevisionList = fragmentRevisionList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ViewerViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
|
|
||||||
super(fragmentActivity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@NonNull
|
|
||||||
@Override
|
|
||||||
public Fragment createFragment(int position) {
|
|
||||||
if (fragmentRevisionList != null && fragmentRevisionList.size() > position) {
|
|
||||||
return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position), fragmentRevisionList.get(position));
|
|
||||||
} else {
|
|
||||||
return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getItemCount() {
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package one.nem.lacerta.component.viewer.model;
|
|
||||||
|
|
||||||
public interface RevSelectListener {
|
|
||||||
void onRevSelect(String revisionId);
|
|
||||||
}
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<androidx.fragment.app.FragmentContainerView
|
<androidx.fragment.app.FragmentContainerView
|
||||||
android:id="@+id/nav_host_fragment"
|
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_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:defaultNavHost="true"
|
app:defaultNavHost="true"
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="@color/colorSurface">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/recycler_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
|
||||||
|
|
||||||
<!-- item_bookmark.xml -->
|
|
||||||
<TextView
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/titleTextView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="16dp"/>
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
android:id="@+id/collapsing_toolbar"
|
android:id="@+id/collapsing_toolbar"
|
||||||
app:contentScrim="@color/colorSecondaryContainer"
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
android:background="@color/colorSurface"
|
android:background="@color/colorSurface"
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
app:layout_collapseMode="pin"
|
app:layout_collapseMode="pin"
|
||||||
app:title="Title" />
|
app:title="Title" />
|
||||||
|
|
||||||
</com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
tools:context=".ViewerBodyFragment">
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/recycler_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_margin="8dp"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="@color/colorSurface">
|
|
||||||
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
|
||||||
android:id="@+id/app_bar_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
|
||||||
android:id="@+id/collapsing_toolbar"
|
|
||||||
app:contentScrim="@color/colorSecondaryContainer"
|
|
||||||
android:background="@color/colorSurface"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="160dp"
|
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
android:minHeight="?attr/actionBarSize"
|
|
||||||
app:collapsedTitleGravity="start|center_vertical"
|
|
||||||
app:expandedTitleGravity="start|bottom"
|
|
||||||
app:expandedTitleMarginBottom="16dp"
|
|
||||||
app:expandedTitleMarginStart="16dp"
|
|
||||||
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
|
||||||
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
|
||||||
android:id="@+id/toolbar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?attr/actionBarSize"
|
|
||||||
app:layout_collapseMode="pin"
|
|
||||||
app:title="Title" />
|
|
||||||
|
|
||||||
</com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
|
|
||||||
|
|
||||||
<com.google.android.material.tabs.TabLayout
|
|
||||||
android:id="@+id/tab_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:tabMode="scrollable"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/loading_progress_bar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:indeterminate="true"
|
|
||||||
android:background="@color/colorSurface"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
|
||||||
|
|
||||||
<androidx.viewpager2.widget.ViewPager2
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:id="@+id/view_pager"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="16dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/tab_title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="TAB TITLE"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:layout_gravity="center"/>
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/tab_modify"
|
|
||||||
android:layout_marginStart="8dp"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="16dp"
|
|
||||||
android:background="@android:color/transparent"
|
|
||||||
android:src="@drawable/more_vert_24px"
|
|
||||||
android:layout_gravity="center_vertical" />
|
|
||||||
</LinearLayout>
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_open_vcs_rev_list"
|
android:id="@+id/action_open_vcs_rev_list"
|
||||||
android:title="バージョン履歴" />
|
android:title="Open VCS Rev List" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_rename"
|
android:id="@+id/action_rename"
|
||||||
@@ -11,22 +10,10 @@
|
|||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_delete"
|
android:id="@+id/action_delete"
|
||||||
android:icon="@drawable/delete_24px"
|
android:title="削除" />
|
||||||
android:title="削除"
|
|
||||||
app:showAsAction="ifRoom"/>
|
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_move"
|
android:id="@+id/action_move"
|
||||||
android:title="移動" />
|
android:title="移動" />
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_combine"
|
|
||||||
android:icon="@drawable/merge_type_24px"
|
|
||||||
android:title="結合"
|
|
||||||
app:showAsAction="ifRoom"/>
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_apply_tag"
|
|
||||||
android:title="タグの管理" />
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_open_vcs_rev_list"
|
|
||||||
android:title="過去のリビジョン" />
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_rename"
|
|
||||||
android:title="リネーム" />
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_delete"
|
|
||||||
android:title="削除" />
|
|
||||||
</menu>
|
|
||||||
@@ -3,11 +3,11 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/component_viewer_navigation"
|
android:id="@+id/component_viewer_navigation"
|
||||||
app:startDestination="@id/viewerListFragment">
|
app:startDestination="@id/componentViewerTopFragment">
|
||||||
|
|
||||||
<fragment
|
<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" >
|
android:label="ComponentViewerTopFragment" >
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"
|
android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
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.path.DocumentPath;
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||||
|
|
||||||
@@ -23,11 +22,7 @@ public interface Document {
|
|||||||
|
|
||||||
CompletableFuture<Void> deleteDocument(String documentId);
|
CompletableFuture<Void> deleteDocument(String documentId);
|
||||||
|
|
||||||
CompletableFuture<Void> moveDocument(String documentId, String parentId);
|
|
||||||
|
|
||||||
CompletableFuture<Void> updateDocument(DocumentDetail detail);
|
CompletableFuture<Void> updateDocument(DocumentDetail detail);
|
||||||
|
|
||||||
CompletableFuture<DocumentDetail> getDocument(String documentId);
|
CompletableFuture<DocumentDetail> getDocument(String documentId);
|
||||||
|
|
||||||
CompletableFuture<ArrayList<Page>> getDocumentPageListByFileNameList(String documentId, ArrayList<String> fileNameList);
|
|
||||||
}
|
}
|
||||||
@@ -9,8 +9,6 @@ import one.nem.lacerta.model.ListItemType;
|
|||||||
import one.nem.lacerta.model.LibraryItemPage;
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
import one.nem.lacerta.model.PublicPath;
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
|
||||||
|
|
||||||
public interface LacertaLibrary {
|
public interface LacertaLibrary {
|
||||||
|
|
||||||
@@ -22,47 +20,10 @@ public interface LacertaLibrary {
|
|||||||
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
|
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
|
||||||
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
|
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
|
||||||
|
|
||||||
// Get Folder List
|
|
||||||
CompletableFuture<LibraryItemPage> getFolderList(String parentId);
|
|
||||||
|
|
||||||
// Create Folder
|
// Create Folder
|
||||||
CompletableFuture<String> createFolder(String parentId, String name);
|
CompletableFuture<String> createFolder(String parentId, String name);
|
||||||
|
|
||||||
// delete Folder
|
|
||||||
CompletableFuture<Void> deleteFolder(String folderId);
|
|
||||||
|
|
||||||
// Get Public Path
|
// Get Public Path
|
||||||
CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
|
CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
|
||||||
|
|
||||||
|
|
||||||
// Tag
|
|
||||||
CompletableFuture<ArrayList<DocumentTag>> getTagList();
|
|
||||||
|
|
||||||
CompletableFuture<ArrayList<DocumentTag>> getAppliedTagList(String documentId);
|
|
||||||
|
|
||||||
CompletableFuture<Void> createTag(DocumentTag tag);
|
|
||||||
|
|
||||||
CompletableFuture<Void> updateTag(DocumentTag tag);
|
|
||||||
|
|
||||||
CompletableFuture<Void> deleteTag(String tagId);
|
|
||||||
|
|
||||||
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);
|
|
||||||
//
|
|
||||||
// CompletableFuture<Void> uncombineDocument(String parentId, ArrayList<String> childIdList);
|
|
||||||
|
|
||||||
CompletableFuture<ArrayList<ToxiDocumentModel>> getCombinedDocumentToxiList(String parentId);
|
|
||||||
}
|
}
|
||||||
@@ -78,11 +78,11 @@ public class DocumentImpl implements Document {
|
|||||||
documentEntity.id = meta.getId();
|
documentEntity.id = meta.getId();
|
||||||
documentEntity.title = meta.getTitle();
|
documentEntity.title = meta.getTitle();
|
||||||
documentEntity.author = meta.getAuthor();
|
documentEntity.author = meta.getAuthor();
|
||||||
|
documentEntity.defaultBranch = meta.getDefaultBranch();
|
||||||
documentEntity.updatedAt = meta.getUpdatedAt();
|
documentEntity.updatedAt = meta.getUpdatedAt();
|
||||||
documentEntity.createdAt = meta.getCreatedAt();
|
documentEntity.createdAt = meta.getCreatedAt();
|
||||||
documentEntity.parentId = meta.getParentId();
|
documentEntity.parentId = meta.getParentId();
|
||||||
documentEntity.isCombineChild = meta.getIsCombineChild();
|
documentEntity.tagIds = meta.getTagIds();
|
||||||
documentEntity.isCombineParent = meta.getIsCombineParent();
|
|
||||||
|
|
||||||
database.documentDao().insert(documentEntity);
|
database.documentDao().insert(documentEntity);
|
||||||
|
|
||||||
@@ -103,11 +103,11 @@ public class DocumentImpl implements Document {
|
|||||||
meta.setId(UUID.randomUUID().toString());
|
meta.setId(UUID.randomUUID().toString());
|
||||||
meta.setTitle("New Document");
|
meta.setTitle("New Document");
|
||||||
meta.setAuthor("author");
|
meta.setAuthor("author");
|
||||||
|
meta.setDefaultBranch("master");
|
||||||
meta.setUpdatedAt(new Date());
|
meta.setUpdatedAt(new Date());
|
||||||
meta.setCreatedAt(new Date());
|
meta.setCreatedAt(new Date());
|
||||||
meta.setParentId(null);
|
meta.setParentId(null);
|
||||||
meta.setIsCombineChild(false);
|
meta.setTags(new ArrayList<>());
|
||||||
meta.setIsCombineParent(false);
|
|
||||||
return createDocument(meta);
|
return createDocument(meta);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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
|
@Override
|
||||||
public CompletableFuture<Void> updateDocument(DocumentDetail detail) {
|
public CompletableFuture<Void> updateDocument(DocumentDetail detail) {
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
@@ -168,9 +155,11 @@ public class DocumentImpl implements Document {
|
|||||||
meta.setId(documentEntity.id);
|
meta.setId(documentEntity.id);
|
||||||
meta.setTitle(documentEntity.title);
|
meta.setTitle(documentEntity.title);
|
||||||
meta.setAuthor(documentEntity.author);
|
meta.setAuthor(documentEntity.author);
|
||||||
|
meta.setDefaultBranch(documentEntity.defaultBranch);
|
||||||
meta.setUpdatedAt(documentEntity.updatedAt);
|
meta.setUpdatedAt(documentEntity.updatedAt);
|
||||||
meta.setCreatedAt(documentEntity.createdAt);
|
meta.setCreatedAt(documentEntity.createdAt);
|
||||||
meta.setParentId(documentEntity.parentId);
|
meta.setParentId(documentEntity.parentId);
|
||||||
|
meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
|
||||||
|
|
||||||
DocumentDetail detail = new DocumentDetail();
|
DocumentDetail detail = new DocumentDetail();
|
||||||
|
|
||||||
@@ -184,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) {
|
private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) {
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
|
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
|
||||||
|
|||||||
@@ -1,16 +1,12 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
import android.nfc.Tag;
|
|
||||||
|
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@@ -22,15 +18,10 @@ import one.nem.lacerta.model.ListItem;
|
|||||||
import one.nem.lacerta.model.ListItemType;
|
import one.nem.lacerta.model.ListItemType;
|
||||||
import one.nem.lacerta.model.PublicPath;
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
|
||||||
import one.nem.lacerta.source.database.LacertaDatabase;
|
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
import one.nem.lacerta.source.database.entity.FolderEntity;
|
import one.nem.lacerta.source.database.entity.FolderEntity;
|
||||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
|
||||||
import one.nem.lacerta.source.database.entity.ToxiDocumentEntity;
|
|
||||||
import one.nem.lacerta.source.database.entity.ToxiDocumentTagEntity;
|
|
||||||
import one.nem.lacerta.utils.FeatureSwitch;
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
@@ -50,15 +41,13 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
|||||||
return CompletableFuture.supplyAsync(() -> {
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
|
List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
|
||||||
|
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
|
||||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
for (DocumentEntity documentEntity : documentEntities) {
|
for (DocumentEntity documentEntity : documentEntities) {
|
||||||
ListItem listItem = new ListItem();
|
ListItem listItem = new ListItem();
|
||||||
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
||||||
listItem.setTitle(documentEntity.title);
|
listItem.setTitle(documentEntity.title);
|
||||||
listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
|
listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
|
||||||
listItem.setItemId(documentEntity.id);
|
listItem.setItemId(documentEntity.id);
|
||||||
listItem.setHasCombined(documentEntity.isCombineParent);
|
|
||||||
listItems.add(listItem);
|
listItems.add(listItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,11 +97,10 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
|||||||
listItem.setTitle(childFolderEntity.name);
|
listItem.setTitle(childFolderEntity.name);
|
||||||
listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
|
listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
|
||||||
listItem.setItemId(childFolderEntity.id);
|
listItem.setItemId(childFolderEntity.id);
|
||||||
listItem.setHasCombined(false);
|
|
||||||
listItems.add(listItem);
|
listItems.add(listItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:");
|
||||||
|
|
||||||
for (DocumentEntity documentEntity : documentEntities) {
|
for (DocumentEntity documentEntity : documentEntities) {
|
||||||
logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
|
logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
|
||||||
@@ -121,20 +109,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
|||||||
listItem.setTitle(documentEntity.title);
|
listItem.setTitle(documentEntity.title);
|
||||||
listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
|
listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
|
||||||
listItem.setItemId(documentEntity.id);
|
listItem.setItemId(documentEntity.id);
|
||||||
listItem.setHasCombined(documentEntity.isCombineParent);
|
|
||||||
// タグを取得して関連付ける処理 TODO-rca: わかりにくい + 責任がめちゃくちゃ + めちゃくちゃ重いのでなんとかする
|
|
||||||
List<ToxiDocumentTagEntity> documentTagEntities = database.toxiDocumentTagDao().findByDocumentId(documentEntity.id);
|
|
||||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
|
||||||
for (ToxiDocumentTagEntity toxiDocumentTagEntity : documentTagEntities) {
|
|
||||||
logger.debug("LacertaLibraryImpl", "toxiDocumentTagEntity.tagId: " + toxiDocumentTagEntity.tagId);
|
|
||||||
TagEntity tagEntity = database.tagDao().findById(toxiDocumentTagEntity.tagId);
|
|
||||||
if (tagEntity != null) {
|
|
||||||
logger.debug("LacertaLibraryImpl", "tagEntity.tagName: " + tagEntity.tagName);
|
|
||||||
documentTags.add(convertTagEntityToDocumentTag(tagEntity));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
listItem.setTagList(documentTags);
|
|
||||||
logger.debug("LacertaLibraryImpl", "documentTags.size(): " + documentTags.size());
|
|
||||||
listItems.add(listItem);
|
listItems.add(listItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,48 +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);
|
|
||||||
listItem.setHasCombined(false);
|
|
||||||
listItems.add(listItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
libraryItemPage.setListItems(listItems);
|
|
||||||
|
|
||||||
return libraryItemPage;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CompletableFuture<String> createFolder(String parentId, String name) {
|
public CompletableFuture<String> createFolder(String parentId, String name) {
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
@@ -207,14 +139,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> deleteFolder(String folderId) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
database.folderDao().deleteById(folderId);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
|
public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
@@ -240,218 +164,6 @@ public class LacertaLibraryImpl implements LacertaLibrary {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Converter
|
|
||||||
private DocumentTag convertTagEntityToDocumentTag(TagEntity tagEntity) {
|
|
||||||
DocumentTag documentTag = new DocumentTag();
|
|
||||||
documentTag.setId(tagEntity.id);
|
|
||||||
documentTag.setName(tagEntity.tagName);
|
|
||||||
documentTag.setColor(tagEntity.color);
|
|
||||||
return documentTag;
|
|
||||||
}
|
|
||||||
|
|
||||||
private TagEntity convertDocumentTagToTagEntity(DocumentTag documentTag) {
|
|
||||||
TagEntity tagEntity = new TagEntity();
|
|
||||||
tagEntity.id = documentTag.getId();
|
|
||||||
tagEntity.tagName = documentTag.getName();
|
|
||||||
tagEntity.color = documentTag.getColor();
|
|
||||||
return tagEntity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<ArrayList<DocumentTag>> getTagList() {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
List<TagEntity> tagEntities = database.tagDao().findAll();
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Get TagEntity List (Size: " + tagEntities.size() + ")");
|
|
||||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
|
||||||
for (TagEntity tagEntity : tagEntities) {
|
|
||||||
documentTags.add(convertTagEntityToDocumentTag(tagEntity));
|
|
||||||
}
|
|
||||||
return documentTags;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<ArrayList<DocumentTag>> getAppliedTagList(String documentId) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
List<ToxiDocumentTagEntity> toxiDocumentTagEntities = database.toxiDocumentTagDao().findByDocumentId(documentId);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Get ToxiDocumentTagEntity List (Size: " + toxiDocumentTagEntities.size() + ")");
|
|
||||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
|
||||||
for (ToxiDocumentTagEntity toxiDocumentTagEntity : toxiDocumentTagEntities) {
|
|
||||||
TagEntity tagEntity = database.tagDao().findById(toxiDocumentTagEntity.tagId);
|
|
||||||
if (tagEntity != null) {
|
|
||||||
documentTags.add(convertTagEntityToDocumentTag(tagEntity));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return documentTags;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> createTag(DocumentTag tag) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
TagEntity tagEntity = convertDocumentTagToTagEntity(tag);
|
|
||||||
if (Objects.isNull(tagEntity.id) || tagEntity.id.isEmpty()) {
|
|
||||||
tagEntity.id = UUID.randomUUID().toString();
|
|
||||||
}
|
|
||||||
database.tagDao().insert(tagEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Inserted TagEntity (" + tag.getId() + ")");
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> updateTag(DocumentTag tag) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
TagEntity tagEntity = convertDocumentTagToTagEntity(tag);
|
|
||||||
database.tagDao().update(tagEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Updated TagEntity (" + tag.getId() + ")");
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> deleteTag(String tagId) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
database.tagDao().deleteById(tagId);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Deleted TagEntity (" + tagId + ")");
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> addTagToDocument(String documentId, String tagId) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
ToxiDocumentTagEntity toxiDocumentTagEntity = new ToxiDocumentTagEntity();
|
|
||||||
toxiDocumentTagEntity.documentId = documentId;
|
|
||||||
toxiDocumentTagEntity.tagId = tagId;
|
|
||||||
database.toxiDocumentTagDao().insert(toxiDocumentTagEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentTagEntity");
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> 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(() -> {
|
|
||||||
database.toxiDocumentTagDao().deleteByDocumentIdAndTagId(documentId, tagId);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentTagEntity");
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> combineDocument(String targetId1, String tagetId2) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
DocumentEntity target1DocumentEntity = database.documentDao().findById(targetId1);
|
|
||||||
DocumentEntity target2DocumentEntity = database.documentDao().findById(tagetId2);
|
|
||||||
if (target1DocumentEntity == null || target2DocumentEntity == null) {
|
|
||||||
logger.warn("LacertaLibraryImpl", "DocumentEntity is not found.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
target1DocumentEntity.isCombineChild = true;
|
|
||||||
target2DocumentEntity.isCombineChild = true;
|
|
||||||
database.documentDao().update(target1DocumentEntity);
|
|
||||||
database.documentDao().update(target2DocumentEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Updated DocumentEntity");
|
|
||||||
|
|
||||||
DocumentEntity parentDocumentEntity = new DocumentEntity();
|
|
||||||
parentDocumentEntity.id = UUID.randomUUID().toString();
|
|
||||||
parentDocumentEntity.title = target1DocumentEntity.title + "(Combined)";
|
|
||||||
parentDocumentEntity.parentId = target1DocumentEntity.parentId;
|
|
||||||
parentDocumentEntity.author = target1DocumentEntity.author; // TODO-rca: Target1とTarget2の作者が異なる場合の処理
|
|
||||||
// CombinedなDocumentはいま作成された と考える
|
|
||||||
parentDocumentEntity.createdAt = new Date();
|
|
||||||
parentDocumentEntity.updatedAt = new Date();
|
|
||||||
parentDocumentEntity.isCombineParent = true;
|
|
||||||
parentDocumentEntity.isCombineChild = false;
|
|
||||||
database.documentDao().insert(parentDocumentEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Inserted DocumentEntity");
|
|
||||||
|
|
||||||
insertCombineDocumentToxi(parentDocumentEntity.id, target1DocumentEntity.id, target1DocumentEntity.title);
|
|
||||||
insertCombineDocumentToxi(parentDocumentEntity.id, target2DocumentEntity.id, target2DocumentEntity.title);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void insertCombineDocumentToxi(String parentId, String childId, String titleCache) {
|
|
||||||
ToxiDocumentEntity toxiDocumentEntity = new ToxiDocumentEntity();
|
|
||||||
toxiDocumentEntity.parentDocumentId = parentId;
|
|
||||||
toxiDocumentEntity.childDocumentId = childId;
|
|
||||||
toxiDocumentEntity.order = 0; // TODO-rca: 並び順の概念をもたせる
|
|
||||||
toxiDocumentEntity.isActive = true; // TODO-rca: タブから非表示にできるようにする
|
|
||||||
toxiDocumentEntity.titleCache = titleCache;
|
|
||||||
database.toxiDocumentDao().insert(toxiDocumentEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Inserted ToxiDocumentEntity");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Void> 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(() -> {
|
|
||||||
DocumentEntity parentDocumentEntity = database.documentDao().findById(parentId);
|
|
||||||
DocumentEntity childDocumentEntity = database.documentDao().findById(childId);
|
|
||||||
if (parentDocumentEntity == null || childDocumentEntity == null) {
|
|
||||||
logger.warn("LacertaLibraryImpl", "DocumentEntity is not found.");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
parentDocumentEntity.isCombineParent = false;
|
|
||||||
childDocumentEntity.isCombineChild = false;
|
|
||||||
database.documentDao().update(parentDocumentEntity);
|
|
||||||
database.documentDao().update(childDocumentEntity);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Updated DocumentEntity");
|
|
||||||
|
|
||||||
database.toxiDocumentDao().deleteByParentIdAndChildId(parentId, childId);
|
|
||||||
logger.debug("LacertaLibraryImpl", "Database Query: Deleted ToxiDocumentEntity");
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<ArrayList<ToxiDocumentModel>> getCombinedDocumentToxiList(String parentId) {
|
|
||||||
return CompletableFuture.supplyAsync(() -> {
|
|
||||||
List<ToxiDocumentEntity> toxiDocumentEntities = database.toxiDocumentDao().findByParentId(parentId);
|
|
||||||
ArrayList<ToxiDocumentModel> toxiDocumentModels = new ArrayList<>();
|
|
||||||
for (ToxiDocumentEntity toxiDocumentEntity : toxiDocumentEntities) {
|
|
||||||
ToxiDocumentModel toxiDocumentModel = new ToxiDocumentModel();
|
|
||||||
toxiDocumentModel.setParentDocumentId(toxiDocumentEntity.parentDocumentId);
|
|
||||||
toxiDocumentModel.setChildDocumentId(toxiDocumentEntity.childDocumentId);
|
|
||||||
toxiDocumentModel.setOrder(toxiDocumentEntity.order);
|
|
||||||
toxiDocumentModel.setActive(toxiDocumentEntity.isActive);
|
|
||||||
toxiDocumentModel.setTitleCache(toxiDocumentEntity.titleCache);
|
|
||||||
toxiDocumentModels.add(toxiDocumentModel);
|
|
||||||
}
|
|
||||||
return toxiDocumentModels;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 再帰的にパスを解決する
|
* 再帰的にパスを解決する
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package one.nem.lacerta.feature.home;
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
public interface DocumentSelectListener {
|
public interface DocumentSelectListener {
|
||||||
void onDocumentSelect(String documentId, String documentName, boolean hasCombined);
|
void onDocumentSelect(String documentId, String documentName);
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
package one.nem.lacerta.feature.home;
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
import android.app.ActivityOptions;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@@ -83,16 +82,12 @@ public class HomeTopFragment extends Fragment {
|
|||||||
Toolbar toolbar = view.findViewById(R.id.home_toolbar);
|
Toolbar toolbar = view.findViewById(R.id.home_toolbar);
|
||||||
toolbarSetup(toolbar, false, "ホーム");
|
toolbarSetup(toolbar, false, "ホーム");
|
||||||
|
|
||||||
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
|
this.listItemAdapter = new ListItemAdapter((documentId, documentName) -> {
|
||||||
@Override
|
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
|
||||||
public void onDocumentSelect(String documentId, String documentName, boolean hasCombined) {
|
Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
|
||||||
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
|
intent.putExtra("documentId", documentId);
|
||||||
Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
|
intent.putExtra("documentName", documentName);
|
||||||
intent.putExtra("documentId", documentId);
|
startActivity(intent);
|
||||||
intent.putExtra("documentName", documentName);
|
|
||||||
intent.putExtra("hasCombined", hasCombined);
|
|
||||||
startActivity(intent, ActivityOptions.makeCustomAnimation(getContext(), one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
recyclerView.setAdapter(listItemAdapter);
|
recyclerView.setAdapter(listItemAdapter);
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
@@ -108,22 +103,20 @@ public class HomeTopFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updateList() {
|
private void updateList() {
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
|
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
|
||||||
long endTime = System.currentTimeMillis();
|
|
||||||
if (listItems == null) {
|
if (listItems == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.listItemAdapter.setListItems(listItems);
|
this.listItemAdapter.setListItems(listItems);
|
||||||
if (endTime - startTime > 500) { // 500ms以上かかった場合は表示アニメーションをする
|
getActivity().runOnUiThread(() -> {
|
||||||
getActivity().runOnUiThread(() -> {
|
Log.d("HomeTopFragment", "onViewCreated: " + listItems.size());
|
||||||
this.listItemAdapter.notifyItemRangeInserted(0, listItems.size());
|
if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
|
||||||
});
|
|
||||||
} else {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
this.listItemAdapter.notifyDataSetChanged();
|
this.listItemAdapter.notifyDataSetChanged();
|
||||||
});
|
} else {
|
||||||
}
|
// IndexOutOfBoundsExceptionを吐くことがあったので いったん
|
||||||
|
this.listItemAdapter.notifyItemRangeInserted(0, listItems.size() - 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,8 +132,6 @@ public class HomeTopFragment extends Fragment {
|
|||||||
if (showBackButton) {
|
if (showBackButton) {
|
||||||
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
|
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
|
||||||
toolbar.setNavigationOnClickListener(v -> {
|
toolbar.setNavigationOnClickListener(v -> {
|
||||||
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
|
|
||||||
// Back
|
|
||||||
Navigation.findNavController(requireView()).popBackStack();
|
Navigation.findNavController(requireView()).popBackStack();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
|
|||||||
holder.description.setText(listItem.getDescription());
|
holder.description.setText(listItem.getDescription());
|
||||||
|
|
||||||
holder.itemView.setOnClickListener( v -> {
|
holder.itemView.setOnClickListener( v -> {
|
||||||
listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle(), listItem.getHasCombined());
|
listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,10 +55,5 @@ dependencies {
|
|||||||
|
|
||||||
implementation project(':component:viewer')
|
implementation project(':component:viewer')
|
||||||
|
|
||||||
implementation project(':processor') // TODO-rca: あんまり依存したくないけど時間がないので一旦
|
|
||||||
|
|
||||||
implementation project(':vcs') // TODO-rca: あんまり依存したくないけど時間がないので一旦
|
|
||||||
|
|
||||||
// TODO-rca: バージョンカタログに切り出す
|
|
||||||
implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
|
|
||||||
}
|
}
|
||||||
@@ -2,5 +2,5 @@ package one.nem.lacerta.feature.library;
|
|||||||
|
|
||||||
public interface DocumentSelectListener {
|
public interface DocumentSelectListener {
|
||||||
void onFolderSelected(String folderId, String folderName);
|
void onFolderSelected(String folderId, String folderName);
|
||||||
void onDocumentSelected(String documentId, String documentName, boolean hasCombined);
|
void onDocumentSelected(String documentId, String documentName);
|
||||||
}
|
}
|
||||||
@@ -1,13 +1,11 @@
|
|||||||
package one.nem.lacerta.feature.library;
|
package one.nem.lacerta.feature.library;
|
||||||
|
|
||||||
|
import android.app.AlertDialog;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.Bitmap;
|
|
||||||
import android.graphics.BitmapFactory;
|
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
import androidx.activity.result.ActivityResultLauncher;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.activity.result.contract.ActivityResultContracts;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
@@ -16,13 +14,24 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
|||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
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.appbar.AppBarLayout;
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import org.w3c.dom.Text;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
@@ -30,14 +39,11 @@ import dagger.hilt.android.AndroidEntryPoint;
|
|||||||
import one.nem.lacerta.component.viewer.ViewerMainActivity;
|
import one.nem.lacerta.component.viewer.ViewerMainActivity;
|
||||||
import one.nem.lacerta.data.Document;
|
import one.nem.lacerta.data.Document;
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
|
import one.nem.lacerta.model.FragmentNavigation;
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
import one.nem.lacerta.model.ListItemType;
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
|
||||||
import one.nem.lacerta.utils.FeatureSwitch;
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -56,10 +62,7 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
String folderId;
|
String folderId;
|
||||||
String title;
|
String title;
|
||||||
String parentId;
|
String parentId;
|
||||||
Toolbar toolbar;
|
|
||||||
|
|
||||||
// ActivityResultContracts
|
|
||||||
ActivityResultLauncher<String> getContent;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
LacertaLibrary lacertaLibrary;
|
LacertaLibrary lacertaLibrary;
|
||||||
@@ -67,15 +70,6 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
@Inject
|
@Inject
|
||||||
LacertaLogger logger;
|
LacertaLogger logger;
|
||||||
|
|
||||||
@Inject
|
|
||||||
Document document;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
DocumentProcessorFactory documentProcessorFactory;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaVcsFactory lacertaVcsFactory;
|
|
||||||
|
|
||||||
ListItemAdapter listItemAdapter;
|
ListItemAdapter listItemAdapter;
|
||||||
|
|
||||||
public LibraryPageFragment() {
|
public LibraryPageFragment() {
|
||||||
@@ -115,37 +109,6 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
getContent = registerForActivityResult(new ActivityResultContracts.GetMultipleContents(), uris -> {
|
|
||||||
for (int i = 0; i < uris.size(); i++) {
|
|
||||||
logger.debug("LibraryTopFragment", "uris.get(" + i + "): " + uris.get(i).getPath());
|
|
||||||
}
|
|
||||||
// ここで取得したURIリストを使用して画像を操作します。
|
|
||||||
if (uris != null) {
|
|
||||||
Bitmap[] bitmaps = new Bitmap[uris.size()];
|
|
||||||
for (int i = 0; i < uris.size(); i++) {
|
|
||||||
Uri uri = uris.get(i);
|
|
||||||
try {
|
|
||||||
bitmaps[i] = BitmapFactory.decodeStream(requireContext().getContentResolver().openInputStream(uri));
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("LibraryTopFragment", "Error: " + e.getMessage());
|
|
||||||
logger.e_code("826da745-7fc9-43e6-9935-9daa17a3932f");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug("LibraryTopFragment", "bitmaps.length: " + bitmaps.length);
|
|
||||||
// ドキュメントを作成
|
|
||||||
document.createDocument().thenApply(documentDetail -> {
|
|
||||||
logger.debug("LibraryTopFragment", "create document (may) success!");
|
|
||||||
// ドキュメントにページを追加
|
|
||||||
addPagesToDocumentDetail(documentDetail, bitmaps, "Initial commit(IMPORT)").join();
|
|
||||||
document.updateDocument(documentDetail).join();
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
logger.debug("LibraryTopFragment", "uris is null");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -184,24 +147,21 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
logger.debug("LibraryTopFragment", "getArguments() is null(maybe root)");
|
logger.debug("LibraryTopFragment", "getArguments() is null(maybe root)");
|
||||||
this.libraryItemPage = new LibraryItemPage();
|
this.libraryItemPage = new LibraryItemPage();
|
||||||
}
|
}
|
||||||
this.toolbar = view.findViewById(R.id.library_toolbar);
|
|
||||||
|
|
||||||
// Toolbar Setup
|
// Toolbar Setup
|
||||||
toolbarSetup(this.toolbar, this.folderId != null, this.title != null ? this.title : "ライブラリ");
|
toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
|
||||||
if(this.folderId == null) {
|
|
||||||
updateToolbarSubtitle(this.toolbar, null); //負荷軽減のため+邪魔なので(folderIdがnullの場合は、ルートフォルダを表示しているので)
|
|
||||||
} else {
|
|
||||||
lacertaLibrary.getPublicPath(this.folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
|
||||||
updateToolbarSubtitle(this.toolbar, "/" + publicPath.parent().getStringPath());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecyclerView Setup
|
// RecyclerView Setup
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
|
RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
|
||||||
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
|
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onFolderSelected(String folderId, String folderName) {
|
public void onFolderSelected(String folderId, String folderName) {
|
||||||
logger.debug("LibraryTopFragment", "Folder selected! folderId: " + folderId + ", folderName: " + folderName);
|
logger.debug("LibraryTopFragment", "Folder selected! folderId: " + folderId + ", folderName: " + folderName);
|
||||||
|
// // 画面遷移
|
||||||
|
// FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
|
||||||
|
// // folderId: 推移先で表示するフォルダのID, folderName: 推移先で表示するフォルダの名前, parentId: このフラグメントで表示しているフォルダのID(推移先の親)
|
||||||
|
// fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, libraryItemPage != null ? libraryItemPage.getParentId() : null), false);
|
||||||
Bundle bundle = new Bundle();
|
Bundle bundle = new Bundle();
|
||||||
bundle.putString("folderId", folderId);
|
bundle.putString("folderId", folderId);
|
||||||
bundle.putString("title", folderName);
|
bundle.putString("title", folderName);
|
||||||
@@ -214,12 +174,11 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDocumentSelected(String documentId, String documentName, boolean hasCombined) {
|
public void onDocumentSelected(String documentId, String documentName) {
|
||||||
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
|
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
|
||||||
logger.debug("LibraryTopFragment", "Document selected! documentId: " + documentId + ", documentName: " + documentName);
|
logger.debug("LibraryTopFragment", "Document selected! documentId: " + documentId + ", documentName: " + documentName);
|
||||||
intent.putExtra("documentId", documentId);
|
intent.putExtra("documentId", documentId);
|
||||||
intent.putExtra("documentName", documentName);
|
intent.putExtra("documentName", documentName);
|
||||||
intent.putExtra("hasCombined", hasCombined);
|
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -228,75 +187,72 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
// Get library page and update RecyclerView items
|
// Get library page and update RecyclerView items
|
||||||
|
lacertaLibrary.getLibraryPage(this.folderId, 10).thenAccept(libraryItemPage -> {
|
||||||
|
this.libraryItemPage = libraryItemPage;
|
||||||
|
|
||||||
updateItem(this.folderId);
|
if (this.parentId == null) {
|
||||||
|
this.parentId = libraryItemPage.getParentId();
|
||||||
|
}
|
||||||
|
if (this.title == null) {
|
||||||
|
this.title = libraryItemPage.getPageTitle();
|
||||||
|
// Toolbar init again
|
||||||
|
toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.debug("LibraryTopFragment", "Item selected! Total item page: " + this.libraryItemPage.getListItems().size());
|
||||||
|
if (!FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
|
||||||
|
getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える?
|
||||||
|
listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
listItemAdapter.setLibraryItemPage(this.libraryItemPage);
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
|
||||||
|
listItemAdapter.notifyDataSetChanged();
|
||||||
|
} else {
|
||||||
|
listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Currentにフォルダを作成する
|
* Currentにフォルダを作成する
|
||||||
*/
|
*/
|
||||||
private void createFolder(String pageId) {
|
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.setTitle("フォルダの作成");
|
||||||
builder.setMessage("フォルダ名を入力してください");
|
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) -> {
|
builder.setPositiveButton("作成", (dialog, which) -> {
|
||||||
lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
|
lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
|
||||||
// Refresh
|
// Refresh
|
||||||
updateItem(pageId);
|
updateItem(pageId);
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||||
dialog.cancel();
|
dialog.cancel();
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.show();
|
builder.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RecyclerViewのアイテムとUIを更新する
|
* RecyclerViewのアイテムを更新する
|
||||||
*/
|
*/
|
||||||
private void updateItem(String pageId) {
|
private void updateItem(String pageId) {
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
lacertaLibrary.getLibraryPage(pageId, 10).thenAccept(libraryItemPage -> {
|
lacertaLibrary.getLibraryPage(pageId, 10).thenAccept(libraryItemPage -> {
|
||||||
long endTime = System.currentTimeMillis();
|
|
||||||
this.libraryItemPage = libraryItemPage;
|
this.libraryItemPage = libraryItemPage;
|
||||||
logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
|
logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
listItemAdapter.notifyItemRangeRemoved(0, libraryItemPage.getListItems().size() - 1);
|
||||||
|
});
|
||||||
listItemAdapter.setLibraryItemPage(libraryItemPage);
|
listItemAdapter.setLibraryItemPage(libraryItemPage);
|
||||||
if (endTime - startTime > 500) { // 500ms以上かかった場合は表示アニメーションをする
|
getActivity().runOnUiThread(() -> {
|
||||||
getActivity().runOnUiThread(() -> {
|
listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
|
||||||
listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size());
|
});
|
||||||
});
|
|
||||||
} else {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
listItemAdapter.notifyDataSetChanged();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
|
|
||||||
updateItem(this.folderId); // 暫定, Pull-to-refreshを実装するまで
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Toolbarのサブタイトルを更新
|
|
||||||
* @param subtitle サブタイトル
|
|
||||||
*/
|
|
||||||
private void updateToolbarSubtitle(Toolbar toolbar, String subtitle) {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
toolbar.setSubtitle(subtitle);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -319,7 +275,6 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
} else {
|
} else {
|
||||||
toolbar.setNavigationIcon(null);
|
toolbar.setNavigationIcon(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
toolbar.setTitle(title);
|
toolbar.setTitle(title);
|
||||||
toolbar.getMenu().clear();
|
toolbar.getMenu().clear();
|
||||||
toolbar.inflateMenu(R.menu.dir_menu);
|
toolbar.inflateMenu(R.menu.dir_menu);
|
||||||
@@ -327,70 +282,10 @@ public class LibraryPageFragment extends Fragment {
|
|||||||
if (item.getItemId() == R.id.menu_item_create_new_folder) {
|
if (item.getItemId() == R.id.menu_item_create_new_folder) {
|
||||||
createFolder(this.folderId);
|
createFolder(this.folderId);
|
||||||
return true;
|
return true;
|
||||||
} else if (item.getItemId() == R.id.menu_item_add_by_media) {
|
|
||||||
createDocByMediaPicker();
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == R.id.menu_item_delete_folder) {
|
|
||||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
|
|
||||||
builder.setTitle("フォルダの削除");
|
|
||||||
builder.setMessage("フォルダを削除しますか?");
|
|
||||||
|
|
||||||
builder.setPositiveButton("削除", (dialog, which) -> {
|
|
||||||
deleteMe();
|
|
||||||
});
|
|
||||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
|
||||||
dialog.cancel();
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.show();
|
|
||||||
return true;
|
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (this.folderId == null) toolbar.getMenu().findItem(R.id.menu_item_delete_folder).setVisible(false); // ルートフォルダの場合は削除ボタンを非表示にする
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void deleteMe() {
|
|
||||||
lacertaLibrary.deleteFolder(this.folderId).thenAccept(aVoid -> {
|
|
||||||
// Move to root
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
Navigation.findNavController(requireView()).popBackStack(R.id.feature_library_top_fragment, false);
|
|
||||||
|
|
||||||
// Refresh
|
|
||||||
updateItem(this.folderId);
|
|
||||||
|
|
||||||
// Update toolbar
|
|
||||||
toolbarSetup(this.toolbar, false, "ライブラリ");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* メディアピッカーを使用してドキュメントを作成する(呼び出し部分)
|
|
||||||
*/
|
|
||||||
private void createDocByMediaPicker() {
|
|
||||||
getContent.launch("image/*");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ページを追加する
|
|
||||||
* @param documentDetail ドキュメント詳細
|
|
||||||
* @param bitmaps ビットマップ
|
|
||||||
* @param commitMessage コミットメッセージ
|
|
||||||
* @return CompletableFuture
|
|
||||||
*/
|
|
||||||
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(commitMessage == null ? "NONE" : commitMessage);
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("LibraryAddSupport", "Error: " + e.getMessage());
|
|
||||||
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,20 +1,14 @@
|
|||||||
package one.nem.lacerta.feature.library;
|
package one.nem.lacerta.feature.library;
|
||||||
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.google.android.material.chip.Chip;
|
|
||||||
import com.google.android.material.chip.ChipGroup;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
import one.nem.lacerta.model.ListItem;
|
import one.nem.lacerta.model.ListItem;
|
||||||
import one.nem.lacerta.model.ListItemType;
|
import one.nem.lacerta.model.ListItemType;
|
||||||
@@ -37,7 +31,7 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
|
|||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
public ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item_with_tag, parent, false);
|
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||||
return new ListItemViewHolder(view);
|
return new ListItemViewHolder(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,25 +43,9 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
|
|||||||
holder.title.setText(listItem.getTitle());
|
holder.title.setText(listItem.getTitle());
|
||||||
holder.description.setText(listItem.getDescription());
|
holder.description.setText(listItem.getDescription());
|
||||||
|
|
||||||
if (listItem.getTagList() != null && !listItem.getTagList().isEmpty()) {
|
|
||||||
if (holder.tagGroup.getChildCount() > 0) { // ごまかし
|
|
||||||
holder.tagGroup.removeAllViews();
|
|
||||||
}
|
|
||||||
for (int i = 0; i < listItem.getTagList().size(); i++) {
|
|
||||||
ChipGroup chipGroup = holder.tagGroup;
|
|
||||||
Chip chip = new Chip(chipGroup.getContext());
|
|
||||||
chip.setText(listItem.getTagList().get(i).getName());
|
|
||||||
chip.setTextColor(Color.parseColor(listItem.getTagList().get(i).getColor()));
|
|
||||||
chipGroup.addView(chip);
|
|
||||||
}
|
|
||||||
holder.tagGroup.setVisibility(View.VISIBLE);
|
|
||||||
} else {
|
|
||||||
holder.tagGroup.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
holder.itemView.setOnClickListener( v -> {
|
holder.itemView.setOnClickListener( v -> {
|
||||||
if (listItem.getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
|
if (listItem.getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||||
listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle(), listItem.getHasCombined());
|
listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle());
|
||||||
}
|
}
|
||||||
else if (listItem.getItemType() == ListItemType.ITEM_TYPE_FOLDER) {
|
else if (listItem.getItemType() == ListItemType.ITEM_TYPE_FOLDER) {
|
||||||
listener.onFolderSelected(listItem.getItemId(), listItem.getTitle());
|
listener.onFolderSelected(listItem.getItemId(), listItem.getTitle());
|
||||||
@@ -86,14 +64,12 @@ public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListIt
|
|||||||
ImageView icon;
|
ImageView icon;
|
||||||
TextView title;
|
TextView title;
|
||||||
TextView description;
|
TextView description;
|
||||||
ChipGroup tagGroup;
|
|
||||||
public ListItemViewHolder(@NonNull View itemView) {
|
public ListItemViewHolder(@NonNull View itemView) {
|
||||||
super(itemView);
|
super(itemView);
|
||||||
|
|
||||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||||
tagGroup = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_tags);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package one.nem.lacerta.feature.library;
|
|
||||||
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.BaseAdapter;
|
|
||||||
|
|
||||||
import com.google.android.material.chip.Chip;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
|
|
||||||
public class TagAdapter extends BaseAdapter {
|
|
||||||
|
|
||||||
private ArrayList<DocumentTag> tagList;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getCount() {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getItem(int position) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getItemId(int position) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View getView(int position, View convertView, ViewGroup parent) {
|
|
||||||
Chip chip;
|
|
||||||
if (convertView == null) {
|
|
||||||
chip = new Chip(parent.getContext());
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
chip = (Chip) convertView;
|
|
||||||
}
|
|
||||||
chip.setText(tagList.get(position).getName());
|
|
||||||
return chip;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<com.google.android.material.appbar.SubtitleCollapsingToolbarLayout
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
android:id="@+id/collapsing_toolbar"
|
android:id="@+id/collapsing_toolbar"
|
||||||
app:contentScrim="@color/colorSecondaryContainer"
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
android:background="@color/colorSurface"
|
android:background="@color/colorSurface"
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
app:layout_collapseMode="pin"
|
app:layout_collapseMode="pin"
|
||||||
app:title="HOGE" />
|
app:title="HOGE" />
|
||||||
|
|
||||||
</com.google.android.material.appbar.SubtitleCollapsingToolbarLayout>
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
|||||||
@@ -8,15 +8,4 @@
|
|||||||
android:title="@string/create_new_folder"
|
android:title="@string/create_new_folder"
|
||||||
app:showAsAction="never"/>
|
app:showAsAction="never"/>
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/menu_item_delete_folder"
|
|
||||||
android:title="このフォルダを削除"
|
|
||||||
app:showAsAction="never"/>
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/menu_item_add_by_media"
|
|
||||||
android:icon="@drawable/developer_mode_24px"
|
|
||||||
android:title="DEBUG_MediaPicker"
|
|
||||||
app:showAsAction="never"/>
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_feature_library_top_fragment_self"
|
android:id="@+id/action_feature_library_top_fragment_self"
|
||||||
app:destination="@id/feature_library_top_fragment"
|
app:destination="@id/feature_library_top_fragment"
|
||||||
app:enterAnim="@anim/nav_twitter_enter_anim"
|
app:enterAnim="@anim/nav_default_enter_anim"
|
||||||
app:exitAnim="@anim/nav_twitter_exit_anim"
|
app:exitAnim="@anim/nav_default_exit_anim"
|
||||||
app:popEnterAnim="@anim/nav_twitter_pop_enter_anim"
|
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
|
||||||
app:popExitAnim="@anim/nav_twitter_pop_exit_anim"
|
app:popExitAnim="@anim/nav_default_pop_exit_anim"
|
||||||
app:popUpTo="@id/feature_library_top_fragment"
|
app:popUpTo="@id/feature_library_top_fragment"
|
||||||
app:popUpToInclusive="false"/>
|
app:popUpToInclusive="false"/>
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
alias(libs.plugins.com.android.library)
|
alias(libs.plugins.com.android.library)
|
||||||
id 'com.google.dagger.hilt.android'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@@ -46,12 +45,6 @@ dependencies {
|
|||||||
// shared
|
// shared
|
||||||
implementation project(':shared:ui')
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
implementation project(':component:common')
|
|
||||||
|
|
||||||
implementation project(':data')
|
|
||||||
|
|
||||||
implementation project(':model')
|
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/androidx.preference/preference
|
// https://mvnrepository.com/artifact/androidx.preference/preference
|
||||||
implementation 'androidx.preference:preference:1.2.1'
|
implementation 'androidx.preference:preference:1.2.1'
|
||||||
|
|
||||||
|
|||||||
@@ -1,148 +0,0 @@
|
|||||||
package one.nem.lacerta.setting;
|
|
||||||
|
|
||||||
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 javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.component.common.LacertaCreateTagDialog;
|
|
||||||
import one.nem.lacerta.component.common.LacertaCreateTagDialogListener;
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
* Use the {@link SettingTagManageFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class SettingTagManageFragment extends Fragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLibrary lacertaLibrary;
|
|
||||||
|
|
||||||
private RecyclerView recyclerView;
|
|
||||||
|
|
||||||
private TagListItemAdapter adapter;
|
|
||||||
|
|
||||||
public SettingTagManageFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SettingTagManageFragment newInstance() {
|
|
||||||
SettingTagManageFragment fragment = new SettingTagManageFragment();
|
|
||||||
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_setting_tag_manage, container, false);
|
|
||||||
|
|
||||||
// Toolbar
|
|
||||||
Toolbar toolbar = view.findViewById(R.id.tag_manage_toolbar);
|
|
||||||
toolbarSetup(toolbar, true, "タグ管理");
|
|
||||||
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
|
|
||||||
this.recyclerView = view.findViewById(R.id.tag_item_recycler_view);
|
|
||||||
this.adapter = new TagListItemAdapter((tagId, tagName, tagColor) -> {
|
|
||||||
Toast.makeText(getContext(), "Tag Clicked", Toast.LENGTH_SHORT).show();
|
|
||||||
});
|
|
||||||
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
|
||||||
|
|
||||||
updateTagList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* タグリストを更新する
|
|
||||||
*/
|
|
||||||
private void updateTagList() {
|
|
||||||
lacertaLibrary.getTagList().thenAccept(documentTags -> {
|
|
||||||
int currentTagCount = this.adapter.getItemCount();
|
|
||||||
this.adapter.setDocumentTags(documentTags);
|
|
||||||
if (currentTagCount != this.adapter.getItemCount()) {
|
|
||||||
this.adapter.notifyItemRangeRemoved(0, currentTagCount);
|
|
||||||
this.adapter.notifyItemRangeInserted(0, this.adapter.getItemCount());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ToolbarをInitする
|
|
||||||
*
|
|
||||||
* @param toolbar Toolbar
|
|
||||||
* @param showBackButton 戻るボタンを表示するか
|
|
||||||
* @param title タイトル
|
|
||||||
*/
|
|
||||||
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
|
|
||||||
getActivity().runOnUiThread(() -> {
|
|
||||||
if (showBackButton) {
|
|
||||||
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
|
|
||||||
toolbar.setNavigationOnClickListener(v -> {
|
|
||||||
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
|
|
||||||
// Back
|
|
||||||
Navigation.findNavController(requireView()).popBackStack();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
toolbar.setNavigationIcon(null);
|
|
||||||
}
|
|
||||||
toolbar.setTitle(title);
|
|
||||||
toolbar.getMenu().clear();
|
|
||||||
toolbar.inflateMenu(R.menu.setting_tag_manage_menu);
|
|
||||||
toolbar.setOnMenuItemClickListener(item -> {
|
|
||||||
if (item.getItemId() == R.id.setting_tag_manage_menu_add) {
|
|
||||||
Toast.makeText(getContext(), "Add Clicked", Toast.LENGTH_SHORT).show();
|
|
||||||
LacertaCreateTagDialog dialog = new LacertaCreateTagDialog();
|
|
||||||
dialog.setListener(new LacertaCreateTagDialogListener() {
|
|
||||||
@Override
|
|
||||||
public void onPositiveClick(String tagName, String tagColor) {
|
|
||||||
Toast.makeText(getContext(), "Positive Clicked", Toast.LENGTH_SHORT).show();
|
|
||||||
DocumentTag newTag = new DocumentTag();
|
|
||||||
newTag.setName(tagName);
|
|
||||||
newTag.setColor(tagColor);
|
|
||||||
lacertaLibrary.createTag(newTag).join();
|
|
||||||
updateTagList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onNegativeClick() {
|
|
||||||
Toast.makeText(getContext(), "Negative Clicked", Toast.LENGTH_SHORT).show();
|
|
||||||
updateTagList();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
dialog.show(getParentFragmentManager(), "create_tag_dialog");
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||