diff --git a/.idea/misc.xml b/.idea/misc.xml index 867daff..97e4e27 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,9 +6,14 @@ + + + + + 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 98b03cb..bb2095c 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; } diff --git a/app/src/main/res/drawable/ic_baseline_add.xml b/app/src/main/res/drawable/ic_baseline_add.xml new file mode 100644 index 0000000..dcbf71a --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_add.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml b/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml new file mode 100644 index 0000000..3dcc8fb --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_horizontal_rule.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml new file mode 100644 index 0000000..770a7db --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml new file mode 100644 index 0000000..ba50375 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_page.xml b/app/src/main/res/layout/activity_page.xml index 1c75869..6a09703 100644 --- a/app/src/main/res/layout/activity_page.xml +++ b/app/src/main/res/layout/activity_page.xml @@ -18,82 +18,91 @@ -