diff --git a/.idea/misc.xml b/.idea/misc.xml
index cf9962a..ca67949 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a2cfbd..4aa667e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,11 +29,11 @@
android:name=".MainActivity"
android:exported="true"
android:screenOrientation="landscape" >
-
-
+
+
-
-
+
+
+ android:screenOrientation="landscape">
+
+
+
+
+
+
keywordList;
+ private Integer drawingNum;
+ private Integer drawingNow = 1;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -31,6 +35,7 @@
String rid = iris.getRid();
String nickName = iris.getNickname();
Boolean bMaster = iris.isMaster();
+ List memberList = iris.getMemberList();
drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class);
//viewModelに必用な情報をセット
@@ -42,10 +47,17 @@
findViewById(R.id.eraserButton).setOnClickListener(this);//消しゴムボタン
TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView
+ TextView textMemberNum = (TextView)findViewById(R.id.drawingNowText);//残りのイラスト枚数のTextView
drawingCanvas = (DrawingCanvas) findViewById(R.id.drawingCanvas);
- //getKeywords
+ //残りのイラスト枚数の表示
+// if(memberList.size() != 0) {
+// drawingNum = 16 / memberList.size(); // 一人あたりが描く枚数
+// if (16 % memberList.size() != 0) drawingNum++; // 余りが出た場合プラス1枚
+// textMemberNum.setText("" + drawingNow + "/" + drawingNum);
+// }
+ //getKeywords
drawingStateViewModel.getKeywords().observe(this, new Observer>(){
@Override
public void onChanged(List keywords) {
@@ -59,6 +71,8 @@
public void onChanged(Integer dno) {
String keyword = keywordList.get(dno);
textKeyword.setText("Dno: " + dno + ", Keyword: " + keyword);
+// drawingNow++;
+// textMemberNum.setText(""+drawingNow+"/"+drawingNum);
}
});
@@ -80,7 +94,7 @@
//getKeywordの呼び出し
drawingStateViewModel.init();
//タイマースタート呼び出し
- drawingStateViewModel.start(500);
+ drawingStateViewModel.start(500,(Iris)getApplication());
}
@Override
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index 84e2276..265f6ac 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -39,7 +39,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.121"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/testText"
+ app:layout_constraintTop_toBottomOf="@+id/drawingNowText"
app:layout_constraintVertical_bias="1.0" />