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 73fca5b..2da8422 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 @@ -57,6 +57,8 @@ return root; } + //------------------------------------------------------------------------------------------------- + //listView @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -73,12 +75,16 @@ ListView listView = (ListView) getActivity().findViewById(R.id.list_view); editViewModel.getWorkJson().observe(getViewLifecycleOwner(), new Observer() { + + //listViewの表示をしている @Override public void onChanged(@Nullable WorkJson workJson) { aidList = (ArrayList) editViewModel.getWorkJson().getValue().getAid(); AnimationJsonList = (ArrayList) acanthus.getAnimationJsonList(); + if(AnimationJsonList != null){ for(int i=0; i { Acanthus acanthus = (Acanthus) getActivity().getApplication(); //Integer uid = acanthus.getPreferenceUid(); @@ -116,6 +127,15 @@ acanthus.setAid(aid); transitionPaintActivity(); }); + + editButton.setOnClickListener(v -> { + Acanthus acanthus = (Acanthus) getActivity().getApplication(); + //dummy--------- + Integer aid = 1111; + //-------------- + acanthus.setAid(aid); + transitionPaintActivity(); + }); } //----------------------------------------------------------------- @@ -125,4 +145,6 @@ Intent intent = new Intent(acanthus, PaintActivity.class); startActivity(intent); } + + } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit.xml b/app/src/main/res/layout/fragment_edit.xml index 25be352..dc9dbf2 100644 --- a/app/src/main/res/layout/fragment_edit.xml +++ b/app/src/main/res/layout/fragment_edit.xml @@ -13,7 +13,7 @@ android:layout_marginTop="4dp" android:text="Button" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.795" + app:layout_constraintHorizontal_bias="0.687" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -42,4 +42,15 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" /> + +