diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 08f679c..c91ae79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,13 @@ + android:screenOrientation="landscape" > + + + + + + - - - - - - - + android:screenOrientation="landscape" /> + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java new file mode 100644 index 0000000..d5ce1d4 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java @@ -0,0 +1,55 @@ +package org.ntlab.irisclient; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + +public class TestDrawingActivity extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.test_activity_draw); + + //上の表示を削除 + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.hide(); + } + + //ownerとして参加 + Button ownerButton = findViewById(R.id.ownerdraw); + ownerButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + ((Iris) getApplication()).setRid("drawtest"); + ((Iris) getApplication()).setNickname("owner"); + Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); + startActivity(intent); + } + }); + + //memberとして参加 + Button memButton = findViewById(R.id.member); + memButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + ((Iris) getApplication()).setRid("drawtest"); + ((Iris) getApplication()).setNickname("member"); + Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); + startActivity(intent); + } + }); + + //backボタン + Button backButton = findViewById(R.id.fromdraw); + backButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(TestDrawingActivity.this,TestEnterActivity.class); + startActivity(intent); + } + }); + + } +} diff --git a/app/src/main/java/org/ntlab/irisclient/TestEnterActivity.java b/app/src/main/java/org/ntlab/irisclient/TestEnterActivity.java new file mode 100644 index 0000000..6897185 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/TestEnterActivity.java @@ -0,0 +1,47 @@ +package org.ntlab.irisclient; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; + +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + +import org.ntlab.irisclient.MainActivity; +import org.ntlab.irisclient.R; + +public class TestEnterActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.test_activity_entrance); + + //上の表示を削除 + ActionBar actionBar = getSupportActionBar(); + if(actionBar != null) { + actionBar.hide(); + } + + //drawtestへ + Button drawButton = findViewById(R.id.dtestenter); + drawButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Intent intent = new Intent(TestEnterActivity.this,TestDrawingActivity.class); + startActivity(intent); + } + }); + + //gametestへ + Button gameButton =(Button)findViewById(R.id.gtestenter); + gameButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v){ + Intent intent = new Intent(TestEnterActivity.this,TestGameActivity.class); + startActivity(intent); + } + }); + + } +} diff --git a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java new file mode 100644 index 0000000..b21e774 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java @@ -0,0 +1,36 @@ +package org.ntlab.irisclient; + +import android.widget.Button; + +public class TestGameActivity { + +} +/* + //member1として参加 + Button mem1Button = findViewById(R.id.member1); + mem1Button.setOnClickListener(new View.OnClickListener() { +public void onClick(View v) { + Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); + startActivity(intent); + } + }); + + //member2として参加 + Button mem2Button = findViewById(R.id.member2); + mem2Button.setOnClickListener(new View.OnClickListener() { +public void onClick(View v) { + Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); + startActivity(intent); + } + }); + + //ownerとして参加 + Button mem3Button = findViewById(R.id.member3); + mem3Button.setOnClickListener(new View.OnClickListener() { +public void onClick(View v) { + Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); + startActivity(intent); + } + }); + + */ \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/models/GameState.java b/app/src/main/java/org/ntlab/irisclient/models/GameState.java new file mode 100644 index 0000000..41dc5ea --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/models/GameState.java @@ -0,0 +1,11 @@ +package org.ntlab.irisclient.models; + +import java.util.HashMap; +import java.util.Map; + +public class GameState { + + private Map drawingList = new HashMap<>(); + private Map keywordList = new HashMap<>(); + +} diff --git a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java new file mode 100644 index 0000000..c29d8a2 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -0,0 +1,45 @@ +package org.ntlab.irisclient.resources; + +import org.ntlab.irisclient.entities.RoomJson; + +import java.util.List; + +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.POST; +import retrofit2.http.Path; + +public interface GameRest { + + //----------------------------------------------- + // カード(絵)の並び順のMapを取得するメソッド + @GET("/{rid}/game/map") + Call> getMap( + @Path("rid") String rid + ); + + //----------------------------------------------- + // カードの色を取得するメソッド + @GET("/{rid}/game/color") + Call> getColor( + @Path("rid") String rid + ); + + //----------------------------------------------- + // 現在開いているすべてのカードを取得するメソッド + @GET("/{rid}/game/opens") + Call> getOpens( + @Path("rid") String rid + ); + + //----------------------------------------------- + // 現在のターンがどちらのチームであるかを取得するメソッド + @GET("/{rid}/game/turn") + Call getTeam( + @Path("rid") String rid + ); + + +} diff --git a/app/src/main/res/layout/test_activity_draw.xml b/app/src/main/res/layout/test_activity_draw.xml new file mode 100644 index 0000000..e731290 --- /dev/null +++ b/app/src/main/res/layout/test_activity_draw.xml @@ -0,0 +1,43 @@ + + + +