Merge pull request #296 from nitta-lab-2021/invited

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge pull request #296 from nitta-lab-2021/invited 確認しました README master
commit 0d37b239cd89a0190a21f348d940629ed18b1e26 2 parents 97120d2 + cfb8a51 fujii kouta authored on 4 Nov 2021

Patch

Unified Split

Showing 9 changed files

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          app/src/main/java/org/ntlab/acanthus_client/resources/accounts/InvitedRest.java
     );
 
    //-----------------------------------------------------------------
 
    @GET("accounts/{uid}/invited")
    @GET("accounts/{uid}/invited/aidList")
    Call<Collection<Integer>> getAccountInvited(
            @Path("uid") Integer ownerUid,
            @Query("token") Integer token
            @Path("uid") Integer Uid,
            @Query("token") String token
    );
 
    //-----------------------------------------------------------------
     );
     //-----------------------------------------------------------------
+    @GET("accounts/{uid}/invited")
+    @GET("accounts/{uid}/invited/aidList")
     Call<Collection<Integer>> getAccountInvited(
+            @Path("uid") Integer ownerUid,
+            @Query("token") Integer token
+            @Path("uid") Integer Uid,
+            @Query("token") String token
     );
     //-----------------------------------------------------------------

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java
     //-----------------------------------------------------------------
    // 作品への参加を許可する
    @FormUrlEncoded
    @PUT("accounts/{uid}/work")
    Call<Work> updateWork(
    Call<Boolean> updateWork(
            @Path("uid")Integer invitedUid,
            @Field("token") String invitedToken,
            @Field("aid") Integer aid
    );
     //-----------------------------------------------------------------
     // 作品への参加を許可する
     @FormUrlEncoded
     @PUT("accounts/{uid}/work")
+    Call<Work> updateWork(
+    Call<Boolean> updateWork(
             @Path("uid")Integer invitedUid,
             @Field("token") String invitedToken,
             @Field("aid") Integer aid
     );

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java

Ignore Space Show notes View app/src/main/res/layout/fragment_mypage.xml

Show line notes below