diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index bb177bc..16f5e75 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -1,13 +1,11 @@ package org.ntlab.acanthus_client.views.paint; -import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import android.content.Intent; import android.os.Bundle; -import android.view.MenuItem; import android.view.View; import android.widget.TextView; @@ -23,7 +21,6 @@ private PaintCanvas paintCanvas; private PaintToolBar paintToolBar; - private ActivityPaintBinding binding; private PaintViewModel paintViewModel; @@ -78,7 +75,6 @@ Acanthus acanthus = (Acanthus) getApplication(); paintViewModel = new ViewModelProvider(this).get(PaintViewModel.class); paintViewModel.init(acanthus); - paintToolBar = new PaintToolBar(this, paintCanvas); startObserve(); } @@ -92,8 +88,8 @@ paintCanvas = (PaintCanvas) findViewById(R.id.myCanvas); paintCanvas.setPaintViewModel(paintViewModel); - BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navPaint); - navigation.setOnNavigationItemReselectedListener(paintToolBar.getOnNavigationItemReselectedListener()); + paintToolBar = new PaintToolBar(this, paintCanvas); + } //-----------------------------------------------------------------