mirror of
https://github.com/lacerta-doc/Lacerta.git
synced 2026-11-07 19:47:36 +00:00
Compare commits
323
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
2d686ce776 | ||
|
|
a61c044391 | ||
|
|
bc19dd22d8 | ||
|
|
61ed1bbf79 | ||
|
|
fd785d9334 | ||
|
|
e6ce3571bf | ||
|
|
462ea77e91 | ||
|
|
faf0971ffe | ||
|
|
3eac0cf49c | ||
|
|
680b101476 | ||
|
|
8200a03168 | ||
|
|
290795d3aa | ||
|
|
1e1f014e59 | ||
|
|
20f6333dcc | ||
|
|
d30e68b23f | ||
|
|
24e54ec0f0 | ||
|
|
d01f5b9c79 | ||
|
|
8502bcdcab | ||
|
|
7c91987c76 | ||
|
|
74aef19312 | ||
|
|
2168f67fea | ||
|
|
380e8117b8 | ||
|
|
a6aeb5480a | ||
|
|
78505c62e6 | ||
|
|
467d5ae9ee | ||
|
|
0f4b66eb37 | ||
|
|
cec7f3bb15 | ||
|
|
1137604515 | ||
|
|
091467d113 | ||
|
|
aefe5d1001 | ||
|
|
d780e57e39 | ||
|
|
35b998eebe | ||
|
|
b99efb3336 | ||
|
|
9ebf656274 | ||
|
|
84a8d0d44d | ||
|
|
5b1461ff26 | ||
|
|
57ca804b2b | ||
|
|
b81f8d5c87 | ||
|
|
e44313d418 | ||
|
|
334d1ccba2 | ||
|
|
5bf55ada0e | ||
|
|
75c0700144 | ||
|
|
dbb737d896 | ||
|
|
3045c75c45 | ||
|
|
aac94922df | ||
|
|
78ff41b3e3 | ||
|
|
e026da96fa | ||
|
|
9245981233 | ||
|
|
bc74ee605e | ||
|
|
475e378b7c | ||
|
|
6c8233536c | ||
|
|
3878c139af | ||
|
|
56a3acf36d | ||
|
|
0cab05c581 | ||
|
|
9db85bb9b3 | ||
|
|
17cb2829ce | ||
|
|
397c923cc1 | ||
|
|
94cec3432e | ||
|
|
e78ee829ce | ||
|
|
4ae2a9fe3a | ||
|
|
d6a0dbeaa2 | ||
|
|
98c3820679 | ||
|
|
de85626d66 | ||
|
|
7e20d8e443 | ||
|
|
eba02abfd4 | ||
|
|
aa7f285773 | ||
|
|
e5e1b3a2bb | ||
|
|
cd5a588545 | ||
|
|
bd5a041424 | ||
|
|
9d793c3c0a | ||
|
|
0d4f0686b7 | ||
|
|
5e6fa45fed | ||
|
|
885cd77d5b | ||
|
|
cbd7c103c5 | ||
|
|
ddd303fa88 | ||
|
|
14fbb56dcd | ||
|
|
bf01610eb5 | ||
|
|
b63e2dd862 | ||
|
|
8f0f95d8af | ||
|
|
d75ecff0e7 | ||
|
|
bc20c92d44 | ||
|
|
5837a1a2d3 | ||
|
|
176d8da59d | ||
|
|
dc516bc083 | ||
|
|
5c83c8fe13 | ||
|
|
200af1955b | ||
|
|
951ee15235 | ||
|
|
9a35c218b3 | ||
|
|
52894cf19c | ||
|
|
656d3a5964 | ||
|
|
f95a2d64c3 | ||
|
|
92f9cfe4aa | ||
|
|
162f0a7bdb | ||
|
|
ba119fdb3d | ||
|
|
c711ad304b | ||
|
|
b2a619629f | ||
|
|
a3426b6620 | ||
|
|
a9fb6283e7 | ||
|
|
6153e944eb | ||
|
|
a0baaf02cb | ||
|
|
623be098d1 | ||
|
|
999de728f0 | ||
|
|
a032b9c1b1 | ||
|
|
34de82cec3 | ||
|
|
fb4ba28391 | ||
|
|
44baef8199 | ||
|
|
60f86cd9a2 | ||
|
|
add140ad39 | ||
|
|
4c40f9926e | ||
|
|
f119264599 | ||
|
|
7f7e7d4af3 | ||
|
|
b99277082d | ||
|
|
a6167b98af | ||
|
|
f75594233f | ||
|
|
32ee755d08 | ||
|
|
0758b697a2 | ||
|
|
1abfcc1e62 | ||
|
|
a1b6ed81df | ||
|
|
00a141a101 | ||
|
|
6845e552ef | ||
|
|
f98614c5f2 | ||
|
|
b040e2572c | ||
|
|
3eb94cade0 | ||
|
|
e9b7ad4d92 | ||
|
|
e07cbda769 | ||
|
|
80aeb8811b | ||
|
|
2d7dfe1b5b | ||
|
|
362eda782d | ||
|
|
b51eeb50ac | ||
|
|
2673fb6bce | ||
|
|
bb5c38cbca | ||
|
|
3f4614cf6b | ||
|
|
dc65cdbac8 | ||
|
|
dbbdda79f4 | ||
|
|
20c0dbd371 | ||
|
|
ccaed8387a | ||
|
|
bfb6bee14a | ||
|
|
3b283c1b05 | ||
|
|
e718e13ed9 | ||
|
|
8277258760 | ||
|
|
062e8c8bf9 | ||
|
|
0439370bd0 | ||
|
|
541b748501 | ||
|
|
88546fe89a | ||
|
|
53b3ebebef | ||
|
|
a7195c4079 | ||
|
|
e848f40b8b | ||
|
|
578f1ef8a8 | ||
|
|
fca44e1753 | ||
|
|
da1dba5fda | ||
|
|
c614230744 | ||
|
|
e5c3b3aa92 | ||
|
|
442ac4866a | ||
|
|
8d00386f20 | ||
|
|
9a14b1db23 | ||
|
|
385f2f327d | ||
|
|
f09d35b8c0 | ||
|
|
002c78d09b | ||
|
|
171c8b380c | ||
|
|
04651f3b8e | ||
|
|
180428fbb7 | ||
|
|
955e9fa6c8 | ||
|
|
1d3015a7e4 | ||
|
|
4ce8315678 | ||
|
|
3c66480f0f | ||
|
|
82d0187a11 | ||
|
|
dc340f1a96 | ||
|
|
1d24467c09 | ||
|
|
bf385b952c | ||
|
|
a5efab5838 | ||
|
|
f186064f6e | ||
|
|
59a35cbb4a | ||
|
|
a78e60416d | ||
|
|
ac5a950ce3 |
No files matched your search
Generated
+2
-2
@@ -4,7 +4,6 @@
|
|||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="testRunner" value="GRADLE" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleJvm" value="jbr-17" />
|
<option name="gradleJvm" value="jbr-17" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
@@ -23,13 +22,14 @@
|
|||||||
<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" />
|
||||||
|
<option value="$PROJECT_DIR$/vcs" />
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
<option name="resolveExternalAnnotations" value="false" />
|
<option name="resolveExternalAnnotations" value="false" />
|
||||||
|
|||||||
Generated
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
|
<?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" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# 概要
|
||||||
|
<!-- PRの概要 -->
|
||||||
|
|
||||||
|
# 関連Issue
|
||||||
|
- #000 <!-- 関連するIssueを指定(なければ省略可) -->
|
||||||
|
|
||||||
|
# 詳細
|
||||||
|
<!-- 詳細 -->
|
||||||
|
|
||||||
|
# 影響箇所
|
||||||
|
<!-- 予想される影響箇所 -->
|
||||||
|
|
||||||
|
# チェック
|
||||||
|
<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
|
||||||
|
- [ ] 機能として完成している
|
||||||
|
- [ ] WIP(Work in progress: 作業中)
|
||||||
|
- [ ] 正常にビルド/起動ができる
|
||||||
|
- [ ] 既存の機能を壊していない
|
||||||
+10
-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,14 @@ dependencies {
|
|||||||
implementation libs.navigation.ui
|
implementation libs.navigation.ui
|
||||||
implementation libs.navigation.dynamic.features.fragment
|
implementation libs.navigation.dynamic.features.fragment
|
||||||
|
|
||||||
|
// Feature
|
||||||
|
implementation project(':feature:home')
|
||||||
|
implementation project(':feature:search')
|
||||||
|
implementation project(':feature:library')
|
||||||
|
implementation project(':feature:scan')
|
||||||
|
implementation project(':feature:debug') // デバッグメニュー
|
||||||
|
implementation project(':feature:setting') // 設定画面
|
||||||
|
|
||||||
|
implementation project(':data')
|
||||||
|
implementation project(':shared:ui')
|
||||||
}
|
}
|
||||||
@@ -1,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,12 +1,15 @@
|
|||||||
package one.nem.lacerta;
|
package one.nem.lacerta;
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.fragment.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
import androidx.navigation.NavController;
|
import androidx.navigation.NavController;
|
||||||
import androidx.navigation.fragment.NavHostFragment;
|
import androidx.navigation.fragment.NavHostFragment;
|
||||||
import androidx.navigation.ui.NavigationUI;
|
import androidx.navigation.ui.NavigationUI;
|
||||||
|
|
||||||
|
import android.graphics.Color;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||||
@@ -25,16 +28,26 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
// Debug
|
// Init navigation
|
||||||
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
try {
|
||||||
|
FragmentManager supportFragmentManager = getSupportFragmentManager();
|
||||||
|
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
||||||
|
assert navHostFragment != null;
|
||||||
|
NavController navController = navHostFragment.getNavController();
|
||||||
|
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
||||||
|
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
||||||
|
}
|
||||||
|
catch (Exception e) {
|
||||||
|
Log.e("Init", "Failed to init navigation");
|
||||||
|
Log.e("Init", "Searchable Error code: " + "894b5941-3bc0-46fe-b752-0dbc88be29a8");
|
||||||
|
Toast.makeText(this, "Failed to init navigation", Toast.LENGTH_LONG).show();
|
||||||
|
finish(); // Exit app
|
||||||
|
}
|
||||||
|
|
||||||
NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
|
// Set navigation bar color
|
||||||
NavController navController = navHostFragment.getNavController();
|
getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
|
||||||
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
|
|
||||||
|
|
||||||
NavigationUI.setupWithNavController(bottomNavigationView, navController);
|
// Set status bar color
|
||||||
|
getWindow().setStatusBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurface));
|
||||||
Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
@@ -24,6 +24,11 @@
|
|||||||
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"
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -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>
|
||||||
@@ -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')
|
||||||
}
|
}
|
||||||
@@ -30,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 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
|
||||||
@@ -46,4 +48,8 @@ dependencies {
|
|||||||
implementation project(':processor')
|
implementation project(':processor')
|
||||||
|
|
||||||
implementation project(':utils')
|
implementation project(':utils')
|
||||||
|
|
||||||
|
implementation project(':vcs')
|
||||||
|
|
||||||
|
implementation project(':data')
|
||||||
}
|
}
|
||||||
@@ -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=".ScannerManagerActivity"
|
||||||
|
android:exported="false" />
|
||||||
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
+101
-100
@@ -123,109 +123,110 @@ public class ScannerDataManagerStubFragment extends Fragment {
|
|||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
// view.findViewById(R.id.button_call_camera).setOnClickListener(v -> {
|
||||||
Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
// Log.d("ScannerDataManagerStubFragment", "button_call_camera clicked");
|
||||||
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
// Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
|
||||||
if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
// if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
|
||||||
File photoFile = null;
|
// File photoFile = null;
|
||||||
try {
|
// try {
|
||||||
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
// String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(new Date());
|
||||||
String imageFileName = "JPEG_" + timeStamp + "_";
|
// String imageFileName = "JPEG_" + timeStamp + "_";
|
||||||
File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
// File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
|
||||||
photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
// photoFile = File.createTempFile(imageFileName, ".jpg", storageDir);
|
||||||
} catch (IOException ex) {
|
// } catch (IOException ex) {
|
||||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while creating the file", ex);
|
||||||
}
|
// }
|
||||||
if (photoFile != null) {
|
// if (photoFile != null) {
|
||||||
photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
// photoURI = FileProvider.getUriForFile(getActivity(), "one.nem.lacerta.provider", photoFile);
|
||||||
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
// takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
|
||||||
cameraLauncher.launch(takePictureIntent);
|
// cameraLauncher.launch(takePictureIntent);
|
||||||
}
|
// }
|
||||||
else {
|
// else {
|
||||||
Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
// Log.d("ScannerDataManagerStubFragment", "photoFile is null");
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
else {
|
// else {
|
||||||
Log.d("ScannerDataManagerStubFragment", "camera not available");
|
// Log.d("ScannerDataManagerStubFragment", "camera not available");
|
||||||
}
|
// }
|
||||||
updateResults();
|
// updateResults();
|
||||||
});
|
// });
|
||||||
|
//
|
||||||
view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
|
// view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
|
||||||
Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
|
// Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
|
||||||
Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
|
||||||
|
//
|
||||||
this.documentDetail = createSampleDocumentDetail();
|
// this.documentDetail = createSampleDocumentDetail();
|
||||||
|
//
|
||||||
});
|
// });
|
||||||
|
//
|
||||||
view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
|
// view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
|
||||||
Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
|
// Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
|
||||||
Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
|
||||||
// TODO-rca: ここでDocumentProcessorを初期化する
|
// // TODO-rca: ここでDocumentProcessorを初期化する
|
||||||
if (this.documentDetail == null) {
|
// if (this.documentDetail == null) {
|
||||||
Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
|
// this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
|
||||||
Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
|
||||||
try {
|
// try {
|
||||||
this.documentProcessor.init();
|
// this.documentProcessor.init();
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "Error occurred while initializing documentProcessor", Toast.LENGTH_LONG).show();
|
||||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while initializing documentProcessor", e);
|
||||||
}
|
// }
|
||||||
Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
|
||||||
});
|
// });
|
||||||
|
//
|
||||||
view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
|
// view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
|
||||||
Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
|
// Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
|
||||||
Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
|
||||||
if (this.documentProcessor == null) {
|
// if (this.documentProcessor == null) {
|
||||||
Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
Bitmap[] bitmaps = new Bitmap[results.size()];
|
// Bitmap[] bitmaps = new Bitmap[results.size()];
|
||||||
for (int i = 0; i < results.size(); i++) {
|
// for (int i = 0; i < results.size(); i++) {
|
||||||
bitmaps[i] = results.get(i).getBitmap();
|
// bitmaps[i] = results.get(i).getBitmap();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
try {
|
// try {
|
||||||
this.documentProcessor.addNewPagesToLast(bitmaps);
|
// this.documentProcessor.addNewPagesToLast(bitmaps);
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "Error occurred while adding pages", Toast.LENGTH_LONG).show();
|
||||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while adding pages", e);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "pages added", Toast.LENGTH_LONG).show();
|
||||||
|
//
|
||||||
try {
|
// try {
|
||||||
this.documentProcessor.close();
|
// this.documentProcessor.close();
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "Error occurred while closing documentProcessor", Toast.LENGTH_LONG).show();
|
||||||
Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
|
// Log.e("ScannerDataManagerStubFragment", "Error occurred while closing documentProcessor", e);
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
|
|
||||||
public DocumentDetail createSampleDocumentDetail() {
|
public DocumentDetail createSampleDocumentDetail() {
|
||||||
|
//
|
||||||
String id = UUID.randomUUID().toString();
|
// String id = UUID.randomUUID().toString();
|
||||||
|
//
|
||||||
Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
|
// Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
|
||||||
//logger.debug("CreateSample", "Generated id: " + id);
|
// //logger.debug("CreateSample", "Generated id: " + id);
|
||||||
|
//
|
||||||
DocumentMeta meta = new DocumentMeta(
|
// DocumentMeta meta = new DocumentMeta(
|
||||||
id,
|
// id,
|
||||||
"Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
|
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
|
||||||
new Date(),
|
// new Date(),
|
||||||
new Date());
|
// new Date());
|
||||||
|
//
|
||||||
DocumentPath path = new DocumentPath(
|
// DocumentPath path = new DocumentPath(
|
||||||
deviceInfoUtils.getExternalStorageDirectoryString(),
|
// deviceInfoUtils.getExternalStorageDirectoryString(),
|
||||||
"Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
// "Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
|
||||||
|
//
|
||||||
return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
|
// return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+204
@@ -0,0 +1,204 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.graphics.BitmapFactory;
|
||||||
|
import android.graphics.drawable.BitmapDrawable;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.activity.EdgeToEdge;
|
||||||
|
import androidx.annotation.AnimatorRes;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.graphics.Insets;
|
||||||
|
import androidx.core.view.ViewCompat;
|
||||||
|
import androidx.core.view.WindowInsetsCompat;
|
||||||
|
|
||||||
|
import com.google.android.material.appbar.MaterialToolbar;
|
||||||
|
import com.websitebeaver.documentscanner.DocumentScanner;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
import one.nem.lacerta.data.Document;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ScannerManagerActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
String TAG = "ScannerManagerActivity";
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
Document document;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
DocumentProcessorFactory documentProcessorFactory;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory lacertaVcsFactory;
|
||||||
|
|
||||||
|
// Variables
|
||||||
|
private ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||||
|
|
||||||
|
View view;
|
||||||
|
|
||||||
|
DocumentScanner documentScanner = new DocumentScanner(
|
||||||
|
this,
|
||||||
|
(croppedImageResults) -> {
|
||||||
|
logger.debug(TAG, "croppedImage size: " + croppedImageResults.size());
|
||||||
|
ArrayList<Bitmap> croppedImages = new ArrayList<>();
|
||||||
|
for (String result : croppedImageResults) {
|
||||||
|
croppedImages.add(BitmapFactory.decodeFile(result));
|
||||||
|
}
|
||||||
|
processResult(croppedImages);
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
(errorMessage) -> {
|
||||||
|
// an error happened
|
||||||
|
logger.error(TAG, "Error: " + errorMessage);
|
||||||
|
logger.e_code("543a230e-cb9a-47a2-8131-3beecfe1c458");
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
() -> {
|
||||||
|
// user canceled document scan
|
||||||
|
logger.debug(TAG, "User canceled document scan");
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
EdgeToEdge.enable(this);
|
||||||
|
setContentView(R.layout.activity_scanner_manager);
|
||||||
|
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
|
||||||
|
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
|
||||||
|
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
|
||||||
|
return insets;
|
||||||
|
});
|
||||||
|
|
||||||
|
MaterialToolbar toolbar = findViewById(R.id.top_toolbar);
|
||||||
|
setSupportActionBar(toolbar);
|
||||||
|
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
|
documentScanner.startScan();
|
||||||
|
// Init
|
||||||
|
|
||||||
|
this.view = findViewById(R.id.main); // TODO-rca:なんとかする
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(android.view.Menu menu) {
|
||||||
|
getMenuInflater().inflate(R.menu.scanner_result_toolbar, menu);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(android.view.MenuItem item) {
|
||||||
|
if (item.getItemId() == R.id.action_save_new) {
|
||||||
|
// 新ドキュメントとして保存
|
||||||
|
Toast.makeText(this, "保存処理", Toast.LENGTH_SHORT).show();
|
||||||
|
saveNewDocument();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == R.id.action_insert_exist) {
|
||||||
|
// 既存ドキュメントに挿入
|
||||||
|
Toast.makeText(this, "挿入処理", Toast.LENGTH_SHORT).show();
|
||||||
|
insertToExistDocument();
|
||||||
|
return true;
|
||||||
|
} else if (item.getItemId() == android.R.id.home) {
|
||||||
|
finish();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void processResult(ArrayList<Bitmap> resultImages) {
|
||||||
|
logger.debug(TAG, "processResult");
|
||||||
|
|
||||||
|
if (resultImages.isEmpty()) {
|
||||||
|
logger.debug(TAG, "resultImages(arg) is empty");
|
||||||
|
if (this.croppedImages.isEmpty()) {
|
||||||
|
logger.debug(TAG, "this.resultImages is empty");
|
||||||
|
logger.e_code("7cb0584e-74ef-48ec-848a-c4d14e75e15a");
|
||||||
|
// TODO-rca: なんかする
|
||||||
|
} else {
|
||||||
|
logger.debug(TAG, "this.resultImages is not empty");
|
||||||
|
updateResultView(this.croppedImages);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger.debug(TAG, "resultImages(arg) is not empty");
|
||||||
|
updateResultView(resultImages);
|
||||||
|
this.croppedImages = resultImages;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void saveNewDocument() {
|
||||||
|
logger.debug(TAG, "saveNewDocument");
|
||||||
|
DocumentMeta documentMeta = new DocumentMeta("Untitled"); // TODO-rca: デフォルトタイトルを指定できるようにする
|
||||||
|
DocumentDetail documentDetail = document.createDocument(documentMeta);
|
||||||
|
Bitmap[] bitmaps = new Bitmap[this.croppedImages.size()];
|
||||||
|
this.croppedImages.toArray(bitmaps);
|
||||||
|
try {
|
||||||
|
documentProcessorFactory.create(documentDetail).addNewPagesToLast(bitmaps);
|
||||||
|
Toast.makeText(this, "Saved.", Toast.LENGTH_SHORT).show();
|
||||||
|
lacertaVcsFactory.create(documentDetail.getMeta().getId()).generateRevisionAtCurrent("Initial commit");
|
||||||
|
lacertaVcsFactory.create(documentDetail.getMeta().getId()).printLog(); // Debug
|
||||||
|
lacertaVcsFactory.create(documentDetail.getMeta().getId()).printRev(); // Debug
|
||||||
|
finish();
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error(TAG, "Error: " + e.getMessage());
|
||||||
|
logger.e_code("9dff2a28-20e8-4ccd-9d04-f0c7646faa6a");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void insertToExistDocument() {
|
||||||
|
logger.debug(TAG, "insertToExistDocument");
|
||||||
|
// TODO-rca: 実装
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateResultView(ArrayList<Bitmap> resultImages) {
|
||||||
|
logger.debug(TAG, "updateResultView");
|
||||||
|
|
||||||
|
LinearLayout resultView = findViewById(R.id.result_list_container);
|
||||||
|
ImageView selectedImage = findViewById(R.id.selected_image);
|
||||||
|
resultView.removeAllViews();
|
||||||
|
|
||||||
|
for (Bitmap resultImage : resultImages) {
|
||||||
|
View resultImageView = getLayoutInflater().inflate(R.layout.result_image_container_item, null);
|
||||||
|
ImageView imageView = resultImageView.findViewById(R.id.result_image);
|
||||||
|
imageView.setImageBitmap(resultImage);
|
||||||
|
imageView.setOnClickListener(v -> {
|
||||||
|
|
||||||
|
selectedImage.setImageBitmap(resultImage);
|
||||||
|
|
||||||
|
for (int i = 0; i < resultView.getChildCount(); i++) {
|
||||||
|
View child = resultView.getChildAt(i).findViewById(R.id.result_image);
|
||||||
|
child.setSelected(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
v.setSelected(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
resultView.addView(resultImageView);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+95
@@ -0,0 +1,95 @@
|
|||||||
|
package one.nem.lacerta.component.scanner;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import com.websitebeaver.documentscanner.DocumentScanner;
|
||||||
|
import com.websitebeaver.documentscanner.DocumentScannerActivity;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class ScannerManagerFragment extends Fragment {
|
||||||
|
|
||||||
|
String TAG = getClass().getSimpleName();
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory vcsFactory;
|
||||||
|
|
||||||
|
private static final boolean DEFAULT_SINGLE_PAGE = false;
|
||||||
|
private boolean singlePage;
|
||||||
|
|
||||||
|
public ScannerManagerFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static ScannerManagerFragment newInstance(boolean singlePage) {
|
||||||
|
// ScannerManagerFragment fragment = new ScannerManagerFragment();
|
||||||
|
// Bundle args = new Bundle();
|
||||||
|
// args.putBoolean("singlePage", singlePage);
|
||||||
|
// fragment.setArguments(args);
|
||||||
|
// return fragment;
|
||||||
|
// }
|
||||||
|
|
||||||
|
public static ScannerManagerFragment newInstance() {
|
||||||
|
ScannerManagerFragment fragment = new ScannerManagerFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
args.putBoolean("singlePage", DEFAULT_SINGLE_PAGE);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
if (getArguments() != null) {
|
||||||
|
singlePage = getArguments().getBoolean("singlePage", DEFAULT_SINGLE_PAGE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_scanner_manager, container, false);
|
||||||
|
|
||||||
|
// ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
|
||||||
|
// ViewGroup.LayoutParams.MATCH_PARENT,
|
||||||
|
// ViewGroup.LayoutParams.MATCH_PARENT
|
||||||
|
// );
|
||||||
|
// view.setLayoutParams(layoutParams);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
// Init
|
||||||
|
logger.debug(TAG, "called");
|
||||||
|
|
||||||
|
view.findViewById(R.id.button_intent_scanner_manager_activity).setOnClickListener(v -> {
|
||||||
|
// DocumentScannerActivityを起動する
|
||||||
|
Intent intent = new Intent(requireActivity().getApplicationContext(), ScannerManagerActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:state_selected="true">
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<solid android:color="#00000000" />
|
||||||
|
<corners android:radius="8dp" />
|
||||||
|
<stroke android:color="#FF0000" android:width="2dp" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle">
|
||||||
|
<solid android:color="#00000000" />
|
||||||
|
<corners android:radius="8dp" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
</selector>
|
||||||
@@ -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:id="@+id/main"
|
||||||
|
android:theme="@style/Theme.Lacerta"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
|
android:id="@+id/top_toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/colorPrimaryContainer"
|
||||||
|
app:titleTextColor="@color/colorOnPrimaryContainer"
|
||||||
|
app:title="Preview"
|
||||||
|
android:minHeight="?attr/actionBarSize"
|
||||||
|
android:theme="?attr/actionBarTheme"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/selected_image"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_above="@+id/horizontal_scroll"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
app:layout_constraintBottom_toTopOf="@+id/horizontal_scroll"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/top_toolbar" />
|
||||||
|
|
||||||
|
<HorizontalScrollView
|
||||||
|
android:id="@+id/horizontal_scroll"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:scrollbars="none"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/selected_image">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/result_list_container"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</HorizontalScrollView>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".ScannerManagerFragment">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/button_intent_scanner_manager_activity"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Button"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/result_image"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:maxHeight="64dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:background="@drawable/result_image_container_item_border"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:scaleType="centerCrop" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_save_new"
|
||||||
|
android:icon="@drawable/save_24px"
|
||||||
|
android:title="Save"
|
||||||
|
app:showAsAction="ifRoom"/>
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_insert_exist"
|
||||||
|
android:icon="@drawable/ic_baseline_add_24"
|
||||||
|
android:title="Save"
|
||||||
|
app:showAsAction="ifRoom"/>
|
||||||
|
</menu>
|
||||||
@@ -56,4 +56,6 @@ dependencies {
|
|||||||
|
|
||||||
// データソースモジュール
|
// データソースモジュール
|
||||||
implementation project(':source')
|
implementation project(':source')
|
||||||
|
|
||||||
|
implementation project(':vcs')
|
||||||
}
|
}
|
||||||
@@ -13,34 +13,13 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
|
|||||||
*/
|
*/
|
||||||
public interface Document {
|
public interface Document {
|
||||||
|
|
||||||
ArrayList<DocumentMeta> getAllDocumentMetas(int limit);
|
DocumentDetail createDocument(DocumentMeta meta);
|
||||||
|
|
||||||
ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset);
|
DocumentDetail createDocument();
|
||||||
|
|
||||||
/**
|
void deleteDocument(String documentId);
|
||||||
* 更新の新しいドキュメントから順に並べてlimit件取得する
|
|
||||||
* @param limit 取得する上限数
|
|
||||||
*/
|
|
||||||
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit);
|
|
||||||
|
|
||||||
/**
|
void updateDocument(DocumentMeta meta, DocumentDetail detail);
|
||||||
* 更新の新しいドキュメントから順に並べてoffset位置からlimit件取得する
|
|
||||||
* @param limit 取得する上限数
|
|
||||||
* @param offset 取得するオフセット
|
|
||||||
*/
|
|
||||||
ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset);
|
|
||||||
|
|
||||||
/**
|
DocumentDetail getDocument(String documentId);
|
||||||
* ドキュメントIDからDocumentDetailを取得する
|
|
||||||
* @param id ドキュメントID
|
|
||||||
*/
|
|
||||||
DocumentDetail getDocumentDetail(String id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DocumentMetaからDocumentDetailを取得する
|
|
||||||
* @param meta DocumentMeta
|
|
||||||
*/
|
|
||||||
DocumentDetail getDocumentDetailByMeta(DocumentMeta meta); // 簡単に使えるように
|
|
||||||
|
|
||||||
DocumentDetail createDocumentByMeta(DocumentMeta meta);
|
|
||||||
}
|
}
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package one.nem.lacerta.data;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
|
|
||||||
public interface DocumentDebug {
|
|
||||||
|
|
||||||
void insertDocument(DocumentMeta meta, DocumentDetail detail);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
package one.nem.lacerta.data;
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
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;
|
||||||
@@ -8,8 +11,8 @@ import one.nem.lacerta.model.document.DocumentDetail;
|
|||||||
public interface LacertaLibrary {
|
public interface LacertaLibrary {
|
||||||
|
|
||||||
// Get History
|
// Get History
|
||||||
LibraryItemPage getRecentDocument(int limit);
|
ArrayList<ListItem> getRecentDocument(int limit);
|
||||||
LibraryItemPage getRecentDocument(int limit, int offset);
|
ArrayList<ListItem> getRecentDocument(int limit, int offset);
|
||||||
|
|
||||||
// Get Library page
|
// Get Library page
|
||||||
LibraryItemPage getLibraryPage(int limit);
|
LibraryItemPage getLibraryPage(int limit);
|
||||||
@@ -18,5 +21,5 @@ public interface LacertaLibrary {
|
|||||||
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
|
LibraryItemPage getLibraryPage(String pageId, int limit, int offset);
|
||||||
|
|
||||||
// GetDocument
|
// GetDocument
|
||||||
DocumentDetail getDocumentDetailById(String id);
|
DocumentDetail getDocumentDetailById(String id); // TODO-rca: Documentに統合する
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
package one.nem.lacerta.data;
|
package one.nem.lacerta.data;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import one.nem.lacerta.model.ListItem;
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
|
||||||
public interface LacertaSearch {
|
public interface LacertaSearch {
|
||||||
|
|
||||||
ListItem autoSearch(String query, int limit);
|
ArrayList<ListItem> autoSearch(String query, int limit);
|
||||||
|
|
||||||
ListItem autoSearch(String query, int limit, int offset);
|
ArrayList<ListItem> autoSearch(String query, int limit, int offset);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import one.nem.lacerta.data.DocumentDebug;
|
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
|
||||||
|
|
||||||
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
|
||||||
import one.nem.lacerta.source.database.entity.LibraryEntity;
|
|
||||||
import one.nem.lacerta.source.database.entity.TagEntity;
|
|
||||||
|
|
||||||
import one.nem.lacerta.source.database.LacertaDatabase;
|
|
||||||
|
|
||||||
public class DocumentDebugImpl implements DocumentDebug{
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaDatabase database;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
public DocumentDebugImpl() {
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void insertDocument(DocumentMeta meta, DocumentDetail detail) {
|
|
||||||
DocumentEntity documentEntity = new DocumentEntity();
|
|
||||||
LibraryEntity libraryEntity = new LibraryEntity();
|
|
||||||
|
|
||||||
documentEntity.id = meta.getId();
|
|
||||||
documentEntity.title = meta.getTitle();
|
|
||||||
documentEntity.createdAt = meta.getCreatedAt();
|
|
||||||
documentEntity.updatedAt = meta.getUpdatedAt();
|
|
||||||
documentEntity.author = detail.getAuthor();
|
|
||||||
documentEntity.defaultBranch = detail.getDefaultBranch();
|
|
||||||
// ArrayListからListに変換
|
|
||||||
documentEntity.tagIds = meta.getTagIds();
|
|
||||||
|
|
||||||
libraryEntity.id = meta.getId();
|
|
||||||
libraryEntity.path = "Placeholder";
|
|
||||||
libraryEntity.rootPath = "Placeholder";
|
|
||||||
|
|
||||||
database.documentDao().insert(documentEntity);
|
|
||||||
database.libraryDao().insert(libraryEntity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,141 +1,107 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.Date;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
// Hilt
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
// Lacerta/data
|
||||||
import one.nem.lacerta.data.Document;
|
import one.nem.lacerta.data.Document;
|
||||||
|
|
||||||
|
// Lacerta/model
|
||||||
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
// Lacerta/source
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
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.jgit.JGitRepository;
|
// Lacerta/utils
|
||||||
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
// Lacerta/vcs
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
|
||||||
public class DocumentImpl implements Document{
|
public class DocumentImpl implements Document {
|
||||||
|
|
||||||
private LacertaDatabase database;
|
String TAG = getClass().getSimpleName();
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public DocumentImpl(LacertaDatabase database) {
|
LacertaLogger logger;
|
||||||
this.database = database;
|
|
||||||
|
@Inject
|
||||||
|
LacertaDatabase database;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory vcsFactory;
|
||||||
|
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public DocumentImpl() {
|
||||||
|
// Init
|
||||||
|
// logger.debug(TAG, "called");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject
|
|
||||||
JGitRepository jGitRepository;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
DeviceInfoUtils deviceInfoUtils;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<DocumentMeta> getAllDocumentMetas(int limit) {
|
public DocumentDetail createDocument(DocumentMeta meta) {
|
||||||
ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
|
DocumentDetail detail = new DocumentDetail();
|
||||||
List<DocumentEntity> documentEntities = database.documentDao().getAllWithLimit(limit);
|
detail.setMeta(meta);
|
||||||
|
detail.setPages(new ArrayList<>());
|
||||||
|
|
||||||
for (DocumentEntity documentEntity : documentEntities) {
|
// TODO-rca: UIスレッドから追い出す
|
||||||
// タグ取得
|
|
||||||
// TODO-rca: 切り出すべきかも?
|
|
||||||
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
|
|
||||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
|
||||||
for (TagEntity tagEntity : tagEntities) {
|
|
||||||
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
|
|
||||||
}
|
|
||||||
|
|
||||||
// 組み立て処理
|
// Create DocumentEntity
|
||||||
// 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
|
DocumentEntity documentEntity = new DocumentEntity();
|
||||||
DocumentMeta documentMeta = new DocumentMeta();
|
documentEntity.id = meta.getId();
|
||||||
documentMeta.setId(documentEntity.id);
|
documentEntity.title = meta.getTitle();
|
||||||
documentMeta.setTitle(documentEntity.title);
|
documentEntity.author = meta.getAuthor();
|
||||||
documentMeta.setCreatedAt(documentEntity.createdAt);
|
documentEntity.defaultBranch = meta.getDefaultBranch();
|
||||||
documentMeta.setUpdatedAt(documentEntity.updatedAt);
|
documentEntity.updatedAt = meta.getUpdatedAt();
|
||||||
documentMeta.setTags(documentTags);
|
documentEntity.createdAt = meta.getCreatedAt();
|
||||||
|
documentEntity.publicPath = meta.getPath().getStringPath();
|
||||||
|
documentEntity.tagIds = meta.getTagIds();
|
||||||
|
|
||||||
documentMetas.add(documentMeta);
|
database.documentDao().insert(documentEntity);
|
||||||
}
|
|
||||||
|
|
||||||
return documentMetas;
|
// Vcs
|
||||||
|
LacertaVcs vcs = vcsFactory.create(meta.getId());
|
||||||
|
vcs.createDocument(meta.getId());
|
||||||
|
|
||||||
|
return detail;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<DocumentMeta> getAllDocumentMetas(int limit, int offset) {
|
public DocumentDetail createDocument() {
|
||||||
return null; // TODO-rca: 実装する
|
DocumentMeta meta = new DocumentMeta();
|
||||||
|
meta.setId(UUID.randomUUID().toString());
|
||||||
|
meta.setTitle("New Document");
|
||||||
|
meta.setAuthor("author");
|
||||||
|
meta.setDefaultBranch("master");
|
||||||
|
meta.setUpdatedAt(new Date());
|
||||||
|
meta.setCreatedAt(new Date());
|
||||||
|
meta.setPath(new PublicPath().getRoot()); // TODO-rca: 2回インスタンスを生成していて無駄なのでなんとかする
|
||||||
|
meta.setTags(new ArrayList<>());
|
||||||
|
return createDocument(meta);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit) {
|
public void deleteDocument(String documentId) {
|
||||||
// ArrayList<DocumentMeta> documentMetas = new ArrayList<>();
|
|
||||||
// database.documentDao().
|
}
|
||||||
// TODO-rca: 履歴取得するDao実装する
|
|
||||||
|
@Override
|
||||||
|
public void updateDocument(DocumentMeta meta, DocumentDetail detail) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DocumentDetail getDocument(String documentId) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ArrayList<DocumentMeta> getRecentDocumentMetas(int limit, int offset) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public DocumentDetail getDocumentDetail(String id) {
|
|
||||||
DocumentDetail documentDetail = new DocumentDetail();
|
|
||||||
DocumentEntity documentEntity = database.documentDao().findById(id);
|
|
||||||
|
|
||||||
// タグ取得
|
|
||||||
// TODO-rca: 切り出すべきかも?
|
|
||||||
List<TagEntity> tagEntities = database.tagDao().findByIds(documentEntity.tagIds);
|
|
||||||
ArrayList<DocumentTag> documentTags = new ArrayList<>();
|
|
||||||
for (TagEntity tagEntity : tagEntities) {
|
|
||||||
documentTags.add(new DocumentTag(tagEntity.id, tagEntity.tagName, tagEntity.color));
|
|
||||||
}
|
|
||||||
|
|
||||||
// パス取得
|
|
||||||
// TODO-rca: 切り出すべきかも?
|
|
||||||
LibraryEntity libraryEntity = database.libraryDao().findById(id);
|
|
||||||
DocumentPath documentPath = new DocumentPath(libraryEntity.rootPath, libraryEntity.path);
|
|
||||||
|
|
||||||
// リポジトリ取得
|
|
||||||
documentDetail.setRepository(jGitRepository.getRepository(id)); // TODO-rca: エラーハンドリング
|
|
||||||
|
|
||||||
// 組み立て処理
|
|
||||||
// 可読性が終わるのでコンストラクタはつかわないほうがいいかも?
|
|
||||||
DocumentMeta documentMeta = new DocumentMeta();
|
|
||||||
documentMeta.setId(documentEntity.id);
|
|
||||||
documentMeta.setTitle(documentEntity.title);
|
|
||||||
documentMeta.setCreatedAt(documentEntity.createdAt);
|
|
||||||
documentMeta.setUpdatedAt(documentEntity.updatedAt);
|
|
||||||
documentMeta.setTags(documentTags);
|
|
||||||
|
|
||||||
documentDetail.setMeta(documentMeta);
|
|
||||||
documentDetail.setAuthor(documentEntity.author);
|
|
||||||
documentDetail.setPath(documentPath);
|
|
||||||
documentDetail.setDefaultBranch(documentEntity.defaultBranch);
|
|
||||||
|
|
||||||
return documentDetail;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public DocumentDetail getDocumentDetailByMeta(DocumentMeta meta) {
|
|
||||||
return getDocumentDetail(meta.getId()); // TODO-rca: 効率悪いのでMetaはもらった物を使うようにする(処理を切り分ける?)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public DocumentDetail createDocumentByMeta(DocumentMeta meta) {
|
|
||||||
DocumentDetail documentDetail = new DocumentDetail();
|
|
||||||
|
|
||||||
documentDetail.setMeta(meta);
|
|
||||||
documentDetail.setAuthor("author"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする or Gitの設定を参照するようにする
|
|
||||||
documentDetail.setPath(new DocumentPath(deviceInfoUtils.getExternalStorageDirectoryString(), meta.getId()));
|
|
||||||
documentDetail.setDefaultBranch("master"); // TODO-rca: SharedPrefを扱う機能を作ってそこから取得するようにする?
|
|
||||||
|
|
||||||
return documentDetail;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,18 +1,48 @@
|
|||||||
package one.nem.lacerta.data.impl;
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import one.nem.lacerta.data.LacertaLibrary;
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
import one.nem.lacerta.model.LibraryItemPage;
|
import one.nem.lacerta.model.LibraryItemPage;
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
import one.nem.lacerta.model.ListItemType;
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.source.database.LacertaDatabase;
|
||||||
|
import one.nem.lacerta.source.database.common.DateTypeConverter;
|
||||||
|
import one.nem.lacerta.source.database.entity.DocumentEntity;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
public class LacertaLibraryImpl implements LacertaLibrary {
|
public class LacertaLibraryImpl implements LacertaLibrary {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaLogger logger;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaDatabase database;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getRecentDocument(int limit) {
|
public ArrayList<ListItem> getRecentDocument(int limit) {
|
||||||
return null;
|
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 getRecentDocument(int limit, int offset) {
|
public ArrayList<ListItem> getRecentDocument(int limit, int offset) {
|
||||||
return null;
|
return null; // TODO-rca: Implement
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -136,9 +136,9 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
|
|||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,8 +148,8 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
|
|||||||
* @return ページオブジェクト
|
* @return ページオブジェクト
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public LibraryItemPage getRecentDocument(int limit) {
|
public ArrayList<ListItem> getRecentDocument(int limit) {
|
||||||
return getRecentDocumentPage(limit);
|
return getRecentDocumentPage(limit).getListItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -159,8 +159,8 @@ public class LacertaLibraryStubImpl implements LacertaLibrary {
|
|||||||
* @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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package one.nem.lacerta.data.impl;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import one.nem.lacerta.data.LacertaSearch;
|
||||||
|
import one.nem.lacerta.model.ListItem;
|
||||||
|
|
||||||
|
import one.nem.lacerta.data.LacertaLibrary;
|
||||||
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
|
public class LacertaSearchStubImpl implements LacertaSearch {
|
||||||
|
|
||||||
|
private LacertaLibrary library;
|
||||||
|
private LacertaLogger logger;
|
||||||
|
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public LacertaSearchStubImpl(LacertaLibrary library, LacertaLogger logger) {
|
||||||
|
this.library = library;
|
||||||
|
this.logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 検索
|
||||||
|
* @param query 検索クエリ
|
||||||
|
* @param limit 最大取得件数
|
||||||
|
* @return 検索結果
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ArrayList<ListItem> autoSearch(String query, int limit) {
|
||||||
|
logger.debug("SearchStub", "autoSearch");
|
||||||
|
logger.debug("SearchStub", "query: " + query);
|
||||||
|
return library.getLibraryPage(limit).getListItems();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 検索
|
||||||
|
* @param query 検索クエリ
|
||||||
|
* @param limit 最大取得件数
|
||||||
|
* @param offset オフセット
|
||||||
|
* @return 検索結果
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ArrayList<ListItem> autoSearch(String query, int limit, int offset) {
|
||||||
|
logger.debug("SearchStub", "autoSearch");
|
||||||
|
logger.debug("SearchStub", "query: " + query);
|
||||||
|
return library.getLibraryPage(limit, offset).getListItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
package one.nem.lacerta.data.module;
|
|
||||||
|
|
||||||
import dagger.Binds;
|
|
||||||
import dagger.Module;
|
|
||||||
import dagger.hilt.InstallIn;
|
|
||||||
import dagger.hilt.components.SingletonComponent;
|
|
||||||
import one.nem.lacerta.data.DocumentDebug;
|
|
||||||
import one.nem.lacerta.data.impl.DocumentDebugImpl;
|
|
||||||
|
|
||||||
@Module
|
|
||||||
@InstallIn(SingletonComponent.class) // TODO-rca: Singletonでいいのか検討する
|
|
||||||
abstract public class DocumentDebugModule {
|
|
||||||
|
|
||||||
@Binds
|
|
||||||
public abstract DocumentDebug bindDocumentDebug(DocumentDebugImpl documentDebugImpl);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package one.nem.lacerta.data.module;
|
||||||
|
|
||||||
|
import dagger.Binds;
|
||||||
|
import dagger.Module;
|
||||||
|
import dagger.hilt.InstallIn;
|
||||||
|
import dagger.hilt.android.components.FragmentComponent;
|
||||||
|
import one.nem.lacerta.data.LacertaSearch;
|
||||||
|
import one.nem.lacerta.data.impl.LacertaSearchStubImpl;
|
||||||
|
|
||||||
|
@Module
|
||||||
|
@InstallIn(FragmentComponent.class)
|
||||||
|
abstract public class LacertaSearchModule {
|
||||||
|
|
||||||
|
@Binds
|
||||||
|
public abstract LacertaSearch bindLacertaSearch(LacertaSearchStubImpl impl);
|
||||||
|
}
|
||||||
@@ -68,4 +68,7 @@ dependencies {
|
|||||||
// Processor
|
// Processor
|
||||||
implementation project(':processor')
|
implementation project(':processor')
|
||||||
|
|
||||||
|
// LacertaVcs
|
||||||
|
implementation project(':vcs')
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -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>
|
||||||
-81
@@ -1,81 +0,0 @@
|
|||||||
package one.nem.lacerta.feature.debug;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import one.nem.lacerta.data.Document;
|
|
||||||
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuDocumentListItemAdapter;
|
|
||||||
import one.nem.lacerta.feature.debug.common.model.DebugMenuDocumentListItem;
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
* Use the {@link DebugMenuDocumentTesterListFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class DebugMenuDocumentTesterListFragment extends Fragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
Document document;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LacertaLogger logger;
|
|
||||||
|
|
||||||
public DebugMenuDocumentTesterListFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
public static DebugMenuDocumentTesterListFragment newInstance() {
|
|
||||||
DebugMenuDocumentTesterListFragment fragment = new DebugMenuDocumentTesterListFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_list, container, false);
|
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.recycler_view_document_list);
|
|
||||||
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
|
||||||
|
|
||||||
ArrayList<DocumentMeta> documentMetas = document.getAllDocumentMetas(100);
|
|
||||||
|
|
||||||
logger.debug("Debug/DocList", "Document count: " + documentMetas.size());
|
|
||||||
|
|
||||||
List<DebugMenuDocumentListItem> debugMenuDocumentListItems = new ArrayList<>();
|
|
||||||
|
|
||||||
for (DocumentMeta documentMeta : documentMetas) {
|
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
||||||
debugMenuDocumentListItems.add(new DebugMenuDocumentListItem(documentMeta.getTitle(), "Internal Id: " + documentMeta.getId(), simpleDateFormat.format(documentMeta.getUpdatedAt())));
|
|
||||||
}
|
|
||||||
|
|
||||||
DebugMenuDocumentListItemAdapter adapter = new DebugMenuDocumentListItemAdapter(debugMenuDocumentListItems);
|
|
||||||
recyclerView.setAdapter(adapter);
|
|
||||||
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-72
@@ -1,72 +0,0 @@
|
|||||||
package one.nem.lacerta.feature.debug;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
|
|
||||||
import com.google.android.material.textfield.TextInputEditText;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint;
|
|
||||||
import dagger.multibindings.IntKey;
|
|
||||||
import one.nem.lacerta.data.DocumentDebug;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A simple {@link Fragment} subclass.
|
|
||||||
* Use the {@link DebugMenuDocumentTesterManageFragment#newInstance} factory method to
|
|
||||||
* create an instance of this fragment.
|
|
||||||
*/
|
|
||||||
@AndroidEntryPoint
|
|
||||||
public class DebugMenuDocumentTesterManageFragment extends Fragment {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
DocumentDebug documentDebug;
|
|
||||||
|
|
||||||
public DebugMenuDocumentTesterManageFragment() {
|
|
||||||
// Required empty public constructor
|
|
||||||
}
|
|
||||||
|
|
||||||
public static DebugMenuDocumentTesterManageFragment newInstance() {
|
|
||||||
DebugMenuDocumentTesterManageFragment fragment = new DebugMenuDocumentTesterManageFragment();
|
|
||||||
Bundle args = new Bundle();
|
|
||||||
fragment.setArguments(args);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
// Inflate the layout for this fragment
|
|
||||||
View view = inflater.inflate(R.layout.fragment_debug_menu_document_tester_manage, container, false);
|
|
||||||
|
|
||||||
TextInputEditText editTextDocumentTitle = view.findViewById(R.id.edit_text_document_title);
|
|
||||||
view.findViewById(R.id.button_insert_test_data).setOnClickListener( v -> {
|
|
||||||
|
|
||||||
DocumentMeta meta = new DocumentMeta(editTextDocumentTitle != null ? editTextDocumentTitle.getText().toString() : "empty title"); // TODO-rca: Nullable
|
|
||||||
DocumentPath path = new DocumentPath("root", "test_path");
|
|
||||||
DocumentDetail detail = new DocumentDetail(meta, path, "test_author", "test_default_branch");
|
|
||||||
|
|
||||||
documentDebug.insertDocument(meta, detail);
|
|
||||||
});
|
|
||||||
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-2
@@ -47,8 +47,8 @@ public class DebugMenuDocumentTesterTopFragment extends Fragment {
|
|||||||
|
|
||||||
List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
|
List<DebugMenuListItem> debugMenuDocTesterListItems = new ArrayList<>();
|
||||||
|
|
||||||
debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
|
// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentListFragment", "DocumentListFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment, true));
|
||||||
debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
|
// debugMenuDocTesterListItems.add(new DebugMenuListItem("DocumentManagerFragment", "DocumentManagerFragment", R.id.action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment, true));
|
||||||
|
|
||||||
|
|
||||||
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);
|
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuDocTesterListItems);
|
||||||
|
|||||||
+3
-3
@@ -57,13 +57,13 @@ public class DebugMenuLibraryItemListPageFragment extends Fragment {
|
|||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
|
View view = inflater.inflate(R.layout.fragment_debug_menu_library_item_list_page, container, false);
|
||||||
|
|
||||||
LibraryItemPage libraryItemPage = lacertaLibrary.getRecentDocument(10);
|
ArrayList<ListItem> listItems = lacertaLibrary.getRecentDocument(10);
|
||||||
for (ListItem listItem : libraryItemPage.getListItems()) {
|
for (ListItem listItem : listItems) {
|
||||||
System.out.println(listItem.getTitle());
|
System.out.println(listItem.getTitle());
|
||||||
}
|
}
|
||||||
|
|
||||||
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
|
RecyclerView recyclerView = view.findViewById(R.id.item_recycler_view);
|
||||||
recyclerView.setAdapter(new ItemAdapter(libraryItemPage.getListItems()));
|
recyclerView.setAdapter(new ItemAdapter(listItems));
|
||||||
|
|
||||||
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
|
|||||||
@@ -49,8 +49,10 @@ public class DebugMenuTopFragment extends Fragment {
|
|||||||
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
|
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
|
||||||
|
|
||||||
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
|
debugMenuListItems.add(new DebugMenuListItem("Document Tester", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuDocumentTesterTopFragment, true));
|
||||||
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
|
debugMenuListItems.add(new DebugMenuListItem("ScannerStub", "placeholder", R.id.action_debugMenuTopFragment_to_scannerDataManagerStubFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("Scanner", "placeholder", R.id.action_debugMenuTopFragment_to_scannerManagerFragment, true));
|
||||||
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
|
debugMenuListItems.add(new DebugMenuListItem("Document List", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("VCS", "placeholder", R.id.action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment, true));
|
||||||
|
|
||||||
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
||||||
recyclerView.setAdapter(adapter);
|
recyclerView.setAdapter(adapter);
|
||||||
|
|||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
package one.nem.lacerta.feature.debug;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint;
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsGeneralActionFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
public class DebugMenuVcsGeneralActionFragment extends Fragment {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
LacertaVcsFactory lacertaVcsFactory;
|
||||||
|
|
||||||
|
public DebugMenuVcsGeneralActionFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsGeneralActionFragment newInstance() {
|
||||||
|
DebugMenuVcsGeneralActionFragment fragment = new DebugMenuVcsGeneralActionFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_general_action, container, false);
|
||||||
|
|
||||||
|
view.findViewById(R.id.add_sample_log_rev_button).setOnClickListener(v -> {
|
||||||
|
LacertaVcs lacertaVcs = lacertaVcsFactory.create("example_id");
|
||||||
|
lacertaVcs.insertPage(1, "example_id");
|
||||||
|
});
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
+59
@@ -0,0 +1,59 @@
|
|||||||
|
package one.nem.lacerta.feature.debug;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import one.nem.lacerta.feature.debug.common.adapter.DebugMenuListItemAdapter;
|
||||||
|
import one.nem.lacerta.feature.debug.common.model.DebugMenuListItem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsGeneralFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DebugMenuVcsGeneralFragment extends Fragment {
|
||||||
|
public DebugMenuVcsGeneralFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsGeneralFragment newInstance() {
|
||||||
|
DebugMenuVcsGeneralFragment fragment = new DebugMenuVcsGeneralFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_general, container, false);
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
|
||||||
|
recyclerView.setLayoutManager(new androidx.recyclerview.widget.LinearLayoutManager(getContext()));
|
||||||
|
List<DebugMenuListItem> debugMenuListItems = new ArrayList<>();
|
||||||
|
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("General Action", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("Log Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment, true));
|
||||||
|
debugMenuListItems.add(new DebugMenuListItem("Rev Record", "placeholder", R.id.action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment, true));
|
||||||
|
|
||||||
|
DebugMenuListItemAdapter adapter = new DebugMenuListItemAdapter(debugMenuListItems);
|
||||||
|
recyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
+42
@@ -0,0 +1,42 @@
|
|||||||
|
package one.nem.lacerta.feature.debug;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsLogRecordFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DebugMenuVcsLogRecordFragment extends Fragment {
|
||||||
|
|
||||||
|
public DebugMenuVcsLogRecordFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsLogRecordFragment newInstance() {
|
||||||
|
DebugMenuVcsLogRecordFragment fragment = new DebugMenuVcsLogRecordFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_log_record, container, false);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
+41
@@ -0,0 +1,41 @@
|
|||||||
|
package one.nem.lacerta.feature.debug;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link DebugMenuVcsRevRecordFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DebugMenuVcsRevRecordFragment extends Fragment {
|
||||||
|
public DebugMenuVcsRevRecordFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DebugMenuVcsRevRecordFragment newInstance() {
|
||||||
|
DebugMenuVcsRevRecordFragment fragment = new DebugMenuVcsRevRecordFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_debug_menu_vcs_rev_record, container, false);
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context=".DebugMenuDocumentTesterManageFragment" >
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical" >
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:background="@drawable/rounded_secondary_container">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textView2"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="16dp"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:textColor="@color/colorOnSecondaryContainer"
|
|
||||||
android:text="Debug actions" />
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:hint="Document title"
|
|
||||||
android:id="@+id/edit_text_document_title"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:inputType="text"
|
|
||||||
android:textSize="16sp"
|
|
||||||
style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox" />
|
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
|
||||||
android:id="@+id/button_insert_test_data"
|
|
||||||
style="@style/Widget.Material3.Button.OutlinedButton"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:text="Insert test data"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
</ScrollView>
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
+3
-3
@@ -4,11 +4,11 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".DebugMenuDocumentTesterListFragment" >
|
tools:context=".DebugMenuVcsGeneralFragment">
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/recycler_view_document_list"
|
android:id="@+id/recycler_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout 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=".DebugMenuVcsGeneralActionFragment">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical" >
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/add_sample_log_rev_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Add Sample log/Rev" />
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".DebugMenuVcsGeneralFragment">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/log_recycler_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
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,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".DebugMenuVcsGeneralFragment">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/rev_recycler_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -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>
|
||||||
@@ -19,29 +19,19 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
|
android:id="@+id/action_debugMenuTopFragment_to_debugMenuLibraryItemListPageFragment"
|
||||||
app:destination="@id/debugMenuLibraryItemListPageFragment" />
|
app:destination="@id/debugMenuLibraryItemListPageFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuTopFragment_to_debugMenuVcsGeneralFragment"
|
||||||
|
app:destination="@id/debugMenuVcsGeneralFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuTopFragment_to_scannerManagerFragment"
|
||||||
|
app:destination="@id/scannerManagerFragment" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/debugMenuDocumentTesterTopFragment"
|
android:id="@+id/debugMenuDocumentTesterTopFragment"
|
||||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
|
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterTopFragment"
|
||||||
android:label="fragment_debug_menu_document_tester_top"
|
android:label="fragment_debug_menu_document_tester_top"
|
||||||
tools:layout="@layout/fragment_debug_menu_document_tester_top" >
|
tools:layout="@layout/fragment_debug_menu_document_tester_top" >
|
||||||
<action
|
|
||||||
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterListFragment"
|
|
||||||
app:destination="@id/debugMenuDocumentTesterListFragment" />
|
|
||||||
<action
|
|
||||||
android:id="@+id/action_debugMenuDocumentTesterTopFragment_to_debugMenuDocumentTesterManageFragment"
|
|
||||||
app:destination="@id/debugMenuDocumentTesterManageFragment" />
|
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
|
||||||
android:id="@+id/debugMenuDocumentTesterListFragment"
|
|
||||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterListFragment"
|
|
||||||
android:label="fragment_debug_menu_document_tester_list"
|
|
||||||
tools:layout="@layout/fragment_debug_menu_document_tester_list" />
|
|
||||||
<fragment
|
|
||||||
android:id="@+id/debugMenuDocumentTesterManageFragment"
|
|
||||||
android:name="one.nem.lacerta.feature.debug.DebugMenuDocumentTesterManageFragment"
|
|
||||||
android:label="fragment_debug_menu_document_tester_manage"
|
|
||||||
tools:layout="@layout/fragment_debug_menu_document_tester_manage" />
|
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/scannerDataManagerStubFragment"
|
android:id="@+id/scannerDataManagerStubFragment"
|
||||||
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
|
android:name="one.nem.lacerta.component.scanner.ScannerDataManagerStubFragment"
|
||||||
@@ -51,4 +41,38 @@
|
|||||||
android:name="one.nem.lacerta.feature.debug.DebugMenuLibraryItemListPageFragment"
|
android:name="one.nem.lacerta.feature.debug.DebugMenuLibraryItemListPageFragment"
|
||||||
android:label="fragment_debug_menu_library_item_list_page"
|
android:label="fragment_debug_menu_library_item_list_page"
|
||||||
tools:layout="@layout/fragment_debug_menu_library_item_list_page" />
|
tools:layout="@layout/fragment_debug_menu_library_item_list_page" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsGeneralFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_general"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_general" >
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsGeneralActionFragment"
|
||||||
|
app:destination="@id/debugMenuVcsGeneralActionFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsRevRecordFragment"
|
||||||
|
app:destination="@id/debugMenuVcsRevRecordFragment" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_debugMenuVcsGeneralFragment_to_debugMenuVcsLogRecordFragment"
|
||||||
|
app:destination="@id/debugMenuVcsLogRecordFragment" />
|
||||||
|
</fragment>
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsGeneralActionFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsGeneralActionFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_general_action"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_general_action" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsLogRecordFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsLogRecordFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_log_record"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_log_record" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/debugMenuVcsRevRecordFragment"
|
||||||
|
android:name="one.nem.lacerta.feature.debug.DebugMenuVcsRevRecordFragment"
|
||||||
|
android:label="fragment_debug_menu_vcs_rev_record"
|
||||||
|
tools:layout="@layout/fragment_debug_menu_vcs_rev_record" />
|
||||||
|
<fragment
|
||||||
|
android:id="@+id/scannerManagerFragment"
|
||||||
|
android:name="one.nem.lacerta.component.scanner.ScannerManagerFragment"
|
||||||
|
android:label="ScannerManagerFragment" />
|
||||||
</navigation>
|
</navigation>
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
|
id 'com.google.dagger.hilt.android'
|
||||||
id 'com.android.library'
|
id 'com.android.library'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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,20 @@ 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')
|
||||||
}
|
}
|
||||||
+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());
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,64 +1,122 @@
|
|||||||
package one.nem.lacerta.feature.home;
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
import androidx.fragment.app.Fragment;
|
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
|
||||||
|
import androidx.appcompat.app.ActionBarDrawerToggle;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.drawerlayout.widget.DrawerLayout;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import com.google.android.material.appbar.AppBarLayout;
|
||||||
|
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import 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.ListItem;
|
||||||
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple {@link Fragment} subclass.
|
* A simple {@link Fragment} subclass.
|
||||||
* Use the {@link HomeTopFragment#newInstance} factory method to
|
* Use the {@link HomeTopFragment#newInstance} factory method to
|
||||||
* create an instance of this fragment.
|
* create an instance of this fragment.
|
||||||
*/
|
*/
|
||||||
|
@AndroidEntryPoint
|
||||||
public class HomeTopFragment extends Fragment {
|
public class HomeTopFragment extends Fragment {
|
||||||
|
|
||||||
// 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 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);
|
||||||
|
|
||||||
|
ArrayList<ListItem> recentDocument = lacertaLibrary.getRecentDocument(10);
|
||||||
|
|
||||||
|
Log.d("docs", Integer.toString(recentDocument.size()));
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.home_item_recycler_view);
|
||||||
|
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
|
||||||
|
ListItemAdapter listItemAdapter = new ListItemAdapter(recentDocument);
|
||||||
|
|
||||||
|
recyclerView.setAdapter(listItemAdapter);
|
||||||
|
|
||||||
|
return view;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
|
CollapsingToolbarLayout collapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
|
||||||
|
Toolbar toolbar = view.findViewById(R.id.toolbar);
|
||||||
|
|
||||||
|
// Set the Toolbar
|
||||||
|
((AppCompatActivity)getActivity()).setSupportActionBar(toolbar);
|
||||||
|
|
||||||
|
// Set the title of the CollapsingToolbarLayout
|
||||||
|
collapsingToolbarLayout.setTitle("Lacerta");
|
||||||
|
|
||||||
|
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
|
||||||
|
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
|
||||||
|
@Override
|
||||||
|
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
|
||||||
|
if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
|
||||||
|
// Collapsed
|
||||||
|
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getActivity(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
|
||||||
|
} else if (verticalOffset == 0) {
|
||||||
|
// Expanded
|
||||||
|
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getActivity(), one.nem.lacerta.shared.ui.R.color.colorSurface));
|
||||||
|
} else {
|
||||||
|
// Somewhere in between
|
||||||
|
// Here you can add a color transition if you want
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package one.nem.lacerta.feature.home;
|
||||||
|
|
||||||
|
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.model.ListItem;
|
||||||
|
|
||||||
|
public class ListItemAdapter extends RecyclerView.Adapter<ListItemAdapter.ListItemViewHolder>{
|
||||||
|
|
||||||
|
ArrayList<ListItem> listItems;
|
||||||
|
|
||||||
|
public ListItemAdapter(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());
|
||||||
|
}
|
||||||
|
|
||||||
|
@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,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/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>
|
||||||
+8
-6
@@ -25,6 +25,8 @@ import one.nem.lacerta.data.Document;
|
|||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple {@link Fragment} subclass.
|
* A simple {@link Fragment} subclass.
|
||||||
* Use the {@link LibraryTopFragment#newInstance} factory method to
|
* Use the {@link LibraryTopFragment#newInstance} factory method to
|
||||||
@@ -33,8 +35,8 @@ import one.nem.lacerta.model.document.tag.DocumentTag;
|
|||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
public class LibraryTopFragment extends Fragment {
|
public class LibraryTopFragment extends Fragment {
|
||||||
|
|
||||||
@Inject
|
// @Inject
|
||||||
Document document;
|
// Document document;
|
||||||
|
|
||||||
// TODO: Rename parameter arguments, choose names that match
|
// TODO: Rename parameter arguments, choose names that match
|
||||||
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
|
||||||
@@ -90,13 +92,13 @@ public class LibraryTopFragment extends Fragment {
|
|||||||
|
|
||||||
//データを取得
|
//データを取得
|
||||||
|
|
||||||
List<DocumentMeta> metas = document.getAllDocumentMetas(100);
|
// List<DocumentMeta> metas = document.getAllDocumentMetas(100);
|
||||||
|
|
||||||
Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
|
// Toast.makeText(getContext(), "Documents: " + Integer.toString(metas.size()), Toast.LENGTH_LONG).show();
|
||||||
|
|
||||||
// Create and set the adapter
|
// Create and set the adapter
|
||||||
DocumentAdapter adapter = new DocumentAdapter(metas);
|
// DocumentAdapter adapter = new DocumentAdapter(metas);
|
||||||
documentRecyclerView.setAdapter(adapter);
|
// documentRecyclerView.setAdapter(adapter);
|
||||||
|
|
||||||
// Use a LinearLayoutManager to specify the layout
|
// Use a LinearLayoutManager to specify the layout
|
||||||
return view;
|
return view;
|
||||||
|
|||||||
@@ -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,48 @@
|
|||||||
|
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')
|
||||||
|
|
||||||
|
}
|
||||||
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,41 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingScanPageFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingScanPageFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingScanPageFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SettingScanPageFragment newInstance() {
|
||||||
|
SettingScanPageFragment fragment = new SettingScanPageFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
return inflater.inflate(R.layout.fragment_setting_scan_page, container, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
package one.nem.lacerta.setting;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.setting.model.SettingListItem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link Fragment} subclass.
|
||||||
|
* Use the {@link SettingTopFragment#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class SettingTopFragment extends Fragment {
|
||||||
|
|
||||||
|
public SettingTopFragment() {
|
||||||
|
// Required empty public constructor
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SettingTopFragment newInstance() {
|
||||||
|
SettingTopFragment fragment = new SettingTopFragment();
|
||||||
|
Bundle args = new Bundle();
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState) {
|
||||||
|
// Inflate the layout for this fragment
|
||||||
|
View view = inflater.inflate(R.layout.fragment_setting_top, container, false);
|
||||||
|
|
||||||
|
// Setting items
|
||||||
|
ArrayList<SettingListItem> settingListItems = new ArrayList<>();
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_display_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_display_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.palette_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingDisplayPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_data_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_data_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.settings_backup_restore_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingDataPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_scan_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_scan_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.document_scanner_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingScanPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
settingListItems.add(
|
||||||
|
new SettingListItem(
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_title),
|
||||||
|
getResources().getString(one.nem.lacerta.shared.ui.R.string.setting_top_about_description),
|
||||||
|
ContextCompat.getDrawable(getContext(), one.nem.lacerta.shared.ui.R.drawable.info_24px),
|
||||||
|
R.id.action_settingTopFragment_to_settingAboutPageFragment
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Init RecyclerView
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.setting_item_recycler_view);
|
||||||
|
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
|
||||||
|
recyclerView.setAdapter(new ListItemAdapter(settingListItems));
|
||||||
|
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".SettingAboutPageFragment">
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="@string/hello_blank_fragment" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".SettingDataPageFragment">
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="@string/hello_blank_fragment" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".SettingDisplayPageFragment">
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="@string/hello_blank_fragment" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".SettingScanPageFragment">
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="@string/hello_blank_fragment" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -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,4 @@
|
|||||||
|
<resources>
|
||||||
|
<!-- TODO: Remove or change this placeholder text -->
|
||||||
|
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||||
|
</resources>
|
||||||
@@ -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,74 @@
|
|||||||
|
package one.nem.lacerta.model;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class PublicPath {
|
||||||
|
/*
|
||||||
|
* ユーザーが扱うパス(内部パスの代替)
|
||||||
|
* (時間がないのでInjectされることは考慮しない)
|
||||||
|
*
|
||||||
|
* TODO-rca:
|
||||||
|
* - こわれたパスを検知する
|
||||||
|
* - バリデーション
|
||||||
|
*/
|
||||||
|
|
||||||
|
List<String> path = new ArrayList<String>();
|
||||||
|
|
||||||
|
public PublicPath() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath(List<String> path) {
|
||||||
|
this.path = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void add(String path) {
|
||||||
|
this.path.add(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void resolveInternal(String path) {
|
||||||
|
if (path.equals("..")) {
|
||||||
|
this.path.remove(this.path.size() - 1);
|
||||||
|
} else {
|
||||||
|
add(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath resolve(String path) {
|
||||||
|
resolveInternal(path);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath resolve(List<String> path) {
|
||||||
|
for (String p : path) {
|
||||||
|
resolveInternal(p);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath resolve(PublicPath path) {
|
||||||
|
for (String p : path.getPath()) {
|
||||||
|
resolveInternal(p);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath parent() {
|
||||||
|
this.path.remove(this.path.size() - 1);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStringPath() {
|
||||||
|
return String.join("/", path);
|
||||||
|
}
|
||||||
|
|
||||||
|
public PublicPath getRoot() {
|
||||||
|
PublicPath root = new PublicPath();
|
||||||
|
root.add("/");
|
||||||
|
return root;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,11 +3,14 @@ package one.nem.lacerta.model.document;
|
|||||||
import org.eclipse.jgit.lib.Repository;
|
import org.eclipse.jgit.lib.Repository;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.path.DocumentPath;
|
import one.nem.lacerta.model.document.path.DocumentPath;
|
||||||
import one.nem.lacerta.model.document.DocumentMeta;
|
import one.nem.lacerta.model.document.DocumentMeta;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ドキュメントの詳細データ
|
* ドキュメントの詳細データ
|
||||||
*/
|
*/
|
||||||
@@ -19,31 +22,21 @@ public class DocumentDetail {
|
|||||||
DocumentMeta meta;
|
DocumentMeta meta;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ドキュメントのパス(DocumentPathインスタンス)
|
* ドキュメントのページ(Pageインスタンスのリスト)
|
||||||
*/
|
*/
|
||||||
DocumentPath path;
|
ArrayList<Page> pages;
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントの作者(String)
|
|
||||||
*/
|
|
||||||
String author;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントのデフォルトブランチ(String)
|
|
||||||
*/
|
|
||||||
String defaultBranch;
|
|
||||||
|
|
||||||
Repository repository;
|
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
public DocumentDetail() {
|
public DocumentDetail() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public DocumentDetail(DocumentMeta meta, DocumentPath path, String author, String defaultBranch) {
|
public DocumentDetail(DocumentMeta meta) {
|
||||||
this.meta = meta;
|
this.meta = meta;
|
||||||
this.path = path;
|
}
|
||||||
this.author = author;
|
|
||||||
this.defaultBranch = defaultBranch;
|
public DocumentDetail(DocumentMeta meta, ArrayList<Page> pages) {
|
||||||
|
this.meta = meta;
|
||||||
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Getter
|
// Getter
|
||||||
@@ -56,34 +49,12 @@ public class DocumentDetail {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ドキュメントのパス(DocumentPathインスタンス)を取得する
|
* ドキュメントのページ(Pageインスタンスのリスト)を取得する
|
||||||
*/
|
*/
|
||||||
public DocumentPath getPath() {
|
public ArrayList<Page> getPages() {
|
||||||
return path;
|
return pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントの作者(String)を取得する
|
|
||||||
*/
|
|
||||||
public String getAuthor() {
|
|
||||||
return author;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントのデフォルトブランチ(String)を取得する
|
|
||||||
*/
|
|
||||||
public String getDefaultBranch() {
|
|
||||||
return defaultBranch;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントのリポジトリを取得する
|
|
||||||
*/
|
|
||||||
public Repository getRepository() {
|
|
||||||
return repository;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Setter
|
// Setter
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -95,34 +66,13 @@ public class DocumentDetail {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ドキュメントのパス(DocumentPathインスタンス)を設定する
|
* ドキュメントのページ(Pageインスタンスのリスト)を設定する
|
||||||
* @param path DocumentPathインスタンス
|
* @param pages Pageインスタンスのリスト
|
||||||
*/
|
*/
|
||||||
public void setPath(DocumentPath path) {
|
public void setPages(ArrayList<Page> pages) {
|
||||||
this.path = path;
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントの作者(String)を設定する
|
|
||||||
* @param author ドキュメントの作者
|
|
||||||
*/
|
|
||||||
public void setAuthor(String author) {
|
|
||||||
this.author = author;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントのデフォルトブランチ(String)を設定する
|
|
||||||
* @param defaultBranch ドキュメントのデフォルトブランチ
|
|
||||||
*/
|
|
||||||
public void setDefaultBranch(String defaultBranch) {
|
|
||||||
this.defaultBranch = defaultBranch;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ドキュメントのリポジトリを設定する
|
|
||||||
*/
|
|
||||||
public void setRepository(Repository repository) {
|
|
||||||
this.repository = repository;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package one.nem.lacerta.model.document;
|
package one.nem.lacerta.model.document;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.PublicPath;
|
||||||
import one.nem.lacerta.model.document.tag.DocumentTag;
|
import one.nem.lacerta.model.document.tag.DocumentTag;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -9,7 +11,7 @@ import java.util.UUID;
|
|||||||
/**
|
/**
|
||||||
* ドキュメントのメタデータ
|
* ドキュメントのメタデータ
|
||||||
*/
|
*/
|
||||||
public class DocumentMeta {
|
public class DocumentMeta { // TODO-rca: JavaDoc対応
|
||||||
/**
|
/**
|
||||||
* ドキュメントのID(String)
|
* ドキュメントのID(String)
|
||||||
*/
|
*/
|
||||||
@@ -35,42 +37,63 @@ public class DocumentMeta {
|
|||||||
*/
|
*/
|
||||||
List<DocumentTag> tags;
|
List<DocumentTag> tags;
|
||||||
|
|
||||||
|
PublicPath path;
|
||||||
|
|
||||||
|
String author;
|
||||||
|
|
||||||
|
String defaultBranch;
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
|
|
||||||
public DocumentMeta() {
|
public DocumentMeta() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags) { // With all
|
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.path = new PublicPath().getRoot();
|
||||||
|
this.updatedAt = new Date();
|
||||||
|
this.createdAt = new Date();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DocumentMeta(String title, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||||
|
this.id = UUID.randomUUID().toString();
|
||||||
|
this.title = title;
|
||||||
|
this.tags = tags;
|
||||||
|
this.author = author;
|
||||||
|
this.defaultBranch = defaultBranch;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DocumentMeta(String id, String title, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||||
|
this.id = id;
|
||||||
|
this.title = title;
|
||||||
|
this.tags = tags;
|
||||||
|
this.author = author;
|
||||||
|
this.defaultBranch = defaultBranch;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, String author, String defaultBranch) {
|
||||||
this.id = id;
|
this.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.author = author;
|
||||||
|
this.defaultBranch = defaultBranch;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt) { // Without tags
|
public DocumentMeta(String id, String title, Date updatedAt, Date createdAt, List<DocumentTag> tags, PublicPath path, 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 = new ArrayList<>();
|
this.tags = tags;
|
||||||
}
|
this.path = path;
|
||||||
|
this.author = author;
|
||||||
public DocumentMeta(String id, String title) { // Without tags, updatedAt, createdAt
|
this.defaultBranch = defaultBranch;
|
||||||
this.id = id;
|
|
||||||
this.title = title;
|
|
||||||
// 現在時刻を設定
|
|
||||||
this.updatedAt = new Date();
|
|
||||||
this.createdAt = new Date();
|
|
||||||
this.tags = new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public DocumentMeta(String title) { // title only
|
|
||||||
this.id = UUID.randomUUID().toString(); // 新規作成時想定なのでコンストラクタで生成してしまう(使う人が楽なので)
|
|
||||||
this.title = title;
|
|
||||||
// 現在時刻を設定
|
|
||||||
this.updatedAt = new Date();
|
|
||||||
this.createdAt = new Date();
|
|
||||||
this.tags = new ArrayList<>();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Getter
|
// Getter
|
||||||
@@ -121,6 +144,27 @@ public class DocumentMeta {
|
|||||||
return tagIds;
|
return tagIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PublicPathを取得する
|
||||||
|
*/
|
||||||
|
public PublicPath getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントの作者(String)を取得する
|
||||||
|
*/
|
||||||
|
public String getAuthor() {
|
||||||
|
return author;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントのデフォルトブランチ(String)を取得する
|
||||||
|
*/
|
||||||
|
public String getDefaultBranch() {
|
||||||
|
return defaultBranch;
|
||||||
|
}
|
||||||
|
|
||||||
// Setter
|
// Setter
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -163,6 +207,30 @@ public class DocumentMeta {
|
|||||||
this.tags = tags;
|
this.tags = tags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PublicPathを設定する
|
||||||
|
* @param path PublicPath
|
||||||
|
*/
|
||||||
|
public void setPath(PublicPath path) {
|
||||||
|
this.path = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントの作者(String)を設定する
|
||||||
|
* @param author ドキュメントの作者
|
||||||
|
*/
|
||||||
|
public void setAuthor(String author) {
|
||||||
|
this.author = author;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ドキュメントのデフォルトブランチ(String)を設定する
|
||||||
|
* @param defaultBranch ドキュメントのデフォルトブランチ
|
||||||
|
*/
|
||||||
|
public void setDefaultBranch(String defaultBranch) {
|
||||||
|
this.defaultBranch = defaultBranch;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* updatedAtを現在時刻に設定する
|
* updatedAtを現在時刻に設定する
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -4,12 +4,8 @@ import java.util.ArrayList;
|
|||||||
|
|
||||||
public class XmlMetaModel {
|
public class XmlMetaModel {
|
||||||
|
|
||||||
String title;
|
String revisionId;
|
||||||
String author;
|
|
||||||
String description;
|
|
||||||
// Date created;
|
|
||||||
// Date updated;
|
|
||||||
String defaultBranch;
|
|
||||||
ArrayList<XmlMetaPageModel> pages;
|
ArrayList<XmlMetaPageModel> pages;
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
@@ -17,31 +13,15 @@ public class XmlMetaModel {
|
|||||||
public XmlMetaModel() {
|
public XmlMetaModel() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public XmlMetaModel(String title, String author, String description, String defaultBranch, ArrayList<XmlMetaPageModel> pages) {
|
public XmlMetaModel(String revisionId, ArrayList<XmlMetaPageModel> pages) {
|
||||||
this.title = title;
|
this.revisionId = revisionId;
|
||||||
this.author = author;
|
|
||||||
this.description = description;
|
|
||||||
this.defaultBranch = defaultBranch;
|
|
||||||
this.pages = pages;
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Getter
|
// Getter
|
||||||
|
|
||||||
public String getTitle() {
|
public String getRevisionId() {
|
||||||
return title;
|
return revisionId;
|
||||||
}
|
|
||||||
|
|
||||||
public String getAuthor() {
|
|
||||||
return author;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDescription() {
|
|
||||||
return description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDefaultBranch() {
|
|
||||||
return defaultBranch;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArrayList<XmlMetaPageModel> getPages() {
|
public ArrayList<XmlMetaPageModel> getPages() {
|
||||||
@@ -50,24 +30,11 @@ public class XmlMetaModel {
|
|||||||
|
|
||||||
// Setter
|
// Setter
|
||||||
|
|
||||||
public void setTitle(String title) {
|
public void setRevisionId(String revisionId) {
|
||||||
this.title = title;
|
this.revisionId = revisionId;
|
||||||
}
|
|
||||||
|
|
||||||
public void setAuthor(String author) {
|
|
||||||
this.author = author;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDescription(String description) {
|
|
||||||
this.description = description;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDefaultBranch(String defaultBranch) {
|
|
||||||
this.defaultBranch = defaultBranch;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPages(ArrayList<XmlMetaPageModel> pages) {
|
public void setPages(ArrayList<XmlMetaPageModel> pages) {
|
||||||
this.pages = pages;
|
this.pages = pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package one.nem.lacerta.model.document.page;
|
||||||
|
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
|
public class Page {
|
||||||
|
|
||||||
|
String fileName;
|
||||||
|
Bitmap bitmap;
|
||||||
|
|
||||||
|
// Constructor
|
||||||
|
|
||||||
|
public Page() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Page(String fileName, Bitmap bitmap) {
|
||||||
|
this.fileName = fileName;
|
||||||
|
this.bitmap = bitmap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Getter
|
||||||
|
|
||||||
|
public String getFileName() {
|
||||||
|
return fileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Bitmap getBitmap() {
|
||||||
|
return bitmap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setter
|
||||||
|
|
||||||
|
public void setFileName(String fileName) {
|
||||||
|
this.fileName = fileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBitmap(Bitmap bitmap) {
|
||||||
|
this.bitmap = bitmap;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -44,4 +44,5 @@ dependencies {
|
|||||||
implementation project(':source')
|
implementation project(':source')
|
||||||
implementation project(':utils')
|
implementation project(':utils')
|
||||||
implementation project(':data')
|
implementation project(':data')
|
||||||
|
implementation project(':vcs')
|
||||||
}
|
}
|
||||||
@@ -2,13 +2,14 @@ package one.nem.lacerta.processor;
|
|||||||
|
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
|
||||||
public interface DocumentProcessor {
|
public interface DocumentProcessor {
|
||||||
|
|
||||||
// ページ操作
|
// ページ操作
|
||||||
void addNewPageToLast(Bitmap bitmap) throws Exception;
|
void addNewPageToLast(Bitmap bitmap) throws Exception;
|
||||||
void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
|
void addNewPagesToLast(Bitmap[] bitmaps) throws Exception;
|
||||||
void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception;
|
void insertPageAtIndex(Bitmap bitmap, int index) throws Exception;
|
||||||
void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception;
|
|
||||||
void removePageAtIndex(int index) throws Exception;
|
void removePageAtIndex(int index) throws Exception;
|
||||||
|
|
||||||
// 更新
|
// 更新
|
||||||
@@ -18,7 +19,5 @@ public interface DocumentProcessor {
|
|||||||
Bitmap getPageAtIndex(int index);
|
Bitmap getPageAtIndex(int index);
|
||||||
int getPageCount();
|
int getPageCount();
|
||||||
|
|
||||||
void close() throws Exception;
|
DocumentDetail getDocumentDetail();
|
||||||
void init() throws Exception; // TODO-rca: 例外処理
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -3,23 +3,32 @@ package one.nem.lacerta.processor.impl;
|
|||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
// Hilt
|
||||||
import dagger.assisted.Assisted;
|
import dagger.assisted.Assisted;
|
||||||
import dagger.assisted.AssistedInject;
|
import dagger.assisted.AssistedInject;
|
||||||
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
|
|
||||||
|
// Lacerta/model
|
||||||
|
import one.nem.lacerta.model.document.DocumentDetail;
|
||||||
|
import one.nem.lacerta.model.document.internal.XmlMetaModel;
|
||||||
|
import one.nem.lacerta.model.document.page.Page;
|
||||||
|
|
||||||
|
// Lacerta/processor
|
||||||
import one.nem.lacerta.processor.DocumentProcessor;
|
import one.nem.lacerta.processor.DocumentProcessor;
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.DocumentDetail;
|
// Lacerta/source
|
||||||
|
|
||||||
import one.nem.lacerta.model.document.internal.XmlMetaModel;
|
|
||||||
import one.nem.lacerta.source.file.FileManager;
|
import one.nem.lacerta.source.file.FileManager;
|
||||||
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
import one.nem.lacerta.source.file.factory.FileManagerFactory;
|
||||||
|
|
||||||
|
// Lacerta/utils
|
||||||
import one.nem.lacerta.utils.LacertaLogger;
|
import one.nem.lacerta.utils.LacertaLogger;
|
||||||
|
|
||||||
import one.nem.lacerta.utils.XmlMetaParser;
|
import one.nem.lacerta.utils.XmlMetaParser;
|
||||||
|
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
|
||||||
|
|
||||||
|
// Lacerta/vcs
|
||||||
|
import one.nem.lacerta.vcs.LacertaVcs;
|
||||||
|
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
|
||||||
|
|
||||||
|
|
||||||
public class DocumentProcessorImpl implements DocumentProcessor{
|
public class DocumentProcessorImpl implements DocumentProcessor{
|
||||||
@@ -32,77 +41,47 @@ public class DocumentProcessorImpl implements DocumentProcessor{
|
|||||||
private XmlMetaModel xmlMetaModel;
|
private XmlMetaModel xmlMetaModel;
|
||||||
private Path documentRootPath;
|
private Path documentRootPath;
|
||||||
private FileManager fileManager;
|
private FileManager fileManager;
|
||||||
|
private LacertaVcs lacertaVcs;
|
||||||
|
|
||||||
// Injection
|
// Injection
|
||||||
private final FileManagerFactory fileManagerFactory;
|
private final FileManagerFactory fileManagerFactory;
|
||||||
private final LacertaLogger logger;
|
private final LacertaLogger logger;
|
||||||
private final XmlMetaParser xmlMetaParser;
|
private final XmlMetaParser xmlMetaParser;
|
||||||
|
private final LacertaVcsFactory lacertaVcsFactory;
|
||||||
|
private final DeviceInfoUtils deviceInfoUtils;
|
||||||
@AssistedInject
|
@AssistedInject
|
||||||
public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, @Assisted DocumentDetail documentDetail) {
|
public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, LacertaVcsFactory lacertaVcsFactory, DeviceInfoUtils deviceInfoUtils, @Assisted DocumentDetail documentDetail) {
|
||||||
this.fileManagerFactory = fileManagerFactory;
|
this.fileManagerFactory = fileManagerFactory;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.xmlMetaParser = xmlMetaParser;
|
this.xmlMetaParser = xmlMetaParser;
|
||||||
if (documentDetail == null) {
|
if (documentDetail == null) {
|
||||||
throw new IllegalArgumentException("documentDetail must not be null");
|
throw new IllegalArgumentException("documentDetail must not be null");
|
||||||
}
|
}
|
||||||
|
this.lacertaVcsFactory = lacertaVcsFactory;
|
||||||
this.documentDetail = documentDetail;
|
this.documentDetail = documentDetail;
|
||||||
}
|
this.deviceInfoUtils = deviceInfoUtils;
|
||||||
|
|
||||||
@Override
|
// Init
|
||||||
public void init() throws Exception{
|
this.documentRootPath = deviceInfoUtils.getExternalStorageDirectory().resolve(this.documentDetail.getMeta().getId());
|
||||||
logger.debug("init", "called");
|
|
||||||
// Init Variables
|
|
||||||
this.documentRootPath = this.documentDetail.getPath().getFullPath();
|
|
||||||
logger.debug("init", "documentRootPath: " + this.documentRootPath);
|
logger.debug("init", "documentRootPath: " + this.documentRootPath);
|
||||||
|
|
||||||
this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
|
this.fileManager = fileManagerFactory.create(this.documentRootPath).enableAutoCreateParent(); //Initialize FileManager
|
||||||
|
this.lacertaVcs = lacertaVcsFactory.create(this.documentDetail.getMeta().getId());
|
||||||
FileManager initFileManager = this.fileManager.getNewInstance();
|
|
||||||
|
|
||||||
logger.debug("init", "fileManager created");
|
|
||||||
|
|
||||||
// xmlファイルの読み込み
|
|
||||||
if (initFileManager.isExist("meta.xml")) {
|
|
||||||
logger.debug("init", "meta.xml found");
|
|
||||||
try {
|
|
||||||
this.xmlMetaModel = xmlMetaParser.deserialize(this.fileManager.loadXml("meta.xml"));
|
|
||||||
logger.debug("init", "meta.xml parsed");
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.debug("init", "meta.xml parse failed");
|
|
||||||
logger.trace("init", e.getMessage());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logger.debug("init", "meta.xml not found");
|
|
||||||
xmlMetaModel = new XmlMetaModel();
|
|
||||||
|
|
||||||
xmlMetaModel.setTitle(this.documentDetail.getMeta().getTitle());
|
|
||||||
xmlMetaModel.setAuthor(this.documentDetail.getAuthor());
|
|
||||||
xmlMetaModel.setDescription(""); // FIXME-rca:
|
|
||||||
xmlMetaModel.setDefaultBranch(this.documentDetail.getDefaultBranch());
|
|
||||||
xmlMetaModel.setPages(new ArrayList<>());
|
|
||||||
|
|
||||||
try {
|
|
||||||
initFileManager.createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
|
|
||||||
logger.debug("init", "meta.xml saved");
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("init", "meta.xml save failed");
|
|
||||||
logger.trace("init", e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info("init", "finished");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addNewPageToLast(Bitmap bitmap) throws Exception{
|
public void addNewPageToLast(Bitmap bitmap) throws Exception{
|
||||||
logger.debug("addNewPageToLast", "called");
|
logger.debug("addNewPageToLast", "called");
|
||||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
||||||
|
|
||||||
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
Page page = new Page();
|
||||||
|
page.setFileName(filename);
|
||||||
|
page.setBitmap(bitmap);
|
||||||
|
this.documentDetail.getPages().add(page);
|
||||||
|
|
||||||
XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
|
lacertaVcs.insertPage(documentDetail.getPages().size(), filename);
|
||||||
xmlMetaPageModel.setFilename(filename);
|
|
||||||
xmlMetaModel.getPages().add(xmlMetaPageModel);
|
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
||||||
|
|
||||||
logger.info("addNewPageToLast", "finished");
|
logger.info("addNewPageToLast", "finished");
|
||||||
logger.info("addNewPageToLast", "filename: " + filename);
|
logger.info("addNewPageToLast", "filename: " + filename);
|
||||||
@@ -118,27 +97,18 @@ public class DocumentProcessorImpl implements DocumentProcessor{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addNewPageAfterIndex(Bitmap bitmap, int index) throws Exception {
|
public void insertPageAtIndex(Bitmap bitmap, int index) throws Exception {
|
||||||
logger.debug("addNewPageAfterIndex", "called");
|
logger.debug("addNewPageAfterIndex", "called");
|
||||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
||||||
|
|
||||||
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
||||||
|
|
||||||
XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
|
Page page = new Page();
|
||||||
xmlMetaPageModel.setFilename(filename);
|
page.setFileName(filename);
|
||||||
xmlMetaModel.getPages().add(index, xmlMetaPageModel);
|
page.setBitmap(bitmap);
|
||||||
}
|
this.documentDetail.getPages().add(index, page);
|
||||||
|
|
||||||
@Override
|
lacertaVcs.insertPage(index, filename);
|
||||||
public void addNewPageBeforeIndex(Bitmap bitmap, int index) throws Exception {
|
|
||||||
logger.debug("addNewPageBeforeIndex", "called");
|
|
||||||
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
|
|
||||||
|
|
||||||
this.fileManager.getNewInstance().createDirectoryIfNotExist(DEFAULT_SAVE_DIR).resolve(DEFAULT_SAVE_DIR).saveBitmap(bitmap, filename);
|
|
||||||
|
|
||||||
XmlMetaPageModel xmlMetaPageModel = new XmlMetaPageModel();
|
|
||||||
xmlMetaPageModel.setFilename(filename);
|
|
||||||
xmlMetaModel.getPages().add(index - 1, xmlMetaPageModel);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -162,14 +132,7 @@ public class DocumentProcessorImpl implements DocumentProcessor{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() throws Exception{
|
public DocumentDetail getDocumentDetail() {
|
||||||
logger.debug("close", "called");
|
return this.documentDetail;
|
||||||
try {
|
|
||||||
this.fileManager.getNewInstance().createFileIfNotExist("meta.xml").saveXml(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
|
|
||||||
logger.debug("close", "meta.xml saved");
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("close", "meta.xml save failed");
|
|
||||||
logger.trace("close", e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-1
@@ -30,4 +30,5 @@ include ':source'
|
|||||||
include ':model'
|
include ':model'
|
||||||
include ':processor'
|
include ':processor'
|
||||||
include ':shared:ui'
|
include ':shared:ui'
|
||||||
include ':shared:icon'
|
include ':vcs'
|
||||||
|
include ':feature:setting'
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<translate android:fromXDelta="-100%p" android:toXDelta="0"
|
<translate android:fromXDelta="-100%p" android:toXDelta="0"
|
||||||
android:duration="@android:integer/config_mediumAnimTime" />
|
android:duration="120" />
|
||||||
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
|
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||||
android:duration="@android:integer/config_mediumAnimTime" />
|
android:duration="120" />
|
||||||
</set>
|
</set>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<translate android:fromXDelta="100%p" android:toXDelta="0"
|
<translate android:fromXDelta="100%p" android:toXDelta="0"
|
||||||
android:duration="@android:integer/config_mediumAnimTime" />
|
android:duration="120" />
|
||||||
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
|
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
|
||||||
android:duration="@android:integer/config_mediumAnimTime" />
|
android:duration="120" />
|
||||||
</set>
|
</set>
|
||||||
Loaded 100 of 159 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user