Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c49062618e | ||
|
|
000a26645e |
No files matched your search
@@ -4,10 +4,10 @@
|
||||
<selectionStates>
|
||||
<SelectionState runConfigName="app">
|
||||
<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">
|
||||
<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>
|
||||
</Target>
|
||||
</DropdownSelection>
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="jbr-17" />
|
||||
<option name="modules">
|
||||
@@ -23,15 +22,14 @@
|
||||
<option value="$PROJECT_DIR$/feature/library" />
|
||||
<option value="$PROJECT_DIR$/feature/scan" />
|
||||
<option value="$PROJECT_DIR$/feature/search" />
|
||||
<option value="$PROJECT_DIR$/feature/setting" />
|
||||
<option value="$PROJECT_DIR$/model" />
|
||||
<option value="$PROJECT_DIR$/processor" />
|
||||
<option value="$PROJECT_DIR$/shared" />
|
||||
<option value="$PROJECT_DIR$/shared/icon" />
|
||||
<option value="$PROJECT_DIR$/shared/ui" />
|
||||
<option value="$PROJECT_DIR$/source" />
|
||||
<option value="$PROJECT_DIR$/utils" />
|
||||
<option value="$PROJECT_DIR$/vcs" />
|
||||
<option value="$PROJECT_DIR$/viewer2" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveExternalAnnotations" value="false" />
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
# 概要
|
||||
<!-- PRの概要 -->
|
||||
|
||||
# 関連Issue
|
||||
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||
|
||||
# 詳細
|
||||
<!-- 詳細 -->
|
||||
|
||||
# 影響箇所
|
||||
<!-- 予想される影響箇所 -->
|
||||
|
||||
# チェック
|
||||
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||
- [ ] 機能として完成している
|
||||
- [ ] WIP(Work in progress: 作業中)
|
||||
- [ ] 正常にビルド/起動ができる
|
||||
- [ ] 既存の機能を壊していない
|
||||
@@ -1,10 +1,8 @@
|
||||
# Lacerta
|
||||
学習に便利な機能とGit-like VCSを持ったドキュメントスキャナ (Work In Progress)
|
||||
(グループワーク)
|
||||
|
||||
WIP
|
||||
## モジュール設計
|
||||

|
||||
|
||||

