diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 940a6c1..f93a860 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:theme="@style/Theme.IrisClient" android:usesCleartextTraffic="true"> () { + @Override + public void onChanged(Integer state) { + if(state >= 1){ + Intent intent = new Intent(MemberRoomActivity.this,DrawingActivity.class); + startActivity(intent); + } + } + }); + //-------------------------------------------------------------------------- //各ボタン処理 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 3e00dab..1c45183 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -31,6 +31,15 @@ final private MutableLiveData settingsMutableLiveData; final private Retrofit retrofit; + + + + + + + + + //更新比較用フィールド private Settings settingsPreData; private RoomJson roomJsonPreData; diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml deleted file mode 100644 index 73857ca..0000000 --- a/app/src/main/res/layout/activity_game.xml +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -