diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java index 68c559c..e0d57e4 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java @@ -1,4 +1,46 @@ package org.ntlab.acanthus_client.resources.accounts; +import org.ntlab.acanthus_client.entities.AidJson; +import org.ntlab.acanthus_client.entities.Work; +import org.ntlab.acanthus_client.entities.WorkJson; + +import java.util.Collection; + +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; +import retrofit2.http.PUT; +import retrofit2.http.Path; +import retrofit2.http.Query; + public interface WorkRest { + //----------------------------------------------------------------- + // 各ユーザーの作品を取得する + @GET("accounts/{uid}/work") + Call getWork( + @Path("uid") Integer uid, + @Query("token") String token + ); + //----------------------------------------------------------------- + // 新しい作品を制作する + @FormUrlEncoded + @POST("accounts/{uid}/work") + Call createWork( + @Path("uid") Integer uid, + @Field("name") String animationName, + @Field("token") String token + ); + //----------------------------------------------------------------- + // 作品への参加を許可する + @FormUrlEncoded + @PUT("accounts/{uid}/work") + Call updateWork( + @Path("uid")String invitedUid, + @Field("token") String invitedToken, + @Field("aid") Integer aid + ); + + //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java index 39d721a..f787480 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java @@ -1,4 +1,30 @@ package org.ntlab.acanthus_client.resources.gallery; +import org.ntlab.acanthus_client.entities.EditorJson; +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.PUT; +import retrofit2.http.Path; +import retrofit2.http.Query; + public interface EditorsRest { + //----------------------------------------------------------------- + //galleryのinvitesにいるか確認 + @GET("gallery/{aid}/Editors") + Call getEditors( + @Path("aid") Integer aid, + @Query("uid") Integer uid + ); + //----------------------------------------------------------------- + //Editorに追加 + @FormUrlEncoded + @PUT("gallery/{aid}/Editors") + Call addEditors( + @Path("aid") Integer aid, + @Field("uid") Integer uid, + @Field("token") String token + ); + //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java index 50610d5..7128cde 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java @@ -1,4 +1,43 @@ package org.ntlab.acanthus_client.resources.gallery; +import org.ntlab.acanthus_client.entities.AnimationJson; + +import java.util.Collection; + +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; +import retrofit2.http.Path; +import retrofit2.http.Query; + public interface GalleryRest { + + //すべての作品情報を返す。 + @GET("gallery") + Call> getGallery(); + + @GET("gallery") + Call> getAnimationByAnimationName( + @Query("name") String name + ); + + //作品の更新 + @FormUrlEncoded + @POST("gallery") + Call createAnimation( + @Field("name") String animationName, + @Field("token") String token, + @Field("uid") Integer uid + ); + + //特定の作品の表示 + @GET("gallery/{aid}") + Call> getAnimationInformation( + @Path("aid") Integer aid + ); + + + } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java index aef01f9..df5c70c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java @@ -27,16 +27,18 @@ binding = FragmentSearchBinding.inflate(inflater, container, false); View root = binding.getRoot(); - final TextView textView = binding.textSearch; - searchViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { - @Override - public void onChanged(@Nullable String s) { - textView.setText(s); - } - }); +// final TextView textView = binding.textSearch; +// searchViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { +// @Override +// public void onChanged(@Nullable String s) { +// textView.setText(s); +// } +// }); return root; } + + @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 6cab28c..ba61953 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -6,17 +6,31 @@ android:layout_height="match_parent" tools:context=".views.main_menu_ui.search.SearchFragment"> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.023" /> + + + \ No newline at end of file