Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Shimokawa

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 Shimokawa 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
commit 31a7c27363d31d0ec275f939e35f0925dfbf111f 2 parents 517c501 + 356afee g-akagi authored on 11 Oct 2022

Browse code

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

commit 31a7c27363d31d0ec275f939e35f0925dfbf111f

2 parents 517c501 + 356afee

g-akagi authored on 11 Oct 2022

Patch

Unified Split

Showing 3 changed files

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

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

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

Show line notes below