diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java index d1718d2..82babd0 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java @@ -22,16 +22,21 @@ import org.ntlab.acanthus_client.databinding.FragmentEditBinding; import org.ntlab.acanthus_client.views.MainActivity; import org.ntlab.acanthus_client.views.main_menu_ui.edit.EditViewModel; +import org.ntlab.acanthus_client.views.main_menu_ui.home.HomeFragment; +import org.ntlab.acanthus_client.views.main_menu_ui.home.HomeViewModel; import org.ntlab.acanthus_client.views.paint.PaintActivity; public class CreateFragment extends Fragment { private CreateViewModel createViewModel; private FragmentCreateBinding binding; + private HomeViewModel homeViewModel; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { createViewModel = new ViewModelProvider(this).get(CreateViewModel.class); + homeViewModel = + new ViewModelProvider(this).get(HomeViewModel.class); binding = FragmentCreateBinding.inflate(inflater, container, false); View root = binding.getRoot(); @@ -59,6 +64,7 @@ //String token = acanthus.getPreferenceToken(); createViewModel.startWorkCreate(uid, name, token); //Integer aid = createViewModel.startWorkCreate(uid, name, token); + homeViewModel.updateGallery(acanthus); transitionPaintActivity(); }); 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 44c6577..c192d57 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 @@ -22,6 +22,8 @@ import org.ntlab.acanthus_client.entities.Animation; import org.ntlab.acanthus_client.entities.AnimationJson; import org.ntlab.acanthus_client.entities.WorkJson; +import org.ntlab.acanthus_client.views.main_menu_ui.home.HomeFragment; +import org.ntlab.acanthus_client.views.main_menu_ui.home.HomeViewModel; import org.ntlab.acanthus_client.views.paint.PaintActivity; import androidx.annotation.NonNull; @@ -54,6 +56,8 @@ private Integer AnimationAid; private String AnimationName; private String AnimationLastUpDate; + private HomeViewModel homeViewModel; + private Acanthus acanthus; private SwipeRefreshLayout mSwipeRefreshLayout; @@ -61,6 +65,8 @@ ViewGroup container, Bundle savedInstanceState) { editViewModel = new ViewModelProvider(this).get(EditViewModel.class); + homeViewModel = + new ViewModelProvider(this).get(HomeViewModel.class); binding = FragmentEditBinding.inflate(inflater, container, false); View root = binding.getRoot(); @@ -76,7 +82,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); @@ -179,14 +185,14 @@ //----------------------------------------------------------------- // 画面遷移 private void transitionPaintActivity() { - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, PaintActivity.class); startActivity(intent); } //各作品毎の画面遷移 private void transitionPaintActivity(AnimationJson animationJson) { - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, PaintActivity.class); acanthus.setAid(animationJson.getAid()); startActivity(intent); @@ -203,7 +209,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/main_menu_ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java index 2f38308..cc7bb55 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java @@ -37,6 +37,7 @@ private HomeViewModel homeViewModel; private FragmentHomeBinding binding; + private Acanthus acanthus; private SwipeRefreshLayout mSwipeRefreshLayout; @@ -69,7 +70,7 @@ super.onActivityCreated(savedInstanceState); Log.d("CreatedActivity", "EditFragment"); - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + acanthus = (Acanthus) getActivity().getApplication(); Integer uid = 1; String token = "abc0"; @@ -127,6 +128,10 @@ } + public void updateGallery() { + homeViewModel.updateGallery(acanthus); + } + @Override public void onDestroyView() { super.onDestroyView(); @@ -151,7 +156,7 @@ // ひっぱり更新の処理 @Override public void onRefresh() { - + homeViewModel.updateGallery(acanthus); mSwipeRefreshLayout.setRefreshing(false); } } \ No newline at end of file