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 Conflicts: app/src/main/res/layout/activity_member_game.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
commit cdc7d09cbb0c1efd4319cff9b2e4a75dabad1b92 2 parents 89cf386 + 34dad93 g-akagi authored on 11 Oct 2022

Browse code

Conflicts:
	app/src/main/res/layout/activity_member_game.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

commit cdc7d09cbb0c1efd4319cff9b2e4a75dabad1b92

2 parents 89cf386 + 34dad93

g-akagi authored on 11 Oct 2022

Patch

Unified Split

Showing 12 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/DrawingCardFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/GameMemberActivity.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/entities/GameJson.java 0 → 100644

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 0 → 100644

Show notes View app/src/main/java/org/ntlab/irisclient/models/GameState.java 100644 → 0

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

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

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

Show line notes below