Browse code Merge remote-tracking branch 'origin/master' into CreateRoomActivity # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.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 8d9c0af42f7694993b5760f26edff2ef244222be 2 parents 8b20461 + 002f847 k-fujii authored on 24 Jun 2022

Showing 26 changed files

• .idea/dictionaries/student.xml
• .idea/gradle.xml
• .idea/inspectionProfiles/Project_Default.xml
• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/irisclient/MainActivity.java
• app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
• app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
• app/src/main/res/drawable/copy_icon.png
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_member_room.xml
• app/src/main/res/layout/activity_owner_room.xml
• app/src/main/res/layout/recycler_view_item.xml
• app/src/main/res/navigation/nav_graph.xml
• app/src/main/res/navigation/nav_graph2.xml
• app/src/main/res/values-land/dimens.xml
• app/src/main/res/values-w1240dp/dimens.xml
• app/src/main/res/values-w600dp/dimens.xml
• app/src/main/res/values/dimens.xml
• app/src/main/res/values/ids.xml
• app/src/main/res/values/strings.xml
• app/src/main/res/values/themes.xml
• build.gradle
• gradle.properties
• gradle/wrapper/gradle-wrapper.properties

Ignore Space Show notes View .idea/dictionaries/student.xml 0 → 100644

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/inspectionProfiles/Project_Default.xml 0 → 100644

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/navigation/nav_graph.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/navigation/nav_graph2.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values-land/dimens.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values-w1240dp/dimens.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values-w600dp/dimens.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/dimens.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/ids.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Ignore Space Show notes View app/src/main/res/values/themes.xml

Ignore Space Show notes View build.gradle

Ignore Space Show notes View gradle.properties

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.properties

Show line notes below