diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java index 52f50d2..20ed231 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java @@ -136,6 +136,7 @@ //----------------------------------------------------------------- // private void startObserve() { + // ページの現在の番号 pageViewModel.getCurPageNo().observe(this, new Observer() { @Override public void onChanged(Integer pageNo) { @@ -145,6 +146,7 @@ } }); + // ページのサムネ更新 pageViewModel.getPages().observe(this, new Observer>() { @Override public void onChanged(HashMap s) { @@ -154,6 +156,14 @@ Log.d("a", "onFailure: -----------------------OK:Obs"); } }); + + // ページのサイズ更新 + pageViewModel.getPageSize().observe(this, new Observer() { + @Override + public void onChanged(Integer pageSize) { + binding.textPageSize.setText("/" + pageSize.toString()); + } + }); } //----------------------------------------------------------------- } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java index 75d4ae7..759af22 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java @@ -38,6 +38,10 @@ return this.mPages; } + public LiveData getPageSize() { + return this.mPageSize; + } + public PaintModelContainer getPaintModelContainer() { return paintModelContainer; } @@ -87,9 +91,10 @@ pageConnectionModel.getPage(mCurPageId); updatePrePageId(); } + //----------------------------------------------------------------- // ひとつ前のページを記憶する - private void updatePrePageId(){ + private void updatePrePageId() { PageConnectionModel pageConnectionModel = paintModelContainer.getPageConnectionModel(); // pageConnectionModel.getPrePageId(); } @@ -129,6 +134,7 @@ pageConnectionModel.getPageThumb(mPages); } + //----------------------------------------------------------------- // public void getPageSizeRequest() { diff --git a/app/src/main/res/layout/activity_page.xml b/app/src/main/res/layout/activity_page.xml index 380d988..6a09703 100644 --- a/app/src/main/res/layout/activity_page.xml +++ b/app/src/main/res/layout/activity_page.xml @@ -39,17 +39,31 @@ android:layout_height="80dp" android:layout_marginLeft="50dp" android:layout_marginRight="50dp" - android:textSize="50dp" + android:textSize="40dp" android:textColor="@color/white" android:textStyle="bold" android:background="#BAF14B16" android:drawableBottom="@android:drawable/list_selector_background" android:gravity="center|center_horizontal" - android:text="pageNo" /> + android:text="100" /> +