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 cccca2b..bb177bc 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 @@ -16,33 +16,16 @@ import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.ActivityPaintBinding; -import org.ntlab.acanthus_client.views.MainActivity; //----------------------------------------------------------------- // 描画ページ public class PaintActivity extends AppCompatActivity { private PaintCanvas paintCanvas; + private PaintToolBar paintToolBar; + private ActivityPaintBinding binding; private PaintViewModel paintViewModel; - private BottomNavigationView.OnNavigationItemReselectedListener onNavigationItemReselectedListener - = new BottomNavigationView.OnNavigationItemReselectedListener() { - @Override - public void onNavigationItemReselected(@NonNull MenuItem item) { - switch (item.getItemId()) { - case R.id.navigation_pen: - break; - - case R.id.navigation_clear: - break; - - case R.id.navigation_invite: - transitionInviteActivity(); - break; - - } - } - }; //----------------------------------------------------------------- //----------------------------------------------------------------- @@ -95,10 +78,9 @@ Acanthus acanthus = (Acanthus) getApplication(); paintViewModel = new ViewModelProvider(this).get(PaintViewModel.class); paintViewModel.init(acanthus); + paintToolBar = new PaintToolBar(this, paintCanvas); startObserve(); - - } //----------------------------------------------------------------- @@ -111,7 +93,7 @@ paintCanvas.setPaintViewModel(paintViewModel); BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navPaint); - navigation.setOnNavigationItemReselectedListener(onNavigationItemReselectedListener); + navigation.setOnNavigationItemReselectedListener(paintToolBar.getOnNavigationItemReselectedListener()); } //-----------------------------------------------------------------