diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/InvitesJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/InvitesJson.java new file mode 100644 index 0000000..7f15a92 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/InvitesJson.java @@ -0,0 +1,22 @@ +package org.ntlab.acanthus_client.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.ArrayList; +import java.util.Collection; + +public class InvitesJson { + @JsonProperty("invites") + private ArrayList invites = new ArrayList<>(); + + public InvitesJson() { + } + + public ArrayList getInvites() { + return invites; + } + + public void setInvitesJson(Integer uid){ + this.invites.add(uid); + } +} 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 ad02038..9d473e0 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,6 +72,8 @@ binding = FragmentEditBinding.inflate(inflater, container, false); View root = binding.getRoot(); + homeViewModel.updateGallery(acanthus); // ギャラリーをアップデート + return root; } @@ -83,7 +85,7 @@ editViewModel = new ViewModelProvider(this).get(EditViewModel.class); - acanthus = (Acanthus) getActivity().getApplication(); + Acanthus acanthus = (Acanthus) getActivity().getApplication(); Integer uid = 1; String token = "abc0"; editViewModel.getWorkList(uid, token); @@ -212,7 +214,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 48173c3..d614b1f 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 @@ -80,7 +80,7 @@ // SwipeRefreshLayoutを作成 createSwipeRefreshLayout(); - updateGallery(); + homeViewModel.updateGallery(acanthus); homeViewModel.getAnimationJson().observe(getViewLifecycleOwner(), new Observer>() { @Override @@ -154,7 +154,7 @@ // ひっぱり更新の処理 @Override public void onRefresh() { - updateGallery(); + homeViewModel.updateGallery(acanthus); mSwipeRefreshLayout.setRefreshing(false); } } \ No newline at end of file diff --git a/app/src/main/res/layout/invites_list.xml b/app/src/main/res/layout/invites_list.xml new file mode 100644 index 0000000..26edc44 --- /dev/null +++ b/app/src/main/res/layout/invites_list.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file