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); + } //----------------------------------------------------------------- diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java index ef2ddb3..6ea82bf 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java @@ -11,51 +11,56 @@ import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.views.MainActivity; +//----------------------------------------------------------------- +// 描画シーンの下部のツールバー public class PaintToolBar { - private BottomNavigationView.OnNavigationItemReselectedListener onNavigationItemReselectedListener; + private BottomNavigationView bottomNavigationView; + private BottomNavigationView.OnNavigationItemSelectedListener onNavigationItemSelectedListener; //----------------------------------------------------------------- //----------------------------------------------------------------- public PaintToolBar(AppCompatActivity appCompatActivity, PaintCanvas paintCanvas) { + this.bottomNavigationView = (BottomNavigationView) appCompatActivity.findViewById(R.id.navPaint); - onNavigationItemReselectedListener - = new BottomNavigationView.OnNavigationItemReselectedListener() { + setNavigationListener(appCompatActivity, paintCanvas); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // ナビゲーションバーのタッチ監視 + private void setNavigationListener(AppCompatActivity appCompatActivity, PaintCanvas paintCanvas) { + this.onNavigationItemSelectedListener = new BottomNavigationView.OnNavigationItemSelectedListener() { @Override - public void onNavigationItemReselected(@NonNull MenuItem item) { + public boolean onNavigationItemSelected(@NonNull MenuItem item) { switch (item.getItemId()) { - case R.id.navigation_pen: - break; - + //----------------------------------------------------------------- + // case R.id.navigation_clear: paintCanvas.clearCanvas(); - break; - + return true; + //----------------------------------------------------------------- + // case R.id.navigation_invite: transitionInviteActivity(appCompatActivity); - break; - + return true; } + + return true; } }; + + bottomNavigationView.setOnNavigationItemSelectedListener(this.onNavigationItemSelectedListener); } //----------------------------------------------------------------- - // - public BottomNavigationView.OnNavigationItemReselectedListener getOnNavigationItemReselectedListener() { - return this.onNavigationItemReselectedListener; - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- // 招待ページへ移動 private void transitionInviteActivity(AppCompatActivity appCompatActivity) { Acanthus acanthus = (Acanthus) appCompatActivity.getApplication(); - Intent intent = new Intent(acanthus, InviteActivity.class); + Intent intent = new Intent(acanthus, MainActivity.class); appCompatActivity.startActivity(intent); } - - //----------------------------------------------------------------- //----------------------------------------------------------------- }