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

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 GameMemberActivity Conflicts: app/src/main/java/org/ntlab/irisclient/DrawingActivity.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
commit e521cae419aecc35e0b1e0eaaf1c7f53a38e65f8 2 parents c4f8307 + 3b9de4e g-akagi authored on 20 Oct 2022

Browse code

Conflicts:
	app/src/main/java/org/ntlab/irisclient/DrawingActivity.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

commit e521cae419aecc35e0b1e0eaaf1c7f53a38e65f8

2 parents c4f8307 + 3b9de4e

g-akagi authored on 20 Oct 2022

Patch

Unified Split

Showing 10 changed files

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/MemberListAdapter.java

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/models/Game.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/models/Turn.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/resources/RoomsRest.java

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

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

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

Show line notes below