diff --git a/.idea/misc.xml b/.idea/misc.xml index f386631..458dba1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,12 +5,14 @@ - - + + + + @@ -18,7 +20,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0a5abc1..b5c06b6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,8 +11,8 @@ android:theme="@style/Theme.IrisClient"> + android:exported="true" + android:screenOrientation="landscape"> @@ -22,23 +22,23 @@ - + android:screenOrientation="landscape"> - + android:exported="true" + android:screenOrientation="landscape"> - + android:exported="true" + android:screenOrientation="landscape"> - + android:exported="true" + android:screenOrientation="landscape"> + \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java new file mode 100644 index 0000000..4575e47 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -0,0 +1,14 @@ +package org.ntlab.irisclient; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class DrawingActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_drawing); + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java index 6c9ef0b..3bcc1db 100644 --- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java @@ -18,6 +18,7 @@ import com.google.android.material.snackbar.Snackbar; import org.ntlab.irisclient.entities.MemberJson; +import org.ntlab.irisclient.entities.RoomJson; import org.ntlab.irisclient.resources.RoomsRest; import java.util.List; @@ -62,10 +63,10 @@ nicknameForm.setError("ニックネームを入力されていません"); roomIdForm.setError("部屋番号を入力されていません"); } else { - Call> call = roomsRest.postMembers(rid,name); - call.enqueue(new Callback>() { + Call call = roomsRest.postMembers(rid,name); + call.enqueue(new Callback() { @Override - public void onResponse(Call> call, Response> response) { + public void onResponse(Call call, Response response) { if(response.isSuccessful()){ Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class); startActivity(intent); @@ -73,7 +74,7 @@ } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call call, Throwable t) { } }); diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index dcefe12..2e61b31 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -6,15 +6,16 @@ import android.view.View; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.ImageButton; import android.widget.ListView; import android.widget.TextView; -import java.lang.reflect.Member; import java.util.ArrayList; public class MemberRoomActivity extends AppCompatActivity { //フィールド + ArrayList members = new ArrayList<>(); String r = "部屋IDがここに表示されるはずです"; @Override @@ -24,39 +25,15 @@ //-------------------------------------------------------------------------- //各ボタン処理 - ArrayList members = new ArrayList<>(); - Button redMasterButton = (Button) findViewById(R.id.beRedMaster); - Button redSpyButton = (Button) findViewById(R.id.beRedSpy); - Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); - Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); + buttonProcesses(); - redMasterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "赤マスターボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - blueMasterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "青マスターボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - //-------------------------------------------------------------------------- //メンバー表示 members.add("1さん"); members.add("2"); - - ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, members); - + ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, members); ListView listView = (ListView)findViewById(R.id.MembersList); listView.setAdapter(adapter); @@ -79,4 +56,67 @@ /*private void addMemberToMemberList(String m){ members.add(m); }*/ + + public void buttonProcesses(){ + Button redMasterButton = (Button) findViewById(R.id.beRedMaster); + Button redSpyButton = (Button) findViewById(R.id.beRedSpy); + Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); + Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); + ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); + ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton); + + redMasterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + r = "赤マスターボタン検知しました"; + TextView RoomIdText = findViewById(R.id.roomID); + RoomIdText.setText(r); + } + }); + + redSpyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + r = "赤諜報員ボタン検知しました"; + TextView RoomIdText = findViewById(R.id.roomID); + RoomIdText.setText(r); + } + }); + + blueMasterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + r = "青マスターボタン検知しました"; + TextView RoomIdText = findViewById(R.id.roomID); + RoomIdText.setText(r); + } + }); + + blueSpyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + r = "青諜報員ボタン検知しました"; + TextView RoomIdText = findViewById(R.id.roomID); + RoomIdText.setText(r); + } + }); + + homeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + r = "ホームボタン検知しました"; + TextView RoomIdText = findViewById(R.id.roomID); + RoomIdText.setText(r); + } + }); + + copyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + r = "コピーボタン検知しました"; + TextView RoomIdText = findViewById(R.id.roomID); + RoomIdText.setText(r); + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java index 8587791..29e3d7b 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java @@ -1,6 +1,7 @@ package org.ntlab.irisclient.entities; import java.util.List; + public class MemberJson { private String nickname; private String belongs; diff --git a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java index 708b405..bb6bfb7 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java @@ -1,8 +1,8 @@ package org.ntlab.irisclient.entities; import android.provider.Settings; - -import java.lang.reflect.Member; +import org.ntlab.irisclient.models.Member; +import org.ntlab.irisclient.models.Room; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -70,8 +70,6 @@ - - //-------------------------------------------------------------- //setter public void setOwnerName(String ownerName) { diff --git a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java index 1aab2fd..ec4a8f8 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java @@ -2,6 +2,7 @@ import org.ntlab.irisclient.entities.MemberJson; import org.ntlab.irisclient.entities.RoomJson; +import org.ntlab.irisclient.models.Settings; import java.util.List; @@ -78,7 +79,7 @@ //---------------------------------------- //設定の情報を入手するメソッド @GET("rooms/{rid}/settings") - Call getSettings( + Call getSettings( @Path("rid") String rid ); @@ -86,7 +87,7 @@ //ゲームの設定を記録するメソッド @FormUrlEncoded @PUT("rooms/{rid}/settings") - Call putSettings( + Call putSettings( @Path("rid") String rid, @Field("drawingTimer") boolean dTimer, @Field("drawingTimerTimes") int dTimerTimes, @@ -98,7 +99,8 @@ //----------------------------------------------- //部屋の情報を入手するメソッド @GET("rooms/{rid}/state") - Call getState( + //ここサーバー側はintになってます + Call getState( @Path("rid") String rid ); @@ -106,7 +108,7 @@ //部屋の状態を記録するメソッド @FormUrlEncoded @PUT("rooms/{rid}/state") - Call putState( + Call putState( @Path("rid") String rid, @Field("nickname") String nickname, @Field("state") Integer state diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java index 7b924f7..bf27c38 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java @@ -57,6 +57,8 @@ }); } + /* + //設定情報の通信、返り値はRoomJsonなら上記のupdateのみで十分なので、不要か？ public void updateSettings(String rid) { final RoomsRest roomsRest = retrofit.create(RoomsRest.class); @@ -75,5 +77,5 @@ } }); - } + }*/ } diff --git a/app/src/main/res/drawable/home_icon.png b/app/src/main/res/drawable/home_icon.png new file mode 100644 index 0000000..88f3e34 --- /dev/null +++ b/app/src/main/res/drawable/home_icon.png Binary files differ diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml new file mode 100644 index 0000000..8b6405a --- /dev/null +++ b/app/src/main/res/layout/activity_drawing.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_member_room.xml b/app/src/main/res/layout/activity_member_room.xml index 8b9de8c..9c6e628 100644 --- a/app/src/main/res/layout/activity_member_room.xml +++ b/app/src/main/res/layout/activity_member_room.xml @@ -53,15 +53,15 @@ + app:layout_constraintVertical_bias="0.653" /> @@ -95,4 +96,19 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/roomID" app:layout_constraintVertical_bias="0.0" /> + + + \ No newline at end of file