diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index fc9b7c3..c1cf82d 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -16,20 +16,21 @@ public class DrawingActivity extends AppCompatActivity implements View.OnClickListener { private DrawingCanvas drawingCanvas; - DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class); + private DrawingStateViewModel drawingStateViewModel; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_drawing); - drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas); + // drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas); //Irisから必要な情報を取得 Iris iris = (Iris) this.getApplication(); String rid = iris.getRid(); String nickName = iris.getNickname(); + drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class); //viewModelに必用な情報をセット drawingStateViewModel.setRid(rid); drawingStateViewModel.setNickName(nickName); @@ -38,14 +39,14 @@ TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView //getKeywords - List keywords = drawingStateViewModel.getKeywords(rid); + //List keywords = drawingStateViewModel.getKeywords(rid); //getDno drawingStateViewModel.getDno().observe(this, new Observer() { @Override public void onChanged(Integer dno) { - String keyword = keywords.get(dno); - textKeyword.setText(keyword); + //String keyword = keywords.get(dno); + //textKeyword.setText(keyword); } });