|
||||
|
||||
## メモ
|
||||
- アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px)
|
||||
@@ -13,28 +11,45 @@
|
||||
### モジュール一覧
|
||||
- `component` : コンポーネント
|
||||
- `common` : 共通コンポーネント
|
||||
- UIの中で共通で使う要素(メニューアイテムとか)
|
||||
- `scanner` : スキャナー
|
||||
- スキャナーの実装
|
||||
- `viewer` : ビューワー
|
||||
- `data` : UIからデータを取得/保存するためのラッパーモジュール
|
||||
- ドキュメントビューワーの実装
|
||||
- `data` : データ
|
||||
- UIからデータを取得/保存するためのラッパーモジュール
|
||||
- `Document` : ドキュメント関係
|
||||
- WIP(JavaDocを参照してください, 余裕があったら追記します)
|
||||
- `feature` : 機能モジュール(ナビゲーションからみた機能で分割)
|
||||
- `common`: 共通機能
|
||||
- 設定画面とか、どこからでも呼ばれうる画面
|
||||
- `debug`: デバッグメニュー
|
||||
- `home`: ホーム画面
|
||||
- `library`: ライブラリ画面
|
||||
- `scan`: スキャン画面 (廃止予定)
|
||||
- `scan`: スキャン画面
|
||||
- `search`: 検索画面
|
||||
- `model` : データモデルをまとめたモジュール
|
||||
- `processor` : プロセッサ(例: `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり))
|
||||
- `shared`: 共有リソース
|
||||
- `ui`: UI要素(Theme, Drawable, Colorなど)
|
||||
- `source` : ソース(DB/FileManagerなど)
|
||||
- `utils` : ユーティリティ(ちょっとしたユーティリティをまとめたモジュール)
|
||||
- `model` : モデル
|
||||
- データモデルをまとめたモジュール (WIP)
|
||||
- `document` : ドキュメント
|
||||
- `meta` : メタデータ
|
||||
- `processor` : プロセッサ
|
||||
- いくつかの処理をまとめたモジュール
|
||||
- `DocumentProcessor` : ドキュメント処理(ドキュメントにページを追加したり更新したり)
|
||||
- `shared` :
|
||||
- 共有リソース
|
||||
- `source` : ソース
|
||||
- (バックエンドが使うのでとりあえず後回し、フロントから直接操作することは絶対にありません)
|
||||
- `utils` : ユーティリティ
|
||||
- ちょっとしたユーティリティをまとめたモジュール
|
||||
- `LacertaLogger` : ロガー
|
||||
- `XmlMetaParser` : XMLメタデータパーサー(フロントから直接操作することは絶対にありません)
|
||||
|
||||
|
||||
## コーディング規則/推奨(WIP)
|
||||
### 規則
|
||||
- `// TODO`コメントには任意のsuffixを付ける
|
||||
- 全員が同じ`// TODO:`を使っていると検索がむずかしくなるため
|
||||
- (例: `// TODO-rca:`)
|
||||
### 推奨
|
||||
- マジックナンバーは控える(必要な場合もあるので)
|
||||
|
||||
## Thanks for
|
||||
- [SDA-SE/document-scanner-android](https://github.com/SDA-SE/document-scanner-android)
|
||||
-
|
||||
@@ -14,8 +14,8 @@ android {
|
||||
|
||||
// ベータ, Internal, Release問わず毎回インクリメントする
|
||||
// https://developer.android.com/studio/publish/versioning#versioningsettings
|
||||
versionCode 2
|
||||
versionName "0.2.0"
|
||||
versionCode 1
|
||||
versionName "0.1.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@@ -59,6 +59,32 @@ dependencies {
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
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)
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
@@ -68,20 +94,4 @@ dependencies {
|
||||
implementation libs.navigation.ui
|
||||
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')
|
||||
|
||||
implementation project(':model')
|
||||
|
||||
implementation project(':utils')
|
||||
|
||||
implementation project(':component:scanner')
|
||||
}
|
||||
@@ -17,10 +17,10 @@
|
||||
android:allowBackup="true"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:fullBackupContent="@xml/backup_rules"
|
||||
android:icon="@mipmap/ic_launcher_final"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:name=".LacertaApplication"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_final_round"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Lacerta"
|
||||
tools:targetApi="31">
|
||||
|
||||
|
Before Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 6.2 KiB |
@@ -1,12 +1,10 @@
|
||||
package one.nem.lacerta;
|
||||
|
||||
import android.app.Application;
|
||||
import android.util.Log;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
|
||||
import dagger.hilt.android.HiltAndroidApp;
|
||||
import one.nem.lacerta.utils.FeatureSwitch;
|
||||
|
||||
@HiltAndroidApp
|
||||
public class LacertaApplication extends Application {
|
||||
@@ -14,17 +12,7 @@ public class LacertaApplication extends Application {
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
if (DynamicColors.isDynamicColorAvailable()) {
|
||||
Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
|
||||
if (FeatureSwitch.Meta.disableDynamicColor) {
|
||||
Log.d("DynamicColors", "DynamicColors is disabled by FeatureSwitch.");
|
||||
} else {
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
}
|
||||
} else {
|
||||
Log.d("DynamicColors", "DynamicColors is not available.");
|
||||
}
|
||||
|
||||
// DynamicColorを有効化
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,200 +1,40 @@
|
||||
package one.nem.lacerta;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.navigation.NavController;
|
||||
import androidx.navigation.NavOptions;
|
||||
import androidx.navigation.fragment.NavHostFragment;
|
||||
import androidx.navigation.ui.NavigationUI;
|
||||
|
||||
import android.app.ActivityOptions;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Color;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.widget.Toast;
|
||||
|
||||
import one.nem.lacerta.component.scanner.ScannerManagerActivity;
|
||||
import one.nem.lacerta.model.FragmentNavigation;
|
||||
import one.nem.lacerta.model.pref.FeatureSwitchOverride;
|
||||
import one.nem.lacerta.utils.FeatureSwitch;
|
||||
|
||||
import com.google.android.material.appbar.AppBarLayout;
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
|
||||
|
||||
import java.io.NotActiveException;
|
||||
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.utils.repository.SharedPrefUtils;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class MainActivity extends AppCompatActivity implements FragmentNavigation {
|
||||
|
||||
@Inject
|
||||
SharedPrefUtils sharedPrefUtils;
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
// Debug
|
||||
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||
|
||||
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||
NavController navController = navHostFragment.getNavController();
|
||||
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||
|
||||
// Initialize app
|
||||
if (sharedPrefUtils.getIsFirstLaunch()) initializeApp();
|
||||
|
||||
// Init navigation
|
||||
try {
|
||||
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||
assert navHostFragment != null;
|
||||
NavController navController = navHostFragment.getNavController();
|
||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||
|
||||
bottomNavigationView.setOnItemSelectedListener(item -> {
|
||||
NavOptions navOptions = new NavOptions.Builder()
|
||||
.setLaunchSingleTop(true)
|
||||
.setEnterAnim(androidx.navigation.ui.R.anim.nav_default_enter_anim)
|
||||
.setExitAnim(androidx.navigation.ui.R.anim.nav_default_exit_anim)
|
||||
.setPopEnterAnim(androidx.navigation.ui.R.anim.nav_default_pop_enter_anim)
|
||||
.setPopExitAnim(androidx.navigation.ui.R.anim.nav_default_pop_exit_anim)
|
||||
.build();
|
||||
|
||||
navController.navigate(item.getItemId(), null, navOptions);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
catch (Exception e) {
|
||||
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
|
||||
}
|
||||
|
||||
// Apply feature switch
|
||||
applyFeatureSwitch(bottomNavigationView, FeatureSwitchOverride.ENABLE_SEARCH, FeatureSwitch.FeatureMaster.enableSearch, one.nem.lacerta.feature.search.R.id.feature_search_navigation);
|
||||
applyFeatureSwitch(bottomNavigationView, FeatureSwitchOverride.ENABLE_DEBUG_MENU, FeatureSwitch.FeatureMaster.enableDebugMenu, one.nem.lacerta.feature.debug.R.id.feature_debug_navigation);
|
||||
|
||||
|
||||
// Set navigation bar color
|
||||
getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
|
||||
|
||||
// Set status bar color
|
||||
getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
|
||||
|
||||
// Fab
|
||||
findViewById(R.id.scanFab).setOnClickListener(v -> {
|
||||
Toast.makeText(this, "Scan", Toast.LENGTH_SHORT).show();
|
||||
Intent intent = new Intent(this.getApplicationContext(), ScannerManagerActivity.class);
|
||||
// startActivity(intent);
|
||||
startActivity(intent, ActivityOptions.makeCustomAnimation(this, one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim).toBundle());
|
||||
});
|
||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||
|
||||
Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||
if (requestCode == 1) {
|
||||
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||
Toast.makeText(this, "Permission granted", Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(this, "カメラの権限は必須です.", Toast.LENGTH_LONG).show();
|
||||
finish(); // Exit app
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void initializeApp() {
|
||||
Log.d("Init", "Initializing app");
|
||||
// Set feature switch override to default value
|
||||
sharedPrefUtils.setFeatureSwitchOverride(FeatureSwitchOverride.ENABLE_SEARCH, FeatureSwitch.FeatureMaster.enableSearch);
|
||||
sharedPrefUtils.setFeatureSwitchOverride(FeatureSwitchOverride.ENABLE_DEBUG_MENU, FeatureSwitch.FeatureMaster.enableDebugMenu);
|
||||
|
||||
// Set isFirstLaunch to false
|
||||
sharedPrefUtils.setIsFirstLaunch(false);
|
||||
}
|
||||
|
||||
private void applyFeatureSwitch(BottomNavigationView bottomNavigationView, FeatureSwitchOverride featureSwitchOverride, boolean defaultValue, int menuId) {
|
||||
boolean isEnabled = FeatureSwitch.Meta.canOverrideSwitch ? sharedPrefUtils.getFeatureSwitchOverride(featureSwitchOverride) : defaultValue;
|
||||
if (!isEnabled) bottomNavigationView.getMenu().removeItem(menuId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void navigateToFragment(Fragment fragment) {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.addToBackStack(null)
|
||||
.commit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void navigateToFragment(Fragment fragment, boolean addToBackStack) {
|
||||
if (addToBackStack) {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.addToBackStack(null)
|
||||
.commit();
|
||||
} else {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.commit();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack) {
|
||||
if (clearBackStack) {
|
||||
getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
|
||||
}
|
||||
if (addToBackStack) {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.addToBackStack(null)
|
||||
.commit();
|
||||
} else {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, fragment)
|
||||
.commit();
|
||||
}
|
||||
}
|
||||
|
||||
public void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack) {
|
||||
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
|
||||
|
||||
// get the current fragment
|
||||
Fragment currentFragment = getSupportFragmentManager().getPrimaryNavigationFragment();
|
||||
|
||||
// hide the current fragment
|
||||
if (currentFragment != null) {
|
||||
transaction.hide(currentFragment);
|
||||
}
|
||||
|
||||
// Add the new fragment
|
||||
transaction.add(R.id.nav_host_fragment, fragment);
|
||||
|
||||
// Add the transaction to the back stack if needed
|
||||
if (addToBackStack) {
|
||||
transaction.addToBackStack(null);
|
||||
}
|
||||
|
||||
// Commit the transaction
|
||||
transaction.commit();
|
||||
|
||||
// Update the primary navigation fragment
|
||||
getSupportFragmentManager().beginTransaction().setPrimaryNavigationFragment(fragment).commit();
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<group android:scaleX="0.37"
|
||||
android:scaleY="0.37"
|
||||
android:translateX="302.4"
|
||||
android:translateY="302.4">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M92.12,225.15L92.12,51.92L265.15,51.92L265.15,107.88L148.08,107.88L148.08,225.15L92.12,225.15ZM812.12,225.15L812.12,107.88L694.85,107.88L694.85,51.92L868.08,51.92L868.08,225.15L812.12,225.15ZM92.12,907.88L92.12,734.85L148.08,734.85L148.08,851.92L265.15,851.92L265.15,907.88L92.12,907.88ZM694.85,907.88L694.85,851.92L812.12,851.92L812.12,734.85L868.08,734.85L868.08,907.88L694.85,907.88ZM268.08,719.61Q268.08,724.42 271.83,728.17Q275.58,731.92 280.39,731.92L679.81,731.92Q684.42,731.92 688.27,728.17Q692.12,724.42 692.12,719.61L692.12,240.19Q692.12,235.58 688.27,231.73Q684.42,227.88 679.81,227.88L280.39,227.88Q275.58,227.88 271.83,231.73Q268.08,235.58 268.08,240.19L268.08,719.61ZM280.39,787.88Q251.74,787.88 231.93,768.07Q212.12,748.26 212.12,719.61L212.12,240.19Q212.12,211.76 231.93,191.84Q251.74,171.92 280.39,171.92L679.81,171.92Q708.24,171.92 728.16,191.84Q748.08,211.76 748.08,240.19L748.08,719.61Q748.08,748.26 728.16,768.07Q708.24,787.88 679.81,787.88L280.39,787.88ZM372.12,387.88L588.08,387.88L588.08,331.92L372.12,331.92L372.12,387.88ZM372.12,507.88L588.08,507.88L588.08,451.92L372.12,451.92L372.12,507.88ZM372.12,627.88L588.08,627.88L588.08,571.92L372.12,571.92L372.12,627.88ZM268.08,719.61L268.08,240.19Q268.08,235.58 268.08,231.73Q268.08,227.88 268.08,227.88L268.08,227.88Q268.08,227.88 268.08,231.73Q268.08,235.58 268.08,240.19L268.08,719.61Q268.08,724.42 268.08,728.17Q268.08,731.92 268.08,731.92L268.08,731.92Q268.08,731.92 268.08,728.17Q268.08,724.42 268.08,719.61Z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -1,15 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#5F4769">
|
||||
<group android:scaleX="0.377"
|
||||
android:scaleY="0.377"
|
||||
android:translateX="7.476"
|
||||
android:translateY="7.476">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -18,33 +18,15 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:navGraph="@navigation/main_nav"
|
||||
tools:layout="@layout/fragment_home_top" />
|
||||
tools:layout="@layout/fragment_debug_menu_container" />
|
||||
|
||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
android:id="@+id/bottom_nav"
|
||||
android:layout_width="0dp"
|
||||
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_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:menu="@menu/bottom_nav_menu" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/scanFab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="32dp"
|
||||
android:layout_marginBottom="32dp"
|
||||
android:clickable="true"
|
||||
app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:srcCompat="@drawable/ic_baseline_add_24" />
|
||||
|
||||
|
||||
app:menu="@menu/bottom_nav_menu"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -4,26 +4,17 @@
|
||||
<item
|
||||
android:id="@id/feature_home_navigation"
|
||||
android:icon="@drawable/home_24px"
|
||||
android:title="@string/home_title"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_search_navigation"
|
||||
android:icon="@drawable/search_24px"
|
||||
android:title="@string/search_title"/>
|
||||
android:title="Home"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_library_navigation"
|
||||
android:icon="@drawable/folder_24px"
|
||||
android:title="@string/library_title"/>
|
||||
android:title="Library"/>
|
||||
|
||||
<item
|
||||
android:id="@id/feature_debug_navigation"
|
||||
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>
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_final_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
|
||||
</adaptive-icon>
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_final_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_final_foreground"/>
|
||||
</adaptive-icon>
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_temp_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_temp_foreground"/>
|
||||
</adaptive-icon>
|
||||
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_temp_background"/>
|
||||
<foreground android:drawable="@drawable/ic_launcher_temp_foreground"/>
|
||||
</adaptive-icon>
|
||||
|
Before Width: | Height: | Size: 888 B |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 768 B |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 728 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 630 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 1004 B |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 6.9 KiB |
@@ -2,7 +2,7 @@
|
||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/app_main_nav"
|
||||
app:startDestination="@id/feature_home_navigation">
|
||||
app:startDestination="@id/feature_debug_navigation">
|
||||
|
||||
<include app:graph="@navigation/feature_debug_navigation" />
|
||||
|
||||
@@ -10,9 +10,5 @@
|
||||
|
||||
<include app:graph="@navigation/feature_home_navigation" />
|
||||
|
||||
<include app:graph="@navigation/feature_search_navigation" />
|
||||
|
||||
<include app:graph="@navigation/feature_setting_navigation" />
|
||||
|
||||
|
||||
</navigation>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_final_background">#B8D3C3</color>
|
||||
</resources>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_temp_background">#A386EB</color>
|
||||
</resources>
|
||||
@@ -1,11 +1,10 @@
|
||||
plugins {
|
||||
alias(libs.plugins.com.android.library)
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'one.nem.lacerta.component.common'
|
||||
compileSdk 34
|
||||
compileSdk 33
|
||||
|
||||
defaultConfig {
|
||||
minSdk 26
|
||||
@@ -33,15 +32,4 @@ dependencies {
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
|
||||
// Hilt (DI)
|
||||
implementation libs.com.google.dagger.hilt.android
|
||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||
|
||||
implementation project(':shared:ui')
|
||||
implementation project(':utils')
|
||||
implementation project(':model')
|
||||
implementation project(':data')
|
||||
|
||||
implementation project(':vcs')
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.CheckBox;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
public class LacertaApplyTagAdapter extends RecyclerView.Adapter<LacertaApplyTagAdapter.LacertaApplyTagViewHolder>{
|
||||
|
||||
// Listener
|
||||
public interface LacertaApplyTagDialogListener {
|
||||
void itemChecked(View view, String tagId);
|
||||
void itemUnchecked(View view, String tagId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
private ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList;
|
||||
private LacertaApplyTagDialogListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaApplyTagAdapter setListener(LacertaApplyTagDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagAdapter setDocumentTagArrayList(ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList) {
|
||||
this.documentTagArrayList = documentTagArrayList;
|
||||
return this;
|
||||
}
|
||||
|
||||
// Empty constructor
|
||||
public LacertaApplyTagAdapter() {
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public LacertaApplyTagAdapter.LacertaApplyTagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.apply_tag_list_item, parent, false);
|
||||
return new LacertaApplyTagAdapter.LacertaApplyTagViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull LacertaApplyTagAdapter.LacertaApplyTagViewHolder holder, int position) {
|
||||
DocumentTagApplyTagDialogExtendedModel documentTag = documentTagArrayList.get(position);
|
||||
if (holder.checkBox == null) {
|
||||
Log.d("LacertaApplyTagAdapter", "onBindViewHolder: holder.checkBox is null");
|
||||
}
|
||||
holder.checkBox.setText(documentTag.getName());
|
||||
holder.checkBox.setChecked(documentTag.getIsChecked());
|
||||
holder.checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
||||
if (isChecked) {
|
||||
listener.itemChecked(buttonView, documentTag.getId());
|
||||
} else {
|
||||
listener.itemUnchecked(buttonView, documentTag.getId());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return documentTagArrayList == null ? 0 : documentTagArrayList.size();
|
||||
}
|
||||
|
||||
public class LacertaApplyTagViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
CheckBox checkBox;
|
||||
|
||||
public LacertaApplyTagViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
checkBox = itemView.findViewById(R.id.tag_check_box);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,184 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.Checkable;
|
||||
import android.widget.EditText;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CompletionException;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.model.DocumentTagApplyTagDialogExtendedModel;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaApplyTagDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaApplyTagDialogListener {
|
||||
void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags);
|
||||
void onDialogNegativeClick();
|
||||
}
|
||||
|
||||
// Variables
|
||||
private String title;
|
||||
private String message;
|
||||
private String positiveButtonText;
|
||||
private String negativeButtonText;
|
||||
private String documentId;
|
||||
private LacertaApplyTagDialogListener listener;
|
||||
private ArrayList<DocumentTag> registeredTags;
|
||||
private ArrayList<DocumentTag> appliedTags;
|
||||
|
||||
// Setter
|
||||
|
||||
public LacertaApplyTagDialog setListener(LacertaApplyTagDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaApplyTagDialog setDocumentId(String documentId) {
|
||||
this.documentId = documentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_apply_tag, null);
|
||||
|
||||
// RecyclerView
|
||||
RecyclerView recyclerView = view.findViewById(R.id.apply_tag_list);
|
||||
|
||||
LacertaApplyTagAdapter lacertaApplyTagAdapter = new LacertaApplyTagAdapter();
|
||||
lacertaApplyTagAdapter.setListener(new LacertaApplyTagAdapter.LacertaApplyTagDialogListener() {
|
||||
@Override
|
||||
public void itemChecked(View view, String tagId) {
|
||||
applyChangeToVariable(true, tagId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void itemUnchecked(View view, String tagId) {
|
||||
applyChangeToVariable(false, tagId);
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setAdapter(lacertaApplyTagAdapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
|
||||
|
||||
getDocumentTagArrayList(documentId).thenAccept(documentTagArrayList -> {
|
||||
lacertaApplyTagAdapter.setDocumentTagArrayList(documentTagArrayList);
|
||||
lacertaApplyTagAdapter.notifyDataSetChanged(); // TODO-rca: アニメーション
|
||||
});
|
||||
|
||||
// Set the dialog title
|
||||
builder.setTitle(title)
|
||||
.setMessage(message)
|
||||
.setView(view)
|
||||
.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, id) -> {
|
||||
// Send the positive button event back to the host activity
|
||||
listener.onDialogPositiveClick(this.appliedTags);
|
||||
})
|
||||
.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, id) -> {
|
||||
// Send the negative button event back to the host activity
|
||||
listener.onDialogNegativeClick();
|
||||
});
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void applyChangeToVariable(boolean isChecked, String tagId) {
|
||||
if (isChecked) {
|
||||
this.registeredTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.add(tag));
|
||||
} else {
|
||||
this.appliedTags.stream().filter(tag -> tag.getId().equals(tagId)).findFirst().ifPresent(tag -> this.appliedTags.remove(tag));
|
||||
}
|
||||
}
|
||||
|
||||
private CompletableFuture<ArrayList<DocumentTagApplyTagDialogExtendedModel>> getDocumentTagArrayList(String documentId) {
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
|
||||
setRegisteredTagList().thenRun(() -> setAppliedTagList(documentId).join()).thenAccept(Void -> {
|
||||
logger.debug("getDocumentTagArrayList", "this.registeredTags.size(): " + this.registeredTags.size());
|
||||
logger.debug("getDocumentTagArrayList", "this.appliedTags.size(): " + this.appliedTags.size());
|
||||
|
||||
documentTagArrayList.addAll(this.registeredTags.stream().map(tag -> {
|
||||
DocumentTagApplyTagDialogExtendedModel documentTag = new DocumentTagApplyTagDialogExtendedModel(
|
||||
new DocumentTag(tag.getId(), tag.getName(), tag.getColor()),
|
||||
this.appliedTags.stream().anyMatch(appliedTag -> appliedTag.getId().equals(tag.getId()))
|
||||
);
|
||||
return documentTag;
|
||||
}).collect(Collectors.toCollection(ArrayList::new)));
|
||||
|
||||
}).join();
|
||||
return documentTagArrayList;
|
||||
});
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> setRegisteredTagList() {
|
||||
return CompletableFuture.runAsync(() -> {
|
||||
this.registeredTags = new ArrayList<>();
|
||||
this.lacertaLibrary.getTagList().thenAccept(documentTagList -> {
|
||||
for (int i = 0; i < documentTagList.size(); i++) {
|
||||
this.registeredTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
|
||||
}
|
||||
}).join();
|
||||
});
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> setAppliedTagList(String documentId) {
|
||||
return CompletableFuture.runAsync(() -> {
|
||||
this.appliedTags = new ArrayList<>();
|
||||
this.lacertaLibrary.getAppliedTagList(documentId).thenAccept(documentTagList -> {
|
||||
for (int i = 0; i < documentTagList.size(); i++) {
|
||||
this.appliedTags.add(new DocumentTag(documentTagList.get(i).getId(), documentTagList.get(i).getName(), documentTagList.get(i).getColor()));
|
||||
}
|
||||
}).join();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
public class LacertaCreateTagDialog extends DialogFragment {
|
||||
|
||||
private String title;
|
||||
|
||||
private String message;
|
||||
|
||||
private String positiveButtonText;
|
||||
|
||||
private String negativeButtonText;
|
||||
|
||||
private LacertaCreateTagDialogListener listener;
|
||||
|
||||
// Setter
|
||||
|
||||
public LacertaCreateTagDialog setListener(LacertaCreateTagDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaCreateTagDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_create_tag, null);
|
||||
|
||||
// TextEdit
|
||||
EditText tag_name_edit_text = view.findViewById(R.id.tag_name_edit_text);
|
||||
com.google.android.material.textfield.TextInputLayout tag_name_text_input_layout = view.findViewById(R.id.tag_name_text_input_layout);
|
||||
tag_name_text_input_layout.setHint("タグの名前");
|
||||
EditText tag_color_edit_text = view.findViewById(R.id.tag_color_edit_text);
|
||||
com.google.android.material.textfield.TextInputLayout tag_color_text_input_layout = view.findViewById(R.id.tag_color_text_input_layout);
|
||||
tag_color_text_input_layout.setHint("タグの色(カラーコード)");
|
||||
|
||||
builder.setTitle(this.title == null ? "Create new tag" : this.title);
|
||||
|
||||
// Button
|
||||
builder.setPositiveButton(positiveButtonText == null ? "OK" : positiveButtonText, (dialog, which) -> {
|
||||
String tag_name = tag_name_edit_text.getText().toString();
|
||||
String tag_color = tag_color_edit_text.getText().toString();
|
||||
if (listener != null) {
|
||||
listener.onPositiveClick(tag_name, tag_color);
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onNegativeClick();
|
||||
}
|
||||
});
|
||||
|
||||
builder.setView(view);
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaCreateTagDialogListener {
|
||||
|
||||
void onPositiveClick(String tag_name, String tag_color);
|
||||
|
||||
void onNegativeClick();
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public class LacertaEditMetaDialog {
|
||||
}
|
||||
@@ -1,163 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaSelectDirDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
private LacertaSelectDirDialogListener listener;
|
||||
|
||||
private String title;
|
||||
|
||||
private String message;
|
||||
|
||||
private String positiveButtonText;
|
||||
|
||||
private String negativeButtonText;
|
||||
|
||||
private SelectDirDialogItemAdapter adapter;
|
||||
|
||||
private RecyclerView recyclerView;
|
||||
|
||||
private TextView current_dir_text_view;
|
||||
|
||||
// Setter
|
||||
|
||||
public LacertaSelectDirDialog setListener(LacertaSelectDirDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectDirDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_select_dir, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
this.recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
||||
this.current_dir_text_view = view.findViewById(R.id.current_dir_text_view);
|
||||
|
||||
this.adapter = new SelectDirDialogItemAdapter(new LacertaSelectDirDialogInternalEventListener() {
|
||||
@Override
|
||||
public void onDirSelected(String name, String itemId) {
|
||||
showRecyclerViewItem(itemId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackSelected(String parentId) {
|
||||
showRecyclerViewItem(parentId);
|
||||
}
|
||||
});
|
||||
|
||||
this.recyclerView.setAdapter(this.adapter);
|
||||
builder.setView(view);
|
||||
|
||||
showRecyclerViewItem(null); // get root folder
|
||||
|
||||
builder.setTitle(this.title == null ? "Select a directory" : this.title);
|
||||
builder.setMessage(this.message == null ? "Select a directory" : this.message);
|
||||
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onDirSelected(
|
||||
adapter.getCurrentPageTitle() == null ? null : adapter.getCurrentPageTitle(),
|
||||
adapter.getCurrentId() == null ? null : adapter.getCurrentId());
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(this.negativeButtonText == null ? "Cancel" : this.negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onCanceled();
|
||||
}
|
||||
});
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void showRecyclerViewItem(String targetDirId) {
|
||||
lacertaLibrary.getPublicPath(targetDirId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
if (publicPath != null) {
|
||||
current_dir_text_view.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPathの実装を修正する
|
||||
} else {
|
||||
current_dir_text_view.setText("/");
|
||||
}
|
||||
});
|
||||
});
|
||||
lacertaLibrary.getFolderList(targetDirId).thenAccept(libraryItemPage -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
int currentCount = adapter.getItemCount();
|
||||
String currentDirId = adapter.getCurrentId();
|
||||
if (currentDirId == null) {
|
||||
// Rootが関わる推移 (Rootからの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() == null) {
|
||||
// Rootが関わる推移 (Rootへの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() != null) {
|
||||
// Rootが関わらない推移
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(1, currentCount);
|
||||
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
|
||||
} else {
|
||||
// その他の遷移(安全側に倒すため全アイテム更新)
|
||||
logger.warn("LacertaSelectDirDialog", "Unknown transition.");
|
||||
logger.warn("LacertaSelectDirDialog", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectDirDialogInternalEventListener {
|
||||
void onDirSelected(String name, String itemId);
|
||||
void onBackSelected(String parentId);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectDirDialogListener {
|
||||
|
||||
void onDirSelected(String name, String itemId);
|
||||
void onCanceled();
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaSelectRevDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
String title;
|
||||
String documentId;
|
||||
String message;
|
||||
String negativeButtonText;
|
||||
|
||||
LacertaSelectRevDialogListener listener;
|
||||
|
||||
public LacertaSelectRevDialog setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setDocumentId(String documentId) {
|
||||
this.documentId = documentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaSelectRevDialog setListener(LacertaSelectRevDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
LayoutInflater inflater = requireActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.lacerta_dialog_select_rev, null);
|
||||
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.select_rev_recycler_view);
|
||||
|
||||
SelectRevDialogItemAdapter adapter = new SelectRevDialogItemAdapter(revId -> {
|
||||
if (listener != null) {
|
||||
listener.onItemSelected(revId);
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
builder.setView(view);
|
||||
|
||||
if (this.documentId == null) {
|
||||
logger.error("SelectRevDialog", "documentId is null");
|
||||
logger.e_code("0296fb0c-07a3-4971-a280-bd1a61461bb7");
|
||||
Toast.makeText(getContext(), "Sorry, something went wrong", Toast.LENGTH_SHORT).show();
|
||||
dismiss();
|
||||
}
|
||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(this.documentId);
|
||||
lacertaVcs.getRevisionHistory().thenAccept(revList -> {
|
||||
adapter.setRevList(revList);
|
||||
adapter.notifyDataSetChanged(); // TODO-rca:時間に応じてアニメーションをつける
|
||||
});
|
||||
|
||||
|
||||
builder.setTitle(title == null ? "Select Rev" : title);
|
||||
builder.setMessage(message == null ? "Select Rev" : message);
|
||||
builder.setNegativeButton(negativeButtonText == null ? "Cancel" : negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onDialogCanceled();
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectRevDialogInternalListener {
|
||||
|
||||
void onItemSelected(String revId);
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
public interface LacertaSelectRevDialogListener {
|
||||
|
||||
void onItemSelected(String revId);
|
||||
|
||||
void onDialogCanceled();
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
public class SelectDirDialogItemAdapter extends RecyclerView.Adapter<SelectDirDialogItemAdapter.SelectDirDialogItemViewHolder> {
|
||||
|
||||
|
||||
private LibraryItemPage libraryItemPage;
|
||||
LacertaSelectDirDialogInternalEventListener listener;
|
||||
|
||||
public SelectDirDialogItemAdapter(LacertaSelectDirDialogInternalEventListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
public void setListItems(LibraryItemPage libraryItemPage) {
|
||||
this.libraryItemPage = libraryItemPage;
|
||||
if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
|
||||
this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
|
||||
}
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public SelectDirDialogItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||
return new SelectDirDialogItemViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(SelectDirDialogItemViewHolder holder, int position) {
|
||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||
holder.title.setText(listItem.getTitle());
|
||||
holder.description.setText(listItem.getDescription());
|
||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||
if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
|
||||
holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
|
||||
} else {
|
||||
holder.itemView.setOnClickListener(v -> listener.onDirSelected(listItem.getTitle(), listItem.getItemId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
|
||||
}
|
||||
|
||||
public String getCurrentId() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageId();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getCurrentPageTitle() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageTitle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class SelectDirDialogItemViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
TextView description;
|
||||
|
||||
ImageView icon;
|
||||
|
||||
|
||||
public SelectDirDialogItemViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||
description.setVisibility(View.GONE); // 暫定
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
package one.nem.lacerta.component.common;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.model.VcsRevModel;
|
||||
|
||||
public class SelectRevDialogItemAdapter extends RecyclerView.Adapter<SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder>{
|
||||
|
||||
ArrayList<VcsRevModel> revList;
|
||||
|
||||
LacertaSelectRevDialogInternalListener listener;
|
||||
|
||||
public SelectRevDialogItemAdapter(LacertaSelectRevDialogInternalListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
public void setRevList(ArrayList<VcsRevModel> revList) {
|
||||
this.revList = revList;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.common_rev_list_item, parent, false);
|
||||
return new SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull SelectRevDialogItemAdapter.SelectRevDialogItemViewHolder holder, int position) {
|
||||
VcsRevModel rev = revList.get(position);
|
||||
holder.title.setText(rev.getCommitMessage());
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||
holder.description.setText(simpleDateFormat.format(rev.getCreatedAt()));
|
||||
holder.revId.setText("RevID: " + rev.getId());
|
||||
|
||||
holder.itemView.setOnClickListener(v -> listener.onItemSelected(rev.getId()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return this.revList == null ? 0 : this.revList.size();
|
||||
}
|
||||
|
||||
public class SelectRevDialogItemViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
TextView description;
|
||||
TextView revId;
|
||||
|
||||
public SelectRevDialogItemViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
title = itemView.findViewById(R.id.rev_item_title);
|
||||
description = itemView.findViewById(R.id.rev_item_detail);
|
||||
revId = itemView.findViewById(R.id.rev_item_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
package one.nem.lacerta.component.common.model;
|
||||
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
|
||||
// TODO-rca: クラス名が長すぎ
|
||||
|
||||
/**
|
||||
* DocumentTagを設定するダイアログで使うための拡張モデル
|
||||
* チェックボックスの状態を保持するように
|
||||
*/
|
||||
public class DocumentTagApplyTagDialogExtendedModel extends DocumentTag {
|
||||
|
||||
private boolean isChecked;
|
||||
|
||||
public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag) {
|
||||
super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
|
||||
}
|
||||
|
||||
public DocumentTagApplyTagDialogExtendedModel(DocumentTag documentTag, boolean isChecked) {
|
||||
super(documentTag.getId(), documentTag.getName(), documentTag.getColor());
|
||||
this.isChecked = isChecked;
|
||||
}
|
||||
|
||||
public boolean getIsChecked() {
|
||||
return isChecked;
|
||||
}
|
||||
|
||||
public void setIsChecked(boolean checked) {
|
||||
isChecked = checked;
|
||||
}
|
||||
}
|
||||
@@ -1,115 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.PublicPath;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaDirPickerDialog extends LacertaFilePickerDialogBase {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaDirPickerDialogListener {
|
||||
void onDirSelected(String name, String dirId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaDirPickerDialogListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaDirPickerDialog setListener(LacertaDirPickerDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
|
||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
||||
TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
|
||||
|
||||
LacertaFilePickerAdapterBase adapter = new LacertaFilePickerAdapterBase();
|
||||
adapter.setListener(new LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener() {
|
||||
@Override
|
||||
public void onItemSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
|
||||
this.updateList(adapter, null); // ルートディレクトリのリストを表示
|
||||
|
||||
// Init dialog
|
||||
builder.setTitle(this.title == null ? "フォルダを選択" : this.title);
|
||||
builder.setMessage(this.message == null ? "フォルダを選択してください" : this.message);
|
||||
builder.setView(view);
|
||||
builder.setPositiveButton(this.positiveButtonText == null ? "OK" : this.positiveButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
listener.onDirSelected(
|
||||
adapter.getCurrentPageTitle(),
|
||||
adapter.getCurrentId());
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
|
||||
if (listener != null) {
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void updatePublicPath(TextView currentDirTextView, String folderId) {
|
||||
lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
||||
this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
|
||||
});
|
||||
}
|
||||
|
||||
private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
|
||||
lacertaLibrary.getFolderList(folderId).thenAccept(libraryItemPage -> {
|
||||
int currentCount = adapter.getItemCount();
|
||||
String currentId = adapter.getCurrentId();
|
||||
// adapter.setListItems(libraryItemPage);
|
||||
getActivity().runOnUiThread(() -> {
|
||||
this.updateListView(adapter, libraryItemPage, currentCount, currentId);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
public class LacertaFilePickerAdapter extends LacertaFilePickerAdapterBase {
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerAdapterListener extends LacertaFilePickerAdapterBase.LacertaFilePickerAdapterListener {
|
||||
void onDocumentSelected(String documentId);
|
||||
void onCombinedDocumentSelected(String documentId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerAdapterListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerAdapter setListener(LacertaFilePickerAdapterListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
|
||||
super.onBindViewHolder(holder, position);
|
||||
if (libraryItemPage.getListItems().get(position).getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||
if (libraryItemPage.getListItems().get(position).getHasCombined()) {
|
||||
holder.itemView.setOnClickListener(v -> {
|
||||
listener.onCombinedDocumentSelected(libraryItemPage.getListItems().get(position).getItemId());
|
||||
});
|
||||
} else {
|
||||
holder.itemView.setOnClickListener(v -> {
|
||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||
listener.onDocumentSelected(listItem.getItemId());
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,127 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerAdapterBase;
|
||||
import one.nem.lacerta.component.common.picker.base.LacertaFilePickerDialogBase;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaFilePickerDialog extends LacertaFilePickerDialogBase {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerDialogListener {
|
||||
void onFileSelected(String name, String fileId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerDialogListener listener;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerDialog setListener(LacertaFilePickerDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
|
||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_dir, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.select_dir_recycler_view);
|
||||
TextView currentDirTextView = view.findViewById(R.id.current_dir_text_view);
|
||||
|
||||
LacertaFilePickerAdapter adapter = new LacertaFilePickerAdapter();
|
||||
adapter.setListener(new LacertaFilePickerAdapter.LacertaFilePickerAdapterListener() {
|
||||
@Override
|
||||
public void onItemSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackSelected(String dirId) {
|
||||
updateList(adapter, dirId);
|
||||
updatePublicPath(currentDirTextView, dirId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDocumentSelected(String documentId) {
|
||||
if (listener != null) {
|
||||
dismiss();
|
||||
listener.onFileSelected(documentId, documentId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCombinedDocumentSelected(String documentId) {
|
||||
if (listener != null) {
|
||||
LacertaFilePickerSelectDocumentDialog dialog = new LacertaFilePickerSelectDocumentDialog();
|
||||
dialog.setDocumentId(documentId);
|
||||
dialog.setListener(documentId1 -> {
|
||||
dismiss();
|
||||
listener.onFileSelected(documentId1, documentId1);
|
||||
});
|
||||
dialog.show(getParentFragmentManager(), "select_document_dialog");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
|
||||
this.updateList(adapter, null); // ルートディレクトリのリストを表示
|
||||
|
||||
// Init dialog
|
||||
builder.setTitle(this.title == null ? "ファイルを選択" : this.title);
|
||||
builder.setMessage(this.message == null ? "ファイルを選択してください" : this.message);
|
||||
builder.setView(view);
|
||||
builder.setNegativeButton(this.negativeButtonText == null ? "キャンセル" : this.negativeButtonText, (dialog, which) -> {
|
||||
dismiss();
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
private void updatePublicPath(TextView currentDirTextView, String folderId) {
|
||||
lacertaLibrary.getPublicPath(folderId, ListItemType.ITEM_TYPE_FOLDER).thenAccept(publicPath -> {
|
||||
this.updatePathTextView(currentDirTextView, publicPath, ListItemType.ITEM_TYPE_FOLDER);
|
||||
});
|
||||
}
|
||||
|
||||
private void updateList(LacertaFilePickerAdapterBase adapter, String folderId) {
|
||||
lacertaLibrary.getLibraryPage(folderId, 100).thenAccept(libraryItemPage -> { // TODO-rca: 100 is a magic number
|
||||
int currentCount = adapter.getItemCount();
|
||||
String currentId = adapter.getCurrentId();
|
||||
// adapter.setListItems(libraryItemPage);
|
||||
getActivity().runOnUiThread(() -> {
|
||||
this.updateListView(adapter, libraryItemPage, currentCount, currentId);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
|
||||
public class LacertaFilePickerSelectDocumentAdapter extends RecyclerView.Adapter<LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder>{
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerSelectDocumentAdapterListener {
|
||||
void onDocumentSelected(String documentId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerSelectDocumentAdapterListener listener;
|
||||
|
||||
ArrayList<ListItem> listItems;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerSelectDocumentAdapter setListener(LacertaFilePickerSelectDocumentAdapterListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setListItems(ArrayList<ListItem> listItems) {
|
||||
this.listItems = listItems;
|
||||
}
|
||||
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||
return new LacertaFilePickerSelectDocumentViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull LacertaFilePickerSelectDocumentAdapter.LacertaFilePickerSelectDocumentViewHolder holder, int position) {
|
||||
ListItem listItem = listItems.get(position);
|
||||
holder.title.setText(listItem.getTitle());
|
||||
holder.description.setVisibility(View.GONE);
|
||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||
holder.itemView.setOnClickListener(v -> listener.onDocumentSelected(listItem.getItemId()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return listItems == null ? 0 : listItems.size();
|
||||
}
|
||||
|
||||
public class LacertaFilePickerSelectDocumentViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
ImageView icon;
|
||||
TextView title;
|
||||
TextView description;
|
||||
|
||||
public LacertaFilePickerSelectDocumentViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.R;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
||||
|
||||
@AndroidEntryPoint
|
||||
public class LacertaFilePickerSelectDocumentDialog extends DialogFragment {
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerSelectDocumentDialogListener {
|
||||
void onDocumentSelected(String documentId);
|
||||
}
|
||||
|
||||
// Variables
|
||||
LacertaFilePickerSelectDocumentDialogListener listener;
|
||||
|
||||
String documentId;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerSelectDocumentDialog setListener(LacertaFilePickerSelectDocumentDialogListener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerSelectDocumentDialog setDocumentId(String documentId) {
|
||||
this.documentId = documentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
super.onCreateDialog(savedInstanceState);
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
View view = LayoutInflater.from(getActivity()).inflate(R.layout.lacerta_dialog_select_doc, null);
|
||||
|
||||
// 高さを画面の40%にする
|
||||
int height = (int) (getResources().getDisplayMetrics().heightPixels * 0.4);
|
||||
view.setMinimumHeight(height);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.document_list_recycler_view);
|
||||
|
||||
LacertaFilePickerSelectDocumentAdapter adapter = new LacertaFilePickerSelectDocumentAdapter();
|
||||
|
||||
adapter.setListener(documentId -> listener.onDocumentSelected(documentId));
|
||||
|
||||
recyclerView.setAdapter(adapter);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
|
||||
builder.setTitle("追加先を選択");
|
||||
|
||||
builder.setView(view);
|
||||
|
||||
lacertaLibrary.getCombinedDocumentToxiList(this.documentId).thenAccept(toxiDocumentModels -> {
|
||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||
for (ToxiDocumentModel toxiDocumentModel : toxiDocumentModels) {
|
||||
listItems.add(new ListItem(toxiDocumentModel.titleCache, null, ListItemType.ITEM_TYPE_DOCUMENT, toxiDocumentModel.childDocumentId));
|
||||
}
|
||||
adapter.setListItems(listItems);
|
||||
adapter.notifyDataSetChanged();
|
||||
});
|
||||
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker.base;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItem;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
|
||||
public class LacertaFilePickerAdapterBase extends RecyclerView.Adapter<LacertaFilePickerAdapterBase.LacertaFilePickerViewHolder> {
|
||||
|
||||
// Listener
|
||||
public interface LacertaFilePickerAdapterListener {
|
||||
void onItemSelected(String dirId);
|
||||
void onBackSelected(String dirId);
|
||||
}
|
||||
|
||||
protected LibraryItemPage libraryItemPage;
|
||||
|
||||
protected LacertaFilePickerAdapterListener listener;
|
||||
|
||||
// Empty constructor
|
||||
public LacertaFilePickerAdapterBase() {
|
||||
}
|
||||
|
||||
public void setListItems(LibraryItemPage libraryItemPage) {
|
||||
this.libraryItemPage = libraryItemPage;
|
||||
if (this.libraryItemPage.getPageId() != null) { // ルートディレクトリの場合は戻るボタンを表示しない
|
||||
this.libraryItemPage.getListItems().add(0, new ListItem("戻る", " ", ListItemType.ITEM_TYPE_ACTION_BACK, null));
|
||||
}
|
||||
}
|
||||
|
||||
public void setListener(LacertaFilePickerAdapterListener listener) {
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public LacertaFilePickerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||
return new LacertaFilePickerViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(LacertaFilePickerViewHolder holder, int position) {
|
||||
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||
holder.title.setText(listItem.getTitle());
|
||||
holder.description.setText(listItem.getDescription());
|
||||
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||
if(listItem.getItemType() == ListItemType.ITEM_TYPE_ACTION_BACK) {
|
||||
holder.itemView.setOnClickListener(v -> listener.onBackSelected(this.libraryItemPage.getParentId()));
|
||||
} else {
|
||||
holder.itemView.setOnClickListener(v -> listener.onItemSelected(listItem.getItemId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return this.libraryItemPage == null ? 0 : this.libraryItemPage.getListItems().size();
|
||||
}
|
||||
|
||||
public String getCurrentId() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageId();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getCurrentPageTitle() {
|
||||
if (this.libraryItemPage == null) {
|
||||
return null;
|
||||
} else {
|
||||
if (this.libraryItemPage.getPageId() == null) {
|
||||
return null;
|
||||
} else {
|
||||
return this.libraryItemPage.getPageTitle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class LacertaFilePickerViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
TextView description;
|
||||
|
||||
ImageView icon;
|
||||
|
||||
|
||||
public LacertaFilePickerViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||
description.setVisibility(View.GONE); // 暫定
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
package one.nem.lacerta.component.common.picker.base;
|
||||
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.model.LibraryItemPage;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.PublicPath;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
|
||||
public class LacertaFilePickerDialogBase extends DialogFragment {
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
// Variables
|
||||
protected String title;
|
||||
protected String message;
|
||||
protected String positiveButtonText;
|
||||
protected String negativeButtonText;
|
||||
|
||||
// Setter
|
||||
public LacertaFilePickerDialogBase setTitle(String title) {
|
||||
this.title = title;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerDialogBase setMessage(String message) {
|
||||
this.message = message;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerDialogBase setPositiveButtonText(String positiveButtonText) {
|
||||
this.positiveButtonText = positiveButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
public LacertaFilePickerDialogBase setNegativeButtonText(String negativeButtonText) {
|
||||
this.negativeButtonText = negativeButtonText;
|
||||
return this;
|
||||
}
|
||||
|
||||
// Methods
|
||||
|
||||
protected void updatePathTextView(TextView currentDirTextView, PublicPath publicPath, ListItemType listItemType) {
|
||||
if (publicPath == null) {
|
||||
currentDirTextView.setText("/");
|
||||
} else {
|
||||
if (listItemType == ListItemType.ITEM_TYPE_FOLDER) {
|
||||
currentDirTextView.setText("/" + publicPath.getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
|
||||
} else {
|
||||
currentDirTextView.setText("/" + publicPath.parent().getStringPath()); // TODO-rca: PublicPath側の実装を治すべき
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void updateListView(LacertaFilePickerAdapterBase adapter, LibraryItemPage libraryItemPage, int currentCount, String currentDirId) {
|
||||
if (currentCount == 0) {
|
||||
// 初回表示
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (currentDirId == null) {
|
||||
// Rootが関わる推移 (Rootからの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() == null) {
|
||||
// Rootが関わる推移 (Rootへの推移)
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
} else if (libraryItemPage.getPageId() != null) {
|
||||
// Rootが関わらない推移
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(1, currentCount);
|
||||
adapter.notifyItemRangeInserted(1, libraryItemPage.getListItems().size());
|
||||
} else {
|
||||
// その他の遷移(安全側に倒すため全アイテム更新)
|
||||
logger.warn("FilePickerDialogBase", "Unknown transition.");
|
||||
logger.warn("FilePickerDialogBase", "currentDirId: " + currentDirId + ", libraryItemPage.getPageId(): " + libraryItemPage.getPageId());
|
||||
adapter.setListItems(libraryItemPage);
|
||||
adapter.notifyItemRangeRemoved(0, currentCount);
|
||||
adapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/tag_check_box"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:layout_marginVertical="4dp"
|
||||
android:text="CheckBox" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,55 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingHorizontal="24dp"
|
||||
android:paddingVertical="16dp">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/item_text_container"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rev_item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Placeholder Title"
|
||||
android:textColor="@color/colorOnSurface"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rev_item_detail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
android:text="2023/01/01 00:00:00 - hogehoge"
|
||||
android:textColor="@color/colorOnSurfaceSecondary"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/rev_item_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rev_item_id"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:text="dd76a029-51f1-40f7-b316-a0c74bbfebb1(Example)"
|
||||
android:textColor="@color/colorOnSurfaceSecondary"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/rev_item_detail" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/apply_tag_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
</FrameLayout>
|
||||
@@ -1,36 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tag_name_text_input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tag_name_edit_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tag_color_text_input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
|
||||
<!-- todo: add color picker -->
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tag_color_edit_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/title_text_input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingHorizontal="16dp"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tag_name_edit_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/current_dir_text_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="32dp" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/select_dir_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/document_list_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
|
||||
</FrameLayout>
|
||||
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/select_rev_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
</FrameLayout>
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
|
||||
android {
|
||||
namespace 'one.nem.lacerta.component.scanner'
|
||||
compileSdk 34
|
||||
compileSdk 33
|
||||
|
||||
defaultConfig {
|
||||
minSdk 26
|
||||
@@ -30,8 +30,6 @@ dependencies {
|
||||
|
||||
implementation libs.androidx.appcompat
|
||||
implementation libs.com.google.android.material
|
||||
implementation libs.androidx.activity
|
||||
implementation libs.androidx.constraintlayout
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.androidx.test.ext.junit
|
||||
androidTestImplementation libs.androidx.test.espresso.core
|
||||
@@ -48,10 +46,4 @@ dependencies {
|
||||
implementation project(':processor')
|
||||
|
||||
implementation project(':utils')
|
||||
|
||||
implementation project(':vcs')
|
||||
|
||||
implementation project(':data')
|
||||
|
||||
implementation project(':component:common')
|
||||
}
|
||||
@@ -1,10 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<application>
|
||||
<activity
|
||||
android:name=".ScannerManagerActivity"
|
||||
android:exported="false" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -123,110 +123,109 @@ public class ScannerDataManagerStubFragment extends Fragment {
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
// view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
||||
// Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
// if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
||||
// File photoFile = null;
|
||||
// try {
|
||||
// String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
||||
// String imageFileName = "JPEG_" + timeStamp + "_";
|
||||
// File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
||||
// photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
||||
// } catch (IOException ex) {
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
||||
// }
|
||||
// if (photoFile != null) {
|
||||
// photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
||||
// takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
||||
// cameraLauncher.launch(takePictureIntent);
|
||||
// }
|
||||
// else {
|
||||
// Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
||||
// }
|
||||
// }
|
||||
// else {
|
||||
// Log.d("ScannerDataManagerStubFragment", "camera not available");
|
||||
// }
|
||||
// updateResults();
|
||||
// });
|
||||
//
|
||||
// view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
|
||||
// Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
|
||||
//
|
||||
// this.documentDetail = createSampleDocumentDetail();
|
||||
//
|
||||
// });
|
||||
//
|
||||
// view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
|
||||
// Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
|
||||
// // TODO-rca: ここでDocumentProcessorを初期化する
|
||||
// if (this.documentDetail == null) {
|
||||
// Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
|
||||
// return;
|
||||
// }
|
||||
// this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
|
||||
// Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
|
||||
// try {
|
||||
// this.documentProcessor.init();
|
||||
// } catch (Exception e) {
|
||||
// Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
|
||||
// }
|
||||
// Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
|
||||
// });
|
||||
//
|
||||
// view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
|
||||
// Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
|
||||
// Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
|
||||
// if (this.documentProcessor == null) {
|
||||
// Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
|
||||
// return;
|
||||
// }
|
||||
// Bitmap[] bitmaps = new Bitmap[results.size()];
|
||||
// for (int i = 0; i < results.size(); i++) {
|
||||
// bitmaps[i] = results.get(i).getBitmap();
|
||||
// }
|
||||
//
|
||||
// try {
|
||||
// this.documentProcessor.addNewPagesToLast(bitmaps);
|
||||
// } catch (Exception e) {
|
||||
// Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
|
||||
// }
|
||||
//
|
||||
// Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
|
||||
//
|
||||
// try {
|
||||
// this.documentProcessor.close();
|
||||
// } catch (Exception e) {
|
||||
// Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
|
||||
// Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
|
||||
// }
|
||||
// });
|
||||
view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
||||
Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
||||
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
||||
File photoFile = null;
|
||||
try {
|
||||
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
||||
String imageFileName = "JPEG_" + timeStamp + "_";
|
||||
File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
||||
photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
||||
} catch (IOException ex) {
|
||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
||||
}
|
||||
if (photoFile != null) {
|
||||
photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
||||
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
||||
cameraLauncher.launch(takePictureIntent);
|
||||
}
|
||||
else {
|
||||
Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
||||
}
|
||||
}
|
||||
else {
|
||||
Log.d("ScannerDataManagerStubFragment", "camera not available");
|
||||
}
|
||||
updateResults();
|
||||
});
|
||||
|
||||
view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
|
||||
Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
|
||||
Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
|
||||
|
||||
this.documentDetail = createSampleDocumentDetail();
|
||||
|
||||
});
|
||||
|
||||
view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
|
||||
Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
|
||||
Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
|
||||
// TODO-rca: ここでDocumentProcessorを初期化する
|
||||
if (this.documentDetail == null) {
|
||||
Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
}
|
||||
this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
|
||||
Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
|
||||
try {
|
||||
this.documentProcessor.init();
|
||||
} catch (Exception e) {
|
||||
Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
|
||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
|
||||
}
|
||||
Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
|
||||
});
|
||||
|
||||
view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
|
||||
Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
|
||||
Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
|
||||
if (this.documentProcessor == null) {
|
||||
Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
}
|
||||
Bitmap[] bitmaps = new Bitmap[results.size()];
|
||||
for (int i = 0; i < results.size(); i++) {
|
||||
bitmaps[i] = results.get(i).getBitmap();
|
||||
}
|
||||
|
||||
try {
|
||||
this.documentProcessor.addNewPagesToLast(bitmaps);
|
||||
} catch (Exception e) {
|
||||
Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
|
||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
|
||||
}
|
||||
|
||||
Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
|
||||
|
||||
try {
|
||||
this.documentProcessor.close();
|
||||
} catch (Exception e) {
|
||||
Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
|
||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public DocumentDetail createSampleDocumentDetail() {
|
||||
//
|
||||
// String id = UUID.randomUUID().toString();
|
||||
//
|
||||
// Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
|
||||
// //logger.debug("CreateSample", "Generated id: " + id);
|
||||
//
|
||||
// DocumentMeta meta = new DocumentMeta(
|
||||
// id,
|
||||
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
|
||||
// new Date(),
|
||||
// new Date());
|
||||
//
|
||||
// DocumentPath path = new DocumentPath(
|
||||
// deviceInfoUtils.getExternalStorageDirectoryString(),
|
||||
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
||||
//
|
||||
// return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
|
||||
return null;
|
||||
|
||||
String id = UUID.randomUUID().toString();
|
||||
|
||||
Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
|
||||
//logger.debug("CreateSample", "Generated id: " + id);
|
||||
|
||||
DocumentMeta meta = new DocumentMeta(
|
||||
id,
|
||||
"Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
|
||||
new Date(),
|
||||
new Date());
|
||||
|
||||
DocumentPath path = new DocumentPath(
|
||||
deviceInfoUtils.getExternalStorageDirectoryString(),
|
||||
"Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
||||
|
||||
return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,333 +0,0 @@
|
||||
package one.nem.lacerta.component.scanner;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.EdgeToEdge;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
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.component.common.picker.LacertaFilePickerDialog;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.document.DocumentDetail;
|
||||
import one.nem.lacerta.model.document.DocumentMeta;
|
||||
import one.nem.lacerta.model.document.page.Page;
|
||||
import one.nem.lacerta.processor.DocumentProcessor;
|
||||
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
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;
|
||||
|
||||
// @Inject
|
||||
// public ScannerManagerActivity(LacertaLogger logger, Document document, LacertaLibrary lacertaLibrary, DocumentProcessorFactory documentProcessorFactory, LacertaVcsFactory lacertaVcsFactory) {
|
||||
// this.logger = logger;
|
||||
// this.document = document;
|
||||
// this.lacertaLibrary = lacertaLibrary;
|
||||
// this.documentProcessorFactory = documentProcessorFactory;
|
||||
// this.lacertaVcsFactory = lacertaVcsFactory;
|
||||
// }
|
||||
|
||||
@Inject
|
||||
public ScannerManagerActivity() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
// Variables
|
||||
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||
|
||||
private boolean update = false;
|
||||
private String documentId;
|
||||
private int index = 0;
|
||||
|
||||
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
|
||||
);
|
||||
|
||||
DocumentScanner documentScannerUpdate = new DocumentScanner( // TODO-rca: ひどすぎるのでなんとかする
|
||||
this,
|
||||
(croppedImageResults) -> {
|
||||
logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
|
||||
ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||
for (String result : croppedImageResults) {
|
||||
croppedImages.add(BitmapFactory.decodeFile(result));
|
||||
}
|
||||
processResult(croppedImages);
|
||||
updatePage();
|
||||
return null;
|
||||
},
|
||||
(errorMessage) -> {
|
||||
// an error happened
|
||||
logger.error(TAG, "Error: " + errorMessage);
|
||||
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
|
||||
finish();
|
||||
return null;
|
||||
},
|
||||
() -> {
|
||||
// user canceled document scan
|
||||
logger.debug(TAG, "User canceled document scan");
|
||||
finish();
|
||||
return null;
|
||||
},
|
||||
null,
|
||||
null,
|
||||
1
|
||||
);
|
||||
|
||||
|
||||
@Override
|
||||
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;
|
||||
});
|
||||
|
||||
|
||||
|
||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
|
||||
!= PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, 1); // TODO-rca: リクエストコードを定数にする
|
||||
}
|
||||
|
||||
|
||||
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
|
||||
setSupportActionBar(toolbar);
|
||||
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
||||
|
||||
Intent intent = getIntent();
|
||||
Bundle bundle = intent.getExtras();
|
||||
if (bundle != null) {
|
||||
update = bundle.getBoolean("update", false);
|
||||
documentId = bundle.getString("documentId");
|
||||
index = bundle.getInt("index", 0);
|
||||
}
|
||||
if (this.update) {
|
||||
documentScanner = documentScannerUpdate;
|
||||
}
|
||||
documentScanner.startScan();
|
||||
// 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) {
|
||||
// 新ドキュメントとして保存
|
||||
saveNewDocument();
|
||||
return true;
|
||||
}
|
||||
else if (item.getItemId() == R.id.action_insert_exist) {
|
||||
// 既存ドキュメントに挿入
|
||||
insertToExistDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == android.R.id.home) {
|
||||
finish();
|
||||
return true;
|
||||
}
|
||||
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");
|
||||
} 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, "Initial Commit").join();
|
||||
document.updateDocument(documentDetail).join();
|
||||
dialog.dismiss();
|
||||
finish();
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps, String commitMessage) {
|
||||
return CompletableFuture.runAsync(() -> {
|
||||
try {
|
||||
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(commitMessage == null ? "NONE" : commitMessage);
|
||||
} catch (Exception e) {
|
||||
logger.error(TAG, "Error: " + e.getMessage());
|
||||
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void updatePage() {
|
||||
logger.debug(TAG, "updatePage");
|
||||
// Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
|
||||
ProgressDialog dialog = new ProgressDialog(this);
|
||||
dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
|
||||
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
||||
dialog.setCancelable(false);
|
||||
dialog.show();
|
||||
document.getDocument(documentId).thenAccept((documentDetail) -> {
|
||||
DocumentProcessor documentProcessor = documentProcessorFactory.create(documentDetail);
|
||||
if (croppedImages.size() != 1) {
|
||||
logger.error(TAG, "croppedImages.size() != 1");
|
||||
logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
|
||||
return;
|
||||
}
|
||||
if (croppedImages.get(0) == null) {
|
||||
logger.error(TAG, "croppedImages.get(0) == null");
|
||||
logger.e_code("d8e2b8c9-9b7e-4b7e-9e1e-9e3b8b8b8b8b");
|
||||
return;
|
||||
}
|
||||
documentProcessor.updatePageAtIndex(croppedImages.get(0), index);
|
||||
document.updateDocument(documentProcessor.getDocumentDetail()).join();
|
||||
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent(index + "ページ目を更新"); // TODO-rca: メッセージを動的にする, 指定できるようにする
|
||||
dialog.dismiss();
|
||||
});
|
||||
}
|
||||
|
||||
private void insertToExistDocument() {
|
||||
logger.debug(TAG, "insertToExistDocument");
|
||||
LacertaFilePickerDialog dialog = new LacertaFilePickerDialog();
|
||||
dialog.setListener(((name, fileId) -> {
|
||||
document.getDocument(fileId).thenAccept((documentDetail) -> {
|
||||
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
|
||||
croppedImages.toArray(bitmaps);
|
||||
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
|
||||
addPagesToDocumentDetail(documentDetail, bitmaps, "ページを追加").join();
|
||||
document.updateDocument(documentDetail).join();
|
||||
finish();
|
||||
});
|
||||
}));
|
||||
dialog.setTitle("追加するドキュメントを選択");
|
||||
dialog.show(getSupportFragmentManager(), "LacertaFilePickerDialog");
|
||||
}
|
||||
|
||||
private void updateResultView(ArrayList<Bitmap> resultImages) {
|
||||
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);
|
||||
}
|
||||
|
||||
selectedImage.setImageBitmap(resultImages.get(0));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ScannerManagerFragment">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button_intent_scanner_manager_activity"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
</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/description_24px"
|
||||
android:title="Insert"
|
||||
app:showAsAction="ifRoom"/>
|
||||
</menu>
|
||||
@@ -1,11 +1,10 @@
|
||||
plugins {
|
||||
alias(libs.plugins.com.android.library)
|
||||
id 'com.google.dagger.hilt.android'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'one.nem.lacerta.component.viewer'
|
||||
compileSdk 34
|
||||
compileSdk 33
|
||||
|
||||
defaultConfig {
|
||||
minSdk 26
|
||||
@@ -30,39 +29,7 @@ dependencies {
|
||||
|
||||
implementation libs.androidx.appcompat
|
||||
implementation libs.com.google.android.material
|
||||
implementation libs.androidx.activity
|
||||
implementation libs.androidx.constraintlayout
|
||||
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')
|
||||
|
||||
implementation project(':utils')
|
||||
|
||||
implementation project(':data')
|
||||
|
||||
implementation project(':model')
|
||||
|
||||
implementation project(':vcs')
|
||||
|
||||
implementation project(':component:common')
|
||||
|
||||
// TODO-rca: バージョンカタログに切り出す
|
||||
implementation "com.hendraanggrian.material:collapsingtoolbarlayout-subtitle:1.5.0"
|
||||
|
||||
// ViewPager2
|
||||
implementation "androidx.viewpager2:viewpager2:1.0.0"
|
||||
|
||||
implementation project(':component:scanner') // めちゃくちゃよくないけどもう正しくやってる時間がないので
|
||||
}
|
||||
@@ -1,10 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<application>
|
||||
<activity
|
||||
android:name=".ViewerMainActivity"
|
||||
android:exported="false" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -1,73 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer.BookMark;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.GestureDetector;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.component.viewer.R;
|
||||
|
||||
// BookMarkFragment.java
|
||||
public class BookMarkFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
BookmarkRepository bookmarkRepository;
|
||||
|
||||
private GestureDetector gestureDetector;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
return inflater.inflate(R.layout.fragment_bookmark, container, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
|
||||
@Override
|
||||
public boolean onDoubleTap(MotionEvent e) {
|
||||
// ダブルタップが検出された時の処理
|
||||
handleDoubleTap();
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
// ブックマークボタンがダブルタップされた時の処理
|
||||
view.setOnTouchListener(new View.OnTouchListener() {
|
||||
@Override
|
||||
public boolean onTouch(View v, MotionEvent event) {
|
||||
return gestureDetector.onTouchEvent(event);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void handleDoubleTap() {
|
||||
// ダブルタップが検出された時の処理
|
||||
// ブックマークを作成
|
||||
String pageId = "current_page_id";
|
||||
String title = "current_page_title";
|
||||
|
||||
Bookmark bookmark = new Bookmark(
|
||||
UUID.randomUUID().toString(),
|
||||
title,
|
||||
pageId,
|
||||
System.currentTimeMillis()
|
||||
);
|
||||
|
||||
// ブックマークを保存
|
||||
bookmarkRepository.addBookmark(bookmark);
|
||||
|
||||
// ユーザーに成功メッセージを表示
|
||||
Toast.makeText(getContext(), "ダブルタップでブックマークが追加されました", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer.BookMark;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import one.nem.lacerta.component.viewer.R;
|
||||
|
||||
// BookMarkListFragment.java
|
||||
public class BookMarkListFragment extends Fragment {
|
||||
@Inject
|
||||
BookmarkRepository bookmarkRepository;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
return inflater.inflate(R.layout.fragment_bookmark_list, container, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
// ブックマーク一覧を取得
|
||||
List<Bookmark> bookmarks = bookmarkRepository.getAllBookmarks();
|
||||
|
||||
// ブックマーク一覧を表示するRecyclerViewのセットアップ
|
||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
||||
BookmarkAdapter adapter = new BookmarkAdapter(bookmarks, new OnBookmarkClickListener() {
|
||||
@Override
|
||||
public void onBookmarkClick(Bookmark selectedBookmark) {
|
||||
// ブックマークが選択された時の処理
|
||||
// 例: ブックマークに関連するページを表示する
|
||||
}
|
||||
});
|
||||
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
|
||||
recyclerView.setAdapter(adapter);
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer.BookMark;
|
||||
|
||||
// Bookmark.java
|
||||
public class Bookmark {
|
||||
private String id; // ブックマークの一意の識別子
|
||||
private String title;
|
||||
private String pageId; // ブックマークが参照するページの識別子
|
||||
private long timestamp; // ブックマークが作成された時刻
|
||||
|
||||
public Bookmark(String id, String title, String pageId, long timestamp) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.pageId = pageId;
|
||||
this.timestamp = timestamp;
|
||||
}
|
||||
|
||||
public Bookmark() {
|
||||
// Empty constructor
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public String getPageId() {
|
||||
return pageId;
|
||||
}
|
||||
|
||||
public long getTimestamp() {
|
||||
return timestamp;
|
||||
}
|
||||
|
||||
// Setter
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public void setPageId(String pageId) {
|
||||
this.pageId = pageId;
|
||||
}
|
||||
|
||||
public void setTimestamp(long timestamp) {
|
||||
this.timestamp = timestamp;
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer.BookMark;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import one.nem.lacerta.component.viewer.R;
|
||||
|
||||
|
||||
public class BookmarkAdapter extends RecyclerView.Adapter<BookmarkAdapter.BookmarkViewHolder> {
|
||||
|
||||
private List<Bookmark> bookmarks;
|
||||
private OnBookmarkClickListener listener;
|
||||
|
||||
public BookmarkAdapter(List<Bookmark> bookmarks, OnBookmarkClickListener listener) {
|
||||
this.bookmarks = bookmarks;
|
||||
this.listener = listener;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public BookmarkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_bookmark, parent, false);
|
||||
return new BookmarkViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull BookmarkViewHolder holder, int position) {
|
||||
final Bookmark bookmark = bookmarks.get(position);
|
||||
|
||||
holder.titleTextView.setText(bookmark.getTitle());
|
||||
|
||||
holder.itemView.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
// ブックマークがクリックされたときの処理
|
||||
listener.onBookmarkClick(bookmark);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return bookmarks.size();
|
||||
}
|
||||
|
||||
static class BookmarkViewHolder extends RecyclerView.ViewHolder {
|
||||
TextView titleTextView;
|
||||
|
||||
public BookmarkViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
titleTextView = itemView.findViewById(R.id.titleTextView);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer.BookMark;
|
||||
|
||||
// BookmarkRepository.java
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class BookmarkRepository {
|
||||
private List<Bookmark> bookmarks = new ArrayList<>();
|
||||
|
||||
public List<Bookmark> getAllBookmarks() {
|
||||
return bookmarks;
|
||||
}
|
||||
|
||||
public void addBookmark(Bookmark bookmark) {
|
||||
bookmarks.add(bookmark);
|
||||
}
|
||||
|
||||
public void removeBookmark(Bookmark bookmark) {
|
||||
bookmarks.remove(bookmark);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer.BookMark;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
// OnBookmarkClickListener.java
|
||||
public interface OnBookmarkClickListener {
|
||||
void onBookmarkClick(Bookmark selectedBookmark);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
public interface ItemClickListener {
|
||||
void onItemClick(String fileName); // DEBUG
|
||||
|
||||
void onItemLongClick(String fileName, int position);
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import one.nem.lacerta.component.viewer.model.RevSelectListener;
|
||||
import one.nem.lacerta.model.VcsRevModel;
|
||||
import one.nem.lacerta.utils.FeatureSwitch;
|
||||
|
||||
public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
|
||||
|
||||
private ArrayList<VcsRevModel> revModels;
|
||||
|
||||
private RevSelectListener revSelectListener;
|
||||
|
||||
public RevAdapter(ArrayList<VcsRevModel> revModels) {
|
||||
this.revModels = revModels;
|
||||
}
|
||||
|
||||
public RevAdapter(RevSelectListener revSelectListener) {
|
||||
this.revSelectListener = revSelectListener;
|
||||
}
|
||||
|
||||
public void setRevModels(ArrayList<VcsRevModel> revModels) {
|
||||
this.revModels = revModels;
|
||||
}
|
||||
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public RevAdapter.RevViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.viewer_rev_list_item, parent, false);
|
||||
return new RevAdapter.RevViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull RevAdapter.RevViewHolder holder, int position) {
|
||||
VcsRevModel revModel = revModels.get(position);
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||
holder.title.setText(revModel.getCommitMessage());
|
||||
if (FeatureSwitch.Vcs.disableBranchDisplay) {
|
||||
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()));
|
||||
holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt()));
|
||||
} else {
|
||||
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + revModel.getBranchName());
|
||||
holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt())+ " " + revModel.getBranchName());
|
||||
}
|
||||
holder.revId.setText("RevID: " + revModel.getId());
|
||||
|
||||
holder.itemView.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
revSelectListener.onRevSelect(revModel.getId());
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
if (revModels == null) {
|
||||
return 0;
|
||||
} else {
|
||||
return revModels.size();
|
||||
}
|
||||
}
|
||||
|
||||
class RevViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
TextView title;
|
||||
|
||||
TextView detail;
|
||||
|
||||
TextView revId;
|
||||
|
||||
public RevViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
title = itemView.findViewById(R.id.rev_item_title);
|
||||
detail = itemView.findViewById(R.id.rev_item_detail);
|
||||
revId = itemView.findViewById(R.id.rev_item_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,67 +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.setOnLongClickListener(v -> {
|
||||
listener.onItemLongClick(pages.get(position).getFileName(), position);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
@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,167 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.scanner.ScannerManagerActivity;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ViewerBodyFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class ViewerBodyFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
Document document;
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
// Variables
|
||||
private String documentId;
|
||||
private String documentName;
|
||||
private String revisionId;
|
||||
|
||||
public ViewerBodyFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static ViewerBodyFragment newInstance(String documentId, String documentName) {
|
||||
ViewerBodyFragment fragment = new ViewerBodyFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
public static ViewerBodyFragment newInstance(String documentId, String documentName, String revisionId) {
|
||||
ViewerBodyFragment fragment = new ViewerBodyFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
args.putString("revisionId", revisionId);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
documentId = getArguments().getString("documentId");
|
||||
documentName = getArguments().getString("documentName");
|
||||
revisionId = getArguments().getString("revisionId");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_viewer_body, container, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
logger.debug("ViewerBodyFragment", "ViewerBodyFragment.onViewCreated");
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
|
||||
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(new ItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(String fileName) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemLongClick(String fileName, int position) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
|
||||
builder.setTitle("ページを更新しますか?");
|
||||
|
||||
builder.setPositiveButton("更新", (dialog, which) -> {
|
||||
// ScannerをIntent
|
||||
Intent intent = new Intent(getActivity(), ScannerManagerActivity.class);
|
||||
intent.putExtra("update", true);
|
||||
intent.putExtra("documentId", documentId);
|
||||
intent.putExtra("index", position);
|
||||
startActivity(intent);
|
||||
});
|
||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||
// cancel
|
||||
dialog.dismiss();
|
||||
});
|
||||
|
||||
builder.show();
|
||||
}
|
||||
});
|
||||
|
||||
getActivity().runOnUiThread(() -> {
|
||||
recyclerView.setAdapter(viewerBodyAdapter);
|
||||
viewerBodyAdapter.notifyDataSetChanged();
|
||||
});
|
||||
|
||||
loadDocument(viewerBodyAdapter, documentId, revisionId);
|
||||
}
|
||||
|
||||
private void loadDocument(ViewerBodyAdapter adapter, String documentId, String revisionId) {
|
||||
if (revisionId == null) { // load latest revision
|
||||
document.getDocument(documentId).thenApply(document -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
adapter.setPages(document.getPages());
|
||||
adapter.notifyDataSetChanged();
|
||||
});
|
||||
return null;
|
||||
});
|
||||
} else { // load specified revision
|
||||
LacertaVcs vcs = lacertaVcsFactory.create(documentId);
|
||||
// document.getDocumentPageListByFileNameList(documentId, vcs.getDocumentPagePathListRev(revisionId).join()).thenApply(documentPageList -> {
|
||||
// getActivity().runOnUiThread(() -> {
|
||||
// adapter.setPages(documentPageList);
|
||||
// adapter.notifyDataSetChanged();
|
||||
// });
|
||||
// return null;
|
||||
// });
|
||||
|
||||
ArrayList<String> fileNameList = vcs.getDocumentPagePathListRev(revisionId).join();
|
||||
document.getDocumentPageListByFileNameList(documentId, fileNameList).thenApply(documentPageList -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
adapter.setPages(documentPageList);
|
||||
adapter.notifyDataSetChanged();
|
||||
});
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,439 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.viewpager2.widget.ViewPager2;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.PopupMenu;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
import com.google.android.material.tabs.TabLayout;
|
||||
import com.google.android.material.tabs.TabLayoutMediator;
|
||||
import com.google.android.material.textfield.TextInputEditText;
|
||||
import com.google.android.material.textfield.TextInputLayout;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.LacertaApplyTagDialog;
|
||||
import one.nem.lacerta.component.common.LacertaSelectRevDialog;
|
||||
import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
|
||||
import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
|
||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.document.page.Page;
|
||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||
import one.nem.lacerta.model.pref.ToxiDocumentModel;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ViewerContainerFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class ViewerContainerFragment extends Fragment {
|
||||
|
||||
// Inject
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
@Inject
|
||||
Document document;
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
// Variables
|
||||
private String documentId;
|
||||
private String documentName;
|
||||
private boolean hasCombined = false;
|
||||
private String revId;
|
||||
private ViewerViewPagerAdapter viewerViewPagerAdapter;
|
||||
|
||||
public ViewerContainerFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static ViewerContainerFragment newInstance(String documentId, String documentName, boolean hasCombined) {
|
||||
ViewerContainerFragment fragment = new ViewerContainerFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
args.putBoolean("hasCombined", hasCombined);
|
||||
args.putString("revId", null);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
public static ViewerContainerFragment newInstance(String documentId, String documentName) {
|
||||
ViewerContainerFragment fragment = new ViewerContainerFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
args.putBoolean("hasCombined", false);
|
||||
args.putString("revId", null);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
public static ViewerContainerFragment newInstance(String documentId, String documentName, String revId) {
|
||||
ViewerContainerFragment fragment = new ViewerContainerFragment();
|
||||
Bundle args = new Bundle();
|
||||
fragment.setArguments(args);
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
args.putBoolean("hasCombined", false);
|
||||
args.putString("revId", revId);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null){
|
||||
documentId = getArguments().getString("documentId");
|
||||
documentName = getArguments().getString("documentName");
|
||||
hasCombined = getArguments().getBoolean("hasCombined");
|
||||
revId = getArguments().getString("revId");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_viewer_container, container, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
// Init view pager
|
||||
ViewPager2 viewPager = view.findViewById(R.id.view_pager);
|
||||
|
||||
// Init view pager adapter
|
||||
this.viewerViewPagerAdapter = new ViewerViewPagerAdapter(requireActivity());
|
||||
viewPager.setAdapter(viewerViewPagerAdapter);
|
||||
|
||||
// Init tab layout
|
||||
TabLayout tabLayout = view.findViewById(R.id.tab_layout);
|
||||
|
||||
// Init toolbar
|
||||
Toolbar toolbar = view.findViewById(R.id.toolbar);
|
||||
initToolbar(toolbar, true, documentName);
|
||||
|
||||
if (this.revId != null) { // Revが指定されている場合
|
||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
|
||||
viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
||||
viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
||||
viewerViewPagerAdapter.setFragmentRevisionList(new ArrayList<String>(){{add(revId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
||||
viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
|
||||
tabLayout.setVisibility(View.GONE);
|
||||
toolbar.setSubtitle("リビジョン: " + revId);
|
||||
} else {
|
||||
// Get document page
|
||||
if (this.hasCombined) { // 結合親の場合
|
||||
// バージョンを遡る操作を非表示
|
||||
toolbar.getMenu().findItem(R.id.action_open_vcs_rev_list).setVisible(false);
|
||||
logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
|
||||
lacertaLibrary.getCombinedDocumentToxiList(documentId).thenAccept(combinedDocumentToxiList -> {
|
||||
logger.debug("ViewerContainerFragment", "combinedDocumentToxiList: " + combinedDocumentToxiList.size());
|
||||
|
||||
viewerViewPagerAdapter.setFragmentTargetIdList(
|
||||
combinedDocumentToxiList.stream().map(ToxiDocumentModel::getChildDocumentId).collect(Collectors.toCollection(ArrayList::new)));
|
||||
viewerViewPagerAdapter.setFragmentTitleList(
|
||||
combinedDocumentToxiList.stream().map(ToxiDocumentModel::getTitleCache).collect(Collectors.toCollection(ArrayList::new)));
|
||||
|
||||
viewerViewPagerAdapter.notifyItemRangeChanged(0, combinedDocumentToxiList.size());
|
||||
toolbar.setSubtitle("結合ドキュメント");
|
||||
});
|
||||
} else { // それ以外の場合
|
||||
logger.debug("ViewerContainerFragment", "hasCombined: " + hasCombined);
|
||||
tabLayout.setVisibility(View.GONE);
|
||||
viewerViewPagerAdapter.setFragmentTargetIdList(new ArrayList<String>(){{add(documentId);}}); // TODO-rca: 読みにくいので直接追加できるようにする
|
||||
viewerViewPagerAdapter.setFragmentTitleList(new ArrayList<String>(){{add(documentName);}});
|
||||
viewerViewPagerAdapter.notifyItemRangeChanged(0, 1);
|
||||
}
|
||||
|
||||
// サブタイトルとしてパスを表示(暫定)
|
||||
lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT).thenAccept(publicPath -> {
|
||||
logger.debug("ViewerContainerFragment", "publicPath: " + publicPath);
|
||||
toolbar.setSubtitle("/" + publicPath.parent().getStringPath());
|
||||
});
|
||||
|
||||
}
|
||||
// Attach tab layout to view pager
|
||||
new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
|
||||
View customView = LayoutInflater.from(getContext()).inflate(R.layout.viewer_custom_tab, null);
|
||||
|
||||
TextView textView = customView.findViewById(R.id.tab_title);
|
||||
textView.setText(viewerViewPagerAdapter.getTabTitle(position));
|
||||
|
||||
ImageButton imageButton = customView.findViewById(R.id.tab_modify);
|
||||
imageButton.setOnClickListener(v -> {
|
||||
PopupMenu popupMenu = new PopupMenu(getContext(), v);
|
||||
popupMenu.inflate(R.menu.viewer_tab_menu);
|
||||
popupMenu.setOnMenuItemClickListener(item -> {
|
||||
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
||||
showRevList(viewerViewPagerAdapter.getFragmentTargetId(position), viewerViewPagerAdapter.getFragmentTitle(position));
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_rename) {
|
||||
renameCombinedDocument(
|
||||
documentId,
|
||||
viewerViewPagerAdapter.getFragmentTargetIdList().get(position),
|
||||
viewerViewPagerAdapter.getFragmentTitle(position),
|
||||
position);
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_delete) {
|
||||
Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
popupMenu.show();
|
||||
});
|
||||
|
||||
tab.setCustomView(customView);
|
||||
}).attach();
|
||||
}
|
||||
|
||||
private void renameCombinedDocument(String parentId, String childId, String current, int position) { // TODO-rca: 無理やりpositionを渡してるのでなんとかする
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
|
||||
builder.setTitle("アイテム名の変更");
|
||||
builder.setMessage("アイテム名を入力してください");
|
||||
|
||||
View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
|
||||
TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
|
||||
TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
|
||||
textInputEditText.setText(current);
|
||||
textInputLayout.setHint("アイテム名");
|
||||
builder.setView(view);
|
||||
|
||||
builder.setPositiveButton("変更", (dialog, which) -> {
|
||||
document.renameDocument(childId, textInputEditText.getText().toString()).thenCombine(
|
||||
lacertaLibrary.updateTitleCache(parentId, childId, textInputEditText.getText().toString()), (aVoid, aVoid2) -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
Toast.makeText(getContext(), "変更しました", Toast.LENGTH_SHORT).show();
|
||||
updateTabTitle(position, textInputEditText.getText().toString());
|
||||
dialog.dismiss();
|
||||
});
|
||||
return null;
|
||||
});
|
||||
});
|
||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||
dialog.cancel();
|
||||
});
|
||||
|
||||
builder.show();
|
||||
}
|
||||
|
||||
private void updateTabTitle(int position, String title) {
|
||||
ArrayList<String> fragmentTitleList = viewerViewPagerAdapter.getFragmentTitleList();
|
||||
fragmentTitleList.set(position, title);
|
||||
viewerViewPagerAdapter.setFragmentTitleList(fragmentTitleList);
|
||||
viewerViewPagerAdapter.notifyItemChanged(position);
|
||||
}
|
||||
|
||||
/**
|
||||
* Toolbarをinitする
|
||||
*
|
||||
* @param toolbar Toolbar
|
||||
* @param showCloseButton Closeボタンを表示するかどうか
|
||||
* @param title タイトル
|
||||
*/
|
||||
private void initToolbar(Toolbar toolbar, boolean showCloseButton, String title) {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
// Close button
|
||||
if (showCloseButton) {
|
||||
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
|
||||
toolbar.setNavigationOnClickListener(v -> {
|
||||
getActivity().finish();
|
||||
});
|
||||
} else {
|
||||
toolbar.setNavigationIcon(null);
|
||||
}
|
||||
|
||||
// Title
|
||||
toolbar.setTitle(title);
|
||||
|
||||
// Menu
|
||||
toolbar.inflateMenu(R.menu.viewer_menu);
|
||||
toolbar.setOnMenuItemClickListener(item -> {
|
||||
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
||||
showRevList(this.documentId, this.documentName);
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_rename) {
|
||||
renameDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_delete) {
|
||||
deleteDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_move) {
|
||||
moveDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_combine) {
|
||||
combineDocument();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_apply_tag) {
|
||||
applyTag();
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private void showRevList(String targetId, String targetName) {
|
||||
LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
|
||||
lacertaSelectRevDialog.setDocumentId(targetId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
|
||||
lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
|
||||
@Override
|
||||
public void onItemSelected(String revId) {
|
||||
logger.debug("ViewerContainerFragment", "Dialog Result: revId: " + revId);
|
||||
getParentFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(targetId, targetName, revId))
|
||||
.commit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDialogCanceled() {
|
||||
}
|
||||
});
|
||||
lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
|
||||
}
|
||||
|
||||
private void moveDocument() {
|
||||
LacertaDirPickerDialog lacertaDirPickerDialog = new LacertaDirPickerDialog();
|
||||
lacertaDirPickerDialog.setListener((name, dirId) -> {
|
||||
logger.debug("MoveDocument", "Selected dir: " + name + ", " + dirId);
|
||||
document.moveDocument(documentId, dirId).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
// Stop Activity
|
||||
getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
|
||||
});
|
||||
});
|
||||
});
|
||||
lacertaDirPickerDialog.setTitle("ファイルの移動")
|
||||
.setMessage("ファイルを移動するフォルダを選択してください。")
|
||||
.setPositiveButtonText("移動")
|
||||
.setNegativeButtonText("キャンセル");
|
||||
lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
|
||||
}
|
||||
|
||||
private void deleteDocument() {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
|
||||
builder.setTitle("ファイルの削除");
|
||||
builder.setMessage("ファイルを削除しますか?");
|
||||
|
||||
builder.setPositiveButton("削除", (dialog, which) -> {
|
||||
document.deleteDocument(documentId).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
Toast.makeText(getContext(), "削除しました", Toast.LENGTH_SHORT).show();
|
||||
getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
|
||||
});
|
||||
});
|
||||
});
|
||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||
dialog.cancel();
|
||||
});
|
||||
|
||||
builder.show();
|
||||
}
|
||||
|
||||
private void applyTag() {
|
||||
LacertaApplyTagDialog lacertaApplyTagDialog = new LacertaApplyTagDialog();
|
||||
lacertaApplyTagDialog
|
||||
.setTitle("タグの適用")
|
||||
.setMessage("適用するタグを選択してください")
|
||||
.setNegativeButtonText("キャンセル")
|
||||
.setDocumentId(documentId)
|
||||
.setListener(new LacertaApplyTagDialog.LacertaApplyTagDialogListener() {
|
||||
@Override
|
||||
public void onDialogPositiveClick(ArrayList<DocumentTag> appliedTags) {
|
||||
logger.debug("ViewerContainerFragment", "Dialog Result: appliedTags: " + appliedTags.size());
|
||||
lacertaLibrary.applyTagListToDocument(documentId, appliedTags).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
Toast.makeText(getContext(), "タグを適用しました", Toast.LENGTH_SHORT).show();
|
||||
lacertaApplyTagDialog.dismiss();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDialogNegativeClick() {
|
||||
lacertaApplyTagDialog.dismiss();
|
||||
}
|
||||
})
|
||||
.show(getChildFragmentManager(), "LacertaApplyTagDialog");
|
||||
}
|
||||
|
||||
private void combineDocument() {
|
||||
LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
|
||||
lacertaFilePickerDialog.setListener((fileName, selectedId) -> {
|
||||
lacertaLibrary.combineDocument(documentId, selectedId).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
Toast.makeText(getContext(), "結合しました", Toast.LENGTH_SHORT).show();
|
||||
getActivity().finish(); // TODO-rca: 終了させずにUIを更新したい
|
||||
});
|
||||
});
|
||||
});
|
||||
lacertaFilePickerDialog
|
||||
.setTitle("ファイルの結合")
|
||||
.setMessage("結合するファイルを選択してください")
|
||||
.setNegativeButtonText("キャンセル")
|
||||
.show(getChildFragmentManager(), "LacertaFilePickerDialog");
|
||||
}
|
||||
|
||||
/**
|
||||
* ドキュメント名を変更する
|
||||
*/
|
||||
private void renameDocument() {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext());
|
||||
builder.setTitle("ファイル名の変更");
|
||||
builder.setMessage("ファイル名を入力してください");
|
||||
|
||||
View view = LayoutInflater.from(getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
|
||||
TextInputEditText textInputEditText = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
|
||||
TextInputLayout textInputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
|
||||
textInputEditText.setText(documentName);
|
||||
textInputLayout.setHint("ファイル名");
|
||||
builder.setView(view);
|
||||
|
||||
builder.setPositiveButton("変更", (dialog, which) -> {
|
||||
document.renameDocument(documentId, textInputEditText.getText().toString()).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
this.documentName = textInputEditText.getText().toString();
|
||||
// TODO-rca: Toolbarのタイトルも変更する
|
||||
});
|
||||
});
|
||||
});
|
||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||
dialog.cancel();
|
||||
});
|
||||
|
||||
builder.show();
|
||||
}
|
||||
}
|
||||
@@ -1,290 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import dagger.hilt.android.AndroidEntryPoint;
|
||||
import one.nem.lacerta.component.common.LacertaSelectDirDialog;
|
||||
import one.nem.lacerta.component.common.LacertaSelectDirDialogListener;
|
||||
import one.nem.lacerta.component.common.LacertaSelectRevDialog;
|
||||
import one.nem.lacerta.component.common.LacertaSelectRevDialogListener;
|
||||
import one.nem.lacerta.component.common.picker.LacertaDirPickerDialog;
|
||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerAdapter;
|
||||
import one.nem.lacerta.component.common.picker.LacertaFilePickerDialog;
|
||||
import one.nem.lacerta.data.Document;
|
||||
import one.nem.lacerta.data.LacertaLibrary;
|
||||
import one.nem.lacerta.model.ListItemType;
|
||||
import one.nem.lacerta.model.document.page.Page;
|
||||
import one.nem.lacerta.utils.FeatureSwitch;
|
||||
import one.nem.lacerta.utils.LacertaLogger;
|
||||
import one.nem.lacerta.vcs.LacertaVcs;
|
||||
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ViewerListFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class ViewerListFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
Document document;
|
||||
|
||||
@Inject
|
||||
LacertaLibrary lacertaLibrary;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
private static final String TAG = "ComponentViewerTopFragment";
|
||||
|
||||
private String documentId;
|
||||
private String documentName;
|
||||
private String revisionId;
|
||||
|
||||
public ViewerListFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static ViewerListFragment newInstance(String documentId, String documentName) {
|
||||
ViewerListFragment fragment = new ViewerListFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
public static ViewerListFragment newInstance(String documentId, String documentName, String revisionId) {
|
||||
ViewerListFragment fragment = new ViewerListFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
args.putString("revisionId", revisionId);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (getArguments() != null) {
|
||||
documentId = getArguments().getString("documentId");
|
||||
documentName = getArguments().getString("documentName");
|
||||
revisionId = getArguments().getString("revisionId");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
|
||||
|
||||
// Toolbar
|
||||
Toolbar toolbar = view.findViewById(R.id.toolbar);
|
||||
toolbarSetup(toolbar, true, this.documentName == null ? "Document" : this.documentName, null);
|
||||
|
||||
RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(new ItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(String fileName) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemLongClick(String fileName, int position) {
|
||||
|
||||
}
|
||||
});
|
||||
recyclerView.setAdapter(viewerBodyAdapter);
|
||||
|
||||
if (revisionId == null) {
|
||||
logger.debug(TAG, "revisionId is empty, loading latest revision");
|
||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
|
||||
document.getDocument(documentId).thenAccept(documentDetail -> {
|
||||
ArrayList<Page> pages = documentDetail.getPages();
|
||||
logger.debug(TAG, "pages.size(): " + pages.size());
|
||||
viewerBodyAdapter.setPages(pages);
|
||||
getActivity().runOnUiThread(() -> {
|
||||
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
|
||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
|
||||
});
|
||||
}).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
|
||||
updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath());
|
||||
});
|
||||
} else {
|
||||
logger.debug(TAG, "revisionId: " + revisionId);
|
||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
|
||||
LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
|
||||
lacertaVcs.getDocumentPagePathListRev(revisionId).thenAccept(documentPathList -> {
|
||||
logger.debug(TAG, "documentPathList.size(): " + documentPathList.size());
|
||||
document.getDocumentPageListByFileNameList(documentId, documentPathList).thenAccept(pages -> {
|
||||
logger.debug(TAG, "pages.size(): " + pages.size());
|
||||
viewerBodyAdapter.setPages(pages);
|
||||
getActivity().runOnUiThread(() -> {
|
||||
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
|
||||
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
|
||||
});
|
||||
});
|
||||
}).thenCompose(aVoid -> lacertaLibrary.getPublicPath(documentId, ListItemType.ITEM_TYPE_DOCUMENT)).thenAccept(publicPath -> {
|
||||
updateToolbarSubtitle(toolbar, "/" + publicPath.parent().getStringPath()); // TODO-rca: リビジョンの場合はリビジョン名を表示する?
|
||||
});
|
||||
}
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
/**
|
||||
* Toolbarのサブタイトルを更新
|
||||
* @param subtitle サブタイトル
|
||||
*/
|
||||
private void updateToolbarSubtitle(Toolbar toolbar, String subtitle) {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
toolbar.setSubtitle(subtitle);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* ToolbarをInitする
|
||||
*
|
||||
* @param toolbar Toolbar
|
||||
* @param showCloseButton 戻るボタンを表示するか
|
||||
* @param title タイトル
|
||||
*/
|
||||
private void toolbarSetup(Toolbar toolbar, boolean showCloseButton, String title, String Subtitle) {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
if (showCloseButton) {
|
||||
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.close_24px);
|
||||
toolbar.setNavigationOnClickListener(v -> {
|
||||
// Stop Activity
|
||||
getActivity().finish();
|
||||
});
|
||||
} else {
|
||||
toolbar.setNavigationIcon(null);
|
||||
}
|
||||
toolbar.setTitle(title);
|
||||
if (Subtitle != null) toolbar.setSubtitle(Subtitle);
|
||||
toolbar.inflateMenu(R.menu.viewer_menu);
|
||||
toolbar.setOnMenuItemClickListener(item -> {
|
||||
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
||||
LacertaSelectRevDialog lacertaSelectRevDialog = new LacertaSelectRevDialog();
|
||||
lacertaSelectRevDialog.setDocumentId(this.documentId).setTitle("リビジョンの選択").setMessage("リビジョンを選択してください。").setNegativeButtonText("キャンセル");
|
||||
lacertaSelectRevDialog.setListener(new LacertaSelectRevDialogListener() {
|
||||
@Override
|
||||
public void onItemSelected(String revId) {
|
||||
getParentFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName, revisionId))
|
||||
.commit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDialogCanceled() {
|
||||
logger.debug(TAG, "Canceled");
|
||||
}
|
||||
});
|
||||
lacertaSelectRevDialog.show(getParentFragmentManager(), "select_rev_dialog");
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_rename) {
|
||||
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
|
||||
builder.setTitle("ファイル名の変更");
|
||||
|
||||
View view = LayoutInflater.from(requireContext()).inflate(one.nem.lacerta.shared.ui.R.layout.lacerta_dialog_edit_text_layout, null);
|
||||
final com.google.android.material.textfield.TextInputEditText input = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_edit_text);
|
||||
final com.google.android.material.textfield.TextInputLayout inputLayout = view.findViewById(one.nem.lacerta.shared.ui.R.id.custom_text_input_layout);
|
||||
inputLayout.setHint("ファイル名");
|
||||
|
||||
builder.setView(view);
|
||||
|
||||
builder.setPositiveButton("変更", (dialog, which) -> {
|
||||
document.renameDocument(documentId, input.getText().toString()).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
toolbar.setTitle(input.getText().toString());
|
||||
documentName = input.getText().toString();
|
||||
});
|
||||
});
|
||||
});
|
||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||
dialog.cancel();
|
||||
});
|
||||
|
||||
builder.show();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_delete) {
|
||||
// TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
|
||||
builder.setTitle("ファイルの削除");
|
||||
builder.setMessage("ファイルを削除しますか?");
|
||||
builder.setPositiveButton("削除", (dialog, which) -> {
|
||||
document.deleteDocument(documentId).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
// Stop Activity
|
||||
getActivity().finish();
|
||||
});
|
||||
});
|
||||
});
|
||||
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||
dialog.cancel();
|
||||
});
|
||||
builder.show();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_move) {
|
||||
LacertaDirPickerDialog lacertaDirPickerDialog = new LacertaDirPickerDialog();
|
||||
lacertaDirPickerDialog.setListener((name, dirId) -> {
|
||||
logger.debug(TAG, "Selected dir: " + name + ", " + dirId);
|
||||
document.moveDocument(documentId, dirId).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
// Stop Activity
|
||||
getActivity().finish(); // TODO-rca: ファイル移動後に終了するべきかは検討
|
||||
});
|
||||
});
|
||||
});
|
||||
lacertaDirPickerDialog.setTitle("ファイルの移動")
|
||||
.setMessage("ファイルを移動するフォルダを選択してください。")
|
||||
.setPositiveButtonText("移動")
|
||||
.setNegativeButtonText("キャンセル");
|
||||
lacertaDirPickerDialog.show(getParentFragmentManager(), "select_dir_dialog");
|
||||
return true;
|
||||
} else if(item.getItemId() == R.id.action_combine) {
|
||||
LacertaFilePickerDialog lacertaFilePickerDialog = new LacertaFilePickerDialog();
|
||||
lacertaFilePickerDialog.setListener((name, fileId) -> {
|
||||
lacertaLibrary.combineDocument(documentId, fileId).thenAccept(aVoid -> {
|
||||
getActivity().runOnUiThread(() -> {
|
||||
// Stop Activity
|
||||
getActivity().finish(); // TODO-rca: 終了せずにUIを更新したい
|
||||
});
|
||||
});
|
||||
});
|
||||
lacertaFilePickerDialog.setTitle("ファイルの結合")
|
||||
.setMessage("結合するファイルを選択してください。")
|
||||
.setNegativeButtonText("キャンセル");
|
||||
lacertaFilePickerDialog.show(getParentFragmentManager(), "select_file_dialog");
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.EdgeToEdge;
|
||||
import androidx.activity.OnBackPressedCallback;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.graphics.Insets;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
|
||||
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;
|
||||
String documentName;
|
||||
boolean hasCombined = false;
|
||||
|
||||
@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;
|
||||
});
|
||||
|
||||
// // Transition
|
||||
// overridePendingTransition(one.nem.lacerta.shared.ui.R.anim.nav_up_enter_anim, one.nem.lacerta.shared.ui.R.anim.nav_up_exit_anim);
|
||||
|
||||
Intent intent = getIntent();
|
||||
try {
|
||||
documentId = intent.getStringExtra("documentId");
|
||||
documentName = intent.getStringExtra("documentName");
|
||||
hasCombined = intent.getBooleanExtra("hasCombined", false);
|
||||
}
|
||||
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();
|
||||
}
|
||||
|
||||
// Navigation
|
||||
// getSupportFragmentManager().beginTransaction()
|
||||
// .replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(documentId, documentName))
|
||||
// .commit();
|
||||
if (hasCombined) {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName, hasCombined))
|
||||
.commit();
|
||||
} else {
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, ViewerContainerFragment.newInstance(documentId, documentName))
|
||||
.commit();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
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 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;
|
||||
|
||||
/**
|
||||
* A simple {@link Fragment} subclass.
|
||||
* Use the {@link ViewerVcsRevListFragment#newInstance} factory method to
|
||||
* create an instance of this fragment.
|
||||
*/
|
||||
@AndroidEntryPoint
|
||||
public class ViewerVcsRevListFragment extends Fragment {
|
||||
|
||||
@Inject
|
||||
LacertaVcsFactory lacertaVcsFactory;
|
||||
|
||||
@Inject
|
||||
LacertaLogger logger;
|
||||
|
||||
LacertaVcs lacertaVcs;
|
||||
|
||||
private String documentId;
|
||||
private String documentName;
|
||||
|
||||
public ViewerVcsRevListFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
public static ViewerVcsRevListFragment newInstance(String documentId, String documentName) {
|
||||
ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
|
||||
Bundle args = new Bundle();
|
||||
args.putString("documentId", documentId);
|
||||
args.putString("documentName", documentName);
|
||||
fragment.setArguments(args);
|
||||
return fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
return inflater.inflate(R.layout.fragment_viewer_vcs_rev_list, container, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
// Init arg
|
||||
if (getArguments() != null) {
|
||||
this.documentId = getArguments().getString("documentId");
|
||||
logger.debug("ViewerVcsRevListFragment", "documentId: " + this.documentId);
|
||||
}
|
||||
|
||||
// Init vcs
|
||||
lacertaVcs = lacertaVcsFactory.create(this.documentId);
|
||||
|
||||
// Init view
|
||||
RecyclerView recyclerView = view.findViewById(R.id.rev_list);
|
||||
|
||||
// Init adapter
|
||||
RevAdapter revAdapter = new RevAdapter(revisionId -> {
|
||||
logger.debug("ViewerVcsRevListFragment", "Selected revisionId: " + revisionId);
|
||||
getParentFragmentManager().beginTransaction()
|
||||
.replace(R.id.nav_host_fragment, ViewerListFragment.newInstance(this.documentId, this.documentName, revisionId))
|
||||
.commit();
|
||||
});
|
||||
|
||||
// Set adapter
|
||||
recyclerView.setAdapter(revAdapter);
|
||||
|
||||
// Set layout manager
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||
|
||||
lacertaVcs.getRevisionHistory().thenAccept(revModels -> {
|
||||
logger.debug("ViewerVcsRevListFragment", "revModels.size(): " + revModels.size());
|
||||
getActivity().runOnUiThread(() -> {
|
||||
revAdapter.setRevModels(revModels);
|
||||
revAdapter.notifyDataSetChanged();
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
package one.nem.lacerta.component.viewer;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentPagerAdapter;
|
||||
import androidx.viewpager2.adapter.FragmentStateAdapter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class ViewerViewPagerAdapter extends FragmentStateAdapter {
|
||||
|
||||
// Variables
|
||||
private ArrayList<String> fragmentTargetIdList = new ArrayList<>();
|
||||
private ArrayList<String> fragmentTitleList = new ArrayList<>();
|
||||
private ArrayList<String> fragmentRevisionList = new ArrayList<>();
|
||||
|
||||
// Setter
|
||||
|
||||
public void setFragmentTargetIdList(ArrayList<String> fragmentTargetIdList) {
|
||||
this.fragmentTargetIdList = fragmentTargetIdList;
|
||||
}
|
||||
|
||||
public void setFragmentTitleList(ArrayList<String> fragmentTitleList) {
|
||||
this.fragmentTitleList = fragmentTitleList;
|
||||
}
|
||||
|
||||
public void setFragmentRevisionList(ArrayList<String> fragmentRevisionList) {
|
||||
this.fragmentRevisionList = fragmentRevisionList;
|
||||
}
|
||||
|
||||
public ViewerViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
|
||||
super(fragmentActivity);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public Fragment createFragment(int position) {
|
||||
if (fragmentRevisionList != null && fragmentRevisionList.size() > position) {
|
||||
return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position), fragmentRevisionList.get(position));
|
||||
} else {
|
||||
return ViewerBodyFragment.newInstance(fragmentTargetIdList.get(position), fragmentTitleList.get(position));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
if (fragmentTargetIdList == null || fragmentTitleList == null) {
|
||||
return 0;
|
||||
} else if (fragmentTargetIdList.size() != fragmentTitleList.size()) {
|
||||
throw new IllegalStateException("fragmentTargetIdList.size() != fragmentTitleList.size()");
|
||||
} else {
|
||||
return fragmentTargetIdList.size();
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public CharSequence getTabTitle(int position) {
|
||||
return fragmentTitleList.get(position);
|
||||
}
|
||||
|
||||
// Getter
|
||||
|
||||
public String getFragmentTargetId(int position) {
|
||||
return fragmentTargetIdList.get(position);
|
||||
}
|
||||
|
||||
public String getFragmentTitle(int position) {
|
||||
return fragmentTitleList.get(position);
|
||||
}
|
||||
|
||||
public ArrayList<String> getFragmentTargetIdList() {
|
||||
return fragmentTargetIdList;
|
||||
}
|
||||
|
||||
public ArrayList<String> getFragmentTitleList() {
|
||||
return fragmentTitleList;
|
||||
}
|
||||
}
|
||||