Fork: 0
nitta-lab-2022 / IrisClient
Browse code
Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Game_Model
Conflicts:
	app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java
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 5cf467d0031573b1c0e8c275e373e75504be4c97
2 parents 8c1f6ad + ebee5ba
d-matsuura authored on 6 Oct 2022
Patch
Unified Split
Showing 10 changed files
View
app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
View
app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
View
app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
View
app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java
View
app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java
View
app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
View
app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
View
app/src/main/res/layout/activity_drawing.xml
View
app/src/main/res/layout/activity_member_game.xml
View
app/src/main/res/layout/fragment_card_drawing.xml