diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java index 9461d79..96a6da2 100644 --- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java @@ -79,9 +79,6 @@ //画面に反映 EditText Hint = findViewById(R.id.GameHint); Hint.setText(hint); - - //操作できるかを判断する。 - isActive = CheckActivity(); } }); @@ -93,10 +90,6 @@ //画面に反映 EditText HintMax = findViewById(R.id.GameHintMax); HintMax.setText(hintMax); - - //操作できるかを判断する。 - isActive = CheckActivity(); - } }); @@ -105,7 +98,7 @@ @Override public void onChanged(String new_currentTeam) { - //画面に反映 + //チームの情報を更新 currentTeam = new_currentTeam; //操作できるかを判断する。 @@ -113,6 +106,21 @@ } }); + /* //「ヒント入力」か「カード選択」かを監視 + gameViewModel.getTurnStateLiveData().observe(this, new Observer() { + @Override + public void onChanged(Integer new_turnState) { + + //チームの情報を更新 + turnState = new_turnState; + + //操作できるかを判断する。 + isActive = CheckActivity(); + } + });*/ + + + } private void buttonProcesses(){ @@ -161,6 +169,14 @@ isActive = true; } + //非アクティブであればヒントの入力を禁止する + if(isActive == false){ + EditText Hint = findViewById(R.id.GameHint); + EditText HintMax = findViewById(R.id.GameHintMax); + Hint.setFocusable(false); + HintMax.setFocusable(false); + } + return isActive; } diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java index 3ceea5a..f620fad 100644 --- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java @@ -42,8 +42,12 @@ Member test3 = new Member("test3"); test2.setBelongs("r"); test3.setBelongs("b"); - players.add(test2); - players.add(test3); + if(players.contains(test2) == false){ + players.add(test2); + } + if(players.contains(test3) == false){ + players.add(test3); + } //memberのリストから名前(string)だけを抽出 ArrayList viewPlayers = new ArrayList<>(); @@ -60,9 +64,6 @@ // BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.fragment_game_player_list, viewPlayers, players); playersList.setAdapter(adapter); - //なぜか他のGamePlayerListFragmentにplayerの内容が引き継がれてしまうので、ここで初期化する。 - players.clear(); - return view; } diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index fc4b9dc..baf2f42 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -150,6 +150,13 @@ Switch dTimer = findViewById(R.id.dTimer); @SuppressLint("UseSwitchCompatOrMaterialCode") Switch gTimer = findViewById(R.id.gTimer); + Switch switch4 = findViewById(R.id.switch4); + Switch switch5 = findViewById(R.id.switch5); + Switch switch6 = findViewById(R.id.switch6); + Switch switch7 = findViewById(R.id.switch7); + Switch switch8 = findViewById(R.id.switch8); + Switch switch9 = findViewById(R.id.switch9); + //OwnerRoom専用ボタン Button randomButton = (Button) findViewById(R.id.random); @@ -213,21 +220,87 @@ dTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - drawingTimer = isChecked; + if(drawingTimer == false){ + switch4.setVisibility(View.GONE); + switch5.setVisibility(View.GONE); + switch6.setVisibility(View.GONE); + }else { + switch4.setVisibility(View.VISIBLE); + switch5.setVisibility(View.VISIBLE); + switch6.setVisibility(View.VISIBLE); + } + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); + switch4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch5.setChecked(false); + switch6.setChecked(false); + } + }); + + switch5.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch4.setChecked(false); + switch6.setChecked(false); + } + }); + + switch6.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch4.setChecked(false); + switch5.setChecked(false); + } + }); + + gTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - gameTimer = isChecked; + if(gameTimer == false){ + switch7.setVisibility(View.GONE); + switch8.setVisibility(View.GONE); + switch9.setVisibility(View.GONE); + }else { + switch7.setVisibility(View.VISIBLE); + switch8.setVisibility(View.VISIBLE); + switch9.setVisibility(View.VISIBLE); + } roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); + switch7.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch8.setChecked(false); + switch9.setChecked(false); + } + }); + + switch8.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch7.setChecked(false); + switch9.setChecked(false); + } + }); + + switch9.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + switch7.setChecked(false); + switch8.setChecked(false); + } + }); + //ランダムボタン randomButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/layout/activity_owner_room.xml b/app/src/main/res/layout/activity_owner_room.xml index 9706b38..ed80f3b 100644 --- a/app/src/main/res/layout/activity_owner_room.xml +++ b/app/src/main/res/layout/activity_owner_room.xml @@ -11,10 +11,11 @@ android:id="@+id/switch7" android:layout_width="73dp" android:layout_height="25dp" - android:layout_marginStart="20dp" android:text="60s" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/beBlueMaster" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.762" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.697" /> @@ -25,8 +26,8 @@ android:text="90s" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.011" - app:layout_constraintStart_toEndOf="@+id/switch4" + app:layout_constraintHorizontal_bias="0.871" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.697" /> @@ -37,8 +38,8 @@ android:text="120s" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.066" - app:layout_constraintStart_toEndOf="@+id/switch5" + app:layout_constraintHorizontal_bias="0.989" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.697" /> @@ -223,10 +224,11 @@ android:id="@+id/switch4" android:layout_width="73dp" android:layout_height="25dp" - android:layout_marginStart="20dp" android:text="20s" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/beRedSpy" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.759" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.45" />