diff --git a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java index 0b72284..9662a51 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -1,11 +1,7 @@ package org.ntlab.irisclient.resources; -import com.squareup.moshi.Json; - import org.ntlab.irisclient.entities.GameJson; -import org.ntlab.irisclient.entities.RoomJson; import org.ntlab.irisclient.entities.TurnJson; -import org.ntlab.irisclient.models.Cell; import java.util.List; @@ -100,7 +96,7 @@ //----------------------------------------------- @GET("rooms/{rid}/game/turns/{tno}/turnstate") - Call getTurnstate( + Call getTurnState( @Path("rid") String rid, @Path("tno") Integer tno ); @@ -143,7 +139,7 @@ //----------------------------------------------- //Turnstateを1に変更 @PUT("/{rid}/game/turns/{tno}/turnstate") - Call setTurnstate( + Call setTurnState( @Path("rid") String rid, @Path("tno") int tno ); @@ -151,7 +147,7 @@ //----------------------------------------------- //Endstateを1に変更 @PUT("/{rid}/game/turns/{tno}/endstate") - Call setEndstate( + Call setEndState( @Path("rid") String rid, @Path("tno") int tno ); diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java index 873a44c..762432f 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -1,8 +1,6 @@ package org.ntlab.irisclient.viewmodels; import org.ntlab.irisclient.entities.GameJson; -import org.ntlab.irisclient.entities.TurnJson; -import org.ntlab.irisclient.models.Cell; import org.ntlab.irisclient.resources.GameRest; import androidx.lifecycle.LiveData; @@ -163,7 +161,7 @@ //現在のTurnStateを送信 public void sendTurnState() { - Call call = gameRest.setTurnstate(rid, tno); + Call call = gameRest.setTurnState(rid, tno); call.enqueue(new Callback() { @Override @@ -182,7 +180,7 @@ //現在のGameStateを送信 public void sendEndState() { - Call call = gameRest.setEndstate(rid, tno); + Call call = gameRest.setEndState(rid, tno); call.enqueue(new Callback() { @Override @@ -497,7 +495,7 @@ //TurnStateの更新 public void updateTurnState() { - Call call = gameRest.getTurnstate(rid, tno); + Call call = gameRest.getTurnState(rid, tno); call.enqueue(new Callback() { @Override