Compare commits

..
Author SHA1 Message Date
r-ca c49062618e DocumentPathを廃止 2024-01-14 15:52:41 +09:00
r-ca 000a26645e DocumentDetailのDocumentPathを廃止してPublicPathに置き換え 2024-01-14 15:48:33 +09:00
146 changed files with 1361 additions and 3408 deletions

No files matched your search

+2 -2
View File
@@ -4,10 +4,10 @@
<selectionStates> <selectionStates>
<SelectionState runConfigName="app"> <SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" /> <option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-01-20T07:15:21.179573376Z"> <DropdownSelection timestamp="2023-12-18T03:36:14.973846Z">
<Target type="DEFAULT_BOOT"> <Target type="DEFAULT_BOOT">
<handle> <handle>
<DeviceId pluginId="LocalEmulator" identifier="path=/home/rca/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" /> <DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22H7V3G7" />
</handle> </handle>
</Target> </Target>
</DropdownSelection> </DropdownSelection>
+1 -1
View File
@@ -22,10 +22,10 @@
<option value="$PROJECT_DIR$/feature/library" /> <option value="$PROJECT_DIR$/feature/library" />
<option value="$PROJECT_DIR$/feature/scan" /> <option value="$PROJECT_DIR$/feature/scan" />
<option value="$PROJECT_DIR$/feature/search" /> <option value="$PROJECT_DIR$/feature/search" />
<option value="$PROJECT_DIR$/feature/setting" />
<option value="$PROJECT_DIR$/model" /> <option value="$PROJECT_DIR$/model" />
<option value="$PROJECT_DIR$/processor" /> <option value="$PROJECT_DIR$/processor" />
<option value="$PROJECT_DIR$/shared" /> <option value="$PROJECT_DIR$/shared" />
<option value="$PROJECT_DIR$/shared/icon" />
<option value="$PROJECT_DIR$/shared/ui" /> <option value="$PROJECT_DIR$/shared/ui" />
<option value="$PROJECT_DIR$/source" /> <option value="$PROJECT_DIR$/source" />
<option value="$PROJECT_DIR$/utils" /> <option value="$PROJECT_DIR$/utils" />
-18
View File
@@ -1,18 +0,0 @@
# 概要
<!-- PRの概要 -->
# 関連Issue
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
# 詳細
<!-- 詳細 -->
# 影響箇所
<!-- 予想される影響箇所 -->
# チェック
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
- [ ] 機能として完成している
- [ ] WIP(Work in progress: 作業中)
- [ ] 正常にビルド/起動ができる
- [ ] 既存の機能を壊していない
+26 -10
View File
@@ -59,6 +59,32 @@ 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
// 内部モジュール
// Feature
implementation project(':feature:home')
implementation project(':feature:search')
implementation project(':feature:library')
implementation project(':feature:scan')
implementation project(':feature:debug') // デバッグメニュー
// // Component
// implementation project(':component:common')
// implementation project(':component:scanner')
// implementation project(':component:viewer')
// // Data
// implementation project(':data:repository')
//
// // Source
// implementation project(':data:source:database')
// implementation project(':data:source:preference')
//
implementation project(':data')
implementation project(':shared:ui')
implementation project(':shared:icon')
// Hilt (DI) // Hilt (DI)
implementation libs.com.google.dagger.hilt.android implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler annotationProcessor libs.com.google.dagger.hilt.compiler
@@ -68,14 +94,4 @@ dependencies {
implementation libs.navigation.ui implementation libs.navigation.ui
implementation libs.navigation.dynamic.features.fragment implementation libs.navigation.dynamic.features.fragment
// Feature
implementation project(':feature:home')
implementation project(':feature:search')
implementation project(':feature:library')
implementation project(':feature:scan')
implementation project(':feature:debug') // デバッグメニュー
implementation project(':feature:setting') // 設定画面
implementation project(':data')
implementation project(':shared:ui')
} }
@@ -1,7 +1,6 @@
package one.nem.lacerta; package one.nem.lacerta;
import android.app.Application; import android.app.Application;
import android.util.Log;
import com.google.android.material.color.DynamicColors; import com.google.android.material.color.DynamicColors;
@@ -13,13 +12,7 @@ public class LacertaApplication extends Application {
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
if (DynamicColors.isDynamicColorAvailable()) { // DynamicColorを有効化
Log.d("DynamicColors", "DynamicColors is available. Applying to activities..."); DynamicColors.applyToActivitiesIfAvailable(this);
DynamicColors.applyToActivitiesIfAvailable(this);
} else {
Log.d("DynamicColors", "DynamicColors is not available.");
}
} }
} }
@@ -1,15 +1,12 @@
package one.nem.lacerta; package one.nem.lacerta;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.navigation.NavController; import androidx.navigation.NavController;
import androidx.navigation.fragment.NavHostFragment; import androidx.navigation.fragment.NavHostFragment;
import androidx.navigation.ui.NavigationUI; import androidx.navigation.ui.NavigationUI;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -28,26 +25,16 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
// Init navigation // Debug
try { FragmentManager supportFragmentManager = getSupportFragmentManager();
FragmentManager supportFragmentManager = getSupportFragmentManager();
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
assert navHostFragment != null;
NavController navController = navHostFragment.getNavController();
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
NavigationUI.setupWithNavController(bottomNavigationView, navController);
}
catch (Exception e) {
Log.e("Init", "Failed to init navigation");
Log.e("Init", "Searchable Error code: " + "894b5941-3bc0-46fe-b752-0dbc88be29a8");
Toast.makeText(this, "Failed to init navigation", Toast.LENGTH_LONG).show();
finish(); // Exit app
}
// Set navigation bar color NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer)); NavController navController = navHostFragment.getNavController();
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
// Set status bar color NavigationUI.setupWithNavController(bottomNavigationView, navController);
getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
} }
}
}
@@ -24,11 +24,6 @@
android:id="@+id/bottom_nav" android:id="@+id/bottom_nav"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorSecondaryContainer"
app:itemIconTint="@color/colorOnSecondaryContainer"
app:itemTextColor="@color/colorOnSecondaryContainer"
app:itemActiveIndicatorStyle="@style/Lacerta.Custom.Indicator"
app:labelVisibilityMode="selected"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
+3 -12
View File
@@ -4,26 +4,17 @@
<item <item
android:id="@id/feature_home_navigation" android:id="@id/feature_home_navigation"
android:icon="@drawable/home_24px" android:icon="@drawable/home_24px"
android:title="@string/home_title"/> android:title="Home"/>
<item
android:id="@id/feature_search_navigation"
android:icon="@drawable/search_24px"
android:title="@string/search_title"/>
<item <item
android:id="@id/feature_library_navigation" android:id="@id/feature_library_navigation"
android:icon="@drawable/folder_24px" android:icon="@drawable/folder_24px"
android:title="@string/library_title"/> android:title="Library"/>
<item <item
android:id="@id/feature_debug_navigation" android:id="@id/feature_debug_navigation"
android:icon="@drawable/developer_mode_24px" android:icon="@drawable/developer_mode_24px"
android:title="@string/debug_menu_title"/> android:title="Debug menu"/>
<item
android:id="@id/feature_setting_navigation"
android:icon="@drawable/settings_24px"
android:title="@string/setting_title"/>
</menu> </menu>
-4
View File
@@ -10,9 +10,5 @@
<include app:graph="@navigation/feature_home_navigation" /> <include app:graph="@navigation/feature_home_navigation" />
<include app:graph="@navigation/feature_search_navigation" />
<include app:graph="@navigation/feature_setting_navigation" />
</navigation> </navigation>
+1 -3
View File
@@ -4,7 +4,7 @@ plugins {
android { android {
namespace 'one.nem.lacerta.component.common' namespace 'one.nem.lacerta.component.common'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -32,6 +32,4 @@ dependencies {
testImplementation libs.junit testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.espresso.core
implementation project(':shared:ui')
} }
+1 -7
View File
@@ -5,7 +5,7 @@ plugins {
android { android {
namespace 'one.nem.lacerta.component.scanner' namespace 'one.nem.lacerta.component.scanner'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -30,8 +30,6 @@ dependencies {
implementation libs.androidx.appcompat implementation libs.androidx.appcompat
implementation libs.com.google.android.material implementation libs.com.google.android.material
implementation libs.androidx.activity
implementation libs.androidx.constraintlayout
testImplementation libs.junit testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.espresso.core
@@ -48,8 +46,4 @@ dependencies {
implementation project(':processor') implementation project(':processor')
implementation project(':utils') implementation project(':utils')
implementation project(':vcs')
implementation project(':data')
} }
@@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".ScannerManagerActivity"
android:exported="false" />
</application>
</manifest> </manifest>
@@ -123,110 +123,109 @@ public class ScannerDataManagerStubFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
// view.findViewById(R.id.button_call_camera).setOnClickListener(v -> { view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
// Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked"); Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
// Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) { if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
// File photoFile = null; File photoFile = null;
// try { try {
// String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date()); String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
// String imageFileName = "JPEG_" + timeStamp + "_"; String imageFileName = "JPEG_" + timeStamp + "_";
// File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES); File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
// photoFile = File.createTempFile(imageFileName, ".jpg", storageDir); photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
// } catch (IOException ex) { } catch (IOException ex) {
// Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex); Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
// } }
// if (photoFile != null) { if (photoFile != null) {
// photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile); photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
// takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI); takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
// cameraLauncher.launch(takePictureIntent); cameraLauncher.launch(takePictureIntent);
// } }
// else { else {
// Log.d("ScannerDataManagerStubFragment", "photoFile is null"); Log.d("ScannerDataManagerStubFragment", "photoFile is null");
// } }
// } }
// else { else {
// Log.d("ScannerDataManagerStubFragment", "camera not available"); Log.d("ScannerDataManagerStubFragment", "camera not available");
// } }
// updateResults(); updateResults();
// }); });
//
// view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> { view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
// Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked"); Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
// Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
//
// this.documentDetail = createSampleDocumentDetail(); this.documentDetail = createSampleDocumentDetail();
//
// }); });
//
// view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> { view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
// Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked"); Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
// Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
// // TODO-rca: ここでDocumentProcessorを初期化する // TODO-rca: ここでDocumentProcessorを初期化する
// if (this.documentDetail == null) { if (this.documentDetail == null) {
// Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
// return; return;
// } }
// this.documentProcessor = documentProcessorFactory.create(this.documentDetail); this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
// Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
// try { try {
// this.documentProcessor.init(); this.documentProcessor.init();
// } catch (Exception e) { } catch (Exception e) {
// Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
// Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e); Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
// } }
// Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
// }); });
//
// view.findViewById(R.id.button_add_page).setOnClickListener(v -> { view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
// Log.d("ScannerDataManagerStubFragment", "button_add_page clicked"); Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
// Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
// if (this.documentProcessor == null) { if (this.documentProcessor == null) {
// Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
// return; return;
// } }
// Bitmap[] bitmaps = new Bitmap[results.size()]; Bitmap[] bitmaps = new Bitmap[results.size()];
// for (int i = 0; i < results.size(); i++) { for (int i = 0; i < results.size(); i++) {
// bitmaps[i] = results.get(i).getBitmap(); bitmaps[i] = results.get(i).getBitmap();
// } }
//
// try { try {
// this.documentProcessor.addNewPagesToLast(bitmaps); this.documentProcessor.addNewPagesToLast(bitmaps);
// } catch (Exception e) { } catch (Exception e) {
// Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
// Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e); Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
// } }
//
// Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
//
// try { try {
// this.documentProcessor.close(); this.documentProcessor.close();
// } catch (Exception e) { } catch (Exception e) {
// Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
// Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e); Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
// } }
// }); });
} }
public DocumentDetail createSampleDocumentDetail() { public DocumentDetail createSampleDocumentDetail() {
//
// String id = UUID.randomUUID().toString(); String id = UUID.randomUUID().toString();
//
// Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show(); Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
// //logger.debug("CreateSample", "Generated id: " + id); //logger.debug("CreateSample", "Generated id: " + id);
//
// DocumentMeta meta = new DocumentMeta( DocumentMeta meta = new DocumentMeta(
// id, id,
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()), "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
// new Date(), new Date(),
// new Date()); new Date());
//
// DocumentPath path = new DocumentPath( DocumentPath path = new DocumentPath(
// deviceInfoUtils.getExternalStorageDirectoryString(), deviceInfoUtils.getExternalStorageDirectoryString(),
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now())); "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
//
// return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch"); return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
return null;
} }
@Override @Override
@@ -1,220 +0,0 @@
package one.nem.lacerta.component.scanner;
import android.app.ProgressDialog;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.annotation.AnimatorRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import com.google.android.material.appbar.MaterialToolbar;
import com.websitebeaver.documentscanner.DocumentScanner;
import java.util.ArrayList;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
@AndroidEntryPoint
public class ScannerManagerActivity extends AppCompatActivity {
String TAG = "ScannerManagerActivity";
@Inject
LacertaLogger logger;
@Inject
Document document;
@Inject
DocumentProcessorFactory documentProcessorFactory;
@Inject
LacertaVcsFactory lacertaVcsFactory;
// Variables
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
View view;
DocumentScanner documentScanner = new DocumentScanner(
this,
(croppedImageResults) -> {
logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
ArrayList<Bitmap> croppedImages = new ArrayList<>();
for (String result : croppedImageResults) {
croppedImages.add(BitmapFactory.decodeFile(result));
}
processResult(croppedImages);
return null;
},
(errorMessage) -> {
// an error happened
logger.error(TAG, "Error: " + errorMessage);
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
return null;
},
() -> {
// user canceled document scan
logger.debug(TAG, "User canceled document scan");
return null;
},
null,
null,
null
);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_scanner_manager);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
setSupportActionBar(toolbar);
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
documentScanner.startScan();
// Init
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
}
@Override
public boolean onCreateOptionsMenu(android.view.Menu menu) {
getMenuInflater().inflate(R.menu.scanner_result_toolbar, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(android.view.MenuItem item) {
if (item.getItemId() == R.id.action_save_new) {
// 新ドキュメントとして保存
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
saveNewDocument();
return true;
} else if (item.getItemId() == R.id.action_insert_exist) {
// 既存ドキュメントに挿入
Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
insertToExistDocument();
return true;
} else if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
private void processResult(ArrayList<Bitmap> resultImages) {
logger.debug(TAG, "processResult");
if (resultImages.isEmpty()) {
logger.debug(TAG, "resultImages(arg) is empty");
if (this.croppedImages.isEmpty()) {
logger.debug(TAG, "this.resultImages is empty");
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
// TODO-rca: なんかする
} else {
logger.debug(TAG, "this.resultImages is not empty");
updateResultView(this.croppedImages);
}
} else {
logger.debug(TAG, "resultImages(arg) is not empty");
updateResultView(resultImages);
this.croppedImages = resultImages;
}
}
private void saveNewDocument() {
logger.debug(TAG, "saveNewDocument");
// Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
ProgressDialog dialog = new ProgressDialog(this);
dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
dialog.setCancelable(false);
dialog.show();
DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
document.createDocument(documentMeta).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();
dialog.dismiss();
finish();
});
}
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
return CompletableFuture.runAsync(() -> {
try {
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
} catch (Exception e) {
logger.error(TAG, "Error: " + e.getMessage());
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
}
});
}
private void insertToExistDocument() {
logger.debug(TAG, "insertToExistDocument");
// TODO-rca: 実装
}
private void updateResultView(ArrayList<Bitmap> resultImages) {
logger.debug(TAG, "updateResultView");
LinearLayout resultView = findViewById(R.id.result_list_container);
ImageView selectedImage = findViewById(R.id.selected_image);
resultView.removeAllViews();
for (Bitmap resultImage : resultImages) {
View resultImageView = getLayoutInflater().inflate(R.layout.result_image_container_item, null);
ImageView imageView = resultImageView.findViewById(R.id.result_image);
imageView.setImageBitmap(resultImage);
imageView.setOnClickListener(v -> {
selectedImage.setImageBitmap(resultImage);
for (int i = 0; i < resultView.getChildCount(); i++) {
View child = resultView.getChildAt(i).findViewById(R.id.result_image);
child.setSelected(false);
}
v.setSelected(true);
});
resultView.addView(resultImageView);
}
}
}
@@ -1,95 +0,0 @@
package one.nem.lacerta.component.scanner;
import android.content.Intent;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.websitebeaver.documentscanner.DocumentScanner;
import com.websitebeaver.documentscanner.DocumentScannerActivity;
import java.util.Objects;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
@AndroidEntryPoint
public class ScannerManagerFragment extends Fragment {
String TAG = getClass().getSimpleName();
@Inject
LacertaLogger logger;
@Inject
LacertaVcsFactory vcsFactory;
private static final boolean DEFAULT_SINGLE_PAGE = false;
private boolean singlePage;
public ScannerManagerFragment() {
// Required empty public constructor
}
// public static ScannerManagerFragment newInstance(boolean singlePage) {
// ScannerManagerFragment fragment = new ScannerManagerFragment();
// Bundle args = new Bundle();
// args.putBoolean("singlePage", singlePage);
// fragment.setArguments(args);
// return fragment;
// }
public static ScannerManagerFragment newInstance() {
ScannerManagerFragment fragment = new ScannerManagerFragment();
Bundle args = new Bundle();
args.putBoolean("singlePage", DEFAULT_SINGLE_PAGE);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
singlePage = getArguments().getBoolean("singlePage", DEFAULT_SINGLE_PAGE);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_scanner_manager, container, false);
// ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
// ViewGroup.LayoutParams.MATCH_PARENT,
// ViewGroup.LayoutParams.MATCH_PARENT
// );
// view.setLayoutParams(layoutParams);
return view;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// Init
logger.debug(TAG, "called");
view.findViewById(R.id.button_intent_scanner_manager_activity).setOnClickListener(v -> {
// DocumentScannerActivityを起動する
Intent intent = new Intent(requireActivity().getApplicationContext(), ScannerManagerActivity.class);
startActivity(intent);
});
}
}
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#00000000" />
<corners android:radius="8dp" />
<stroke android:color="#FF0000" android:width="2dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="#00000000" />
<corners android:radius="8dp" />
</shape>
</item>
</selector>
@@ -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:id="@+id/main"
android:theme="@style/Theme.Lacerta"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimaryContainer"
app:titleTextColor="@color/colorOnPrimaryContainer"
app:title="Preview"
android:minHeight="?attr/actionBarSize"
android:theme="?attr/actionBarTheme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/selected_image"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/horizontal_scroll"
android:scaleType="centerInside"
app:layout_constraintBottom_toTopOf="@+id/horizontal_scroll"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_toolbar" />
<HorizontalScrollView
android:id="@+id/horizontal_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:scrollbars="none"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/selected_image">
<LinearLayout
android:id="@+id/result_list_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>
</HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -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,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/result_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="64dp"
android:adjustViewBounds="true"
android:background="@drawable/result_image_container_item_border"
android:padding="8dp"
android:scaleType="centerCrop" />
</FrameLayout>
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_save_new"
android:icon="@drawable/save_24px"
android:title="Save"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_insert_exist"
android:icon="@drawable/ic_baseline_add_24"
android:title="Save"
app:showAsAction="ifRoom"/>
</menu>
+1 -23
View File
@@ -1,11 +1,10 @@
plugins { plugins {
alias(libs.plugins.com.android.library) alias(libs.plugins.com.android.library)
id 'com.google.dagger.hilt.android'
} }
android { android {
namespace 'one.nem.lacerta.component.viewer' namespace 'one.nem.lacerta.component.viewer'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -30,28 +29,7 @@ dependencies {
implementation libs.androidx.appcompat implementation libs.androidx.appcompat
implementation libs.com.google.android.material implementation libs.com.google.android.material
implementation libs.androidx.activity
implementation libs.androidx.constraintlayout
testImplementation libs.junit testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.espresso.core
// Navigation
implementation libs.navigation.fragment
implementation libs.navigation.ui
implementation libs.navigation.dynamic.features.fragment
// DI
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
// shared
implementation project(':shared:ui')
implementation project(':utils')
implementation project(':data')
implementation project(':model')
} }
@@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".ViewerMainActivity"
android:exported="false" />
</application>
</manifest> </manifest>
@@ -1,88 +0,0 @@
package one.nem.lacerta.component.viewer;
import android.graphics.Bitmap;
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 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.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;
public ComponentViewerTopFragment() {
// Required empty public constructor
}
public static ComponentViewerTopFragment newInstance(String documentId) {
ComponentViewerTopFragment fragment = new ComponentViewerTopFragment();
Bundle args = new Bundle();
args.putString("documentId", documentId);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
documentId = getArguments().getString("documentId");
}
}
@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);
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);
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());
});
});
return view;
}
}
@@ -1,5 +0,0 @@
package one.nem.lacerta.component.viewer;
public interface ItemClickListener {
void onItemClick(String fileName); // DEBUG
}
@@ -1,66 +0,0 @@
package one.nem.lacerta.component.viewer;
import android.graphics.Bitmap;
import android.media.Image;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import one.nem.lacerta.model.document.page.Page;
public class ViewerBodyAdapter extends RecyclerView.Adapter<ViewerBodyAdapter.ViewHolder>{
ArrayList<Page> pages;
ItemClickListener listener;
public ViewerBodyAdapter(ArrayList<Page> pages, ItemClickListener listener){
this.pages = pages;
this.listener = listener;
}
public ViewerBodyAdapter(ItemClickListener listener){
this.pages = new ArrayList<>();
this.listener = listener;
}
public void setPages(ArrayList<Page> pages){
this.pages = pages;
}
@NonNull
@Override
public ViewerBodyAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = View.inflate(parent.getContext(), R.layout.viewer_body_list_item, null);
return new ViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
Bitmap bitmap = pages.get(position).getBitmap();
holder.image.setImageBitmap(bitmap);
holder.itemView.setOnClickListener(v -> {
});
}
@Override
public int getItemCount() {
return pages.size();
}
public class ViewHolder extends RecyclerView.ViewHolder{
ImageView image;
public ViewHolder(@NonNull View itemView) {
super(itemView);
image = itemView.findViewById(R.id.imageView);
}
}
}
@@ -1,65 +0,0 @@
package one.nem.lacerta.component.viewer;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.FragmentManager;
import androidx.navigation.NavController;
import androidx.navigation.fragment.NavHostFragment;
import androidx.navigation.ui.NavigationUI;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.utils.LacertaLogger;
@AndroidEntryPoint
public class ViewerMainActivity extends AppCompatActivity {
@Inject
LacertaLogger logger;
@Inject
public ViewerMainActivity() {
}
// Variables
private static final String TAG = "ViewerMainActivity";
String documentId;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_viewer_main);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
Intent intent = getIntent();
try {
documentId = intent.getStringExtra("documentId");
}
catch (Exception e) {
logger.error(TAG, "Failed to get documentId from intent");
logger.error(TAG, "Searchable Error code: " + "f64c21a2-391f-4c40-92f6-183da459de21");
Toast.makeText(this, "Failed to get documentId from intent", Toast.LENGTH_LONG).show();
finish();
}
getSupportFragmentManager().beginTransaction()
.replace(R.id.nav_host_fragment, ComponentViewerTopFragment.newInstance(documentId))
.commitNow();
}
}
@@ -1,20 +0,0 @@
package one.nem.lacerta.component.viewer.model;
import android.graphics.Bitmap;
public class ViewerBodyListItem {
Bitmap image;
public ViewerBodyListItem(Bitmap image) {
this.image = image;
}
public Bitmap getImage() {
return image;
}
public void setImage(Bitmap image) {
this.image = image;
}
}
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ViewerMainActivity">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,51 +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.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="Title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/body_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="8dp"
android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@tools:sample/backgrounds/scenic" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/component_viewer_navigation"
app:startDestination="@id/componentViewerTopFragment">
<fragment
android:id="@+id/componentViewerTopFragment"
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
android:label="ComponentViewerTopFragment" />
</navigation>
@@ -1,4 +0,0 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
-2
View File
@@ -56,6 +56,4 @@ dependencies {
// データソースモジュール // データソースモジュール
implementation project(':source') implementation project(':source')
implementation project(':vcs')
} }
@@ -2,7 +2,6 @@ package one.nem.lacerta.data;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
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;
@@ -14,13 +13,34 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
*/ */
public interface Document { public interface Document {
CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta); ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
CompletableFuture<DocumentDetail> createDocument(); ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
CompletableFuture<Void> deleteDocument(String documentId); /**
* 更新の新しいドキュメントから順に並べてlimit件取得する
* @param limit 取得する上限数
*/
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
CompletableFuture<Void> updateDocument(DocumentDetail detail); /**
* 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
* @param limit 取得する上限数
* @param offset 取得するオフセット
*/
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset);
CompletableFuture<DocumentDetail> getDocument(String documentId); /**
* ドキュメントIDからDocumentDetailを取得する
* @param id ドキュメントID
*/
DocumentDetail getDocumentDetail(String id);
/**
* DocumentMetaからDocumentDetailを取得する
* @param meta DocumentMeta
*/
DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように
DocumentDetail createDocumentByMeta(DocumentMeta meta);
} }
@@ -0,0 +1,12 @@
package one.nem.lacerta.data;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.model.document.tag.DocumentTag;
public interface DocumentDebug {
void insertDocument(DocumentMeta meta, DocumentDetail detail);
}
@@ -1,9 +1,5 @@
package one.nem.lacerta.data; package one.nem.lacerta.data;
import java.util.ArrayList;
import java.util.concurrent.CompletableFuture;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType; import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.LibraryItemPage; import one.nem.lacerta.model.LibraryItemPage;
@@ -12,13 +8,15 @@ import one.nem.lacerta.model.document.DocumentDetail;
public interface LacertaLibrary { public interface LacertaLibrary {
// Get History // Get History
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit); LibraryItemPage getRecentDocument(int limit);
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset); LibraryItemPage getRecentDocument(int limit, int offset);
// Get Library page // Get Library page
CompletableFuture<LibraryItemPage> getLibraryPage(int limit); LibraryItemPage getLibraryPage(int limit);
CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset); LibraryItemPage getLibraryPage(int limit, int offset);
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit); LibraryItemPage getLibraryPage(String pageId, int limit);
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset); LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
// GetDocument
DocumentDetail getDocumentDetailById(String id);
} }
@@ -0,0 +1,47 @@
package one.nem.lacerta.data.impl;
import java.util.List;
import javax.inject.Inject;
import one.nem.lacerta.data.DocumentDebug;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.source.database.entity.DocumentEntity;
import one.nem.lacerta.source.database.entity.LibraryEntity;
import one.nem.lacerta.source.database.entity.TagEntity;
import one.nem.lacerta.source.database.LacertaDatabase;
public class DocumentDebugImpl implements DocumentDebug{
@Inject
LacertaDatabase database;
@Inject
public DocumentDebugImpl() {
}
public void insertDocument(DocumentMeta meta, DocumentDetail detail) {
DocumentEntity documentEntity = new DocumentEntity();
LibraryEntity libraryEntity = new LibraryEntity();
documentEntity.id = meta.getId();
documentEntity.title = meta.getTitle();
documentEntity.createdAt = meta.getCreatedAt();
documentEntity.updatedAt = meta.getUpdatedAt();
documentEntity.author = detail.getAuthor();
documentEntity.defaultBranch = detail.getDefaultBranch();
// ArrayListからListに変換
documentEntity.tagIds = meta.getTagIds();
libraryEntity.id = meta.getId();
libraryEntity.path = "Placeholder";
libraryEntity.rootPath = "Placeholder";
database.documentDao().insert(documentEntity);
database.libraryDao().insert(libraryEntity);
}
}
@@ -1,221 +1,139 @@
package one.nem.lacerta.data.impl; package one.nem.lacerta.data.impl;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
// Hilt
import javax.inject.Inject; import javax.inject.Inject;
// Lacerta/data
import one.nem.lacerta.data.Document; import one.nem.lacerta.data.Document;
// Lacerta/model
import one.nem.lacerta.model.PublicPath;
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;
// Lacerta/source import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.model.document.internal.XmlMetaModel; import one.nem.lacerta.model.document.tag.DocumentTag;
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
import one.nem.lacerta.model.document.page.Page;
import one.nem.lacerta.source.database.LacertaDatabase; import one.nem.lacerta.source.database.LacertaDatabase;
import one.nem.lacerta.source.database.entity.DocumentEntity; import one.nem.lacerta.source.database.entity.DocumentEntity;
import one.nem.lacerta.source.database.entity.LibraryEntity;
import one.nem.lacerta.source.database.entity.TagEntity;
// Lacerta/utils import one.nem.lacerta.source.jgit.JGitRepository;
import one.nem.lacerta.source.file.FileManager;
import one.nem.lacerta.source.file.factory.FileManagerFactory;
import one.nem.lacerta.utils.LacertaLogger;
// Lacerta/vcs
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.repository.DeviceInfoUtils; import one.nem.lacerta.utils.repository.DeviceInfoUtils;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
public class DocumentImpl implements Document { public class DocumentImpl implements Document{
String TAG = getClass().getSimpleName(); private LacertaDatabase database;
@Inject @Inject
LacertaLogger logger; public DocumentImpl(LacertaDatabase database) {
this.database = database;
}
@Inject @Inject
LacertaDatabase database; JGitRepository jGitRepository;
@Inject
LacertaVcsFactory vcsFactory;
@Inject
FileManagerFactory fileManagerFactory;
@Inject @Inject
DeviceInfoUtils deviceInfoUtils; DeviceInfoUtils deviceInfoUtils;
@Inject
XmlMetaParser xmlMetaParser;
@Inject
public DocumentImpl() {
// Init
// logger.debug(TAG, "called");
}
@Override @Override
public CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta) { public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
return CompletableFuture.supplyAsync(() -> { ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
DocumentDetail detail = new DocumentDetail(); List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
detail.setMeta(meta);
detail.setPages(new ArrayList<>());
// Create DocumentEntity
DocumentEntity documentEntity = new DocumentEntity();
documentEntity.id = meta.getId();
documentEntity.title = meta.getTitle();
documentEntity.author = meta.getAuthor();
documentEntity.defaultBranch = meta.getDefaultBranch();
documentEntity.updatedAt = meta.getUpdatedAt();
documentEntity.createdAt = meta.getCreatedAt();
documentEntity.publicPath = meta.getPath().getStringPath();
documentEntity.tagIds = meta.getTagIds();
database.documentDao().insert(documentEntity); for (DocumentEntity documentEntity : documentEntities) {
// タグ取得
// TODO-rca: 切り出すべきかも?
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
ArrayList<DocumentTag> documentTags = new ArrayList<>();
for (TagEntity tagEntity : tagEntities) {
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
}
// Vcs // 組み立て処理
LacertaVcs vcs = vcsFactory.create(meta.getId()); // 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
vcs.createDocument(meta.getId()); DocumentMeta documentMeta = new DocumentMeta();
documentMeta.setId(documentEntity.id);
documentMeta.setTitle(documentEntity.title);
documentMeta.setCreatedAt(documentEntity.createdAt);
documentMeta.setUpdatedAt(documentEntity.updatedAt);
documentMeta.setTags(documentTags);
// XmlMeta documentMetas.add(documentMeta);
updateXmlMeta(detail).join(); }
return detail; return documentMetas;
});
} }
@Override @Override
public CompletableFuture<DocumentDetail> createDocument() { public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
DocumentMeta meta = new DocumentMeta(); return null; // TODO-rca: 実装する
meta.setId(UUID.randomUUID().toString());
meta.setTitle("New Document");
meta.setAuthor("author");
meta.setDefaultBranch("master");
meta.setUpdatedAt(new Date());
meta.setCreatedAt(new Date());
meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
meta.setTags(new ArrayList<>());
return createDocument(meta);
} }
@Override @Override
public CompletableFuture<Void> deleteDocument(String documentId) { public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
return CompletableFuture.supplyAsync(() -> { // ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
return null; // database.documentDao().
}); // TODO-rca: 履歴取得するDao実装する
return null;
} }
@Override @Override
public CompletableFuture<Void> updateDocument(DocumentDetail detail) { public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
return CompletableFuture.supplyAsync(() -> { return null;
updateXmlMeta(detail).join();
return null;
});
} }
@Override @Override
public CompletableFuture<DocumentDetail> getDocument(String documentId) { public DocumentDetail getDocumentDetail(String id) {
return CompletableFuture.supplyAsync(() -> { DocumentDetail documentDetail = new DocumentDetail();
DocumentEntity documentEntity = database.documentDao().findById(documentId); DocumentEntity documentEntity = database.documentDao().findById(id);
if (documentEntity == null) {
throw new IllegalArgumentException("documentId is not found");
}
DocumentMeta meta = new DocumentMeta();
meta.setId(documentEntity.id);
meta.setTitle(documentEntity.title);
meta.setAuthor(documentEntity.author);
meta.setDefaultBranch(documentEntity.defaultBranch);
meta.setUpdatedAt(documentEntity.updatedAt);
meta.setCreatedAt(documentEntity.createdAt);
meta.setPath(new PublicPath().resolve(documentEntity.publicPath));
meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
DocumentDetail detail = new DocumentDetail(); // タグ取得
// TODO-rca: 切り出すべきかも?
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
ArrayList<DocumentTag> documentTags = new ArrayList<>();
for (TagEntity tagEntity : tagEntities) {
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
}
getPagesByXmlMeta(documentId).thenCompose(xmlMetaPageModels -> getPagesByXmlMetaPageModel(documentId, xmlMetaPageModels)).thenAccept(pages -> { // パス取得
logger.debug(TAG, "pages: " + pages.size()); // TODO-rca: 切り出すべきかも?
detail.setMeta(meta); LibraryEntity libraryEntity = database.libraryDao().findById(id);
detail.setPages(pages); DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path);
}).join();
return detail; // リポジトリ取得
}); documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング
// 組み立て処理
// 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
DocumentMeta documentMeta = new DocumentMeta();
documentMeta.setId(documentEntity.id);
documentMeta.setTitle(documentEntity.title);
documentMeta.setCreatedAt(documentEntity.createdAt);
documentMeta.setUpdatedAt(documentEntity.updatedAt);
documentMeta.setTags(documentTags);
documentDetail.setMeta(documentMeta);
documentDetail.setAuthor(documentEntity.author);
documentDetail.setDefaultBranch(documentEntity.defaultBranch);
return documentDetail;
} }
private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) { @Override
return CompletableFuture.supplyAsync(() -> { public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) {
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()); return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする(処理を切り分ける?)
try {
ArrayList<XmlMetaPageModel> xmlMetaPageModels = xmlMetaParser.deserialize(fileManager.resolve(documentId).loadXml("meta.xml")).getPages();
// Debug
logger.debug(TAG, "xmlMetaPageModels: " + xmlMetaPageModels.size());
for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
logger.debug(TAG, "\txmlMetaPageModel: " + xmlMetaPageModel.getFilename());
}
return xmlMetaPageModels;
} catch (IOException e) {
logger.error(TAG, "DocumentMeta parse error");
logger.trace(TAG, e.getMessage());
logger.e_code("db18c04a-1625-4871-9e4e-918d805568ac");
}
return null;
});
} }
private CompletableFuture<ArrayList<Page>> getPagesByXmlMetaPageModel(String documentId, ArrayList<XmlMetaPageModel> xmlMetaPageModels) { @Override
return CompletableFuture.supplyAsync(() -> { public DocumentDetail createDocumentByMeta(DocumentMeta meta) {
ArrayList<Page> pages = new ArrayList<>(); DocumentDetail documentDetail = new DocumentDetail();
FileManager fileManager;
try {
fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId);
} catch (IOException e) {
logger.error(TAG, "FileManager resolve error");
logger.trace(TAG, e.getMessage());
logger.e_code("2235e8ee-4177-46f8-af6b-084381b202e6");
return null;
}
for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
try {
pages.add(new Page(xmlMetaPageModel.getFilename(), fileManager.resolve("raw").loadBitmap(xmlMetaPageModel.getFilename())));
} catch (IOException e) {
logger.error(TAG, "Bitmap decode error");
logger.trace(TAG, e.getMessage());
logger.e_code("3bba8c8f-90fb-4a24-a726-7ea201929f8b");
return null;
}
}
return pages;
});
}
private CompletableFuture<Void> updateXmlMeta(DocumentDetail documentDetail) { documentDetail.setMeta(meta);
return CompletableFuture.supplyAsync(() -> { documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする
// TODO-rca: リビジョンIDを検証する, 挿入する documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする?
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
ArrayList<XmlMetaPageModel> xmlMetaPageModels = new ArrayList<>(); return documentDetail;
for (Page page : documentDetail.getPages()) {
xmlMetaPageModels.add(new XmlMetaPageModel(page.getFileName()));
}
try {
fileManager.createDirectoryIfNotExist(documentDetail.getMeta().getId()).resolve(documentDetail.getMeta().getId())
.createFileIfNotExist("meta.xml").resolve("meta.xml").saveXml(xmlMetaParser.serialize(new XmlMetaModel("revisionId_PLACEHOLDER", xmlMetaPageModels)));
} catch (IOException e) {
logger.error(TAG, "DocumentMeta serialize error");
logger.trace(TAG, e.getMessage());
logger.e_code("e3b4d0c9-5b7e-4b7e-9e9a-5b8b8b8b8b8b");
}
return null;
});
} }
} }
@@ -1,90 +1,42 @@
package one.nem.lacerta.data.impl; package one.nem.lacerta.data.impl;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import one.nem.lacerta.data.LacertaLibrary; import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.LibraryItemPage; import one.nem.lacerta.model.LibraryItemPage;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.ListItemType;
import one.nem.lacerta.model.document.DocumentDetail; import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.source.database.LacertaDatabase;
import one.nem.lacerta.source.database.common.DateTypeConverter;
import one.nem.lacerta.source.database.entity.DocumentEntity;
import one.nem.lacerta.utils.LacertaLogger;
public class LacertaLibraryImpl implements LacertaLibrary { public class LacertaLibraryImpl implements LacertaLibrary {
@Override
LacertaLogger logger; public LibraryItemPage getRecentDocument(int limit) {
LacertaDatabase database; return null;
@Inject
public LacertaLibraryImpl(LacertaLogger logger, LacertaDatabase database) {
this.logger = logger;
this.database = database;
} }
@Override @Override
public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit) { public LibraryItemPage getRecentDocument(int limit, int offset) {
return CompletableFuture.supplyAsync(() -> { return null;
// 5秒フリーズさせる
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
ArrayList<ListItem> listItems = new ArrayList<>();
for (DocumentEntity documentEntity : documentEntities) {
ListItem listItem = new ListItem();
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
listItem.setTitle(documentEntity.title);
listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
listItem.setItemId(documentEntity.id);
listItems.add(listItem);
}
return listItems;
});
} }
@Override @Override
public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset) { public LibraryItemPage getLibraryPage(int limit) {
return null; // TODO-rca: Implement return null;
} }
@Override @Override
public CompletableFuture<LibraryItemPage> getLibraryPage(int limit) { public LibraryItemPage getLibraryPage(int limit, int offset) {
return CompletableFuture.supplyAsync(() -> { return null;
return null;
});
} }
@Override @Override
public CompletableFuture<LibraryItemPage> getLibraryPage(int limit, int offset) { public LibraryItemPage getLibraryPage(String pageId, int limit) {
return CompletableFuture.supplyAsync(() -> { return null;
return null;
});
} }
@Override @Override
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) { public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
return CompletableFuture.supplyAsync(() -> { return null;
return null;
});
} }
@Override @Override
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset) { public DocumentDetail getDocumentDetailById(String id) {
return CompletableFuture.supplyAsync(() -> { return null;
return null;
});
} }
} }
@@ -1,219 +1,219 @@
//package one.nem.lacerta.data.impl; package one.nem.lacerta.data.impl;
//
//import one.nem.lacerta.data.LacertaLibrary; import one.nem.lacerta.data.LacertaLibrary;
//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;
//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.path.DocumentPath; import one.nem.lacerta.model.document.path.DocumentPath;
//import one.nem.lacerta.utils.LacertaLogger; import one.nem.lacerta.utils.LacertaLogger;
//
//import com.github.javafaker.DateAndTime; import com.github.javafaker.DateAndTime;
//import com.github.javafaker.Faker; import com.github.javafaker.Faker;
//
//import java.text.DateFormat; import java.text.DateFormat;
//import java.util.ArrayList; import java.util.ArrayList;
//import java.util.Objects; import java.util.Objects;
//import java.util.UUID; import java.util.UUID;
//
//import javax.inject.Inject; import javax.inject.Inject;
//
///** /**
// * LacertaLibraryのスタブ実装 * LacertaLibraryのスタブ実装
// */ */
//public class LacertaLibraryStubImpl implements LacertaLibrary { public class LacertaLibraryStubImpl implements LacertaLibrary {
//
// LacertaLogger logger; LacertaLogger logger;
//
// Faker faker; Faker faker;
//
// @Inject @Inject
// public LacertaLibraryStubImpl(LacertaLogger logger) { public LacertaLibraryStubImpl(LacertaLogger logger) {
// faker = new Faker(); // Init Faker faker = new Faker(); // Init Faker
// this.logger = logger; this.logger = logger;
// logger.debug("LibraryStub", "Initialized"); logger.debug("LibraryStub", "Initialized");
// } }
//
// // Internal Methods // Internal Methods
//
// // Generate Stub Data // Generate Stub Data
// private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) { private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
// logger.debug("LibraryStub", "generateStubLibraryItemPage"); logger.debug("LibraryStub", "generateStubLibraryItemPage");
// ArrayList<ListItem> listItems = new ArrayList<>(); ArrayList<ListItem> listItems = new ArrayList<>();
// int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定 int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
// int folderTotal; int folderTotal;
// // フォルダ数の抽選 // フォルダ数の抽選
// if (itemTotal > 4) { if (itemTotal > 4) {
// folderTotal = faker.number().numberBetween(1, itemTotal - 2); folderTotal = faker.number().numberBetween(1, itemTotal - 2);
// } }
// else { else {
// if (itemTotal > 2) { if (itemTotal > 2) {
// folderTotal = 1; folderTotal = 1;
// } }
// else { // ドキュメント数がゼロにならないように else { // ドキュメント数がゼロにならないように
// folderTotal = 0; folderTotal = 0;
// } }
// } }
// int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定 int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
// logger.debug("LibraryStub", "itemTotal: " + itemTotal); logger.debug("LibraryStub", "itemTotal: " + itemTotal);
// logger.debug("LibraryStub", "folderTotal: " + folderTotal); logger.debug("LibraryStub", "folderTotal: " + folderTotal);
// logger.debug("LibraryStub", "documentTotal: " + documentTotal); logger.debug("LibraryStub", "documentTotal: " + documentTotal);
//
// // フォルダを生成 // フォルダを生成
// for (int i = 0; i < folderTotal; i++) { for (int i = 0; i < folderTotal; i++) {
// listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER)); listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
// } }
// // ドキュメントを生成 // ドキュメントを生成
// for (int i = 0; i < documentTotal; i++) { for (int i = 0; i < documentTotal; i++) {
// listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT)); listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
// } }
//
// LibraryItemPage libraryItemPage = new LibraryItemPage(); LibraryItemPage libraryItemPage = new LibraryItemPage();
// libraryItemPage.setListItems(listItems); libraryItemPage.setListItems(listItems);
// if (pageId == null) { if (pageId == null) {
// libraryItemPage.setPageId(UUID.randomUUID().toString()); libraryItemPage.setPageId(UUID.randomUUID().toString());
// } else { } else {
// libraryItemPage.setPageId(pageId); libraryItemPage.setPageId(pageId);
// } }
// libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3)); libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
//
// return libraryItemPage; return libraryItemPage;
// } }
//
// private ListItem generateStubListItem(ListItemType itemType) { private ListItem generateStubListItem(ListItemType itemType) {
// if (itemType == ListItemType.ITEM_TYPE_FOLDER) { if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
// ListItem listItem = new ListItem(); ListItem listItem = new ListItem();
// listItem.setTitle("FakeFolder" + faker.number().digits(3)); listItem.setTitle("FakeFolder" + faker.number().digits(3));
// listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday())); listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
// listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER); listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
// listItem.setItemId(UUID.randomUUID().toString()); listItem.setItemId(UUID.randomUUID().toString());
// return listItem; return listItem;
// } else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) { } else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
// ListItem listItem = new ListItem(); ListItem listItem = new ListItem();
// listItem.setTitle("FakeDocument" + faker.book().title()); listItem.setTitle("FakeDocument" + faker.book().title());
// listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday())); listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
// listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT); listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
// listItem.setItemId(UUID.randomUUID().toString()); listItem.setItemId(UUID.randomUUID().toString());
// return listItem; return listItem;
// } else { } else {
// return null; return null;
// } }
// } }
//
// private LibraryItemPage getRecentDocumentPage(int limit) { private LibraryItemPage getRecentDocumentPage(int limit) {
// int itemTotal = faker.number().numberBetween(1, limit); int itemTotal = faker.number().numberBetween(1, limit);
// ArrayList<ListItem> listItems = new ArrayList<>(); ArrayList<ListItem> listItems = new ArrayList<>();
// for (int i = 0; i < itemTotal; i++) { for (int i = 0; i < itemTotal; i++) {
// listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT)); listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
// } }
// // DescriptionからDateを抽出して新しい順にソート // DescriptionからDateを抽出して新しい順にソート
// listItems.sort((a, b) -> { listItems.sort((a, b) -> {
// String aDate = a.getDescription().substring(11); String aDate = a.getDescription().substring(11);
// String bDate = b.getDescription().substring(11); String bDate = b.getDescription().substring(11);
// return bDate.compareTo(aDate); return bDate.compareTo(aDate);
// }); });
// LibraryItemPage libraryItemPage = new LibraryItemPage(); LibraryItemPage libraryItemPage = new LibraryItemPage();
// libraryItemPage.setListItems(listItems); libraryItemPage.setListItems(listItems);
// libraryItemPage.setPageId(UUID.randomUUID().toString()); libraryItemPage.setPageId(UUID.randomUUID().toString());
// libraryItemPage.setPageTitle("RecentDocument"); libraryItemPage.setPageTitle("RecentDocument");
// return libraryItemPage; return libraryItemPage;
// } }
//
// private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException { private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
//
// if (Objects.isNull(id)) { if (Objects.isNull(id)) {
// throw new IllegalArgumentException("id is null"); throw new IllegalArgumentException("id is null");
// } }
//
// DocumentMeta documentMeta = new DocumentMeta(); DocumentMeta documentMeta = new DocumentMeta();
// documentMeta.setId(id); documentMeta.setId(id);
// documentMeta.setTitle("FakeDocument" + faker.book().title()); documentMeta.setTitle("FakeDocument" + faker.book().title());
// documentMeta.setCreatedAt(faker.date().birthday()); documentMeta.setCreatedAt(faker.date().birthday());
// documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする? documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする?
// ArrayList<String> tagIds = new ArrayList<>(); ArrayList<String> tagIds = new ArrayList<>();
//
// DocumentDetail documentDetail = new DocumentDetail(); DocumentDetail documentDetail = new DocumentDetail();
// documentDetail.setMeta(documentMeta); documentDetail.setMeta(documentMeta);
//// documentDetail.setPath(null); // TODO-rca: なんとかする documentDetail.setPath(null); // TODO-rca: なんとかする
//// documentDetail.setAuthor(faker.name().fullName()); documentDetail.setAuthor(faker.name().fullName());
//// documentDetail.setRepository(null); // TODO-rca: なんとかする documentDetail.setRepository(null); // TODO-rca: なんとかする
// return documentDetail; return documentDetail;
// } }
//
// /** /**
// * 履歴ページを取得する * 履歴ページを取得する
// * @param limit 取得するアイテム数 * @param limit 取得するアイテム数
// * @return ページオブジェクト * @return ページオブジェクト
// */ */
// @Override @Override
// public ArrayList<ListItem> getRecentDocument(int limit) { public LibraryItemPage getRecentDocument(int limit) {
// return getRecentDocumentPage(limit).getListItems(); return getRecentDocumentPage(limit);
// } }
//
// /** /**
// * 履歴ページを取得する * 履歴ページを取得する
// * @param limit 取得するアイテム数 * @param limit 取得するアイテム数
// * @param offset 取得するアイテムのオフセット * @param offset 取得するアイテムのオフセット
// * @return ページオブジェクト * @return ページオブジェクト
// */ */
// @Override @Override
// public ArrayList<ListItem> getRecentDocument(int limit, int offset) { public LibraryItemPage getRecentDocument(int limit, int offset) {
// return getRecentDocumentPage(limit).getListItems(); return getRecentDocumentPage(limit);
// } }
//
// /** /**
// * ライブラリページを取得する * ライブラリページを取得する
// * @param limit 取得するアイテム数 * @param limit 取得するアイテム数
// * @return ページオブジェクト * @return ページオブジェクト
// */ */
// @Override @Override
// public LibraryItemPage getLibraryPage(int limit) { public LibraryItemPage getLibraryPage(int limit) {
// return generateStubLibraryItemPage(limit, null); return generateStubLibraryItemPage(limit, null);
// } }
//
// /** /**
// * ライブラリページを取得する * ライブラリページを取得する
// * @param limit 取得するアイテム数 * @param limit 取得するアイテム数
// * @param offset 取得するアイテムのオフセット * @param offset 取得するアイテムのオフセット
// * @return ページオブジェクト * @return ページオブジェクト
// */ */
// @Override @Override
// public LibraryItemPage getLibraryPage(int limit, int offset) { public LibraryItemPage getLibraryPage(int limit, int offset) {
// return generateStubLibraryItemPage(limit, null); return generateStubLibraryItemPage(limit, null);
// } }
//
// /** /**
// * ライブラリページを取得する * ライブラリページを取得する
// * @param pageId ページID * @param pageId ページID
// * @param limit 取得するアイテム数 * @param limit 取得するアイテム数
// * @return ページオブジェクト * @return ページオブジェクト
// */ */
// @Override @Override
// public LibraryItemPage getLibraryPage(String pageId, int limit) { public LibraryItemPage getLibraryPage(String pageId, int limit) {
// return generateStubLibraryItemPage(limit, pageId); return generateStubLibraryItemPage(limit, pageId);
// } }
//
// /** /**
// * ライブラリページを取得する * ライブラリページを取得する
// * @param pageId ページID * @param pageId ページID
// * @param limit 取得するアイテム数 * @param limit 取得するアイテム数
// * @param offset 取得するアイテムのオフセット * @param offset 取得するアイテムのオフセット
// * @return ページオブジェクト * @return ページオブジェクト
// */ */
// @Override @Override
// public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) { public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
// return generateStubLibraryItemPage(limit, pageId); return generateStubLibraryItemPage(limit, pageId);
// } }
//
// /** /**
// * ドキュメント詳細を取得する * ドキュメント詳細を取得する
// * @param id ドキュメントID * @param id ドキュメントID
// * @return ドキュメント詳細オブジェクト * @return ドキュメント詳細オブジェクト
// */ */
// @Override @Override
// public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException { public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
// return generateStubDocumentDetail(id); return generateStubDocumentDetail(id);
// } }
//} }
@@ -30,10 +30,9 @@ public class LacertaSearchStubImpl implements LacertaSearch {
*/ */
@Override @Override
public ArrayList<ListItem> autoSearch(String query, int limit) { public ArrayList<ListItem> autoSearch(String query, int limit) {
// logger.debug("SearchStub", "autoSearch"); logger.debug("SearchStub", "autoSearch");
// logger.debug("SearchStub", "query: " + query); logger.debug("SearchStub", "query: " + query);
// return library.getLibraryPage(limit).getListItems(); return library.getLibraryPage(limit).getListItems();
return null;
} }
/** /**
@@ -45,9 +44,8 @@ public class LacertaSearchStubImpl implements LacertaSearch {
*/ */
@Override @Override
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) { public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
// logger.debug("SearchStub", "autoSearch"); logger.debug("SearchStub", "autoSearch");
// logger.debug("SearchStub", "query: " + query); logger.debug("SearchStub", "query: " + query);
// return library.getLibraryPage(limit, offset).getListItems(); return library.getLibraryPage(limit, offset).getListItems();
return null;
} }
} }
@@ -0,0 +1,16 @@
package one.nem.lacerta.data.module;
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.components.SingletonComponent;
import one.nem.lacerta.data.DocumentDebug;
import one.nem.lacerta.data.impl.DocumentDebugImpl;
@Module
@InstallIn(SingletonComponent.class) // TODO-rca: Singletonでいいのか検討する
abstract public class DocumentDebugModule {
@Binds
public abstract DocumentDebug bindDocumentDebug(DocumentDebugImpl documentDebugImpl);
}
@@ -7,7 +7,7 @@ import dagger.hilt.android.components.FragmentComponent;
import dagger.hilt.migration.DisableInstallInCheck; import dagger.hilt.migration.DisableInstallInCheck;
import one.nem.lacerta.data.LacertaLibrary; import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.data.impl.LacertaLibraryImpl; import one.nem.lacerta.data.impl.LacertaLibraryStubImpl;
import one.nem.lacerta.utils.LacertaLogger; import one.nem.lacerta.utils.LacertaLogger;
@Module @Module
@@ -16,6 +16,6 @@ import one.nem.lacerta.utils.LacertaLogger;
abstract public class LacertaLibraryModule { abstract public class LacertaLibraryModule {
@Binds @Binds
public abstract LacertaLibrary bindLacertaLibrary(LacertaLibraryImpl impl); public abstract LacertaLibrary bindLacertaLibrary(LacertaLibraryStubImpl impl);
} }
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
android { android {
namespace 'one.nem.lacerta.feature.common' namespace 'one.nem.lacerta.feature.common'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".DebugMenuContainerActivity"
android:exported="false" />
</application>
</manifest> </manifest>
@@ -0,0 +1,81 @@
package one.nem.lacerta.feature.debug;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuDocumentListItemAdapter;
import one.nem.lacerta.feature.debug.common.model.DebugMenuDocumentListItem;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.utils.LacertaLogger;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuDocumentTesterListFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMenuDocumentTesterListFragment extends Fragment {
@Inject
Document document;
@Inject
LacertaLogger logger;
public DebugMenuDocumentTesterListFragment() {
// Required empty public constructor
}
public static DebugMenuDocumentTesterListFragment newInstance() {
DebugMenuDocumentTesterListFragment fragment = new DebugMenuDocumentTesterListFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_list, container, false);
RecyclerView recyclerView = view.findViewById(R.id.recycler_view_document_list);
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
ArrayList<DocumentMeta> documentMetas = document.getAllDocumentMetas(100);
logger.debug("Debug/DocList", "Document count: " + documentMetas.size());
List<DebugMenuDocumentListItem> debugMenuDocumentListItems = new ArrayList<>();
for (DocumentMeta documentMeta : documentMetas) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
debugMenuDocumentListItems.add(new DebugMenuDocumentListItem(documentMeta.getTitle(), "Internal Id: " + documentMeta.getId(), simpleDateFormat.format(documentMeta.getUpdatedAt())));
}
DebugMenuDocumentListItemAdapter adapter = new DebugMenuDocumentListItemAdapter(debugMenuDocumentListItems);
recyclerView.setAdapter(adapter);
return view;
}
}
@@ -0,0 +1,72 @@
package one.nem.lacerta.feature.debug;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.google.android.material.textfield.TextInputEditText;
import java.util.UUID;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import dagger.multibindings.IntKey;
import one.nem.lacerta.data.DocumentDebug;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.model.document.tag.DocumentTag;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuDocumentTesterManageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMenuDocumentTesterManageFragment extends Fragment {
@Inject
DocumentDebug documentDebug;
public DebugMenuDocumentTesterManageFragment() {
// Required empty public constructor
}
public static DebugMenuDocumentTesterManageFragment newInstance() {
DebugMenuDocumentTesterManageFragment fragment = new DebugMenuDocumentTesterManageFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_manage, container, false);
TextInputEditText editTextDocumentTitle = view.findViewById(R.id.edit_text_document_title);
view.findViewById(R.id.button_insert_test_data).setOnClickListener( v -> {
DocumentMeta meta = new DocumentMeta(editTextDocumentTitle != null ? editTextDocumentTitle.getText().toString() : "empty title"); // TODO-rca: Nullable
DocumentPath path = new DocumentPath("root", "test_path");
DocumentDetail detail = new DocumentDetail(meta, path, "test_author", "test_default_branch");
documentDebug.insertDocument(meta, detail);
});
return view;
}
}
@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>(); List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true)); debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true)); debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems); DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);
@@ -57,14 +57,13 @@ public class DebugMenuLibraryItemListPageFragment extends Fragment {
// Inflate the layout for this fragment // Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false); View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
// ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10); LibraryItemPage libraryItemPage = lacertaLibrary.getRecentDocument(10);
ArrayList<ListItem> listItems = new ArrayList<>(); for (ListItem listItem : libraryItemPage.getListItems()) {
for (ListItem listItem : listItems) {
System.out.println(listItem.getTitle()); System.out.println(listItem.getTitle());
} }
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view); RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
recyclerView.setAdapter(new ItemAdapter(listItems)); recyclerView.setAdapter(new ItemAdapter(libraryItemPage.getListItems()));
recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -49,8 +49,7 @@ public class DebugMenuTopFragment extends Fragment {
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>(); List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true)); debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
debugMenuListItems.add(new DebugMenuListItem("ScannerStub", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true)); debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerManagerFragment, true));
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true)); debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true)); debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true));
@@ -4,13 +4,13 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ScannerManagerFragment"> tools:context=".DebugMenuDocumentTesterListFragment" >
<Button <androidx.recyclerview.widget.RecyclerView
android:id="@+id/button_intent_scanner_manager_activity" android:id="@+id/recycler_view_document_list"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:text="Button" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DebugMenuDocumentTesterManageFragment" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_margin="16dp"
android:background="@drawable/rounded_secondary_container">
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textSize="16sp"
android:textColor="@color/colorOnSecondaryContainer"
android:text="Debug actions" />
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Document title"
android:id="@+id/edit_text_document_title"
android:layout_margin="16dp"
android:inputType="text"
android:textSize="16sp"
style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_insert_test_data"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="Insert test data"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -11,7 +11,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="16sp" android:textSize="16sp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="Placeholder Title"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -20,11 +19,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
android:text="Placeholder Description"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" /> app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -22,16 +22,29 @@
<action <action
android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment" android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
app:destination="@id/debugMenuVcsGeneralFragment" /> app:destination="@id/debugMenuVcsGeneralFragment" />
<action
android:id="@+id/action_debugMenuTopFragment_to_scannerManagerFragment"
app:destination="@id/scannerManagerFragment" />
</fragment> </fragment>
<fragment <fragment
android:id="@+id/debugMenuDocumentTesterTopFragment" android:id="@+id/debugMenuDocumentTesterTopFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment" android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
android:label="fragment_debug_menu_document_tester_top" android:label="fragment_debug_menu_document_tester_top"
tools:layout="@layout/fragment_debug_menu_document_tester_top" > tools:layout="@layout/fragment_debug_menu_document_tester_top" >
<action
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment"
app:destination="@id/debugMenuDocumentTesterListFragment" />
<action
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment"
app:destination="@id/debugMenuDocumentTesterManageFragment" />
</fragment> </fragment>
<fragment
android:id="@+id/debugMenuDocumentTesterListFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterListFragment"
android:label="fragment_debug_menu_document_tester_list"
tools:layout="@layout/fragment_debug_menu_document_tester_list" />
<fragment
android:id="@+id/debugMenuDocumentTesterManageFragment"
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterManageFragment"
android:label="fragment_debug_menu_document_tester_manage"
tools:layout="@layout/fragment_debug_menu_document_tester_manage" />
<fragment <fragment
android:id="@+id/scannerDataManagerStubFragment" android:id="@+id/scannerDataManagerStubFragment"
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment" android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
@@ -71,8 +84,4 @@
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment" android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment"
android:label="fragment_debug_menu_vcs_rev_record" android:label="fragment_debug_menu_vcs_rev_record"
tools:layout="@layout/fragment_debug_menu_vcs_rev_record" /> tools:layout="@layout/fragment_debug_menu_vcs_rev_record" />
<fragment
android:id="@+id/scannerManagerFragment"
android:name="one.nem.lacerta.component.scanner.ScannerManagerFragment"
android:label="ScannerManagerFragment" />
</navigation> </navigation>
+1 -20
View File
@@ -1,11 +1,10 @@
plugins { plugins {
id 'com.google.dagger.hilt.android'
id 'com.android.library' id 'com.android.library'
} }
android { android {
namespace 'one.nem.lacerta.feature.home' namespace 'one.nem.lacerta.feature.home'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -30,8 +29,6 @@ dependencies {
implementation libs.androidx.appcompat implementation libs.androidx.appcompat
implementation libs.com.google.android.material implementation libs.com.google.android.material
implementation project(path: ':feature:debug')
implementation project(path: ':utils')
testImplementation libs.junit testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.espresso.core
@@ -41,22 +38,6 @@ dependencies {
implementation libs.navigation.ui implementation libs.navigation.ui
implementation libs.navigation.dynamic.features.fragment implementation libs.navigation.dynamic.features.fragment
// DI
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
// shared // shared
implementation project(':shared:ui') implementation project(':shared:ui')
// DI
implementation project(':data')
//model
implementation project(':model')
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation project(':component:common')
implementation project(':component:viewer')
} }
@@ -22,7 +22,5 @@ public class ExampleInstrumentedTest {
// Context of the app under test. // Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName()); assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName());
} }
} }
@@ -1,5 +0,0 @@
package one.nem.lacerta.feature.home;
public interface DocumentSelectListener {
void onDocumentSelect(String documentId);
}
@@ -1,132 +1,64 @@
package one.nem.lacerta.feature.home; package one.nem.lacerta.feature.home;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.viewer.ViewerMainActivity;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.document.DocumentMeta;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
* Use the {@link HomeTopFragment#newInstance} factory method to * Use the {@link HomeTopFragment#newInstance} factory method to
* create an instance of this fragment. * create an instance of this fragment.
*/ */
@AndroidEntryPoint
public class HomeTopFragment extends Fragment { public class HomeTopFragment extends Fragment {
@Inject // TODO: Rename parameter arguments, choose names that match
LacertaLibrary lacertaLibrary; // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public HomeTopFragment() { public HomeTopFragment() {
// Required empty public constructor // Required empty public constructor
} }
public static HomeTopFragment newInstance() { /**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment HomeTopFragment.
*/
// TODO: Rename and change types and number of parameters
public static HomeTopFragment newInstance(String param1, String param2) {
HomeTopFragment fragment = new HomeTopFragment(); HomeTopFragment fragment = new HomeTopFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment // Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_home_top, container, false); return inflater.inflate(R.layout.fragment_home_top, container, false);
return view;
} }
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
ListItemAdapter listItemAdapter = new ListItemAdapter(documentId -> {
Log.d("HomeTopFragment", "onViewCreated: " + documentId);
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
intent.putExtra("documentId", documentId);
startActivity(intent);
});
recyclerView.setAdapter(listItemAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
listItemAdapter.setListItems(listItems);
getActivity().runOnUiThread(() -> {
listItemAdapter.notifyItemRangeInserted(0, listItems.size());
});
});
CollapsingToolbarLayout collapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
Toolbar toolbar = view.findViewById(R.id.toolbar);
// Set the Toolbar
((AppCompatActivity)getActivity()).setSupportActionBar(toolbar);
// Set the title of the CollapsingToolbarLayout
collapsingToolbarLayout.setTitle("Lacerta");
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getActivity(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getActivity(), one.nem.lacerta.shared.ui.R.color.colorSurface));
} else {
// Somewhere in between
// Here you can add a color transition if you want
}
}
});
}
}
@@ -1,73 +0,0 @@
package one.nem.lacerta.feature.home;
import android.content.Intent;
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.viewer.ViewerMainActivity;
import one.nem.lacerta.model.ListItem;
public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
ArrayList<ListItem> listItems;
DocumentSelectListener listener;
public ListItemAdapter(DocumentSelectListener listener){
this.listItems = new ArrayList<>();
this.listener = listener;
}
public void setListItems(ArrayList<ListItem> listItems) {
this.listItems = listItems;
}
@NonNull
@Override
public ListItemAdapter.ListItemViewHolder 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 ListItemViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull ListItemAdapter.ListItemViewHolder holder, int position) {
ListItem listItem = listItems.get(position);
holder.icon.setImageResource(listItem.getItemType().getIconId());
holder.icon.setColorFilter(one.nem.lacerta.shared.ui.R.color.colorOnSurface);
holder.title.setText(listItem.getTitle());
holder.description.setText(listItem.getDescription());
holder.itemView.setOnClickListener( v -> {
Intent intent = new Intent(v.getContext(), ViewerMainActivity.class);
intent.putExtra("documentId", listItem.getItemId());
v.getContext().startActivity(intent);
});
}
@Override
public int getItemCount() {
return listItems.size();
}
public static class ListItemViewHolder extends RecyclerView.ViewHolder{
ImageView icon;
TextView title;
TextView description;
public ListItemViewHolder(@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,70 +0,0 @@
package one.nem.lacerta.feature.home;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import one.nem.lacerta.model.ListItem;
import one.nem.lacerta.model.document.DocumentMeta;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;
public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyAdapterViewHolder> {
ArrayList<ListItem> listItems;
public MyAdapter(ArrayList<ListItem> listItems) {
this.listItems = listItems;
}
@NonNull
@Override
public MyAdapterViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_home_document, parent, false);
return new MyAdapterViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull MyAdapterViewHolder holder, int position) {
holder.title.setText(listItems.get(position).getTitle());
holder.description.setText(listItems.get(position).getDescription());
}
@Override
public int getItemCount() {
return listItems.size();
}
public class MyAdapterViewHolder extends RecyclerView.ViewHolder {
TextView title;
TextView description;
public MyAdapterViewHolder(@NonNull View itemView) {
super(itemView);
title = itemView.findViewById(R.id.debug_menu_item_title);
description = itemView.findViewById(R.id.debug_menu_item_description);
}
}
}
@@ -1,50 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorSurface"> tools:context=".HomeTopFragment">
<androidx.coordinatorlayout.widget.CoordinatorLayout <!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="HOGE" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/home_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout> </FrameLayout>
@@ -1,36 +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:padding="16dp">
<TextView
android:id="@+id/debug_menu_item_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginEnd="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/debug_menu_item_description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
<TextView
android:id="@+id/debug_menu_item_updated_at_home"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="Updated at: aaaaaaaaaa"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/item_placeholder"
android:icon="@drawable/developer_mode_24px"
android:title="@string/placeholder" />
</menu>
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="my_recycler_view" type="id" />
<item name="TITLE" type="id" />
<item name="textView" type="id" />
</resources>
@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
@@ -1,5 +1,4 @@
<resources> <resources>
<!-- TODO: Remove or change this placeholder text --> <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<string name="textview">TextView</string>
</resources> </resources>
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
android { android {
namespace 'one.nem.lacerta.feature.library' namespace 'one.nem.lacerta.feature.library'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -25,8 +25,6 @@ import one.nem.lacerta.data.Document;
import one.nem.lacerta.model.document.DocumentMeta; import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.tag.DocumentTag; import one.nem.lacerta.model.document.tag.DocumentTag;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
* Use the {@link LibraryTopFragment#newInstance} factory method to * Use the {@link LibraryTopFragment#newInstance} factory method to
@@ -35,8 +33,8 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
@AndroidEntryPoint @AndroidEntryPoint
public class LibraryTopFragment extends Fragment { public class LibraryTopFragment extends Fragment {
// @Inject @Inject
// Document document; Document document;
// TODO: Rename parameter arguments, choose names that match // TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -92,13 +90,13 @@ public class LibraryTopFragment extends Fragment {
//データを取得 //データを取得
// List<DocumentMeta> metas = document.getAllDocumentMetas(100); List<DocumentMeta> metas = document.getAllDocumentMetas(100);
// Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
// Create and set the adapter // Create and set the adapter
// DocumentAdapter adapter = new DocumentAdapter(metas); DocumentAdapter adapter = new DocumentAdapter(metas);
// documentRecyclerView.setAdapter(adapter); documentRecyclerView.setAdapter(adapter);
// Use a LinearLayoutManager to specify the layout // Use a LinearLayoutManager to specify the layout
return view; return view;
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
android { android {
namespace 'one.nem.lacerta.feature.scan' namespace 'one.nem.lacerta.feature.scan'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
+6 -14
View File
@@ -4,7 +4,7 @@ plugins {
android { android {
namespace 'one.nem.lacerta.feature.search' namespace 'one.nem.lacerta.feature.search'
compileSdk 34 compileSdk 33
defaultConfig { defaultConfig {
minSdk 26 minSdk 26
@@ -27,17 +27,9 @@ android {
dependencies { dependencies {
implementation libs.androidx.appcompat implementation 'androidx.appcompat:appcompat:1.6.1'
implementation libs.com.google.android.material implementation 'com.google.android.material:material:1.10.0'
testImplementation libs.junit testImplementation 'junit:junit:4.13.2'
androidTestImplementation libs.androidx.test.ext.junit androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
// Navigation
implementation libs.navigation.fragment
implementation libs.navigation.ui
implementation libs.navigation.dynamic.features.fragment
// shared
implementation project(':shared:ui')
} }
@@ -1,142 +0,0 @@
package one.nem.lacerta.feature.search;
import android.app.LauncherActivity;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.SearchView;
import java.util.ArrayList;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SearchTopFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SearchTopFragment extends Fragment {
private static final String TAG = SearchTopFragment.class.getSimpleName();
private final SearchTopFragment self = this;
private SearchView searchView;
private String searchWord;
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public SearchTopFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment SearchTopFragment.
*/
// TODO: Rename and change types and number of parameters
public static SearchTopFragment newInstance(String param1, String param2) {
SearchTopFragment fragment = new SearchTopFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_search_top, container, false);
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
this.searchView.setIconifiedByDefault(true);
this.searchView.setSubmitButtonEnabled(false);
if (!this.searchWord.equals("")) {
this.searchView.setQuery(this.searchWord, false);
} else {
String queryHint = self.getResources().getString(R.string.hello_blank_fragment);
this.searchView.setQueryHint(queryHint);
}
this.searchView.setOnQueryTextListener(self.onQueryTextListener);
}
private final SearchView.OnQueryTextListener onQueryTextListener = new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
return self.setSearchWord(searchWord);
}
@Override
public boolean onQueryTextChange(String query) {
return false;
}
};
private boolean setSearchWord(String query) {
if (searchWord != null && !searchWord.equals("")) {
this.searchWord = searchWord;
}
this.searchView.setIconified(false);
this.searchView.onActionViewCollapsed();
this.searchView.clearFocus();
return false;
}
}
interface LacertaSearch {
ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit);
ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit, int offset);
}
@@ -1,27 +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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:context=".SearchTopFragment">
<!-- TODO: Update blank fragment layout -->
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/Search_tool_bar"
android:layout_width="match_parent"
android:layout_height="69dp"
android:background="#E4E8EA"
android:minHeight="?attr/actionBarSize"
android:theme="?attr/actionBarTheme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="" />
<SearchView
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/feature_search_navigation"
app:startDestination="@id/searchTopFragment">
<fragment
android:id="@+id/searchTopFragment"
android:name="one.nem.lacerta.feature.search.SearchTopFragment"
android:label="fragment_search_top"
tools:layout="@layout/fragment_search_top" />
</navigation>
@@ -1,4 +0,0 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
-1
View File
@@ -1 +0,0 @@
/build
-48
View File
@@ -1,48 +0,0 @@
plugins {
alias(libs.plugins.com.android.library)
}
android {
namespace 'one.nem.lacerta.setting'
compileSdk 34
defaultConfig {
minSdk 26
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
dependencies {
implementation libs.androidx.appcompat
implementation libs.com.google.android.material
testImplementation libs.junit
androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core
// Navigation
implementation libs.navigation.fragment
implementation libs.navigation.ui
implementation libs.navigation.dynamic.features.fragment
// DI
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
// shared
implementation project(':shared:ui')
}
-21
View File
@@ -1,21 +0,0 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
@@ -1,26 +0,0 @@
package one.nem.lacerta.setting;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("one.nem.lacerta.setting.test", appContext.getPackageName());
}
}
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
@@ -1,63 +0,0 @@
package one.nem.lacerta.setting;
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.navigation.Navigation;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import one.nem.lacerta.setting.model.SettingListItem;
public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
ArrayList<SettingListItem> listItems;
public ListItemAdapter(ArrayList<SettingListItem> listItems){
this.listItems = listItems;
}
@NonNull
@Override
public ListItemAdapter.ListItemViewHolder 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 ListItemViewHolder(view);
}
@Override
public void onBindViewHolder(@NonNull ListItemAdapter.ListItemViewHolder holder, int position) {
SettingListItem listItem = listItems.get(position);
holder.icon.setImageDrawable(listItem.getIcon());
holder.icon.setColorFilter(one.nem.lacerta.shared.ui.R.color.colorOnSurface);
holder.title.setText(listItem.getTitle());
holder.description.setText(listItem.getDescription());
holder.itemView.setOnClickListener( v -> {
Navigation.findNavController(v).navigate(listItem.getDestination());
});
}
@Override
public int getItemCount() {
return listItems.size();
}
public static class ListItemViewHolder extends RecyclerView.ViewHolder{
ImageView icon;
TextView title;
TextView description;
public ListItemViewHolder(@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,43 +0,0 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingAboutPageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SettingAboutPageFragment extends Fragment {
public SettingAboutPageFragment() {
// Required empty public constructor
}
public static SettingAboutPageFragment newInstance() {
SettingAboutPageFragment fragment = new SettingAboutPageFragment();
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_about_page, container, false);
return view;
}
}
@@ -1,40 +0,0 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingDataPageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SettingDataPageFragment extends Fragment {
public SettingDataPageFragment() {
// Required empty public constructor
}
public static SettingDataPageFragment newInstance() {
SettingDataPageFragment fragment = new SettingDataPageFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_setting_data_page, container, false);
}
}
@@ -1,40 +0,0 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingDisplayPageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SettingDisplayPageFragment extends Fragment {
public SettingDisplayPageFragment() {
// Required empty public constructor
}
public static SettingDisplayPageFragment newInstance() {
SettingDisplayPageFragment fragment = new SettingDisplayPageFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_setting_display_page, container, false);
}
}
@@ -1,41 +0,0 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingScanPageFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SettingScanPageFragment extends Fragment {
public SettingScanPageFragment() {
// Required empty public constructor
}
public static SettingScanPageFragment newInstance() {
SettingScanPageFragment fragment = new SettingScanPageFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
}
}
@@ -1,92 +0,0 @@
package one.nem.lacerta.setting;
import android.os.Bundle;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import java.util.ArrayList;
import one.nem.lacerta.setting.model.SettingListItem;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingTopFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SettingTopFragment extends Fragment {
public SettingTopFragment() {
// Required empty public constructor
}
public static SettingTopFragment newInstance() {
SettingTopFragment fragment = new SettingTopFragment();
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_top, container, false);
// Setting items
ArrayList<SettingListItem> settingListItems = new ArrayList<>();
settingListItems.add(
new SettingListItem(
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_display_title),
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_display_description),
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.palette_24px),
R.id.action_settingTopFragment_to_settingDisplayPageFragment
)
);
settingListItems.add(
new SettingListItem(
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_data_title),
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_data_description),
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.settings_backup_restore_24px),
R.id.action_settingTopFragment_to_settingDataPageFragment
)
);
settingListItems.add(
new SettingListItem(
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_scan_title),
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_scan_description),
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.document_scanner_24px),
R.id.action_settingTopFragment_to_settingScanPageFragment
)
);
settingListItems.add(
new SettingListItem(
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_title),
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_description),
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.info_24px),
R.id.action_settingTopFragment_to_settingAboutPageFragment
)
);
// Init RecyclerView
RecyclerView recyclerView = view.findViewById(R.id.setting_item_recycler_view);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(new ListItemAdapter(settingListItems));
return view;
}
}
@@ -1,34 +0,0 @@
package one.nem.lacerta.setting.model;
import android.graphics.drawable.Drawable;
public class SettingListItem {
String title;
String description;
Drawable icon;
int destination;
public SettingListItem(String title, String description, Drawable icon, int destination) {
this.title = title;
this.description = description;
this.icon = icon;
this.destination = destination;
}
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
public Drawable getIcon() {
return icon;
}
public int getDestination() {
return destination;
}
}
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingAboutPageFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingDataPageFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingDisplayPageFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingScanPageFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
@@ -1,50 +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.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
app:contentScrim="@color/colorSecondaryContainer"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="160dp"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
app:collapsedTitleGravity="start|center_vertical"
app:expandedTitleGravity="start|bottom"
app:expandedTitleMarginBottom="16dp"
app:expandedTitleMarginStart="16dp"
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:title="@string/setting_title" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/setting_item_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -1,61 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/feature_setting_navigation"
app:startDestination="@id/settingTopFragment">
<fragment
android:id="@+id/settingTopFragment"
android:name="one.nem.lacerta.setting.SettingTopFragment"
android:label="SettingTopFragment" >
<action
android:id="@+id/action_settingTopFragment_to_settingAboutPageFragment"
app:destination="@id/settingAboutPageFragment"
app:enterAnim="@anim/slide_from_right"
app:exitAnim="@anim/slide_to_left"
app:popEnterAnim="@anim/slide_from_left"
app:popExitAnim="@anim/slide_to_right" />
<action
android:id="@+id/action_settingTopFragment_to_settingDisplayPageFragment"
app:destination="@id/settingDisplayPageFragment"
app:enterAnim="@anim/slide_from_right"
app:exitAnim="@anim/slide_to_left"
app:popEnterAnim="@anim/slide_from_left"
app:popExitAnim="@anim/slide_to_right" />
<action
android:id="@+id/action_settingTopFragment_to_settingDataPageFragment"
app:destination="@id/settingDataPageFragment"
app:enterAnim="@anim/slide_from_right"
app:exitAnim="@anim/slide_to_left"
app:popEnterAnim="@anim/slide_from_left"
app:popExitAnim="@anim/slide_to_right" />
<action
android:id="@+id/action_settingTopFragment_to_settingScanPageFragment"
app:destination="@id/settingScanPageFragment"
app:enterAnim="@anim/slide_from_right"
app:exitAnim="@anim/slide_to_left"
app:popEnterAnim="@anim/slide_from_left"
app:popExitAnim="@anim/slide_to_right" />
</fragment>
<fragment
android:id="@+id/settingAboutPageFragment"
android:name="one.nem.lacerta.setting.SettingAboutPageFragment"
android:label="fragment_setting_about_page"
tools:layout="@layout/fragment_setting_about_page" />
<fragment
android:id="@+id/settingDataPageFragment"
android:name="one.nem.lacerta.setting.SettingDataPageFragment"
android:label="fragment_setting_data_page"
tools:layout="@layout/fragment_setting_data_page" />
<fragment
android:id="@+id/settingDisplayPageFragment"
android:name="one.nem.lacerta.setting.SettingDisplayPageFragment"
android:label="fragment_setting_display_page"
tools:layout="@layout/fragment_setting_display_page" />
<fragment
android:id="@+id/settingScanPageFragment"
android:name="one.nem.lacerta.setting.SettingScanPageFragment"
android:label="fragment_setting_scan_page"
tools:layout="@layout/fragment_setting_scan_page" />
</navigation>
@@ -1,4 +0,0 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
@@ -1,17 +0,0 @@
package one.nem.lacerta.setting;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}
@@ -65,10 +65,4 @@ public class PublicPath {
public String getStringPath() { public String getStringPath() {
return String.join("/", path); return String.join("/", path);
} }
public PublicPath getRoot() {
PublicPath root = new PublicPath();
root.add("/");
return root;
}
} }
@@ -3,14 +3,12 @@ package one.nem.lacerta.model.document;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import one.nem.lacerta.model.document.path.DocumentPath; import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.model.PublicPath;
import one.nem.lacerta.model.document.DocumentMeta; import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.page.Page;
/** /**
* ドキュメントの詳細データ * ドキュメントの詳細データ
*/ */
@@ -22,21 +20,31 @@ public class DocumentDetail {
DocumentMeta meta; DocumentMeta meta;
/** /**
* ドキュメントのページ(Pageインスタンスのリスト) * ユーザーが扱うパス
*/ */
ArrayList<Page> pages; PublicPath publicPath;
/**
* ドキュメントの作者(String)
*/
String author;
/**
* ドキュメントのデフォルトブランチ(String)
*/
String defaultBranch;
Repository repository;
// Constructor // Constructor
public DocumentDetail() { public DocumentDetail() {
} }
public DocumentDetail(DocumentMeta meta) { public DocumentDetail(DocumentMeta meta, PublicPath publicPath, String author, String defaultBranch) {
this.meta = meta; this.meta = meta;
} this.publicPath = publicPath;
this.author = author;
public DocumentDetail(DocumentMeta meta, ArrayList<Page> pages) { this.defaultBranch = defaultBranch;
this.meta = meta;
this.pages = pages;
} }
// Getter // Getter
@@ -49,12 +57,34 @@ public class DocumentDetail {
} }
/** /**
* ドキュメントのページ(Pageインスタンスのリスト)を取得する * ユーザーが扱うパスを取得する
*/ */
public ArrayList<Page> getPages() { public PublicPath getPublicPath() {
return pages; return publicPath;
} }
/**
* ドキュメントの作者(String)を取得する
*/
public String getAuthor() {
return author;
}
/**
* ドキュメントのデフォルトブランチ(String)を取得する
*/
public String getDefaultBranch() {
return defaultBranch;
}
/**
* ドキュメントのリポジトリを取得する
*/
public Repository getRepository() {
return repository;
}
// Setter // Setter
/** /**
@@ -66,13 +96,34 @@ public class DocumentDetail {
} }
/** /**
* ドキュメントのページ(Pageインスタンスのリスト)を設定する * ユーザーが扱うパスを設定する
* @param pages Pageインスタンスのリスト * @param publicPath ユーザーが扱うパス
*/ */
public void setPages(ArrayList<Page> pages) { public void setPublicPath(PublicPath publicPath) {
this.pages = pages; this.publicPath = publicPath;
} }
/**
* ドキュメントの作者(String)を設定する
* @param author ドキュメントの作者
*/
public void setAuthor(String author) {
this.author = author;
} }
/**
* ドキュメントのデフォルトブランチ(String)を設定する
* @param defaultBranch ドキュメントのデフォルトブランチ
*/
public void setDefaultBranch(String defaultBranch) {
this.defaultBranch = defaultBranch;
}
/**
* ドキュメントのリポジトリを設定する
*/
public void setRepository(Repository repository) {
this.repository = repository;
}
}
@@ -1,8 +1,6 @@
package one.nem.lacerta.model.document; package one.nem.lacerta.model.document;
import java.util.ArrayList; import java.util.ArrayList;
import one.nem.lacerta.model.PublicPath;
import one.nem.lacerta.model.document.tag.DocumentTag; import one.nem.lacerta.model.document.tag.DocumentTag;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -11,7 +9,7 @@ import java.util.UUID;
/** /**
* ドキュメントのメタデータ * ドキュメントのメタデータ
*/ */
public class DocumentMeta { // TODO-rca: JavaDoc対応 public class DocumentMeta {
/** /**
* ドキュメントのID(String) * ドキュメントのID(String)
*/ */
@@ -37,63 +35,42 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
*/ */
List<DocumentTag> tags; List<DocumentTag> tags;
PublicPath path;
String author;
String defaultBranch;
// Constructor // Constructor
public DocumentMeta() { public DocumentMeta() {
} }
public DocumentMeta(String title) { public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags) { // With all
this.id = UUID.randomUUID().toString(); this.id = id;
this.title = title; this.title = title;
this.updatedAt = updatedAt;
this.createdAt = createdAt;
this.tags = tags;
}
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt) { // Without tags
this.id = id;
this.title = title;
this.updatedAt = updatedAt;
this.createdAt = createdAt;
this.tags = new ArrayList<>(); this.tags = new ArrayList<>();
this.author = ""; // TODO-rca: 作者のデフォルト値を設定できるようにする }
this.defaultBranch = "main"; // TODO-rca: デフォルトブランチのデフォルト値を設定できるようにする
this.path = new PublicPath().getRoot(); public DocumentMeta(String id, String title) { // Without tags, updatedAt, createdAt
this.id = id;
this.title = title;
// 現在時刻を設定
this.updatedAt = new Date(); this.updatedAt = new Date();
this.createdAt = new Date(); this.createdAt = new Date();
this.tags = new ArrayList<>();
} }
public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) { public DocumentMeta(String title) { // title only
this.id = UUID.randomUUID().toString(); this.id = UUID.randomUUID().toString(); // 新規作成時想定なのでコンストラクタで生成してしまう(使う人が楽なので)
this.title = title; this.title = title;
this.tags = tags; // 現在時刻を設定
this.author = author; this.updatedAt = new Date();
this.defaultBranch = defaultBranch; this.createdAt = new Date();
} this.tags = new ArrayList<>();
public DocumentMeta(String id, String title, List<DocumentTag> tags, String author, String defaultBranch) {
this.id = id;
this.title = title;
this.tags = tags;
this.author = author;
this.defaultBranch = defaultBranch;
}
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String author, String defaultBranch) {
this.id = id;
this.title = title;
this.updatedAt = updatedAt;
this.createdAt = createdAt;
this.tags = tags;
this.author = author;
this.defaultBranch = defaultBranch;
}
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, String author, String defaultBranch) {
this.id = id;
this.title = title;
this.updatedAt = updatedAt;
this.createdAt = createdAt;
this.tags = tags;
this.path = path;
this.author = author;
this.defaultBranch = defaultBranch;
} }
// Getter // Getter
@@ -144,27 +121,6 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
return tagIds; return tagIds;
} }
/**
* PublicPathを取得する
*/
public PublicPath getPath() {
return path;
}
/**
* ドキュメントの作者(String)を取得する
*/
public String getAuthor() {
return author;
}
/**
* ドキュメントのデフォルトブランチ(String)を取得する
*/
public String getDefaultBranch() {
return defaultBranch;
}
// Setter // Setter
/** /**
@@ -207,30 +163,6 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
this.tags = tags; this.tags = tags;
} }
/**
* PublicPathを設定する
* @param path PublicPath
*/
public void setPath(PublicPath path) {
this.path = path;
}
/**
* ドキュメントの作者(String)を設定する
* @param author ドキュメントの作者
*/
public void setAuthor(String author) {
this.author = author;
}
/**
* ドキュメントのデフォルトブランチ(String)を設定する
* @param defaultBranch ドキュメントのデフォルトブランチ
*/
public void setDefaultBranch(String defaultBranch) {
this.defaultBranch = defaultBranch;
}
/** /**
* updatedAtを現在時刻に設定する * updatedAtを現在時刻に設定する
*/ */
@@ -4,8 +4,12 @@ import java.util.ArrayList;
public class XmlMetaModel { public class XmlMetaModel {
String revisionId; String title;
String author;
String description;
// Date created;
// Date updated;
String defaultBranch;
ArrayList<XmlMetaPageModel> pages; ArrayList<XmlMetaPageModel> pages;
// Constructor // Constructor
@@ -13,15 +17,31 @@ public class XmlMetaModel {
public XmlMetaModel() { public XmlMetaModel() {
} }
public XmlMetaModel(String revisionId, ArrayList<XmlMetaPageModel> pages) { public XmlMetaModel(String title, String author, String description, String defaultBranch, ArrayList<XmlMetaPageModel> pages) {
this.revisionId = revisionId; this.title = title;
this.author = author;
this.description = description;
this.defaultBranch = defaultBranch;
this.pages = pages; this.pages = pages;
} }
// Getter // Getter
public String getRevisionId() { public String getTitle() {
return revisionId; return title;
}
public String getAuthor() {
return author;
}
public String getDescription() {
return description;
}
public String getDefaultBranch() {
return defaultBranch;
} }
public ArrayList<XmlMetaPageModel> getPages() { public ArrayList<XmlMetaPageModel> getPages() {
@@ -30,11 +50,24 @@ public class XmlMetaModel {
// Setter // Setter
public void setRevisionId(String revisionId) { public void setTitle(String title) {
this.revisionId = revisionId; this.title = title;
}
public void setAuthor(String author) {
this.author = author;
}
public void setDescription(String description) {
this.description = description;
}
public void setDefaultBranch(String defaultBranch) {
this.defaultBranch = defaultBranch;
} }
public void setPages(ArrayList<XmlMetaPageModel> pages) { public void setPages(ArrayList<XmlMetaPageModel> pages) {
this.pages = pages; this.pages = pages;
} }
} }
@@ -1,39 +0,0 @@
package one.nem.lacerta.model.document.page;
import android.graphics.Bitmap;
public class Page {
String fileName;
Bitmap bitmap;
// Constructor
public Page() {
}
public Page(String fileName, Bitmap bitmap) {
this.fileName = fileName;
this.bitmap = bitmap;
}
// Getter
public String getFileName() {
return fileName;
}
public Bitmap getBitmap() {
return bitmap;
}
// Setter
public void setFileName(String fileName) {
this.fileName = fileName;
}
public void setBitmap(Bitmap bitmap) {
this.bitmap = bitmap;
}
}
-1
View File
@@ -44,5 +44,4 @@ dependencies {
implementation project(':source') implementation project(':source')
implementation project(':utils') implementation project(':utils')
implementation project(':data') implementation project(':data')
implementation project(':vcs')
} }
Loaded 100 of 146 files, more files were not shown because too many files have changed in this diff. Show more