Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Shimokawa
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
|
---|
.idea/deploymentTargetDropDown.xml 100644 → 0 |
---|
app/src/main/java/org/ntlab/irisclient/DrawingActivity.java |
---|
app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java |
---|
app/src/main/java/org/ntlab/irisclient/GameMemberActivity.java |
---|
app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java |
---|
app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java |
---|
app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java |
---|
app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java |
---|
app/src/main/java/org/ntlab/irisclient/models/Game.java |
---|
app/src/main/java/org/ntlab/irisclient/models/Turn.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/irisclient/resources/GameRest.java |
---|
app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java |
---|
app/src/main/res/drawable/test01.jpg 0 → 100644 |
---|
|
app/src/main/res/drawable/test02.jpg 0 → 100644 |
---|
|
app/src/main/res/layout/fragment_card_drawing.xml |
---|