Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into GameActivity0920 Conflicts: .idea/misc.xml DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01

commit 5ac6e4a2b9f9469c0888ff76e22393d0f49a5530 2 parents ea1ff55 + 69451ec yugo-asano authored on 4 Oct 2022

Showing 17 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
• app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java
• app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java
• app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java
• app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
• app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
• app/src/main/java/org/ntlab/irisclient/viewmodels/TimerViewModel.java
• app/src/main/res/layout/activity_drawing.xml
• app/src/main/res/layout/activity_member_room.xml
• app/src/main/res/layout/member_list_layout.xml

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml 0 → 100644

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/DrawingActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/DrawingCanvas.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/viewmodels/TimerViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_drawing.xml

Ignore Space Show notes View app/src/main/res/layout/activity_member_room.xml

Ignore Space Show notes View app/src/main/res/layout/member_list_layout.xml 0 → 100644

Show line notes below