mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2026-11-07 19:47:36 +00:00
Compare commits
381
Commits
r-ca-patch-2
...
submit1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
53c8114708 | ||
|
|
f65732c42b | ||
|
|
2821ad8552 | ||
|
|
fc5ef3ed8f | ||
|
|
ad05e3db44 | ||
|
|
18abe66031 | ||
|
|
c5a0079812 | ||
|
|
73c2271782 | ||
|
|
06771d2e74 | ||
|
|
09c6d47a47 | ||
|
|
29f745bb5c | ||
|
|
cef688187a | ||
|
|
da26641e2f | ||
|
|
9f50696b39 | ||
|
|
9865790a98 | ||
|
|
5df0c7ee52 | ||
|
|
872bbd0f4e | ||
|
|
8e2af0c963 | ||
|
|
b3d095fa40 | ||
|
|
1c71ac6545 | ||
|
|
c731749233 | ||
|
|
0ef6863992 | ||
|
|
1a247d9b8b | ||
|
|
ce4656558a | ||
|
|
32b238df58 | ||
|
|
87099ae693 | ||
|
|
b11b78fa7f | ||
|
|
cd0c5e81c5 | ||
|
|
b9d81ab997 | ||
|
|
a61de24931 | ||
|
|
9de39309bc | ||
|
|
9d229a2857 | ||
|
|
da9cd9be8e | ||
|
|
0b2d58470b | ||
|
|
ed5e699493 | ||
|
|
29737303af | ||
|
|
151c2dde25 | ||
|
|
18eee403ef | ||
|
|
2b9a68b6f5 | ||
|
|
b820f42007 | ||
|
|
af8935cd7f | ||
|
|
6c50675938 | ||
|
|
791084b737 | ||
|
|
15d4a369d8 | ||
|
|
07e14eb90c | ||
|
|
b13f048c7e | ||
|
|
f0ed4327ca | ||
|
|
b852e9b7ee | ||
|
|
ca063709dd | ||
|
|
67de02b502 | ||
|
|
5fafbec247 | ||
|
|
e104b3d8ff | ||
|
|
d8d8a5932b | ||
|
|
113a2fd3d2 | ||
|
|
4714e3d8cb | ||
|
|
14ff9abab9 | ||
|
|
1105c17fca | ||
|
|
37a18704e3 | ||
|
|
d5df291c81 | ||
|
|
3178e9233b | ||
|
|
004bedb45f | ||
|
|
de30eb241c | ||
|
|
c7f2a3eebe | ||
|
|
2a7e329ad7 | ||
|
|
52f41881fd | ||
|
|
68fb0b719b | ||
|
|
da8d4fb4fc | ||
|
|
f7d07b0ec3 | ||
|
|
7f71e818a8 | ||
|
|
fc6cbb9d37 | ||
|
|
df3edbf354 | ||
|
|
d40b188f87 | ||
|
|
253c77d6f5 | ||
|
|
b87b635d2b | ||
|
|
9df033af73 | ||
|
|
58e0686304 | ||
|
|
a0f89de1ac | ||
|
|
fe4999384a | ||
|
|
bc304f8535 | ||
|
|
e77fafc108 | ||
|
|
305cbcd679 | ||
|
|
c06d7e6b15 | ||
|
|
1648e0b7c1 | ||
|
|
04db160548 | ||
|
|
611c5b516d | ||
|
|
734f75b4c7 | ||
|
|
6e0c473c66 | ||
|
|
20828e2f0f | ||
|
|
3b684bec53 | ||
|
|
afef074242 | ||
|
|
1ceb3e29b7 | ||
|
|
a5fa89252c | ||
|
|
106bb93644 | ||
|
|
ab39cd4d00 | ||
|
|
d1a5cd2f23 | ||
|
|
0dc69e1d73 | ||
|
|
3d8ab69742 | ||
|
|
6bc43869c9 | ||
|
|
63dfbc120d | ||
|
|
064c4edfbe | ||
|
|
1a80d00319 | ||
|
|
3f893fc580 | ||
|
|
225058f836 | ||
|
|
c23b92d386 | ||
|
|
41e5ab2349 | ||
|
|
580e79b03a | ||
|
|
301fab8024 | ||
|
|
281238a38e | ||
|
|
81fa259985 | ||
|
|
b2c6085933 | ||
|
|
caf3a0dd34 | ||
|
|
c4e10b9487 | ||
|
|
b05ee22c29 | ||
|
|
839433dbb1 | ||
|
|
153242ef66 | ||
|
|
05997eafe1 | ||
|
|
d6f4885b4a | ||
|
|
0b33c60a5a | ||
|
|
ad3a600e8c | ||
|
|
50dfb9be8b | ||
|
|
fafb996453 | ||
|
|
e1129bc009 | ||
|
|
5752e3285b | ||
|
|
a2ed78dfb8 | ||
|
|
0eadc3c3d5 | ||
|
|
6d0b24eb70 | ||
|
|
9da41e73aa | ||
|
|
01f28ecd4d | ||
|
|
2f3a331527 | ||
|
|
9496c3efbb | ||
|
|
93b833f7a9 | ||
|
|
3130be88be | ||
|
|
bb7b628d2f | ||
|
|
5f9ea732cf | ||
|
|
42f6bc17d3 | ||
|
|
1c6878c3fd | ||
|
|
b5beb7cc15 | ||
|
|
c6fb06ffe2 | ||
|
|
95d808dc75 | ||
|
|
b4135f9ec0 | ||
|
|
a62d748c72 | ||
|
|
ea0b1a7665 | ||
|
|
4cfc87a40b | ||
|
|
40a0d08a1f | ||
|
|
fd850651b3 | ||
|
|
ec633a7238 | ||
|
|
e10207959b | ||
|
|
c46ec70d97 | ||
|
|
871dfad6c4 | ||
|
|
676a0e2772 | ||
|
|
d9d22198d5 | ||
|
|
2dc3407217 | ||
|
|
d40f61928c | ||
|
|
19ff824591 | ||
|
|
ec7adbe331 | ||
|
|
af626f4dc0 | ||
|
|
acea8ba27d | ||
|
|
8f1849591d | ||
|
|
882207682f | ||
|
|
0be12e73a8 | ||
|
|
f0b4cc556e | ||
|
|
8c71dedd85 | ||
|
|
c1151b778c | ||
|
|
10e3093c53 | ||
|
|
9ef49e0226 | ||
|
|
a8ce70e6d9 | ||
|
|
2f9777f1f4 | ||
|
|
0a867051f2 | ||
|
|
673918771c | ||
|
|
df14850df1 | ||
|
|
28cae3fa19 | ||
|
|
c167d83940 | ||
|
|
722a3d8c7b | ||
|
|
d7f22c8e36 | ||
|
|
0da5e8a961 | ||
|
|
c45847ecd2 | ||
|
|
d6faf8ec16 | ||
|
|
3e21b0ea1c | ||
|
|
a8e15d8e18 | ||
|
|
50eeaa03bf | ||
|
|
f5b94e0f6a | ||
|
|
e9145d491c | ||
|
|
cb662fe1ff | ||
|
|
8ad3150f33 | ||
|
|
5cc718e35d | ||
|
|
0accd4fa79 | ||
|
|
5840c0126e | ||
|
|
017a2413b6 | ||
|
|
c53c4ed9a1 | ||
|
|
12ba9234a4 | ||
|
|
aaff0be438 | ||
|
|
11e32572ef | ||
|
|
ce3f9ebfd7 | ||
|
|
1b70b444f2 | ||
|
|
7214da80fa | ||
|
|
4e5aab276a | ||
|
|
4ab13508c4 | ||
|
|
df22a754b7 | ||
|
|
9efecab4b6 | ||
|
|
9aea4bb90e | ||
|
|
5c17f96d3d | ||
|
|
d47c6d0cc8 | ||
|
|
176160cd8f | ||
|
|
e6a4393b6d | ||
|
|
acc5b166d5 | ||
|
|
1d2f3345df | ||
|
|
b63e9a6747 | ||
|
|
1f8b56bc78 | ||
|
|
dc9a6bfd9b | ||
|
|
a825ad6a36 | ||
|
|
dd1be73904 | ||
|
|
7156bc417c | ||
|
|
d9c46898ab | ||
|
|
19ce9cbd7e | ||
|
|
584556faca | ||
|
|
028ca6303a | ||
|
|
76734de987 | ||
|
|
646a97e77b | ||
|
|
1aa41eb638 | ||
|
|
2a34100bf2 | ||
|
|
5d33d188bd | ||
|
|
8343ba9c2d | ||
|
|
95cbfdf42c | ||
|
|
7e72cbef54 | ||
|
|
a7642795ca | ||
|
|
f392991988 | ||
|
|
556c7d0841 | ||
|
|
d43bcf09b2 | ||
|
|
6120427400 | ||
|
|
2b087a4c45 | ||
|
|
457e58264b | ||
|
|
4d5d02c794 | ||
|
|
b8f3b016b7 | ||
|
|
b6307f67ce | ||
|
|
1e8dec3021 | ||
|
|
86d290b217 | ||
|
|
02d26f864d | ||
|
|
5aa6c975da | ||
|
|
7075fc710d | ||
|
|
ba0cb871a4 | ||
|
|
95a2a44cb1 | ||
|
|
fd65b17921 | ||
|
|
a3f469b466 | ||
|
|
e86129295a | ||
|
|
f4c46fbd5d | ||
|
|
439b76f8bf | ||
|
|
ffd455c6d8 | ||
|
|
29c3fddd14 | ||
|
|
516a55e4e0 | ||
|
|
68e4d0639a | ||
|
|
db26e639e6 | ||
|
|
32cd27997c | ||
|
|
6fb8091754 | ||
|
|
0d7d47ea10 | ||
|
|
3d544fa423 | ||
|
|
487451712e | ||
|
|
e78718ab79 | ||
|
|
35c58e14ad | ||
|
|
4efad853f7 | ||
|
|
6c22050906 | ||
|
|
17dc90162b | ||
|
|
72933fd45b | ||
|
|
c8c0e37052 | ||
|
|
7b6d8e3a18 | ||
|
|
6167c412c7 | ||
|
|
226f09f8bb | ||
|
|
0c4ba99a07 | ||
|
|
097adebd9b | ||
|
|
03a75a5b29 | ||
|
|
0c6e2b1a98 | ||
|
|
a7b92120ba | ||
|
|
3f78dccf3b | ||
|
|
c6ddd6fd03 | ||
|
|
eab00983a8 | ||
|
|
038c526652 | ||
|
|
704c128801 | ||
|
|
209eab0755 | ||
|
|
65d48d03fd | ||
|
|
dcd5f1b650 | ||
|
|
a74eb821f8 | ||
|
|
738d8a055c | ||
|
|
2e5559df88 | ||
|
|
dc1cc429e9 | ||
|
|
339566b243 | ||
|
|
0e1d4703e5 | ||
|
|
bcaa0e5c5c | ||
|
|
cbc1d139af | ||
|
|
ef48223d46 | ||
|
|
81ba96a3d0 | ||
|
|
80104a2285 | ||
|
|
b9973b845f | ||
|
|
a325ace6f3 | ||
|
|
7a2beececc | ||
|
|
4b5ce622fd | ||
|
|
5d8b9f338d | ||
|
|
9d2e5dd217 | ||
|
|
9ad6a6291d | ||
|
|
4235030986 | ||
|
|
c60fedeb87 | ||
|
|
2f18134581 | ||
|
|
4101f75685 | ||
|
|
184771c92d | ||
|
|
3e12f1222b | ||
|
|
29f2749cb7 | ||
|
|
244b2fb123 | ||
|
|
725d541316 | ||
|
|
fc712a131a | ||
|
|
cc7b0dc5d1 | ||
|
|
169a6c6e0a | ||
|
|
42eb3d4c80 | ||
|
|
1c87b73a5b | ||
|
|
46f119b531 | ||
|
|
def799bbe6 | ||
|
|
defc051436 | ||
|
|
de9b68de87 | ||
|
|
802e4cc75a | ||
|
|
abc91b79ee | ||
|
|
b601b28f81 | ||
|
|
853ac1eca3 | ||
|
|
834bc35318 | ||
|
|
1e3a3262a4 | ||
|
|
475c511d32 | ||
|
|
474d6417c9 | ||
|
|
c7e141b892 | ||
|
|
3d2cc5ac05 | ||
|
|
73c310ee01 | ||
|
|
5c3d811979 | ||
|
|
f5bc740f58 | ||
|
|
8a57331d32 | ||
|
|
abdca108d4 | ||
|
|
8b66646e7d | ||
|
|
c9160a2df0 | ||
|
|
c5b0a33720 | ||
|
|
13f31017f7 | ||
|
|
e6778e6214 | ||
|
|
71f9be77cd | ||
|
|
e0d63122bd | ||
|
|
1c3fdf921d | ||
|
|
d07e63f534 | ||
|
|
5160411c76 | ||
|
|
20d30e338e | ||
|
|
3be6185c21 | ||
|
|
c82952f397 | ||
|
|
8c9dc14f16 | ||
|
|
d22644e37a | ||
|
|
c80576d046 | ||
|
|
b7cb4369d1 | ||
|
|
2cfab24c76 | ||
|
|
55b34d964c | ||
|
|
744a2bef65 | ||
|
|
74becab37b | ||
|
|
58d6ae17c6 | ||
|
|
dea5f240f0 | ||
|
|
119771a7f9 | ||
|
|
b6a30d5cbf | ||
|
|
2ec4b96c14 | ||
|
|
151911d0b2 | ||
|
|
d832438f8f | ||
|
|
0487553f3b | ||
|
|
678c9730ef | ||
|
|
e1b43a5f22 | ||
|
|
d384347e0a | ||
|
|
8faaf1e84a | ||
|
|
a81d79a972 | ||
|
|
1e2f48e0ae | ||
|
|
be7bd6b6fc | ||
|
|
16eb6d083e | ||
|
|
4de33b9550 | ||
|
|
b4d94954b9 | ||
|
|
526ab97706 | ||
|
|
6f0af7c4eb | ||
|
|
c6d85471c6 | ||
|
|
c5d7224b40 | ||
|
|
cc62529224 | ||
|
|
a61c044391 | ||
|
|
bc19dd22d8 | ||
|
|
a5efab5838 | ||
|
|
f186064f6e | ||
|
|
59a35cbb4a | ||
|
|
a78e60416d | ||
|
|
ac5a950ce3 |
No files matched your search
Generated
+2
-2
@@ -4,10 +4,10 @@
|
|||||||
<selectionStates>
|
<selectionStates>
|
||||||
<SelectionState runConfigName="app">
|
<SelectionState runConfigName="app">
|
||||||
<option name="selectionMode" value="DROPDOWN" />
|
<option name="selectionMode" value="DROPDOWN" />
|
||||||
<DropdownSelection timestamp="2023-12-18T03:36:14.973846Z">
|
<DropdownSelection timestamp="2024-01-20T07:15:21.179573376Z">
|
||||||
<Target type="DEFAULT_BOOT">
|
<Target type="DEFAULT_BOOT">
|
||||||
<handle>
|
<handle>
|
||||||
<DeviceId pluginId="PhysicalDevice" identifier="serial=ZY22H7V3G7" />
|
<DeviceId pluginId="LocalEmulator" identifier="path=/home/rca/.android/avd/Pixel_3a_API_34_extension_level_7_x86_64.avd" />
|
||||||
</handle>
|
</handle>
|
||||||
</Target>
|
</Target>
|
||||||
</DropdownSelection>
|
</DropdownSelection>
|
||||||
|
|||||||
Generated
+1
-1
@@ -22,10 +22,10 @@
|
|||||||
<option value="$PROJECT_DIR$/feature/library" />
|
<option value="$PROJECT_DIR$/feature/library" />
|
||||||
<option value="$PROJECT_DIR$/feature/scan" />
|
<option value="$PROJECT_DIR$/feature/scan" />
|
||||||
<option value="$PROJECT_DIR$/feature/search" />
|
<option value="$PROJECT_DIR$/feature/search" />
|
||||||
|
<option value="$PROJECT_DIR$/feature/setting" />
|
||||||
<option value="$PROJECT_DIR$/model" />
|
<option value="$PROJECT_DIR$/model" />
|
||||||
<option value="$PROJECT_DIR$/processor" />
|
<option value="$PROJECT_DIR$/processor" />
|
||||||
<option value="$PROJECT_DIR$/shared" />
|
<option value="$PROJECT_DIR$/shared" />
|
||||||
<option value="$PROJECT_DIR$/shared/icon" />
|
|
||||||
<option value="$PROJECT_DIR$/shared/ui" />
|
<option value="$PROJECT_DIR$/shared/ui" />
|
||||||
<option value="$PROJECT_DIR$/source" />
|
<option value="$PROJECT_DIR$/source" />
|
||||||
<option value="$PROJECT_DIR$/utils" />
|
<option value="$PROJECT_DIR$/utils" />
|
||||||
|
|||||||
Generated
-1
@@ -1,4 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" 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">
|
||||||
|
|||||||
+16
-26
@@ -59,32 +59,6 @@ dependencies {
|
|||||||
androidTestImplementation libs.androidx.test.ext.junit
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
androidTestImplementation libs.androidx.test.espresso.core
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
// 内部モジュール
|
|
||||||
// Feature
|
|
||||||
implementation project(':feature:home')
|
|
||||||
implementation project(':feature:search')
|
|
||||||
implementation project(':feature:library')
|
|
||||||
implementation project(':feature:scan')
|
|
||||||
implementation project(':feature:debug') // デバッグメニュー
|
|
||||||
|
|
||||||
// // Component
|
|
||||||
// implementation project(':component:common')
|
|
||||||
// implementation project(':component:scanner')
|
|
||||||
// implementation project(':component:viewer')
|
|
||||||
|
|
||||||
// // Data
|
|
||||||
// implementation project(':data:repository')
|
|
||||||
//
|
|
||||||
// // Source
|
|
||||||
// implementation project(':data:source:database')
|
|
||||||
// implementation project(':data:source:preference')
|
|
||||||
//
|
|
||||||
implementation project(':data')
|
|
||||||
|
|
||||||
implementation project(':shared:ui')
|
|
||||||
|
|
||||||
implementation project(':shared:icon')
|
|
||||||
|
|
||||||
// Hilt (DI)
|
// Hilt (DI)
|
||||||
implementation libs.com.google.dagger.hilt.android
|
implementation libs.com.google.dagger.hilt.android
|
||||||
annotationProcessor libs.com.google.dagger.hilt.compiler
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
@@ -94,4 +68,20 @@ dependencies {
|
|||||||
implementation libs.navigation.ui
|
implementation libs.navigation.ui
|
||||||
implementation libs.navigation.dynamic.features.fragment
|
implementation libs.navigation.dynamic.features.fragment
|
||||||
|
|
||||||
|
// Feature
|
||||||
|
implementation project(':feature:home')
|
||||||
|
implementation project(':feature:search')
|
||||||
|
implementation project(':feature:library')
|
||||||
|
implementation project(':feature:scan')
|
||||||
|
implementation project(':feature:debug') // デバッグメニュー
|
||||||
|
implementation project(':feature:setting') // 設定画面
|
||||||
|
|
||||||
|
implementation project(':data')
|
||||||
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
|
implementation project(':model')
|
||||||
|
|
||||||
|
implementation project(':utils')
|
||||||
|
|
||||||
|
implementation project(':component:scanner')
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package one.nem.lacerta;
|
package one.nem.lacerta;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
import com.google.android.material.color.DynamicColors;
|
import com.google.android.material.color.DynamicColors;
|
||||||
|
|
||||||
@@ -12,7 +13,13 @@ public class LacertaApplication extends Application {
|
|||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
|
|
||||||
// DynamicColorを有効化
|
if (DynamicColors.isDynamicColorAvailable()) {
|
||||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
|
||||||
|
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||||
|
} else {
|
||||||
|
Log.d("DynamicColors", "DynamicColors is not available.");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,40 +1,167 @@
|
|||||||
package one.nem.lacerta;
|
package one.nem.lacerta;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
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.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
import androidx.navigation.NavController;
|
import androidx.navigation.NavController;
|
||||||
import androidx.navigation.fragment.NavHostFragment;
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
import androidx.navigation.ui.NavigationUI;
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
import android.widget.Toast;
|
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.bottomnavigation.BottomNavigationView;
|
||||||
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.NotActiveException;
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.utils.repository.SharedPrefUtils;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
public class MainActivity extends AppCompatActivity {
|
public class MainActivity extends AppCompatActivity implements FragmentNavigation {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
SharedPrefUtils sharedPrefUtils;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
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);
|
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||||
|
|
||||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
// Initialize app
|
||||||
|
if (sharedPrefUtils.getIsFirstLaunch()) initializeApp();
|
||||||
|
|
||||||
Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
|
// 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);
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,15 +18,33 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:navGraph="@navigation/main_nav"
|
app:navGraph="@navigation/main_nav"
|
||||||
tools:layout="@layout/fragment_debug_menu_container" />
|
tools:layout="@layout/fragment_home_top" />
|
||||||
|
|
||||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||||
android:id="@+id/bottom_nav"
|
android:id="@+id/bottom_nav"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/colorSecondaryContainer"
|
||||||
|
app:itemIconTint="@color/colorOnSecondaryContainer"
|
||||||
|
app:itemTextColor="@color/colorOnSecondaryContainer"
|
||||||
|
app:itemActiveIndicatorStyle="@style/Lacerta.Custom.Indicator"
|
||||||
|
app:labelVisibilityMode="selected"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:menu="@menu/bottom_nav_menu"/>
|
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" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -4,17 +4,26 @@
|
|||||||
<item
|
<item
|
||||||
android:id="@id/feature_home_navigation"
|
android:id="@id/feature_home_navigation"
|
||||||
android:icon="@drawable/home_24px"
|
android:icon="@drawable/home_24px"
|
||||||
android:title="Home"/>
|
android:title="@string/home_title"/>
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@id/feature_search_navigation"
|
||||||
|
android:icon="@drawable/search_24px"
|
||||||
|
android:title="@string/search_title"/>
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@id/feature_library_navigation"
|
android:id="@id/feature_library_navigation"
|
||||||
android:icon="@drawable/folder_24px"
|
android:icon="@drawable/folder_24px"
|
||||||
android:title="Library"/>
|
android:title="@string/library_title"/>
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@id/feature_debug_navigation"
|
android:id="@id/feature_debug_navigation"
|
||||||
android:icon="@drawable/developer_mode_24px"
|
android:icon="@drawable/developer_mode_24px"
|
||||||
android:title="Debug menu"/>
|
android:title="@string/debug_menu_title" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@id/feature_setting_navigation"
|
||||||
|
android:icon="@drawable/settings_24px"
|
||||||
|
android:title="@string/setting_title"/>
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:id="@+id/app_main_nav"
|
android:id="@+id/app_main_nav"
|
||||||
app:startDestination="@id/feature_debug_navigation">
|
app:startDestination="@id/feature_home_navigation">
|
||||||
|
|
||||||
<include app:graph="@navigation/feature_debug_navigation" />
|
<include app:graph="@navigation/feature_debug_navigation" />
|
||||||
|
|
||||||
@@ -10,5 +10,9 @@
|
|||||||
|
|
||||||
<include app:graph="@navigation/feature_home_navigation" />
|
<include app:graph="@navigation/feature_home_navigation" />
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_search_navigation" />
|
||||||
|
|
||||||
|
<include app:graph="@navigation/feature_setting_navigation" />
|
||||||
|
|
||||||
|
|
||||||
</navigation>
|
</navigation>
|
||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.component.common'
|
namespace 'one.nem.lacerta.component.common'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
@@ -32,4 +32,6 @@ dependencies {
|
|||||||
testImplementation libs.junit
|
testImplementation libs.junit
|
||||||
androidTestImplementation libs.androidx.test.ext.junit
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
androidTestImplementation libs.androidx.test.espresso.core
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
implementation project(':shared:ui')
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.component.scanner'
|
namespace 'one.nem.lacerta.component.scanner'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
|
|||||||
+41
-6
@@ -1,17 +1,15 @@
|
|||||||
package one.nem.lacerta.component.scanner;
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.app.ProgressDialog;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.graphics.BitmapFactory;
|
import android.graphics.BitmapFactory;
|
||||||
import android.graphics.drawable.BitmapDrawable;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.activity.EdgeToEdge;
|
import androidx.activity.EdgeToEdge;
|
||||||
import androidx.annotation.AnimatorRes;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.core.graphics.Insets;
|
import androidx.core.graphics.Insets;
|
||||||
import androidx.core.view.ViewCompat;
|
import androidx.core.view.ViewCompat;
|
||||||
@@ -22,12 +20,17 @@ import com.websitebeaver.documentscanner.DocumentScanner;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
import one.nem.lacerta.data.Document;
|
import one.nem.lacerta.data.Document;
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
public class ScannerManagerActivity extends AppCompatActivity {
|
public class ScannerManagerActivity extends AppCompatActivity {
|
||||||
@@ -40,6 +43,11 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
@Inject
|
@Inject
|
||||||
Document document;
|
Document document;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
DocumentProcessorFactory documentProcessorFactory;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory lacertaVcsFactory;
|
||||||
|
|
||||||
// Variables
|
// Variables
|
||||||
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||||
@@ -110,7 +118,7 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
return true;
|
return true;
|
||||||
} else if (item.getItemId() == R.id.action_insert_exist) {
|
} else if (item.getItemId() == R.id.action_insert_exist) {
|
||||||
// 既存ドキュメントに挿入
|
// 既存ドキュメントに挿入
|
||||||
Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, "Work in progress", Toast.LENGTH_SHORT).show();
|
||||||
insertToExistDocument();
|
insertToExistDocument();
|
||||||
return true;
|
return true;
|
||||||
} else if (item.getItemId() == android.R.id.home) {
|
} else if (item.getItemId() == android.R.id.home) {
|
||||||
@@ -128,7 +136,6 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
if (this.croppedImages.isEmpty()) {
|
if (this.croppedImages.isEmpty()) {
|
||||||
logger.debug(TAG, "this.resultImages is empty");
|
logger.debug(TAG, "this.resultImages is empty");
|
||||||
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
|
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
|
||||||
// TODO-rca: なんかする
|
|
||||||
} else {
|
} else {
|
||||||
logger.debug(TAG, "this.resultImages is not empty");
|
logger.debug(TAG, "this.resultImages is not empty");
|
||||||
updateResultView(this.croppedImages);
|
updateResultView(this.croppedImages);
|
||||||
@@ -143,9 +150,37 @@ public class ScannerManagerActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
private void saveNewDocument() {
|
private void saveNewDocument() {
|
||||||
logger.debug(TAG, "saveNewDocument");
|
logger.debug(TAG, "saveNewDocument");
|
||||||
|
// Deprecatedだが、中断機能が存在しないので操作をブロックする目的で(意図的に)使用
|
||||||
|
ProgressDialog dialog = new ProgressDialog(this);
|
||||||
|
dialog.setMessage("保存中..."); // TODO-rca: テキストをリソースに移動
|
||||||
|
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
|
||||||
|
dialog.setCancelable(false);
|
||||||
|
dialog.show();
|
||||||
|
DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
|
||||||
|
document.createDocument(documentMeta).thenAccept((documentDetail) -> {
|
||||||
|
Bitmap[] bitmaps = new Bitmap[croppedImages.size()];
|
||||||
|
croppedImages.toArray(bitmaps);
|
||||||
|
logger.debug(TAG, "bitmaps.length: " + bitmaps.length);
|
||||||
|
addPagesToDocumentDetail(documentDetail, bitmaps).join();
|
||||||
|
document.updateDocument(documentDetail).join();
|
||||||
|
dialog.dismiss();
|
||||||
|
finish();
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<Void> addPagesToDocumentDetail(DocumentDetail documentDetail, Bitmap[] bitmaps) {
|
||||||
|
return CompletableFuture.runAsync(() -> {
|
||||||
|
try {
|
||||||
|
document.updateDocument(documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps).getDocumentDetail()).join();
|
||||||
|
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error(TAG, "Error: " + e.getMessage());
|
||||||
|
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private void insertToExistDocument() {
|
private void insertToExistDocument() {
|
||||||
logger.debug(TAG, "insertToExistDocument");
|
logger.debug(TAG, "insertToExistDocument");
|
||||||
// TODO-rca: 実装
|
// TODO-rca: 実装
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
plugins {
|
plugins {
|
||||||
alias(libs.plugins.com.android.library)
|
alias(libs.plugins.com.android.library)
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.component.viewer'
|
namespace 'one.nem.lacerta.component.viewer'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
@@ -29,7 +30,30 @@ dependencies {
|
|||||||
|
|
||||||
implementation libs.androidx.appcompat
|
implementation libs.androidx.appcompat
|
||||||
implementation libs.com.google.android.material
|
implementation libs.com.google.android.material
|
||||||
|
implementation libs.androidx.activity
|
||||||
|
implementation libs.androidx.constraintlayout
|
||||||
testImplementation libs.junit
|
testImplementation libs.junit
|
||||||
androidTestImplementation libs.androidx.test.ext.junit
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
androidTestImplementation libs.androidx.test.espresso.core
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
// Navigation
|
||||||
|
implementation libs.navigation.fragment
|
||||||
|
implementation libs.navigation.ui
|
||||||
|
implementation libs.navigation.dynamic.features.fragment
|
||||||
|
|
||||||
|
// DI
|
||||||
|
implementation libs.com.google.dagger.hilt.android
|
||||||
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
|
|
||||||
|
// shared
|
||||||
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
|
implementation project(':utils')
|
||||||
|
|
||||||
|
implementation project(':data')
|
||||||
|
|
||||||
|
implementation project(':model')
|
||||||
|
|
||||||
|
implementation project(':vcs')
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<application>
|
||||||
|
<activity
|
||||||
|
android:name=".ViewerMainActivity"
|
||||||
|
android:exported="false" />
|
||||||
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
+178
@@ -0,0 +1,178 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.app.AlertDialog;
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.navigation.Navigation;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.data.Document;
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link ComponentViewerTopFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ComponentViewerTopFragment extends Fragment {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
Document document;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
private static final String TAG = "ComponentViewerTopFragment";
|
||||||
|
|
||||||
|
private String documentId;
|
||||||
|
private String documentName;
|
||||||
|
|
||||||
|
public ComponentViewerTopFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ComponentViewerTopFragment newInstance(String documentId, String documentName) {
|
||||||
|
ComponentViewerTopFragment fragment = new ComponentViewerTopFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString("documentId", documentId);
|
||||||
|
args.putString("documentName", documentName);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
documentId = getArguments().getString("documentId");
|
||||||
|
documentName = getArguments().getString("documentName");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_component_viewer_top, container, false);
|
||||||
|
|
||||||
|
// Toolbar
|
||||||
|
Toolbar toolbar = view.findViewById(R.id.toolbar);
|
||||||
|
toolbarSetup(toolbar, true, this.documentName == null ? "Document" : this.documentName);
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.body_recycler_view);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
ViewerBodyAdapter viewerBodyAdapter = new ViewerBodyAdapter(fileName -> {
|
||||||
|
Toast.makeText(getContext(), fileName, Toast.LENGTH_SHORT).show();
|
||||||
|
});
|
||||||
|
recyclerView.setAdapter(viewerBodyAdapter);
|
||||||
|
|
||||||
|
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
|
||||||
|
document.getDocument(documentId).thenAccept(documentDetail -> {
|
||||||
|
ArrayList<Page> pages = documentDetail.getPages();
|
||||||
|
logger.debug(TAG, "pages.size(): " + pages.size());
|
||||||
|
viewerBodyAdapter.setPages(pages);
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
|
||||||
|
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ToolbarをInitする
|
||||||
|
*
|
||||||
|
* @param toolbar Toolbar
|
||||||
|
* @param showBackButton 戻るボタンを表示するか
|
||||||
|
* @param title タイトル
|
||||||
|
*/
|
||||||
|
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
if (showBackButton) {
|
||||||
|
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
|
||||||
|
toolbar.setNavigationOnClickListener(v -> {
|
||||||
|
// Stop Activity
|
||||||
|
getActivity().finish();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toolbar.setNavigationIcon(null);
|
||||||
|
}
|
||||||
|
toolbar.setTitle(title);
|
||||||
|
toolbar.inflateMenu(R.menu.viewer_menu);
|
||||||
|
toolbar.setOnMenuItemClickListener(item -> {
|
||||||
|
if (item.getItemId() == R.id.action_open_vcs_rev_list) {
|
||||||
|
// Open vcs rev list
|
||||||
|
getParentFragmentManager().beginTransaction()
|
||||||
|
.replace(R.id.nav_host_fragment, ViewerVcsRevListFragment.newInstance(documentId))
|
||||||
|
.commit();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.action_rename) {
|
||||||
|
// TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
|
||||||
|
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||||
|
builder.setTitle("ファイル名の変更");
|
||||||
|
builder.setMessage("ファイル名を入力してください");
|
||||||
|
final android.widget.EditText input = new android.widget.EditText(getContext());
|
||||||
|
input.setText(documentName);
|
||||||
|
builder.setView(input);
|
||||||
|
builder.setPositiveButton("作成", (dialog, which) -> {
|
||||||
|
document.renameDocument(documentId, input.getText().toString()).thenAccept(aVoid -> {
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
toolbar.setTitle(input.getText().toString());
|
||||||
|
documentName = input.getText().toString();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||||
|
dialog.cancel();
|
||||||
|
});
|
||||||
|
builder.show();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.action_delete) {
|
||||||
|
// TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
|
||||||
|
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||||
|
builder.setTitle("ファイルの削除");
|
||||||
|
builder.setMessage("ファイルを削除しますか?");
|
||||||
|
builder.setPositiveButton("削除", (dialog, which) -> {
|
||||||
|
document.deleteDocument(documentId).thenAccept(aVoid -> {
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
// Stop Activity
|
||||||
|
getActivity().finish();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||||
|
dialog.cancel();
|
||||||
|
});
|
||||||
|
builder.show();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.action_move) {
|
||||||
|
Toast.makeText(getContext(), "Work in progress", Toast.LENGTH_SHORT).show();
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
public interface ItemClickListener {
|
||||||
|
void onItemClick(String fileName); // DEBUG
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
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.time.format.DateTimeFormatter;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.VcsRevModel;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
|
||||||
|
public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
|
||||||
|
|
||||||
|
private ArrayList<VcsRevModel> revModels;
|
||||||
|
|
||||||
|
public RevAdapter(ArrayList<VcsRevModel> revModels) {
|
||||||
|
this.revModels = revModels;
|
||||||
|
}
|
||||||
|
|
||||||
|
public RevAdapter() {
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
holder.title.setText(revModel.getCommitMessage());
|
||||||
|
if (FeatureSwitch.Vcs.disableBranchDisplay) {
|
||||||
|
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()));
|
||||||
|
holder.detail.setText("DateTimePlaceholder");
|
||||||
|
} else {
|
||||||
|
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + revModel.getBranchName());
|
||||||
|
holder.detail.setText("DateTimePlaceholder" + " " + revModel.getBranchName());
|
||||||
|
}
|
||||||
|
holder.revId.setText("RevID: " + 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+66
@@ -0,0 +1,66 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.media.Image;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
|
||||||
|
public class ViewerBodyAdapter extends RecyclerView.Adapter<ViewerBodyAdapter.ViewHolder>{
|
||||||
|
|
||||||
|
ArrayList<Page> pages;
|
||||||
|
|
||||||
|
ItemClickListener listener;
|
||||||
|
|
||||||
|
public ViewerBodyAdapter(ArrayList<Page> pages, ItemClickListener listener){
|
||||||
|
this.pages = pages;
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ViewerBodyAdapter(ItemClickListener listener){
|
||||||
|
this.pages = new ArrayList<>();
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPages(ArrayList<Page> pages){
|
||||||
|
this.pages = pages;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public ViewerBodyAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
View view = View.inflate(parent.getContext(), R.layout.viewer_body_list_item, null);
|
||||||
|
return new ViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull ViewerBodyAdapter.ViewHolder holder, int position) {
|
||||||
|
Bitmap bitmap = pages.get(position).getBitmap();
|
||||||
|
holder.image.setImageBitmap(bitmap);
|
||||||
|
holder.itemView.setOnClickListener(v -> {
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return pages.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
|
||||||
|
ImageView image;
|
||||||
|
|
||||||
|
public ViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
image = itemView.findViewById(R.id.imageView);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+68
@@ -0,0 +1,68 @@
|
|||||||
|
package one.nem.lacerta.component.viewer;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.activity.EdgeToEdge;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.graphics.Insets;
|
||||||
|
import androidx.core.view.ViewCompat;
|
||||||
|
import androidx.core.view.WindowInsetsCompat;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.navigation.NavController;
|
||||||
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
|
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ViewerMainActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public ViewerMainActivity() {
|
||||||
|
}
|
||||||
|
|
||||||
|
// Variables
|
||||||
|
private static final String TAG = "ViewerMainActivity";
|
||||||
|
String documentId;
|
||||||
|
String documentName;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
EdgeToEdge.enable(this);
|
||||||
|
setContentView(R.layout.activity_viewer_main);
|
||||||
|
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
||||||
|
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
||||||
|
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
|
||||||
|
return insets;
|
||||||
|
});
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
try {
|
||||||
|
documentId = intent.getStringExtra("documentId");
|
||||||
|
documentName = intent.getStringExtra("documentName");
|
||||||
|
}
|
||||||
|
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, ComponentViewerTopFragment.newInstance(documentId, documentName))
|
||||||
|
.commit();
|
||||||
|
}
|
||||||
|
}
|
||||||
+95
@@ -0,0 +1,95 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
public ViewerVcsRevListFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ViewerVcsRevListFragment newInstance(String documentId) {
|
||||||
|
ViewerVcsRevListFragment fragment = new ViewerVcsRevListFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString("documentId", documentId);
|
||||||
|
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: " + documentId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Init vcs
|
||||||
|
lacertaVcs = lacertaVcsFactory.create(documentId);
|
||||||
|
|
||||||
|
// Init view
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.rev_list);
|
||||||
|
|
||||||
|
// Init adapter
|
||||||
|
RevAdapter revAdapter = new RevAdapter();
|
||||||
|
|
||||||
|
// 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();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
package one.nem.lacerta.component.viewer.model;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
|
public class ViewerBodyListItem {
|
||||||
|
|
||||||
|
Bitmap image;
|
||||||
|
|
||||||
|
public ViewerBodyListItem(Bitmap image) {
|
||||||
|
this.image = image;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Bitmap getImage() {
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setImage(Bitmap image) {
|
||||||
|
this.image = image;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/main"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".ViewerMainActivity">
|
||||||
|
|
||||||
|
<androidx.fragment.app.FragmentContainerView
|
||||||
|
android:id="@+id/nav_host_fragment"
|
||||||
|
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:defaultNavHost="true"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"/>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="Title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:id="@+id/loading_progress_bar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/body_recycler_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_margin="16dp"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".ViewerVcsRevListFragment">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/rev_list"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:elevation="8dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:srcCompat="@tools:sample/backgrounds/scenic" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
<?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="0dp"
|
||||||
|
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="0dp"
|
||||||
|
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="0dp"
|
||||||
|
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>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_open_vcs_rev_list"
|
||||||
|
android:title="Open VCS Rev List" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_rename"
|
||||||
|
android:title="リネーム" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_delete"
|
||||||
|
android:title="削除" />
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_move"
|
||||||
|
android:title="移動" />
|
||||||
|
|
||||||
|
</menu>
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/component_viewer_navigation"
|
||||||
|
app:startDestination="@id/componentViewerTopFragment">
|
||||||
|
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/componentViewerTopFragment"
|
||||||
|
android:name="one.nem.lacerta.component.viewer.ComponentViewerTopFragment"
|
||||||
|
android:label="ComponentViewerTopFragment" >
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_componentViewerTopFragment_to_viewerVcsRevListFragment"
|
||||||
|
app:destination="@id/viewerVcsRevListFragment" />
|
||||||
|
</fragment>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/viewerVcsRevListFragment"
|
||||||
|
android:name="one.nem.lacerta.component.viewer.ViewerVcsRevListFragment"
|
||||||
|
android:label="fragment_viewer_vcs_rev_list"
|
||||||
|
tools:layout="@layout/fragment_viewer_vcs_rev_list" />
|
||||||
|
</navigation>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
</resources>
|
||||||
@@ -2,6 +2,7 @@ package one.nem.lacerta.data;
|
|||||||
|
|
||||||
import java.lang.reflect.Array;
|
import java.lang.reflect.Array;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
@@ -13,13 +14,15 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
|
|||||||
*/
|
*/
|
||||||
public interface Document {
|
public interface Document {
|
||||||
|
|
||||||
DocumentDetail createDocument(DocumentMeta meta);
|
CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta);
|
||||||
|
|
||||||
DocumentDetail createDocument();
|
CompletableFuture<DocumentDetail> createDocument();
|
||||||
|
|
||||||
void deleteDocument(String documentId);
|
CompletableFuture<Void> renameDocument(String documentId, String name);
|
||||||
|
|
||||||
void updateDocument(DocumentMeta meta, DocumentDetail detail);
|
CompletableFuture<Void> deleteDocument(String documentId);
|
||||||
|
|
||||||
DocumentDetail getDocument(String documentId);
|
CompletableFuture<Void> updateDocument(DocumentDetail detail);
|
||||||
|
|
||||||
|
CompletableFuture<DocumentDetail> getDocument(String documentId);
|
||||||
}
|
}
|
||||||
@@ -1,22 +1,29 @@
|
|||||||
package one.nem.lacerta.data;
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
import one.nem.lacerta.model.ListItemType;
|
import one.nem.lacerta.model.ListItemType;
|
||||||
|
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
|
||||||
public interface LacertaLibrary {
|
public interface LacertaLibrary {
|
||||||
|
|
||||||
// Get History
|
// Get History
|
||||||
LibraryItemPage getRecentDocument(int limit);
|
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit);
|
||||||
LibraryItemPage getRecentDocument(int limit, int offset);
|
CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset);
|
||||||
|
|
||||||
// Get Library page
|
// Get Library Page
|
||||||
LibraryItemPage getLibraryPage(int limit);
|
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit);
|
||||||
LibraryItemPage getLibraryPage(int limit, int offset);
|
CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset);
|
||||||
LibraryItemPage getLibraryPage(String pageId, int limit);
|
|
||||||
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
|
// Create Folder
|
||||||
|
CompletableFuture<String> createFolder(String parentId, String name);
|
||||||
|
|
||||||
|
// Get Public Path
|
||||||
|
CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType);
|
||||||
|
|
||||||
// GetDocument
|
|
||||||
DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する
|
|
||||||
}
|
}
|
||||||
@@ -1,34 +1,41 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
|
import androidx.room.Update;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
// Hilt
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
// Lacerta/data
|
||||||
import one.nem.lacerta.data.Document;
|
import one.nem.lacerta.data.Document;
|
||||||
|
|
||||||
|
// Lacerta/model
|
||||||
import one.nem.lacerta.model.PublicPath;
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
// Lacerta/source
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
import one.nem.lacerta.model.document.internal.XmlMetaModel;
|
||||||
|
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
import one.nem.lacerta.source.database.LacertaDatabase;
|
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
|
|
||||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
import one.nem.lacerta.source.database.entity.LibraryEntity;
|
|
||||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
|
||||||
|
|
||||||
import one.nem.lacerta.source.database.entity.VcsLogEntity;
|
// Lacerta/utils
|
||||||
import one.nem.lacerta.vcs.ActionType;
|
import one.nem.lacerta.source.file.FileManager;
|
||||||
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
||||||
import one.nem.lacerta.source.jgit.JGitRepository;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
// Lacerta/vcs
|
||||||
import one.nem.lacerta.utils.XmlMetaParser;
|
import one.nem.lacerta.utils.XmlMetaParser;
|
||||||
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
||||||
import one.nem.lacerta.vcs.LacertaVcs;
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
|
||||||
public class DocumentImpl implements Document {
|
public class DocumentImpl implements Document {
|
||||||
@@ -42,45 +49,56 @@ public class DocumentImpl implements Document {
|
|||||||
LacertaDatabase database;
|
LacertaDatabase database;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
LacertaVcs vcs;
|
LacertaVcsFactory vcsFactory;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
FileManagerFactory fileManagerFactory;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
DeviceInfoUtils deviceInfoUtils;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
XmlMetaParser xmlMetaParser;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public DocumentImpl() {
|
public DocumentImpl() {
|
||||||
// Init
|
// Init
|
||||||
logger.debug(TAG, "called");
|
// logger.debug(TAG, "called");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DocumentDetail createDocument(DocumentMeta meta) {
|
public CompletableFuture<DocumentDetail> createDocument(DocumentMeta meta) {
|
||||||
DocumentDetail detail = new DocumentDetail();
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
detail.setMeta(meta);
|
DocumentDetail detail = new DocumentDetail();
|
||||||
detail.setPages(new ArrayList<>());
|
detail.setMeta(meta);
|
||||||
|
detail.setPages(new ArrayList<>());
|
||||||
|
// Create DocumentEntity
|
||||||
|
DocumentEntity documentEntity = new DocumentEntity();
|
||||||
|
documentEntity.id = meta.getId();
|
||||||
|
documentEntity.title = meta.getTitle();
|
||||||
|
documentEntity.author = meta.getAuthor();
|
||||||
|
documentEntity.defaultBranch = meta.getDefaultBranch();
|
||||||
|
documentEntity.updatedAt = meta.getUpdatedAt();
|
||||||
|
documentEntity.createdAt = meta.getCreatedAt();
|
||||||
|
documentEntity.parentId = meta.getParentId();
|
||||||
|
documentEntity.tagIds = meta.getTagIds();
|
||||||
|
|
||||||
// TODO-rca: UIスレッドから追い出す
|
database.documentDao().insert(documentEntity);
|
||||||
|
|
||||||
// Create DocumentEntity
|
// Vcs
|
||||||
DocumentEntity documentEntity = new DocumentEntity();
|
LacertaVcs vcs = vcsFactory.create(meta.getId());
|
||||||
documentEntity.id = meta.getId();
|
vcs.createDocument(meta.getId());
|
||||||
documentEntity.title = meta.getTitle();
|
|
||||||
documentEntity.author = meta.getAuthor();
|
|
||||||
documentEntity.defaultBranch = meta.getDefaultBranch();
|
|
||||||
documentEntity.updatedAt = meta.getUpdatedAt();
|
|
||||||
documentEntity.createdAt = meta.getCreatedAt();
|
|
||||||
documentEntity.publicPath = meta.getPath().getStringPath();
|
|
||||||
documentEntity.tagIds = meta.getTagIds();
|
|
||||||
|
|
||||||
database.documentDao().insert(documentEntity);
|
// XmlMeta
|
||||||
|
updateXmlMeta(detail).join();
|
||||||
|
|
||||||
// Vcs
|
return detail;
|
||||||
vcs.createDocument(meta.getId());
|
});
|
||||||
|
|
||||||
return detail;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DocumentDetail createDocument() {
|
public CompletableFuture<DocumentDetail> createDocument() {
|
||||||
DocumentMeta meta = new DocumentMeta();
|
DocumentMeta meta = new DocumentMeta();
|
||||||
meta.setId(UUID.randomUUID().toString());
|
meta.setId(UUID.randomUUID().toString());
|
||||||
meta.setTitle("New Document");
|
meta.setTitle("New Document");
|
||||||
@@ -88,23 +106,136 @@ public class DocumentImpl implements Document {
|
|||||||
meta.setDefaultBranch("master");
|
meta.setDefaultBranch("master");
|
||||||
meta.setUpdatedAt(new Date());
|
meta.setUpdatedAt(new Date());
|
||||||
meta.setCreatedAt(new Date());
|
meta.setCreatedAt(new Date());
|
||||||
meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
|
meta.setParentId(null);
|
||||||
meta.setTags(new ArrayList<>());
|
meta.setTags(new ArrayList<>());
|
||||||
return createDocument(meta);
|
return createDocument(meta);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteDocument(String documentId) {
|
public CompletableFuture<Void> deleteDocument(String documentId) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
DocumentEntity documentEntity = database.documentDao().findById(documentId);
|
||||||
|
if (documentEntity == null) {
|
||||||
|
throw new IllegalArgumentException("documentId is not found");
|
||||||
|
}
|
||||||
|
database.documentDao().delete(documentEntity);
|
||||||
|
return null;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateDocument(DocumentMeta meta, DocumentDetail detail) {
|
public CompletableFuture<Void> updateDocument(DocumentDetail detail) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
updateXmlMeta(detail).join();
|
||||||
|
return null;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DocumentDetail getDocument(String documentId) {
|
public CompletableFuture<Void> renameDocument(String documentId, String name) {
|
||||||
return null;
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
DocumentEntity documentEntity = database.documentDao().findById(documentId);
|
||||||
|
if (documentEntity == null) {
|
||||||
|
throw new IllegalArgumentException("documentId is not found");
|
||||||
|
}
|
||||||
|
documentEntity.title = name;
|
||||||
|
database.documentDao().update(documentEntity);
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<DocumentDetail> getDocument(String documentId) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
DocumentEntity documentEntity = database.documentDao().findById(documentId);
|
||||||
|
if (documentEntity == null) {
|
||||||
|
throw new IllegalArgumentException("documentId is not found");
|
||||||
|
}
|
||||||
|
DocumentMeta meta = new DocumentMeta();
|
||||||
|
meta.setId(documentEntity.id);
|
||||||
|
meta.setTitle(documentEntity.title);
|
||||||
|
meta.setAuthor(documentEntity.author);
|
||||||
|
meta.setDefaultBranch(documentEntity.defaultBranch);
|
||||||
|
meta.setUpdatedAt(documentEntity.updatedAt);
|
||||||
|
meta.setCreatedAt(documentEntity.createdAt);
|
||||||
|
meta.setParentId(documentEntity.parentId);
|
||||||
|
meta.setTags(new ArrayList<>()); // TODO-rca: タグを取得する
|
||||||
|
|
||||||
|
DocumentDetail detail = new DocumentDetail();
|
||||||
|
|
||||||
|
getPagesByXmlMeta(documentId).thenCompose(xmlMetaPageModels -> getPagesByXmlMetaPageModel(documentId, xmlMetaPageModels)).thenAccept(pages -> {
|
||||||
|
logger.debug(TAG, "pages: " + pages.size());
|
||||||
|
detail.setMeta(meta);
|
||||||
|
detail.setPages(pages);
|
||||||
|
}).join();
|
||||||
|
|
||||||
|
return detail;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<ArrayList<XmlMetaPageModel>> getPagesByXmlMeta(String documentId) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
|
||||||
|
try {
|
||||||
|
ArrayList<XmlMetaPageModel> xmlMetaPageModels = xmlMetaParser.deserialize(fileManager.resolve(documentId).loadXml("meta.xml")).getPages();
|
||||||
|
// Debug
|
||||||
|
logger.debug(TAG, "xmlMetaPageModels: " + xmlMetaPageModels.size());
|
||||||
|
for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
|
||||||
|
logger.debug(TAG, "\txmlMetaPageModel: " + xmlMetaPageModel.getFilename());
|
||||||
|
}
|
||||||
|
return xmlMetaPageModels;
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "DocumentMeta parse error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("db18c04a-1625-4871-9e4e-918d805568ac");
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<ArrayList<Page>> getPagesByXmlMetaPageModel(String documentId, ArrayList<XmlMetaPageModel> xmlMetaPageModels) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
ArrayList<Page> pages = new ArrayList<>();
|
||||||
|
FileManager fileManager;
|
||||||
|
try {
|
||||||
|
fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory()).resolve(documentId);
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "FileManager resolve error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("2235e8ee-4177-46f8-af6b-084381b202e6");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
for (XmlMetaPageModel xmlMetaPageModel : xmlMetaPageModels) {
|
||||||
|
try {
|
||||||
|
pages.add(new Page(xmlMetaPageModel.getFilename(), fileManager.resolve("raw").loadBitmap(xmlMetaPageModel.getFilename())));
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "Bitmap decode error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("3bba8c8f-90fb-4a24-a726-7ea201929f8b");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pages;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private CompletableFuture<Void> updateXmlMeta(DocumentDetail documentDetail) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
// TODO-rca: リビジョンIDを検証する, 挿入する
|
||||||
|
FileManager fileManager = fileManagerFactory.create(deviceInfoUtils.getExternalStorageDirectory());
|
||||||
|
ArrayList<XmlMetaPageModel> xmlMetaPageModels = new ArrayList<>();
|
||||||
|
for (Page page : documentDetail.getPages()) {
|
||||||
|
xmlMetaPageModels.add(new XmlMetaPageModel(page.getFileName()));
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
fileManager.createDirectoryIfNotExist(documentDetail.getMeta().getId()).resolve(documentDetail.getMeta().getId())
|
||||||
|
.createFileIfNotExist("meta.xml").resolve("meta.xml").saveXml(xmlMetaParser.serialize(new XmlMetaModel("revisionId_PLACEHOLDER", xmlMetaPageModels)));
|
||||||
|
} catch (IOException e) {
|
||||||
|
logger.error(TAG, "DocumentMeta serialize error");
|
||||||
|
logger.trace(TAG, e.getMessage());
|
||||||
|
logger.e_code("e3b4d0c9-5b7e-4b7e-9e9a-5b8b8b8b8b8b");
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,42 +1,196 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
import one.nem.lacerta.model.ListItemType;
|
||||||
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
|
import one.nem.lacerta.source.database.entity.FolderEntity;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
public class LacertaLibraryImpl implements LacertaLibrary {
|
public class LacertaLibraryImpl implements LacertaLibrary {
|
||||||
@Override
|
|
||||||
public LibraryItemPage getRecentDocument(int limit) {
|
LacertaLogger logger;
|
||||||
return null;
|
LacertaDatabase database;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public LacertaLibraryImpl(LacertaLogger logger, LacertaDatabase database) {
|
||||||
|
this.logger = logger;
|
||||||
|
this.database = database;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getRecentDocument(int limit, int offset) {
|
public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit) {
|
||||||
return null;
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
List<DocumentEntity> documentEntities = database.documentDao().getRecentDocument(limit);
|
||||||
|
|
||||||
|
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
|
for (DocumentEntity documentEntity : documentEntities) {
|
||||||
|
ListItem listItem = new ListItem();
|
||||||
|
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
||||||
|
listItem.setTitle(documentEntity.title);
|
||||||
|
listItem.setDescription(DateFormat.getDateInstance().format(documentEntity.updatedAt));
|
||||||
|
listItem.setItemId(documentEntity.id);
|
||||||
|
listItems.add(listItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
return listItems;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getLibraryPage(int limit) {
|
public CompletableFuture<ArrayList<ListItem>> getRecentDocument(int limit, int offset) {
|
||||||
return null;
|
return null; // TODO-rca: Implement
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getLibraryPage(int limit, int offset) {
|
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit) {
|
||||||
return null;
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
LibraryItemPage libraryItemPage = new LibraryItemPage();
|
||||||
|
|
||||||
|
List<FolderEntity> folderEntities;
|
||||||
|
List<DocumentEntity> documentEntities;
|
||||||
|
|
||||||
|
if (pageId == null) { // When root folder
|
||||||
|
libraryItemPage.setPageTitle("ライブラリ");
|
||||||
|
libraryItemPage.setPageId(null);
|
||||||
|
libraryItemPage.setParentId(null);
|
||||||
|
|
||||||
|
folderEntities = database.folderDao().findRootFolders();
|
||||||
|
documentEntities = database.documentDao().findRootDocuments();
|
||||||
|
} else {
|
||||||
|
FolderEntity folderEntity = database.folderDao().findById(pageId);
|
||||||
|
if (folderEntity == null) {
|
||||||
|
logger.warn("LacertaLibraryImpl", pageId + " is not found.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
libraryItemPage.setPageTitle(folderEntity.name);
|
||||||
|
libraryItemPage.setPageId(folderEntity.id);
|
||||||
|
libraryItemPage.setParentId(folderEntity.parentId);
|
||||||
|
|
||||||
|
folderEntities = database.folderDao().findByParentId(pageId);
|
||||||
|
documentEntities = database.documentDao().findByParentId(pageId);
|
||||||
|
}
|
||||||
|
|
||||||
|
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
|
for (FolderEntity childFolderEntity : folderEntities) {
|
||||||
|
logger.debug("LacertaLibraryImpl", "childFolderEntity.name: " + childFolderEntity.name);
|
||||||
|
ListItem listItem = new ListItem();
|
||||||
|
listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
|
||||||
|
listItem.setTitle(childFolderEntity.name);
|
||||||
|
listItem.setDescription("フォルダ"); // TODO-rca: ハードコーディングやめる
|
||||||
|
listItem.setItemId(childFolderEntity.id);
|
||||||
|
listItems.add(listItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:");
|
||||||
|
|
||||||
|
for (DocumentEntity documentEntity : documentEntities) {
|
||||||
|
logger.debug("LacertaLibraryImpl", "documentEntity.title: " + documentEntity.title);
|
||||||
|
ListItem listItem = new ListItem();
|
||||||
|
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
||||||
|
listItem.setTitle(documentEntity.title);
|
||||||
|
listItem.setDescription(simpleDateFormat.format(documentEntity.updatedAt));
|
||||||
|
listItem.setItemId(documentEntity.id);
|
||||||
|
listItems.add(listItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
libraryItemPage.setListItems(listItems);
|
||||||
|
|
||||||
|
logger.debug("LacertaLibraryImpl", "libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
|
||||||
|
|
||||||
|
return libraryItemPage;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getLibraryPage(String pageId, int limit) {
|
public CompletableFuture<LibraryItemPage> getLibraryPage(String pageId, int limit, int offset) {
|
||||||
return null;
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
return null;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
|
public CompletableFuture<String> createFolder(String parentId, String name) {
|
||||||
return null;
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
FolderEntity folderEntity = new FolderEntity();
|
||||||
|
folderEntity.id = UUID.randomUUID().toString();
|
||||||
|
folderEntity.name = name;
|
||||||
|
folderEntity.parentId = parentId;
|
||||||
|
database.folderDao().insert(folderEntity);
|
||||||
|
return folderEntity.id;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DocumentDetail getDocumentDetailById(String id) {
|
public CompletableFuture<PublicPath> getPublicPath(String itemId, ListItemType itemType) {
|
||||||
return null;
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||||
|
DocumentEntity documentEntity = database.documentDao().findById(itemId);
|
||||||
|
if (documentEntity == null) {
|
||||||
|
logger.warn("LacertaLibraryImpl", itemId + " is not found.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
PublicPath publicPath = recursiveResolve(documentEntity.parentId);
|
||||||
|
publicPath.resolve(documentEntity.title);
|
||||||
|
return publicPath;
|
||||||
|
} else if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
|
||||||
|
FolderEntity folderEntity = database.folderDao().findById(itemId);
|
||||||
|
if (folderEntity == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return recursiveResolve(folderEntity.id);
|
||||||
|
} else {
|
||||||
|
logger.warn("LacertaLibraryImpl", "Unknown ListItemType: " + itemType);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 再帰的にパスを解決する
|
||||||
|
*
|
||||||
|
* @param folderId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private PublicPath recursiveResolve(String folderId) {
|
||||||
|
String current = folderId;
|
||||||
|
boolean continueFlag = true;
|
||||||
|
ArrayList<String> folderNames = new ArrayList<>();
|
||||||
|
while (continueFlag) {
|
||||||
|
FolderEntity folderEntity = database.folderDao().findById(current);
|
||||||
|
if (folderEntity == null) { // 存在しないフォルダIDが指定された場合
|
||||||
|
continueFlag = false;
|
||||||
|
} else {
|
||||||
|
folderNames.add(folderEntity.name);
|
||||||
|
current = folderEntity.parentId;
|
||||||
|
if (current == null) { // ルートフォルダに到達した場合
|
||||||
|
continueFlag = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// フォルダ名を逆順にしてListに変換
|
||||||
|
Collections.reverse(folderNames);
|
||||||
|
List<String> folderNamesReversed = new ArrayList<>(folderNames);
|
||||||
|
|
||||||
|
return new PublicPath(folderNamesReversed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,219 +1,219 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
//package one.nem.lacerta.data.impl;
|
||||||
|
//
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
//import one.nem.lacerta.data.LacertaLibrary;
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
//import one.nem.lacerta.model.LibraryItemPage;
|
||||||
import one.nem.lacerta.model.ListItem;
|
//import one.nem.lacerta.model.ListItem;
|
||||||
import one.nem.lacerta.model.ListItemType;
|
//import one.nem.lacerta.model.ListItemType;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
//import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
//
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
//import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
//import one.nem.lacerta.model.document.path.DocumentPath;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
//import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
//
|
||||||
import com.github.javafaker.DateAndTime;
|
//import com.github.javafaker.DateAndTime;
|
||||||
import com.github.javafaker.Faker;
|
//import com.github.javafaker.Faker;
|
||||||
|
//
|
||||||
import java.text.DateFormat;
|
//import java.text.DateFormat;
|
||||||
import java.util.ArrayList;
|
//import java.util.ArrayList;
|
||||||
import java.util.Objects;
|
//import java.util.Objects;
|
||||||
import java.util.UUID;
|
//import java.util.UUID;
|
||||||
|
//
|
||||||
import javax.inject.Inject;
|
//import javax.inject.Inject;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* LacertaLibraryのスタブ実装
|
// * LacertaLibraryのスタブ実装
|
||||||
*/
|
// */
|
||||||
public class LacertaLibraryStubImpl implements LacertaLibrary {
|
//public class LacertaLibraryStubImpl implements LacertaLibrary {
|
||||||
|
//
|
||||||
LacertaLogger logger;
|
// LacertaLogger logger;
|
||||||
|
//
|
||||||
Faker faker;
|
// Faker faker;
|
||||||
|
//
|
||||||
@Inject
|
// @Inject
|
||||||
public LacertaLibraryStubImpl(LacertaLogger logger) {
|
// public LacertaLibraryStubImpl(LacertaLogger logger) {
|
||||||
faker = new Faker(); // Init Faker
|
// faker = new Faker(); // Init Faker
|
||||||
this.logger = logger;
|
// this.logger = logger;
|
||||||
logger.debug("LibraryStub", "Initialized");
|
// logger.debug("LibraryStub", "Initialized");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
// Internal Methods
|
// // Internal Methods
|
||||||
|
//
|
||||||
// Generate Stub Data
|
// // Generate Stub Data
|
||||||
private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
|
// private LibraryItemPage generateStubLibraryItemPage(int limit, String pageId) {
|
||||||
logger.debug("LibraryStub", "generateStubLibraryItemPage");
|
// logger.debug("LibraryStub", "generateStubLibraryItemPage");
|
||||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
// ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
|
// int itemTotal = faker.number().numberBetween(1, limit); // 実際に返却するアイテム数を決定
|
||||||
int folderTotal;
|
// int folderTotal;
|
||||||
// フォルダ数の抽選
|
// // フォルダ数の抽選
|
||||||
if (itemTotal > 4) {
|
// if (itemTotal > 4) {
|
||||||
folderTotal = faker.number().numberBetween(1, itemTotal - 2);
|
// folderTotal = faker.number().numberBetween(1, itemTotal - 2);
|
||||||
}
|
// }
|
||||||
else {
|
// else {
|
||||||
if (itemTotal > 2) {
|
// if (itemTotal > 2) {
|
||||||
folderTotal = 1;
|
// folderTotal = 1;
|
||||||
}
|
// }
|
||||||
else { // ドキュメント数がゼロにならないように
|
// else { // ドキュメント数がゼロにならないように
|
||||||
folderTotal = 0;
|
// folderTotal = 0;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
|
// int documentTotal = itemTotal - folderTotal; // ドキュメント数を決定
|
||||||
logger.debug("LibraryStub", "itemTotal: " + itemTotal);
|
// logger.debug("LibraryStub", "itemTotal: " + itemTotal);
|
||||||
logger.debug("LibraryStub", "folderTotal: " + folderTotal);
|
// logger.debug("LibraryStub", "folderTotal: " + folderTotal);
|
||||||
logger.debug("LibraryStub", "documentTotal: " + documentTotal);
|
// logger.debug("LibraryStub", "documentTotal: " + documentTotal);
|
||||||
|
//
|
||||||
// フォルダを生成
|
// // フォルダを生成
|
||||||
for (int i = 0; i < folderTotal; i++) {
|
// for (int i = 0; i < folderTotal; i++) {
|
||||||
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
|
// listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_FOLDER));
|
||||||
}
|
// }
|
||||||
// ドキュメントを生成
|
// // ドキュメントを生成
|
||||||
for (int i = 0; i < documentTotal; i++) {
|
// for (int i = 0; i < documentTotal; i++) {
|
||||||
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
|
// listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
LibraryItemPage libraryItemPage = new LibraryItemPage();
|
// LibraryItemPage libraryItemPage = new LibraryItemPage();
|
||||||
libraryItemPage.setListItems(listItems);
|
// libraryItemPage.setListItems(listItems);
|
||||||
if (pageId == null) {
|
// if (pageId == null) {
|
||||||
libraryItemPage.setPageId(UUID.randomUUID().toString());
|
// libraryItemPage.setPageId(UUID.randomUUID().toString());
|
||||||
} else {
|
// } else {
|
||||||
libraryItemPage.setPageId(pageId);
|
// libraryItemPage.setPageId(pageId);
|
||||||
}
|
// }
|
||||||
libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
|
// libraryItemPage.setPageTitle("FakePage" + faker.number().digits(3));
|
||||||
|
//
|
||||||
return libraryItemPage;
|
// return libraryItemPage;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
private ListItem generateStubListItem(ListItemType itemType) {
|
// private ListItem generateStubListItem(ListItemType itemType) {
|
||||||
if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
|
// if (itemType == ListItemType.ITEM_TYPE_FOLDER) {
|
||||||
ListItem listItem = new ListItem();
|
// ListItem listItem = new ListItem();
|
||||||
listItem.setTitle("FakeFolder" + faker.number().digits(3));
|
// listItem.setTitle("FakeFolder" + faker.number().digits(3));
|
||||||
listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
|
// listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
|
||||||
listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
|
// listItem.setItemType(ListItemType.ITEM_TYPE_FOLDER);
|
||||||
listItem.setItemId(UUID.randomUUID().toString());
|
// listItem.setItemId(UUID.randomUUID().toString());
|
||||||
return listItem;
|
// return listItem;
|
||||||
} else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
|
// } else if (itemType == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||||
ListItem listItem = new ListItem();
|
// ListItem listItem = new ListItem();
|
||||||
listItem.setTitle("FakeDocument" + faker.book().title());
|
// listItem.setTitle("FakeDocument" + faker.book().title());
|
||||||
listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
|
// listItem.setDescription("Updated at " + DateFormat.getDateTimeInstance().format(faker.date().birthday()));
|
||||||
listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
// listItem.setItemType(ListItemType.ITEM_TYPE_DOCUMENT);
|
||||||
listItem.setItemId(UUID.randomUUID().toString());
|
// listItem.setItemId(UUID.randomUUID().toString());
|
||||||
return listItem;
|
// return listItem;
|
||||||
} else {
|
// } else {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
private LibraryItemPage getRecentDocumentPage(int limit) {
|
// private LibraryItemPage getRecentDocumentPage(int limit) {
|
||||||
int itemTotal = faker.number().numberBetween(1, limit);
|
// int itemTotal = faker.number().numberBetween(1, limit);
|
||||||
ArrayList<ListItem> listItems = new ArrayList<>();
|
// ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
for (int i = 0; i < itemTotal; i++) {
|
// for (int i = 0; i < itemTotal; i++) {
|
||||||
listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
|
// listItems.add(generateStubListItem(ListItemType.ITEM_TYPE_DOCUMENT));
|
||||||
}
|
// }
|
||||||
// DescriptionからDateを抽出して新しい順にソート
|
// // DescriptionからDateを抽出して新しい順にソート
|
||||||
listItems.sort((a, b) -> {
|
// listItems.sort((a, b) -> {
|
||||||
String aDate = a.getDescription().substring(11);
|
// String aDate = a.getDescription().substring(11);
|
||||||
String bDate = b.getDescription().substring(11);
|
// String bDate = b.getDescription().substring(11);
|
||||||
return bDate.compareTo(aDate);
|
// return bDate.compareTo(aDate);
|
||||||
});
|
// });
|
||||||
LibraryItemPage libraryItemPage = new LibraryItemPage();
|
// LibraryItemPage libraryItemPage = new LibraryItemPage();
|
||||||
libraryItemPage.setListItems(listItems);
|
// libraryItemPage.setListItems(listItems);
|
||||||
libraryItemPage.setPageId(UUID.randomUUID().toString());
|
// libraryItemPage.setPageId(UUID.randomUUID().toString());
|
||||||
libraryItemPage.setPageTitle("RecentDocument");
|
// libraryItemPage.setPageTitle("RecentDocument");
|
||||||
return libraryItemPage;
|
// return libraryItemPage;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
|
// private DocumentDetail generateStubDocumentDetail(String id) throws IllegalArgumentException {
|
||||||
|
//
|
||||||
if (Objects.isNull(id)) {
|
// if (Objects.isNull(id)) {
|
||||||
throw new IllegalArgumentException("id is null");
|
// throw new IllegalArgumentException("id is null");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
DocumentMeta documentMeta = new DocumentMeta();
|
// DocumentMeta documentMeta = new DocumentMeta();
|
||||||
documentMeta.setId(id);
|
// documentMeta.setId(id);
|
||||||
documentMeta.setTitle("FakeDocument" + faker.book().title());
|
// documentMeta.setTitle("FakeDocument" + faker.book().title());
|
||||||
documentMeta.setCreatedAt(faker.date().birthday());
|
// documentMeta.setCreatedAt(faker.date().birthday());
|
||||||
documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする?
|
// documentMeta.setUpdatedAt(faker.date().birthday()); // TODO-rca: 更新日のほうが古くなることがあるのでなんとかする?
|
||||||
ArrayList<String> tagIds = new ArrayList<>();
|
// ArrayList<String> tagIds = new ArrayList<>();
|
||||||
|
//
|
||||||
DocumentDetail documentDetail = new DocumentDetail();
|
// DocumentDetail documentDetail = new DocumentDetail();
|
||||||
documentDetail.setMeta(documentMeta);
|
// documentDetail.setMeta(documentMeta);
|
||||||
// documentDetail.setPath(null); // TODO-rca: なんとかする
|
//// documentDetail.setPath(null); // TODO-rca: なんとかする
|
||||||
// documentDetail.setAuthor(faker.name().fullName());
|
//// documentDetail.setAuthor(faker.name().fullName());
|
||||||
// documentDetail.setRepository(null); // TODO-rca: なんとかする
|
//// documentDetail.setRepository(null); // TODO-rca: なんとかする
|
||||||
return documentDetail;
|
// return documentDetail;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* 履歴ページを取得する
|
// * 履歴ページを取得する
|
||||||
* @param limit 取得するアイテム数
|
// * @param limit 取得するアイテム数
|
||||||
* @return ページオブジェクト
|
// * @return ページオブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public LibraryItemPage getRecentDocument(int limit) {
|
// public ArrayList<ListItem> getRecentDocument(int limit) {
|
||||||
return getRecentDocumentPage(limit);
|
// return getRecentDocumentPage(limit).getListItems();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* 履歴ページを取得する
|
// * 履歴ページを取得する
|
||||||
* @param limit 取得するアイテム数
|
// * @param limit 取得するアイテム数
|
||||||
* @param offset 取得するアイテムのオフセット
|
// * @param offset 取得するアイテムのオフセット
|
||||||
* @return ページオブジェクト
|
// * @return ページオブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public LibraryItemPage getRecentDocument(int limit, int offset) {
|
// public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
|
||||||
return getRecentDocumentPage(limit);
|
// return getRecentDocumentPage(limit).getListItems();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* ライブラリページを取得する
|
// * ライブラリページを取得する
|
||||||
* @param limit 取得するアイテム数
|
// * @param limit 取得するアイテム数
|
||||||
* @return ページオブジェクト
|
// * @return ページオブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public LibraryItemPage getLibraryPage(int limit) {
|
// public LibraryItemPage getLibraryPage(int limit) {
|
||||||
return generateStubLibraryItemPage(limit, null);
|
// return generateStubLibraryItemPage(limit, null);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* ライブラリページを取得する
|
// * ライブラリページを取得する
|
||||||
* @param limit 取得するアイテム数
|
// * @param limit 取得するアイテム数
|
||||||
* @param offset 取得するアイテムのオフセット
|
// * @param offset 取得するアイテムのオフセット
|
||||||
* @return ページオブジェクト
|
// * @return ページオブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public LibraryItemPage getLibraryPage(int limit, int offset) {
|
// public LibraryItemPage getLibraryPage(int limit, int offset) {
|
||||||
return generateStubLibraryItemPage(limit, null);
|
// return generateStubLibraryItemPage(limit, null);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* ライブラリページを取得する
|
// * ライブラリページを取得する
|
||||||
* @param pageId ページID
|
// * @param pageId ページID
|
||||||
* @param limit 取得するアイテム数
|
// * @param limit 取得するアイテム数
|
||||||
* @return ページオブジェクト
|
// * @return ページオブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public LibraryItemPage getLibraryPage(String pageId, int limit) {
|
// public LibraryItemPage getLibraryPage(String pageId, int limit) {
|
||||||
return generateStubLibraryItemPage(limit, pageId);
|
// return generateStubLibraryItemPage(limit, pageId);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* ライブラリページを取得する
|
// * ライブラリページを取得する
|
||||||
* @param pageId ページID
|
// * @param pageId ページID
|
||||||
* @param limit 取得するアイテム数
|
// * @param limit 取得するアイテム数
|
||||||
* @param offset 取得するアイテムのオフセット
|
// * @param offset 取得するアイテムのオフセット
|
||||||
* @return ページオブジェクト
|
// * @return ページオブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
|
// public LibraryItemPage getLibraryPage(String pageId, int limit, int offset) {
|
||||||
return generateStubLibraryItemPage(limit, pageId);
|
// return generateStubLibraryItemPage(limit, pageId);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* ドキュメント詳細を取得する
|
// * ドキュメント詳細を取得する
|
||||||
* @param id ドキュメントID
|
// * @param id ドキュメントID
|
||||||
* @return ドキュメント詳細オブジェクト
|
// * @return ドキュメント詳細オブジェクト
|
||||||
*/
|
// */
|
||||||
@Override
|
// @Override
|
||||||
public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
|
// public DocumentDetail getDocumentDetailById(String id) throws IllegalArgumentException {
|
||||||
return generateStubDocumentDetail(id);
|
// return generateStubDocumentDetail(id);
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
@@ -30,9 +30,10 @@ public class LacertaSearchStubImpl implements LacertaSearch {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<ListItem> autoSearch(String query, int limit) {
|
public ArrayList<ListItem> autoSearch(String query, int limit) {
|
||||||
logger.debug("SearchStub", "autoSearch");
|
// logger.debug("SearchStub", "autoSearch");
|
||||||
logger.debug("SearchStub", "query: " + query);
|
// logger.debug("SearchStub", "query: " + query);
|
||||||
return library.getLibraryPage(limit).getListItems();
|
// return library.getLibraryPage(limit).getListItems();
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -44,8 +45,9 @@ public class LacertaSearchStubImpl implements LacertaSearch {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
|
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
|
||||||
logger.debug("SearchStub", "autoSearch");
|
// logger.debug("SearchStub", "autoSearch");
|
||||||
logger.debug("SearchStub", "query: " + query);
|
// logger.debug("SearchStub", "query: " + query);
|
||||||
return library.getLibraryPage(limit, offset).getListItems();
|
// return library.getLibraryPage(limit, offset).getListItems();
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@ import dagger.hilt.android.components.FragmentComponent;
|
|||||||
import dagger.hilt.migration.DisableInstallInCheck;
|
import dagger.hilt.migration.DisableInstallInCheck;
|
||||||
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
import one.nem.lacerta.data.impl.LacertaLibraryStubImpl;
|
import one.nem.lacerta.data.impl.LacertaLibraryImpl;
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
@Module
|
@Module
|
||||||
@@ -16,6 +16,6 @@ import one.nem.lacerta.utils.LacertaLogger;
|
|||||||
abstract public class LacertaLibraryModule {
|
abstract public class LacertaLibraryModule {
|
||||||
|
|
||||||
@Binds
|
@Binds
|
||||||
public abstract LacertaLibrary bindLacertaLibrary(LacertaLibraryStubImpl impl);
|
public abstract LacertaLibrary bindLacertaLibrary(LacertaLibraryImpl impl);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.feature.common'
|
namespace 'one.nem.lacerta.feature.common'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
|
|||||||
@@ -1,10 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<application>
|
|
||||||
<activity
|
|
||||||
android:name=".DebugMenuContainerActivity"
|
|
||||||
android:exported="false" />
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
+4
-3
@@ -57,13 +57,14 @@ public class DebugMenuLibraryItemListPageFragment extends Fragment {
|
|||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
|
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
|
||||||
|
|
||||||
LibraryItemPage libraryItemPage = lacertaLibrary.getRecentDocument(10);
|
// ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10);
|
||||||
for (ListItem listItem : libraryItemPage.getListItems()) {
|
ArrayList<ListItem> listItems = new ArrayList<>();
|
||||||
|
for (ListItem listItem : listItems) {
|
||||||
System.out.println(listItem.getTitle());
|
System.out.println(listItem.getTitle());
|
||||||
}
|
}
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
|
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
|
||||||
recyclerView.setAdapter(new ItemAdapter(libraryItemPage.getListItems()));
|
recyclerView.setAdapter(new ItemAdapter(listItems));
|
||||||
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_marginEnd="8dp"
|
android:layout_marginEnd="8dp"
|
||||||
|
android:text="Placeholder Title"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
@@ -19,8 +20,11 @@
|
|||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
|
android:text="Placeholder Description"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
|
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
id 'com.android.library'
|
id 'com.android.library'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.feature.home'
|
namespace 'one.nem.lacerta.feature.home'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
@@ -29,6 +30,8 @@ dependencies {
|
|||||||
|
|
||||||
implementation libs.androidx.appcompat
|
implementation libs.androidx.appcompat
|
||||||
implementation libs.com.google.android.material
|
implementation libs.com.google.android.material
|
||||||
|
implementation project(path: ':feature:debug')
|
||||||
|
implementation project(path: ':utils')
|
||||||
testImplementation libs.junit
|
testImplementation libs.junit
|
||||||
androidTestImplementation libs.androidx.test.ext.junit
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
androidTestImplementation libs.androidx.test.espresso.core
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
@@ -38,6 +41,22 @@ dependencies {
|
|||||||
implementation libs.navigation.ui
|
implementation libs.navigation.ui
|
||||||
implementation libs.navigation.dynamic.features.fragment
|
implementation libs.navigation.dynamic.features.fragment
|
||||||
|
|
||||||
|
// DI
|
||||||
|
implementation libs.com.google.dagger.hilt.android
|
||||||
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
|
|
||||||
// shared
|
// shared
|
||||||
implementation project(':shared:ui')
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
|
// DI
|
||||||
|
implementation project(':data')
|
||||||
|
|
||||||
|
//model
|
||||||
|
implementation project(':model')
|
||||||
|
|
||||||
|
implementation "androidx.recyclerview:recyclerview:1.3.2"
|
||||||
|
|
||||||
|
implementation project(':component:common')
|
||||||
|
|
||||||
|
implementation project(':component:viewer')
|
||||||
}
|
}
|
||||||
+2
@@ -22,5 +22,7 @@ public class ExampleInstrumentedTest {
|
|||||||
// Context of the app under test.
|
// Context of the app under test.
|
||||||
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName());
|
assertEquals("one.nem.lacerta.feature.home.test", appContext.getPackageName());
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
|
public interface DocumentSelectListener {
|
||||||
|
void onDocumentSelect(String documentId, String documentName);
|
||||||
|
}
|
||||||
@@ -1,64 +1,141 @@
|
|||||||
package one.nem.lacerta.feature.home;
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.navigation.Navigation;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.component.viewer.ViewerMainActivity;
|
||||||
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple {@link Fragment} subclass.
|
* A simple {@link Fragment} subclass.
|
||||||
* Use the {@link HomeTopFragment#newInstance} factory method to
|
* Use the {@link HomeTopFragment#newInstance} factory method to
|
||||||
* create an instance of this fragment.
|
* create an instance of this fragment.
|
||||||
*/
|
*/
|
||||||
|
@AndroidEntryPoint
|
||||||
public class HomeTopFragment extends Fragment {
|
public class HomeTopFragment extends Fragment {
|
||||||
|
|
||||||
// TODO: Rename parameter arguments, choose names that match
|
@Inject
|
||||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
LacertaLibrary lacertaLibrary;
|
||||||
private static final String ARG_PARAM1 = "param1";
|
|
||||||
private static final String ARG_PARAM2 = "param2";
|
|
||||||
|
|
||||||
// TODO: Rename and change types of parameters
|
private ListItemAdapter listItemAdapter;
|
||||||
private String mParam1;
|
|
||||||
private String mParam2;
|
|
||||||
|
|
||||||
public HomeTopFragment() {
|
public HomeTopFragment() {
|
||||||
// Required empty public constructor
|
// Required empty public constructor
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public static HomeTopFragment newInstance() {
|
||||||
* Use this factory method to create a new instance of
|
|
||||||
* this fragment using the provided parameters.
|
|
||||||
*
|
|
||||||
* @param param1 Parameter 1.
|
|
||||||
* @param param2 Parameter 2.
|
|
||||||
* @return A new instance of fragment HomeTopFragment.
|
|
||||||
*/
|
|
||||||
// TODO: Rename and change types and number of parameters
|
|
||||||
public static HomeTopFragment newInstance(String param1, String param2) {
|
|
||||||
HomeTopFragment fragment = new HomeTopFragment();
|
HomeTopFragment fragment = new HomeTopFragment();
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putString(ARG_PARAM1, param1);
|
|
||||||
args.putString(ARG_PARAM2, param2);
|
|
||||||
fragment.setArguments(args);
|
fragment.setArguments(args);
|
||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
if (getArguments() != null) {
|
|
||||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
|
||||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
return inflater.inflate(R.layout.fragment_home_top, container, false);
|
View view = inflater.inflate(R.layout.fragment_home_top, container, false);
|
||||||
|
|
||||||
|
return view;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
|
||||||
|
|
||||||
|
Toolbar toolbar = view.findViewById(R.id.home_toolbar);
|
||||||
|
toolbarSetup(toolbar, false, "ホーム");
|
||||||
|
|
||||||
|
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
|
||||||
|
@Override
|
||||||
|
public void onDocumentSelect(String documentId, String documentName) {
|
||||||
|
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
|
||||||
|
Log.d("HomeTopFragment", "onDocumentSelect: " + documentId + " " + documentName);
|
||||||
|
intent.putExtra("documentId", documentId);
|
||||||
|
intent.putExtra("documentName", documentName);
|
||||||
|
startActivity(intent);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
recyclerView.setAdapter(listItemAdapter);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
|
updateList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
|
||||||
|
updateList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateList() {
|
||||||
|
lacertaLibrary.getRecentDocument(10).thenAccept(listItems -> {
|
||||||
|
if (listItems == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.listItemAdapter.setListItems(listItems);
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
Log.d("HomeTopFragment", "onViewCreated: " + listItems.size());
|
||||||
|
if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
|
||||||
|
this.listItemAdapter.notifyDataSetChanged();
|
||||||
|
} else {
|
||||||
|
// IndexOutOfBoundsExceptionを吐くことがあったので いったん
|
||||||
|
this.listItemAdapter.notifyItemRangeInserted(0, listItems.size() - 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ToolbarをInitする
|
||||||
|
*
|
||||||
|
* @param toolbar Toolbar
|
||||||
|
* @param showBackButton 戻るボタンを表示するか
|
||||||
|
* @param title タイトル
|
||||||
|
*/
|
||||||
|
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
if (showBackButton) {
|
||||||
|
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
|
||||||
|
toolbar.setNavigationOnClickListener(v -> {
|
||||||
|
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
|
||||||
|
// Back
|
||||||
|
Navigation.findNavController(requireView()).popBackStack();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toolbar.setNavigationIcon(null);
|
||||||
|
}
|
||||||
|
toolbar.setTitle(title);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.component.viewer.ViewerMainActivity;
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
|
||||||
|
public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
|
||||||
|
|
||||||
|
ArrayList<ListItem> listItems;
|
||||||
|
|
||||||
|
DocumentSelectListener listener;
|
||||||
|
|
||||||
|
public ListItemAdapter(DocumentSelectListener listener){
|
||||||
|
this.listItems = new ArrayList<>();
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setListItems(ArrayList<ListItem> listItems) {
|
||||||
|
this.listItems = listItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public ListItemAdapter.ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||||
|
return new ListItemViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull ListItemAdapter.ListItemViewHolder holder, int position) {
|
||||||
|
ListItem listItem = listItems.get(position);
|
||||||
|
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||||
|
holder.icon.setColorFilter(one.nem.lacerta.shared.ui.R.color.colorOnSurface);
|
||||||
|
holder.title.setText(listItem.getTitle());
|
||||||
|
holder.description.setText(listItem.getDescription());
|
||||||
|
|
||||||
|
holder.itemView.setOnClickListener( v -> {
|
||||||
|
listener.onDocumentSelect(listItem.getItemId(), listItem.getTitle());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
if (listItems == null) {
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
return listItems.size();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ListItemViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
|
||||||
|
ImageView icon;
|
||||||
|
TextView title;
|
||||||
|
TextView description;
|
||||||
|
public ListItemViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
|
||||||
|
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||||
|
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||||
|
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyAdapterViewHolder> {
|
||||||
|
|
||||||
|
ArrayList<ListItem> listItems;
|
||||||
|
|
||||||
|
public MyAdapter(ArrayList<ListItem> listItems) {
|
||||||
|
this.listItems = listItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public MyAdapterViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_home_document, parent, false);
|
||||||
|
return new MyAdapterViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull MyAdapterViewHolder holder, int position) {
|
||||||
|
|
||||||
|
|
||||||
|
holder.title.setText(listItems.get(position).getTitle());
|
||||||
|
holder.description.setText(listItems.get(position).getDescription());
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return listItems.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class MyAdapterViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
|
TextView title;
|
||||||
|
|
||||||
|
TextView description;
|
||||||
|
|
||||||
|
public MyAdapterViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
|
||||||
|
title = itemView.findViewById(R.id.debug_menu_item_title);
|
||||||
|
description = itemView.findViewById(R.id.debug_menu_item_description);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,14 +1,50 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".HomeTopFragment">
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
<!-- TODO: Update blank fragment layout -->
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:text="@string/hello_blank_fragment" />
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/home_toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="HOGE" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/home_item_recycler_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/debug_menu_item_title"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:layout_marginEnd="8dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/debug_menu_item_description"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="14sp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/debug_menu_item_updated_at_home"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:text="Updated at: aaaaaaaaaa"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/item_placeholder"
|
||||||
|
android:icon="@drawable/developer_mode_24px"
|
||||||
|
android:title="@string/placeholder" />
|
||||||
|
</menu>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<item name="my_recycler_view" type="id" />
|
||||||
|
<item name="TITLE" type="id" />
|
||||||
|
<item name="textView" type="id" />
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources></resources>
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<!-- TODO: Remove or change this placeholder text -->
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
<string name="textview">TextView</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -5,7 +5,7 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.feature.library'
|
namespace 'one.nem.lacerta.feature.library'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
@@ -51,5 +51,7 @@ dependencies {
|
|||||||
|
|
||||||
implementation project(':data')
|
implementation project(':data')
|
||||||
|
|
||||||
|
implementation project(':utils')
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+6
@@ -0,0 +1,6 @@
|
|||||||
|
package one.nem.lacerta.feature.library;
|
||||||
|
|
||||||
|
public interface DocumentSelectListener {
|
||||||
|
void onFolderSelected(String folderId, String folderName);
|
||||||
|
void onDocumentSelected(String documentId, String documentName);
|
||||||
|
}
|
||||||
-38
@@ -1,38 +0,0 @@
|
|||||||
package one.nem.lacerta.feature.library;
|
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.View;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
|
|
||||||
// LibraryArchiveFragment.java
|
|
||||||
|
|
||||||
//画面変移用のコード
|
|
||||||
//Fragmentへのデータの受け渡し機能
|
|
||||||
public class LibraryArchiveFragment extends AppCompatActivity {
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.fragment_library_top);
|
|
||||||
|
|
||||||
// ここに入力された内容を表示する機能
|
|
||||||
TextView textView = findViewById(R.id.document_list);
|
|
||||||
|
|
||||||
textView.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
// 文字をタップしたときの処理
|
|
||||||
|
|
||||||
// 移動先のアクティビティを指定
|
|
||||||
Intent intent = new Intent(LibraryArchiveFragment.this, LibraryDocFragment.class);
|
|
||||||
|
|
||||||
// データを付加する
|
|
||||||
intent.putExtra("key_name", "value_data");
|
|
||||||
|
|
||||||
startActivity(intent);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
package one.nem.lacerta.feature.library;
|
package one.nem.lacerta.feature.library;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Currently, this file is not used in the app.
|
||||||
|
*/
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|||||||
+291
@@ -0,0 +1,291 @@
|
|||||||
|
package one.nem.lacerta.feature.library;
|
||||||
|
|
||||||
|
import android.app.AlertDialog;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
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.navigation.Navigation;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ArrayAdapter;
|
||||||
|
import android.widget.ListView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.google.android.material.appbar.AppBarLayout;
|
||||||
|
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
||||||
|
|
||||||
|
import org.w3c.dom.Text;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.data.Document;
|
||||||
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
|
import one.nem.lacerta.model.FragmentNavigation;
|
||||||
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
|
import one.nem.lacerta.model.PublicPath;
|
||||||
|
import one.nem.lacerta.utils.FeatureSwitch;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link LibraryPageFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class LibraryPageFragment extends Fragment {
|
||||||
|
|
||||||
|
// Variables
|
||||||
|
// このインスタンスで表示されているページ
|
||||||
|
LibraryItemPage libraryItemPage;
|
||||||
|
|
||||||
|
// Arguments
|
||||||
|
String folderId;
|
||||||
|
String title;
|
||||||
|
String parentId;
|
||||||
|
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLibrary lacertaLibrary;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
ListItemAdapter listItemAdapter;
|
||||||
|
|
||||||
|
public LibraryPageFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LibraryPageFragment newInstance(String folderId, String title, String parentId) {
|
||||||
|
LibraryPageFragment fragment = new LibraryPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString("folderId", folderId);
|
||||||
|
args.putString("title", title);
|
||||||
|
args.putString("publicPath", parentId);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LibraryPageFragment newInstance(String folderId) { // Back action
|
||||||
|
LibraryPageFragment fragment = new LibraryPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString("folderId", folderId);
|
||||||
|
args.putString("title", null);
|
||||||
|
args.putString("publicPath", null);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LibraryPageFragment newInstance() {
|
||||||
|
LibraryPageFragment fragment = new LibraryPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString("folderId", null);
|
||||||
|
args.putString("title", null);
|
||||||
|
args.putString("publicPath", null);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_library_top, container, false);
|
||||||
|
|
||||||
|
// Set status bar color
|
||||||
|
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
|
||||||
|
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
|
||||||
|
@Override
|
||||||
|
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
|
||||||
|
if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
|
||||||
|
// Collapsed
|
||||||
|
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
|
||||||
|
} else if (verticalOffset == 0) {
|
||||||
|
// Expanded
|
||||||
|
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
|
||||||
|
} else {
|
||||||
|
// Somewhere in between
|
||||||
|
// Here you can add a color transition if you want
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
if (getArguments() != null) {
|
||||||
|
this.folderId = getArguments().getString("folderId"); // Required
|
||||||
|
if (getArguments().getString("title") == null && getArguments().getString("publicPath") == null) {
|
||||||
|
this.libraryItemPage = new LibraryItemPage();
|
||||||
|
} else {
|
||||||
|
this.title = getArguments().getString("title");
|
||||||
|
this.parentId = getArguments().getString("publicPath");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.debug("LibraryTopFragment", "getArguments() is null(maybe root)");
|
||||||
|
this.libraryItemPage = new LibraryItemPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Toolbar Setup
|
||||||
|
toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
|
||||||
|
|
||||||
|
// RecyclerView Setup
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.library_item_recycler_view);
|
||||||
|
this.listItemAdapter = new ListItemAdapter(new DocumentSelectListener() {
|
||||||
|
@Override
|
||||||
|
public void onFolderSelected(String folderId, String folderName) {
|
||||||
|
logger.debug("LibraryTopFragment", "Folder selected! folderId: " + folderId + ", folderName: " + folderName);
|
||||||
|
// // 画面遷移
|
||||||
|
// FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
|
||||||
|
// // folderId: 推移先で表示するフォルダのID, folderName: 推移先で表示するフォルダの名前, parentId: このフラグメントで表示しているフォルダのID(推移先の親)
|
||||||
|
// fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, libraryItemPage != null ? libraryItemPage.getParentId() : null), false);
|
||||||
|
Bundle bundle = new Bundle();
|
||||||
|
bundle.putString("folderId", folderId);
|
||||||
|
bundle.putString("title", folderName);
|
||||||
|
bundle.putString("publicPath", libraryItemPage != null ? libraryItemPage.getParentId() : null);
|
||||||
|
try {
|
||||||
|
Navigation.findNavController(requireView()).navigate(R.id.action_feature_library_top_fragment_self, bundle);
|
||||||
|
} catch (IllegalStateException e) {
|
||||||
|
logger.error("LibraryTopFragment", "IllegalStateException: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDocumentSelected(String documentId, String documentName) {
|
||||||
|
Toast.makeText(getContext(), "Document selected! documentId: " + documentId + ", documentName: " + documentName, Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
recyclerView.setAdapter(listItemAdapter);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
|
// Get library page and update RecyclerView items
|
||||||
|
lacertaLibrary.getLibraryPage(this.folderId, 10).thenAccept(libraryItemPage -> {
|
||||||
|
this.libraryItemPage = libraryItemPage;
|
||||||
|
|
||||||
|
if (this.parentId == null) {
|
||||||
|
this.parentId = libraryItemPage.getParentId();
|
||||||
|
}
|
||||||
|
if (this.title == null) {
|
||||||
|
this.title = libraryItemPage.getPageTitle();
|
||||||
|
// Toolbar init again
|
||||||
|
toolbarSetup(view.findViewById(R.id.library_toolbar), this.folderId != null, this.title != null ? this.title : "ライブラリ");
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.debug("LibraryTopFragment", "Item selected! Total item page: " + this.libraryItemPage.getListItems().size());
|
||||||
|
if (!FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
|
||||||
|
getActivity().runOnUiThread(() -> { // TODO-rca: 実行条件を考える?
|
||||||
|
listItemAdapter.notifyItemRangeRemoved(0, this.libraryItemPage.getListItems().size() - 1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
listItemAdapter.setLibraryItemPage(this.libraryItemPage);
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
if (FeatureSwitch.RecyclerView.useSimpleNotifyMethod) {
|
||||||
|
listItemAdapter.notifyDataSetChanged();
|
||||||
|
} else {
|
||||||
|
listItemAdapter.notifyItemRangeInserted(0, this.libraryItemPage.getListItems().size() - 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Currentにフォルダを作成する
|
||||||
|
*/
|
||||||
|
private void createFolder(String pageId) {
|
||||||
|
// TODO-rca: デザインをMaterial Design 3に合わせたカスタムダイアログにする
|
||||||
|
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||||
|
builder.setTitle("フォルダの作成");
|
||||||
|
builder.setMessage("フォルダ名を入力してください");
|
||||||
|
final android.widget.EditText input = new android.widget.EditText(getContext());
|
||||||
|
input.setText("フォルダ名");
|
||||||
|
builder.setView(input);
|
||||||
|
builder.setPositiveButton("作成", (dialog, which) -> {
|
||||||
|
lacertaLibrary.createFolder(pageId, input.getText().toString()).thenAccept(folderId -> {
|
||||||
|
// Refresh
|
||||||
|
updateItem(pageId);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
builder.setNegativeButton("キャンセル", (dialog, which) -> {
|
||||||
|
dialog.cancel();
|
||||||
|
});
|
||||||
|
builder.show();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* RecyclerViewのアイテムを更新する
|
||||||
|
*/
|
||||||
|
private void updateItem(String pageId) {
|
||||||
|
lacertaLibrary.getLibraryPage(pageId, 10).thenAccept(libraryItemPage -> {
|
||||||
|
this.libraryItemPage = libraryItemPage;
|
||||||
|
logger.debug("LibraryTopFragment", "Item selected! libraryItemPage.getListItems().size(): " + libraryItemPage.getListItems().size());
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
listItemAdapter.notifyItemRangeRemoved(0, libraryItemPage.getListItems().size() - 1);
|
||||||
|
});
|
||||||
|
listItemAdapter.setLibraryItemPage(libraryItemPage);
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
listItemAdapter.notifyItemRangeInserted(0, libraryItemPage.getListItems().size() - 1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ToolbarをInitする
|
||||||
|
*
|
||||||
|
* @param toolbar Toolbar
|
||||||
|
* @param showBackButton 戻るボタンを表示するか
|
||||||
|
* @param title タイトル
|
||||||
|
*/
|
||||||
|
private void toolbarSetup(Toolbar toolbar, boolean showBackButton, String title) {
|
||||||
|
getActivity().runOnUiThread(() -> {
|
||||||
|
if (showBackButton) {
|
||||||
|
toolbar.setNavigationIcon(one.nem.lacerta.shared.ui.R.drawable.arrow_back_24px);
|
||||||
|
toolbar.setNavigationOnClickListener(v -> {
|
||||||
|
//this.libraryItemPage = lacertaLibrary.getLibraryPage(this.libraryItemPage.getParentId(), 10).join();
|
||||||
|
// Back
|
||||||
|
Navigation.findNavController(requireView()).popBackStack();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toolbar.setNavigationIcon(null);
|
||||||
|
}
|
||||||
|
toolbar.setTitle(title);
|
||||||
|
toolbar.getMenu().clear();
|
||||||
|
toolbar.inflateMenu(R.menu.dir_menu);
|
||||||
|
toolbar.setOnMenuItemClickListener(item -> {
|
||||||
|
if (item.getItemId() == R.id.menu_item_create_new_folder) {
|
||||||
|
createFolder(this.folderId);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
-104
@@ -1,104 +0,0 @@
|
|||||||
package one.nem.lacerta.feature.library;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
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.ArrayAdapter;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.Toast;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.data.Document;
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
* Use the {@link LibraryTopFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class LibraryTopFragment extends Fragment {
|
|
||||||
|
|
||||||
// @Inject
|
|
||||||
// Document document;
|
|
||||||
|
|
||||||
// TODO: Rename parameter arguments, choose names that match
|
|
||||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
|
||||||
private static final String ARG_PARAM1 = "param1";
|
|
||||||
private static final String ARG_PARAM2 = "param2";
|
|
||||||
|
|
||||||
// TODO: Rename and change types of parameters
|
|
||||||
private String mParam1;
|
|
||||||
private String mParam2;
|
|
||||||
|
|
||||||
public LibraryTopFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Use this factory method to create a new instance of
|
|
||||||
* this fragment using the provided parameters.
|
|
||||||
*
|
|
||||||
* @param param1 Parameter 1.
|
|
||||||
* @param param2 Parameter 2.
|
|
||||||
* @return A new instance of fragment LibraryTopFragment.
|
|
||||||
*/
|
|
||||||
// TODO: Rename and change types and number of parameters
|
|
||||||
public static LibraryTopFragment newInstance(String param1, String param2) {
|
|
||||||
LibraryTopFragment fragment = new LibraryTopFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
args.putString(ARG_PARAM1, param1);
|
|
||||||
args.putString(ARG_PARAM2, param2);
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
if (getArguments() != null) {
|
|
||||||
mParam1 = getArguments().getString(ARG_PARAM1);
|
|
||||||
mParam2 = getArguments().getString(ARG_PARAM2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
View view = inflater.inflate(R.layout.fragment_library_top, container, false);
|
|
||||||
|
|
||||||
// Use view.findViewById instead of findViewById
|
|
||||||
RecyclerView documentRecyclerView = view.findViewById(R.id.document_list);
|
|
||||||
|
|
||||||
LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
|
|
||||||
documentRecyclerView.setLayoutManager(layoutManager);
|
|
||||||
|
|
||||||
//データを取得
|
|
||||||
|
|
||||||
// List<DocumentMeta> metas = document.getAllDocumentMetas(100);
|
|
||||||
|
|
||||||
// Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
|
|
||||||
|
|
||||||
// Create and set the adapter
|
|
||||||
// DocumentAdapter adapter = new DocumentAdapter(metas);
|
|
||||||
// documentRecyclerView.setAdapter(adapter);
|
|
||||||
|
|
||||||
// Use a LinearLayoutManager to specify the layout
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package one.nem.lacerta.feature.library;
|
||||||
|
|
||||||
|
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 ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
|
||||||
|
|
||||||
|
LibraryItemPage libraryItemPage;
|
||||||
|
|
||||||
|
DocumentSelectListener listener;
|
||||||
|
|
||||||
|
|
||||||
|
public ListItemAdapter(DocumentSelectListener listener) {
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLibraryItemPage(LibraryItemPage libraryItemPage) {
|
||||||
|
this.libraryItemPage = libraryItemPage;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||||
|
return new ListItemViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull ListItemViewHolder holder, int position) {
|
||||||
|
ListItem listItem = libraryItemPage.getListItems().get(position);
|
||||||
|
holder.icon.setImageResource(listItem.getItemType().getIconId());
|
||||||
|
holder.icon.setColorFilter(one.nem.lacerta.shared.ui.R.color.colorOnSurface);
|
||||||
|
holder.title.setText(listItem.getTitle());
|
||||||
|
holder.description.setText(listItem.getDescription());
|
||||||
|
|
||||||
|
holder.itemView.setOnClickListener( v -> {
|
||||||
|
if (listItem.getItemType() == ListItemType.ITEM_TYPE_DOCUMENT) {
|
||||||
|
listener.onDocumentSelected(listItem.getItemId(), listItem.getTitle());
|
||||||
|
}
|
||||||
|
else if (listItem.getItemType() == ListItemType.ITEM_TYPE_FOLDER) {
|
||||||
|
listener.onFolderSelected(listItem.getItemId(), listItem.getTitle());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return this.libraryItemPage == null ? 0
|
||||||
|
: this.libraryItemPage.getListItems() == null ? 0 : this.libraryItemPage.getListItems().size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ListItemViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
|
||||||
|
ImageView icon;
|
||||||
|
TextView title;
|
||||||
|
TextView description;
|
||||||
|
public ListItemViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
|
||||||
|
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||||
|
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||||
|
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,32 +1,50 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:theme="@style/Theme.Lacerta"
|
android:background="@color/colorSurface">
|
||||||
tools:context=".LibraryTopFragment">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
android:id="@+id/tool_bar"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent">
|
||||||
android:background="@color/colorPrimaryContainer"
|
|
||||||
android:minHeight="?attr/actionBarSize"
|
|
||||||
android:theme="?attr/actionBarTheme"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:title="Library"
|
|
||||||
app:titleTextColor="@color/colorOnPrimaryContainer" />
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
android:id="@+id/document_list"
|
android:id="@+id/app_bar_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="wrap_content">
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/library_toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="HOGE" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/library_item_recycler_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?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/menu_item_create_new_folder"
|
||||||
|
android:icon="@drawable/create_new_folder_24px"
|
||||||
|
android:title="@string/create_new_folder"
|
||||||
|
app:showAsAction="never"/>
|
||||||
|
|
||||||
|
</menu>
|
||||||
@@ -6,7 +6,17 @@
|
|||||||
app:startDestination="@id/feature_library_top_fragment">
|
app:startDestination="@id/feature_library_top_fragment">
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/feature_library_top_fragment"
|
android:id="@+id/feature_library_top_fragment"
|
||||||
android:name="one.nem.lacerta.feature.library.LibraryTopFragment"
|
android:name="one.nem.lacerta.feature.library.LibraryPageFragment"
|
||||||
android:label="fragment_library_top"
|
android:label="fragment_library_top"
|
||||||
tools:layout="@layout/fragment_library_top" />
|
tools:layout="@layout/fragment_library_top" >
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_feature_library_top_fragment_self"
|
||||||
|
app:destination="@id/feature_library_top_fragment"
|
||||||
|
app:enterAnim="@anim/nav_default_enter_anim"
|
||||||
|
app:exitAnim="@anim/nav_default_exit_anim"
|
||||||
|
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
|
||||||
|
app:popExitAnim="@anim/nav_default_pop_exit_anim"
|
||||||
|
app:popUpTo="@id/feature_library_top_fragment"
|
||||||
|
app:popUpToInclusive="false"/>
|
||||||
|
</fragment>
|
||||||
</navigation>
|
</navigation>
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">Library</string>
|
<string name="app_name">Library</string>
|
||||||
|
<string name="create_new_folder">新しいフォルダを作成</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.feature.scan'
|
namespace 'one.nem.lacerta.feature.scan'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'one.nem.lacerta.feature.search'
|
namespace 'one.nem.lacerta.feature.search'
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk 26
|
minSdk 26
|
||||||
@@ -27,9 +27,17 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
implementation libs.androidx.appcompat
|
||||||
implementation 'com.google.android.material:material:1.10.0'
|
implementation libs.com.google.android.material
|
||||||
testImplementation 'junit:junit:4.13.2'
|
testImplementation libs.junit
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
// Navigation
|
||||||
|
implementation libs.navigation.fragment
|
||||||
|
implementation libs.navigation.ui
|
||||||
|
implementation libs.navigation.dynamic.features.fragment
|
||||||
|
|
||||||
|
// shared
|
||||||
|
implementation project(':shared:ui')
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
package one.nem.lacerta.feature.search;
|
||||||
|
|
||||||
|
import android.app.LauncherActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.SearchView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SearchTopFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SearchTopFragment extends Fragment {
|
||||||
|
private static final String TAG = SearchTopFragment.class.getSimpleName();
|
||||||
|
private final SearchTopFragment self = this;
|
||||||
|
|
||||||
|
private SearchView searchView;
|
||||||
|
private String searchWord;
|
||||||
|
|
||||||
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
|
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||||
|
private static final String ARG_PARAM1 = "param1";
|
||||||
|
private static final String ARG_PARAM2 = "param2";
|
||||||
|
|
||||||
|
// TODO: Rename and change types of parameters
|
||||||
|
private String mParam1;
|
||||||
|
private String mParam2;
|
||||||
|
|
||||||
|
public SearchTopFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use this factory method to create a new instance of
|
||||||
|
* this fragment using the provided parameters.
|
||||||
|
*
|
||||||
|
* @param param1 Parameter 1.
|
||||||
|
* @param param2 Parameter 2.
|
||||||
|
* @return A new instance of fragment SearchTopFragment.
|
||||||
|
*/
|
||||||
|
// TODO: Rename and change types and number of parameters
|
||||||
|
public static SearchTopFragment newInstance(String param1, String param2) {
|
||||||
|
SearchTopFragment fragment = new SearchTopFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putString(ARG_PARAM1, param1);
|
||||||
|
args.putString(ARG_PARAM2, param2);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
mParam1 = getArguments().getString(ARG_PARAM1);
|
||||||
|
mParam2 = getArguments().getString(ARG_PARAM2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
return inflater.inflate(R.layout.fragment_search_top, container, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||||
|
super.onCreateOptionsMenu(menu, inflater);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
this.searchView.setIconifiedByDefault(true);
|
||||||
|
|
||||||
|
|
||||||
|
this.searchView.setSubmitButtonEnabled(false);
|
||||||
|
|
||||||
|
|
||||||
|
if (!this.searchWord.equals("")) {
|
||||||
|
|
||||||
|
this.searchView.setQuery(this.searchWord, false);
|
||||||
|
} else {
|
||||||
|
String queryHint = self.getResources().getString(R.string.hello_blank_fragment);
|
||||||
|
|
||||||
|
this.searchView.setQueryHint(queryHint);
|
||||||
|
}
|
||||||
|
this.searchView.setOnQueryTextListener(self.onQueryTextListener);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final SearchView.OnQueryTextListener onQueryTextListener = new SearchView.OnQueryTextListener() {
|
||||||
|
@Override
|
||||||
|
public boolean onQueryTextSubmit(String query) {
|
||||||
|
|
||||||
|
return self.setSearchWord(searchWord);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onQueryTextChange(String query) {
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
private boolean setSearchWord(String query) {
|
||||||
|
|
||||||
|
|
||||||
|
if (searchWord != null && !searchWord.equals("")) {
|
||||||
|
|
||||||
|
this.searchWord = searchWord;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.searchView.setIconified(false);
|
||||||
|
|
||||||
|
this.searchView.onActionViewCollapsed();
|
||||||
|
|
||||||
|
this.searchView.clearFocus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
interface LacertaSearch {
|
||||||
|
ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit);
|
||||||
|
|
||||||
|
ArrayList<LauncherActivity.ListItem> autoSearch(String query, int limit, int offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
tools:context=".SearchTopFragment">
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
|
android:id="@+id/Search_tool_bar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="69dp"
|
||||||
|
android:background="#E4E8EA"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
android:theme="?attr/actionBarTheme"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:title="" />
|
||||||
|
|
||||||
|
<SearchView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/feature_search_navigation"
|
||||||
|
app:startDestination="@id/searchTopFragment">
|
||||||
|
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/searchTopFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.search.SearchTopFragment"
|
||||||
|
android:label="fragment_search_top"
|
||||||
|
tools:layout="@layout/fragment_search_top" />
|
||||||
|
</navigation>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
plugins {
|
||||||
|
alias(libs.plugins.com.android.library)
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'one.nem.lacerta.setting'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk 26
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
consumerProguardFiles "consumer-rules.pro"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation libs.androidx.appcompat
|
||||||
|
implementation libs.com.google.android.material
|
||||||
|
testImplementation libs.junit
|
||||||
|
androidTestImplementation libs.androidx.test.ext.junit
|
||||||
|
androidTestImplementation libs.androidx.test.espresso.core
|
||||||
|
|
||||||
|
// Navigation
|
||||||
|
implementation libs.navigation.fragment
|
||||||
|
implementation libs.navigation.ui
|
||||||
|
implementation libs.navigation.dynamic.features.fragment
|
||||||
|
|
||||||
|
// DI
|
||||||
|
implementation libs.com.google.dagger.hilt.android
|
||||||
|
annotationProcessor libs.com.google.dagger.hilt.compiler
|
||||||
|
|
||||||
|
// shared
|
||||||
|
implementation project(':shared:ui')
|
||||||
|
|
||||||
|
// https://mvnrepository.com/artifact/androidx.preference/preference
|
||||||
|
implementation 'androidx.preference:preference:1.2.1'
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
File renamed without changes.
Vendored
+21
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("one.nem.lacerta.setting.test", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.navigation.Navigation;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.setting.model.SettingListItem;
|
||||||
|
|
||||||
|
public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
|
||||||
|
|
||||||
|
ArrayList<SettingListItem> listItems;
|
||||||
|
|
||||||
|
public ListItemAdapter(ArrayList<SettingListItem> listItems){
|
||||||
|
this.listItems = listItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public ListItemAdapter.ListItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
|
View view = LayoutInflater.from(parent.getContext()).inflate(one.nem.lacerta.shared.ui.R.layout.common_list_item, parent, false);
|
||||||
|
return new ListItemViewHolder(view);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(@NonNull ListItemAdapter.ListItemViewHolder holder, int position) {
|
||||||
|
SettingListItem listItem = listItems.get(position);
|
||||||
|
holder.icon.setImageDrawable(listItem.getIcon());
|
||||||
|
holder.icon.setColorFilter(one.nem.lacerta.shared.ui.R.color.colorOnSurface);
|
||||||
|
holder.title.setText(listItem.getTitle());
|
||||||
|
holder.description.setText(listItem.getDescription());
|
||||||
|
|
||||||
|
holder.itemView.setOnClickListener( v -> {
|
||||||
|
Navigation.findNavController(v).navigate(listItem.getDestination());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return listItems.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ListItemViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
|
||||||
|
ImageView icon;
|
||||||
|
TextView title;
|
||||||
|
TextView description;
|
||||||
|
public ListItemViewHolder(@NonNull View itemView) {
|
||||||
|
super(itemView);
|
||||||
|
|
||||||
|
icon = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_icon);
|
||||||
|
title = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_title);
|
||||||
|
description = itemView.findViewById(one.nem.lacerta.shared.ui.R.id.item_description);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingAboutPageFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingAboutPageFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingAboutPageFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SettingAboutPageFragment newInstance() {
|
||||||
|
SettingAboutPageFragment fragment = new SettingAboutPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_setting_about_page, container, false);
|
||||||
|
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingDataPageFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingDataPageFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingDataPageFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SettingDataPageFragment newInstance() {
|
||||||
|
SettingDataPageFragment fragment = new SettingDataPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
return inflater.inflate(R.layout.fragment_setting_data_page, container, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingDisplayPageFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingDisplayPageFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingDisplayPageFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SettingDisplayPageFragment newInstance() {
|
||||||
|
SettingDisplayPageFragment fragment = new SettingDisplayPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
return inflater.inflate(R.layout.fragment_setting_display_page, container, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
|
|
||||||
|
import android.preference.PreferenceFragment;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingScanPageFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingScanPageFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingScanPageFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// @Override
|
||||||
|
// public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
|
||||||
|
//// addPreferencesFromResource(R.xml.scan_preferences);
|
||||||
|
// }
|
||||||
|
|
||||||
|
public static SettingScanPageFragment newInstance() {
|
||||||
|
SettingScanPageFragment fragment = new SettingScanPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.setting.model.SettingListItem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingTopFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingTopFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingTopFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SettingTopFragment newInstance() {
|
||||||
|
SettingTopFragment fragment = new SettingTopFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_setting_top, container, false);
|
||||||
|
|
||||||
|
// Setting items
|
||||||
|
ArrayList<SettingListItem> settingListItems = new ArrayList<>();
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_display_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_display_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.palette_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingDisplayPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_data_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_data_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.settings_backup_restore_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingDataPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_scan_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_scan_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.document_scanner_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingScanPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.info_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingAboutPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Init RecyclerView
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.setting_item_recycler_view);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
recyclerView.setAdapter(new ListItemAdapter(settingListItems));
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package one.nem.lacerta.setting.model;
|
||||||
|
|
||||||
|
import android.graphics.drawable.Drawable;
|
||||||
|
|
||||||
|
public class SettingListItem {
|
||||||
|
|
||||||
|
String title;
|
||||||
|
String description;
|
||||||
|
Drawable icon;
|
||||||
|
int destination;
|
||||||
|
|
||||||
|
public SettingListItem(String title, String description, Drawable icon, int destination) {
|
||||||
|
this.title = title;
|
||||||
|
this.description = description;
|
||||||
|
this.icon = icon;
|
||||||
|
this.destination = destination;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Drawable getIcon() {
|
||||||
|
return icon;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getDestination() {
|
||||||
|
return destination;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="@string/setting_top_about_title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:padding="32dp"
|
||||||
|
android:background="@drawable/rounded_secondary_container" >
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Work in Progress..."
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="実装中..."
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="@string/setting_top_data_title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:padding="32dp"
|
||||||
|
android:background="@drawable/rounded_secondary_container" >
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Work in Progress..."
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="実装中..."
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="@string/setting_top_display_title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:padding="32dp"
|
||||||
|
android:background="@drawable/rounded_secondary_container" >
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Work in Progress..."
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="実装中..."
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="@string/setting_top_scan_title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:padding="32dp"
|
||||||
|
android:background="@drawable/rounded_secondary_container" >
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Work in Progress..."
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
<com.google.android.material.textview.MaterialTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="実装中..."
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="@color/colorOnSurfaceSecondary"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorSurface">
|
||||||
|
|
||||||
|
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/app_bar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/collapsing_toolbar"
|
||||||
|
app:contentScrim="@color/colorSecondaryContainer"
|
||||||
|
android:background="@color/colorSurface"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="160dp"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
app:collapsedTitleGravity="start|center_vertical"
|
||||||
|
app:expandedTitleGravity="start|bottom"
|
||||||
|
app:expandedTitleMarginBottom="16dp"
|
||||||
|
app:expandedTitleMarginStart="16dp"
|
||||||
|
app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline4"
|
||||||
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
app:layout_collapseMode="pin"
|
||||||
|
app:title="@string/setting_title" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/setting_item_recycler_view"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||||
|
|
||||||
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/feature_setting_navigation"
|
||||||
|
app:startDestination="@id/settingTopFragment">
|
||||||
|
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/settingTopFragment"
|
||||||
|
android:name="one.nem.lacerta.setting.SettingTopFragment"
|
||||||
|
android:label="SettingTopFragment" >
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_settingTopFragment_to_settingAboutPageFragment"
|
||||||
|
app:destination="@id/settingAboutPageFragment"
|
||||||
|
app:enterAnim="@anim/slide_from_right"
|
||||||
|
app:exitAnim="@anim/slide_to_left"
|
||||||
|
app:popEnterAnim="@anim/slide_from_left"
|
||||||
|
app:popExitAnim="@anim/slide_to_right" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_settingTopFragment_to_settingDisplayPageFragment"
|
||||||
|
app:destination="@id/settingDisplayPageFragment"
|
||||||
|
app:enterAnim="@anim/slide_from_right"
|
||||||
|
app:exitAnim="@anim/slide_to_left"
|
||||||
|
app:popEnterAnim="@anim/slide_from_left"
|
||||||
|
app:popExitAnim="@anim/slide_to_right" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_settingTopFragment_to_settingDataPageFragment"
|
||||||
|
app:destination="@id/settingDataPageFragment"
|
||||||
|
app:enterAnim="@anim/slide_from_right"
|
||||||
|
app:exitAnim="@anim/slide_to_left"
|
||||||
|
app:popEnterAnim="@anim/slide_from_left"
|
||||||
|
app:popExitAnim="@anim/slide_to_right" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_settingTopFragment_to_settingScanPageFragment"
|
||||||
|
app:destination="@id/settingScanPageFragment"
|
||||||
|
app:enterAnim="@anim/slide_from_right"
|
||||||
|
app:exitAnim="@anim/slide_to_left"
|
||||||
|
app:popEnterAnim="@anim/slide_from_left"
|
||||||
|
app:popExitAnim="@anim/slide_to_right" />
|
||||||
|
</fragment>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/settingAboutPageFragment"
|
||||||
|
android:name="one.nem.lacerta.setting.SettingAboutPageFragment"
|
||||||
|
android:label="fragment_setting_about_page"
|
||||||
|
tools:layout="@layout/fragment_setting_about_page" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/settingDataPageFragment"
|
||||||
|
android:name="one.nem.lacerta.setting.SettingDataPageFragment"
|
||||||
|
android:label="fragment_setting_data_page"
|
||||||
|
tools:layout="@layout/fragment_setting_data_page" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/settingDisplayPageFragment"
|
||||||
|
android:name="one.nem.lacerta.setting.SettingDisplayPageFragment"
|
||||||
|
android:label="fragment_setting_display_page"
|
||||||
|
tools:layout="@layout/fragment_setting_display_page" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/settingScanPageFragment"
|
||||||
|
android:name="one.nem.lacerta.setting.SettingScanPageFragment"
|
||||||
|
android:label="fragment_setting_scan_page"
|
||||||
|
tools:layout="@layout/fragment_setting_scan_page" />
|
||||||
|
</navigation>
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<array name="png_quality_array">
|
||||||
|
<item name="5">5</item>
|
||||||
|
<item name="6">6</item>
|
||||||
|
<item name="7">7</item>
|
||||||
|
<item name="8">8</item>
|
||||||
|
<item name="9">9</item>
|
||||||
|
</array>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<integer name="png_quality_default">70</integer>
|
||||||
|
<integer name="png_quality_min">5</integer>
|
||||||
|
<integer name="png_quality_max">100</integer>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<PreferenceCategory android:title="@string/setting_scan_quality_title">
|
||||||
|
<SeekBarPreference
|
||||||
|
android:defaultValue="@integer/png_quality_default"
|
||||||
|
android:key="png_quality"
|
||||||
|
android:max="@integer/png_quality_max"
|
||||||
|
android:min="@integer/png_quality_min"
|
||||||
|
android:summary="@string/setting_scan_quality_png_quality_description"
|
||||||
|
android:title="@string/setting_scan_quality_png_quality_title" />
|
||||||
|
</PreferenceCategory>
|
||||||
|
<PreferenceCategory android:title="@string/setting_scan_default_title">
|
||||||
|
|
||||||
|
<EditTextPreference
|
||||||
|
android:defaultValue="Untitled"
|
||||||
|
android:key="new_doc_default_title"
|
||||||
|
android:selectAllOnFocus="true"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:title="@string/setting_scan_default_document_name" />
|
||||||
|
<EditTextPreference
|
||||||
|
android:defaultValue="NewFolder"
|
||||||
|
android:key="new_dir_default_title"
|
||||||
|
android:selectAllOnFocus="true"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:title="@string/setting_scan_default_folder_name" />
|
||||||
|
</PreferenceCategory>
|
||||||
|
</PreferenceScreen>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
package one.nem.lacerta.model;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
public interface FragmentNavigation {
|
||||||
|
void navigateToFragment(Fragment fragment);
|
||||||
|
|
||||||
|
void navigateToFragment(Fragment fragment, boolean addToBackStack);
|
||||||
|
|
||||||
|
void navigateToFragment(Fragment fragment, boolean addToBackStack, boolean clearBackStack);
|
||||||
|
|
||||||
|
void navigateToFragmentAlternate(Fragment fragment, boolean addToBackStack);
|
||||||
|
}
|
||||||
@@ -6,10 +6,18 @@ public class LibraryItemPage {
|
|||||||
|
|
||||||
String pageTitle;
|
String pageTitle;
|
||||||
String pageId;
|
String pageId;
|
||||||
|
String parentId;
|
||||||
ArrayList<ListItem> listItems;
|
ArrayList<ListItem> listItems;
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
|
|
||||||
|
public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems, String parentId) {
|
||||||
|
this.pageTitle = pageTitle;
|
||||||
|
this.pageId = pageId;
|
||||||
|
this.listItems = listItems;
|
||||||
|
this.parentId = parentId;
|
||||||
|
}
|
||||||
|
|
||||||
public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems) {
|
public LibraryItemPage(String pageTitle, String pageId, ArrayList<ListItem> listItems) {
|
||||||
this.pageTitle = pageTitle;
|
this.pageTitle = pageTitle;
|
||||||
this.pageId = pageId;
|
this.pageId = pageId;
|
||||||
@@ -30,6 +38,10 @@ public class LibraryItemPage {
|
|||||||
return pageId;
|
return pageId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getParentId() {
|
||||||
|
return parentId;
|
||||||
|
}
|
||||||
|
|
||||||
public ArrayList<ListItem> getListItems() {
|
public ArrayList<ListItem> getListItems() {
|
||||||
return listItems;
|
return listItems;
|
||||||
}
|
}
|
||||||
@@ -44,6 +56,10 @@ public class LibraryItemPage {
|
|||||||
this.pageId = pageId;
|
this.pageId = pageId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setParentId(String parentId) {
|
||||||
|
this.parentId = parentId;
|
||||||
|
}
|
||||||
|
|
||||||
public void setListItems(ArrayList<ListItem> listItems) {
|
public void setListItems(ArrayList<ListItem> listItems) {
|
||||||
this.listItems = listItems;
|
this.listItems = listItems;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package one.nem.lacerta.model;
|
package one.nem.lacerta.model;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -29,11 +31,31 @@ public class PublicPath {
|
|||||||
private void resolveInternal(String path) {
|
private void resolveInternal(String path) {
|
||||||
if (path.equals("..")) {
|
if (path.equals("..")) {
|
||||||
this.path.remove(this.path.size() - 1);
|
this.path.remove(this.path.size() - 1);
|
||||||
|
} else if (path.equals(".")) {
|
||||||
|
// do nothing
|
||||||
} else {
|
} else {
|
||||||
add(path);
|
this.path.add(path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PublicPath parse(String path) {
|
||||||
|
if (path == null) {
|
||||||
|
this.path.clear();
|
||||||
|
this.path.add("/");
|
||||||
|
} else {
|
||||||
|
if (path.startsWith("/")) {
|
||||||
|
this.path.clear();
|
||||||
|
path = path.substring(1);
|
||||||
|
}
|
||||||
|
String[] pathArray = path.split("/");
|
||||||
|
for (String p : pathArray) {
|
||||||
|
Log.d("PublicPath", "parse: " + p);
|
||||||
|
resolveInternal(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public PublicPath resolve(String path) {
|
public PublicPath resolve(String path) {
|
||||||
resolveInternal(path);
|
resolveInternal(path);
|
||||||
return this;
|
return this;
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package one.nem.lacerta.model;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
public class VcsRevModel {
|
||||||
|
|
||||||
|
String id;
|
||||||
|
|
||||||
|
String documentId;
|
||||||
|
|
||||||
|
String branchName;
|
||||||
|
|
||||||
|
String commitMessage;
|
||||||
|
|
||||||
|
Date createdAt;
|
||||||
|
|
||||||
|
ArrayList<String> logIds;
|
||||||
|
|
||||||
|
public VcsRevModel(String id, String documentId, String branchName, String commitMessage, Date createdAt, ArrayList<String> logIds) {
|
||||||
|
this.id = id;
|
||||||
|
this.documentId = documentId;
|
||||||
|
this.branchName = branchName;
|
||||||
|
this.commitMessage = commitMessage;
|
||||||
|
this.createdAt = createdAt;
|
||||||
|
this.logIds = logIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty constructor
|
||||||
|
public VcsRevModel() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDocumentId() {
|
||||||
|
return documentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getBranchName() {
|
||||||
|
return branchName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCommitMessage() {
|
||||||
|
return commitMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Date getCreatedAt() {
|
||||||
|
return createdAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getLogIds() {
|
||||||
|
return logIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(String id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDocumentId(String documentId) {
|
||||||
|
this.documentId = documentId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBranchName(String branchName) {
|
||||||
|
this.branchName = branchName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCommitMessage(String commitMessage) {
|
||||||
|
this.commitMessage = commitMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCreatedAt(Date createdAt) {
|
||||||
|
this.createdAt = createdAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLogIds(ArrayList<String> logIds) {
|
||||||
|
this.logIds = logIds;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -73,4 +73,6 @@ public class DocumentDetail {
|
|||||||
this.pages = pages;
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
|
|||||||
*/
|
*/
|
||||||
List<DocumentTag> tags;
|
List<DocumentTag> tags;
|
||||||
|
|
||||||
PublicPath path;
|
String parentId;
|
||||||
|
|
||||||
String author;
|
String author;
|
||||||
|
|
||||||
@@ -48,6 +48,17 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
|
|||||||
public DocumentMeta() {
|
public DocumentMeta() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DocumentMeta(String title) {
|
||||||
|
this.id = UUID.randomUUID().toString();
|
||||||
|
this.title = title;
|
||||||
|
this.tags = new ArrayList<>();
|
||||||
|
this.author = ""; // TODO-rca: 作者のデフォルト値を設定できるようにする
|
||||||
|
this.defaultBranch = "main"; // TODO-rca: デフォルトブランチのデフォルト値を設定できるようにする
|
||||||
|
this.parentId = null;
|
||||||
|
this.updatedAt = new Date();
|
||||||
|
this.createdAt = new Date();
|
||||||
|
}
|
||||||
|
|
||||||
public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
|
public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||||
this.id = UUID.randomUUID().toString();
|
this.id = UUID.randomUUID().toString();
|
||||||
this.title = title;
|
this.title = title;
|
||||||
@@ -74,13 +85,13 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
|
|||||||
this.defaultBranch = defaultBranch;
|
this.defaultBranch = defaultBranch;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, String author, String defaultBranch) {
|
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String parentId, String author, String defaultBranch) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.title = title;
|
this.title = title;
|
||||||
this.updatedAt = updatedAt;
|
this.updatedAt = updatedAt;
|
||||||
this.createdAt = createdAt;
|
this.createdAt = createdAt;
|
||||||
this.tags = tags;
|
this.tags = tags;
|
||||||
this.path = path;
|
this.parentId = parentId;
|
||||||
this.author = author;
|
this.author = author;
|
||||||
this.defaultBranch = defaultBranch;
|
this.defaultBranch = defaultBranch;
|
||||||
}
|
}
|
||||||
@@ -134,10 +145,10 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PublicPathを取得する
|
* ドキュメントの親フォルダのID(String)を取得する
|
||||||
*/
|
*/
|
||||||
public PublicPath getPath() {
|
public String getParentId() {
|
||||||
return path;
|
return parentId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -197,11 +208,11 @@ public class DocumentMeta { // TODO-rca: JavaDoc対応
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PublicPathを設定する
|
* ドキュメントの親フォルダのID(String)を設定する
|
||||||
* @param path PublicPath
|
* @param parentId ドキュメントの親フォルダのID
|
||||||
*/
|
*/
|
||||||
public void setPath(PublicPath path) {
|
public void setParentId(String parentId) {
|
||||||
this.path = path;
|
this.parentId = parentId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package one.nem.lacerta.model.pref;
|
||||||
|
|
||||||
|
public enum FeatureSwitchOverride {
|
||||||
|
|
||||||
|
ENABLE_DEBUG_MENU("enableDebugMenu"),
|
||||||
|
ENABLE_SEARCH("enableSearch"),
|
||||||
|
SHOW_DISPLAY_MENU("showDisplayMenu"),
|
||||||
|
SHOW_DATA_MENU("showDataMenu"),
|
||||||
|
SHOW_SCAN_MENU("showScanMenu");
|
||||||
|
|
||||||
|
private final String key;
|
||||||
|
|
||||||
|
FeatureSwitchOverride(String key) {
|
||||||
|
this.key = key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getKey() {
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static FeatureSwitchOverride fromKey(String key) {
|
||||||
|
for (FeatureSwitchOverride value : values()) {
|
||||||
|
if (value.getKey().equals(key)) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loaded 100 of 145 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user