Browse code Merge remote-tracking branch 'origin/master' into OwnerRoomActivity # Conflicts: # app/build.gradle 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 1c4fdfdc9d72e9cafa4875ec58a488d6aad9f586 2 parents 850cf6d + 95fd9d3 r-nishimura authored on 1 Jul 2022

Showing 11 changed files

• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/MainActivity.java
• app/src/main/java/org/ntlab/irisclient/models/Room.java
• app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
• app/src/main/res/drawable-v24/backbottom.jpeg
• app/src/main/res/layout/activity_create_room.xml
• app/src/main/res/layout/activity_enter_room.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/build.gradle

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

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

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

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/models/Room.java 0 → 100644

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

Ignore Space Show notes View app/src/main/res/drawable-v24/backbottom.jpeg 0 → 100644

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

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

Show line notes below