Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Shimokawa Conflicts: .idea/misc.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 test01

commit 379964682fe34fd971a92f4872f0e16335ada5f5 2 parents e09601c + be9d145 g-akagi authored on 15 Jul 2022

Showing 12 changed files

• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/irisclient/DrawingActivity.java
• app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
• app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
• app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java
• app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
• app/src/main/res/drawable/home_icon.png
• app/src/main/res/layout/activity_drawing.xml
• app/src/main/res/layout/activity_member_room.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

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

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/entities/RoomJson.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/RoomViewModel.java

Ignore Space Show notes View app/src/main/res/drawable/home_icon.png 0 → 100644

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

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

Show line notes below