lacerta-dev/Lacerta
1
0
Fork 0
mirror of https://github.com/lacerta-doc/Lacerta.git synced 2024-11-23 00:13:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

リビジョンIDを指定して呼び出した場合にそのバージョンを表示するように

Browse Source
This commit is contained in:
r-ca 2024-01-24 17:09:32 +09:00
parent bd8edc85ce
commit 778473f898
No known key found for this signature in database
GPG Key ID: 6A72911AC73464A9
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
component/viewer/src/main/java/one/nem/lacerta/component/viewer/ViewerPrimaryFragment.java
View File

@ -22,6 +22,8 @@ import one.nem.lacerta.data.Document;
import one.nem.lacerta.model.document.page.Page; import one.nem.lacerta.model.document.page.Page;
import one.nem.lacerta.utils.FeatureSwitch; import one.nem.lacerta.utils.FeatureSwitch;
import one.nem.lacerta.utils.LacertaLogger; import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
@ -37,10 +39,14 @@ public class ViewerPrimaryFragment extends Fragment {
@Inject @Inject
LacertaLogger logger; LacertaLogger logger;
@Inject
LacertaVcsFactory lacertaVcsFactory;
private static final String TAG = "ComponentViewerTopFragment"; private static final String TAG = "ComponentViewerTopFragment";
private String documentId; private String documentId;
private String documentName; private String documentName;
private String revisionId;
public ViewerPrimaryFragment() { public ViewerPrimaryFragment() {
// Required empty public constructor // Required empty public constructor
@ -71,6 +77,7 @@ public class ViewerPrimaryFragment extends Fragment {
if (getArguments() != null) { if (getArguments() != null) {
documentId = getArguments().getString("documentId"); documentId = getArguments().getString("documentId");
documentName = getArguments().getString("documentName"); documentName = getArguments().getString("documentName");
revisionId = getArguments().getString("revisionId");
} }
} }
@ -91,16 +98,34 @@ public class ViewerPrimaryFragment extends Fragment {
}); });
recyclerView.setAdapter(viewerBodyAdapter); recyclerView.setAdapter(viewerBodyAdapter);
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE); if (revisionId.isEmpty()) {
document.getDocument(documentId).thenAccept(documentDetail -> { logger.debug(TAG, "revisionId is empty, loading latest revision");
ArrayList<Page> pages = documentDetail.getPages(); if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
logger.debug(TAG, "pages.size(): " + pages.size()); document.getDocument(documentId).thenAccept(documentDetail -> {
viewerBodyAdapter.setPages(pages); ArrayList<Page> pages = documentDetail.getPages();
getActivity().runOnUiThread(() -> { logger.debug(TAG, "pages.size(): " + pages.size());
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size()); viewerBodyAdapter.setPages(pages);
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE); getActivity().runOnUiThread(() -> {
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
});
}); });
}); } else {
logger.debug(TAG, "revisionId: " + revisionId);
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.VISIBLE);
LacertaVcs lacertaVcs = lacertaVcsFactory.create(documentId);
lacertaVcs.getDocumentPagePathListRev(revisionId).thenAccept(documentPathList -> {
logger.debug(TAG, "documentPathList.size(): " + documentPathList.size());
document.getDocumentPageListByFileNameList(documentId, documentPathList).thenAccept(pages -> {
logger.debug(TAG, "pages.size(): " + pages.size());
viewerBodyAdapter.setPages(pages);
getActivity().runOnUiThread(() -> {
viewerBodyAdapter.notifyItemRangeChanged(0, pages.size());
if (FeatureSwitch.Viewer.showProgressBarWhenLoading) view.findViewById(R.id.loading_progress_bar).setVisibility(View.GONE);
});
});
});
}
return view; return view;
} }