Merge branch 'master' into RoomViewModel

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge branch 'master' into RoomViewModel 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 a79e25b5779ae87c9e1df1d51131261da9691088 2 parents 490f035 + 5d0e6ef s-michishita authored on 5 Jul 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 test01

commit a79e25b5779ae87c9e1df1d51131261da9691088

2 parents 490f035 + 5d0e6ef

s-michishita authored on 5 Jul 2022

Patch

Unified Split

Showing 10 changed files

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

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

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

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

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

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

Show line notes below