diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index 9d473e0..ad02038 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -72,8 +72,6 @@ binding = FragmentEditBinding.inflate(inflater, container, false); View root = binding.getRoot(); - homeViewModel.updateGallery(acanthus); // ギャラリーをアップデート - return root; } @@ -85,7 +83,7 @@ editViewModel = new ViewModelProvider(this).get(EditViewModel.class); - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + acanthus = (Acanthus) getActivity().getApplication(); Integer uid = 1; String token = "abc0"; editViewModel.getWorkList(uid, token); @@ -214,7 +212,7 @@ // ひっぱり更新の処理 @Override public void onRefresh() { - + homeViewModel.updateGallery(acanthus); // ギャラリーをアップデート mSwipeRefreshLayout.setRefreshing(false); } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index 5bd3edb..2896e5f 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -46,27 +46,6 @@ setTheme(R.style.AppTheme_NoTitleBar);//タイトルバーを消す init(); initView(); - - Button button = findViewById(R.id.button_keep); - button.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //bottonタップで表示されてたら非表示にする。 - if (buttonView) { - findViewById(R.id.capture).setVisibility(View.INVISIBLE); - findViewById(R.id.image).setVisibility(View.INVISIBLE); - findViewById(R.id.textView3).setVisibility(View.INVISIBLE); - - buttonView = false; - } else { - findViewById(R.id.capture).setVisibility(View.VISIBLE); - findViewById(R.id.image).setVisibility(View.VISIBLE); - findViewById(R.id.textView3).setVisibility(View.VISIBLE); - - buttonView = true; - } - } - }); } //----------------------------------------------------------------- diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java index c5d0955..8b5c4d3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java @@ -108,16 +108,16 @@ Call call = pagesRest.getPage(acanthus.getAid(), acanthus.getEditingPageNo()); -// try { -// Response response = call.execute(); -// // ページ番号とページIDを取得する -// acanthus.setEditingPageId(response.body().getPid()); -// mPageId.setValue(response.body().getPid()); -// -// Log.d("curPageNo", acanthus.getEditingPageNo().toString()); -// Log.d("curPageID", acanthus.getEditingPageId().toString()); -// } catch (Exception ex) { -// } + try { + Response response = call.execute(); + // ページ番号とページIDを取得する + acanthus.setEditingPageId(response.body().getPid()); + mPageId.setValue(response.body().getPid()); + + Log.d("curPageNo", acanthus.getEditingPageNo().toString()); + Log.d("curPageID", acanthus.getEditingPageId().toString()); + } catch (Exception ex) { + } call.enqueue(new Callback() { @Override