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()); } //----------------------------------------------------------------- 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 new file mode 100644 index 0000000..ef2ddb3 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java @@ -0,0 +1,61 @@ +package org.ntlab.acanthus_client.views.paint; + +import android.content.Intent; +import android.graphics.Paint; +import android.view.MenuItem; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + +import com.google.android.material.bottomnavigation.BottomNavigationView; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.R; + +public class PaintToolBar { + private BottomNavigationView.OnNavigationItemReselectedListener onNavigationItemReselectedListener; + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + public PaintToolBar(AppCompatActivity appCompatActivity, PaintCanvas paintCanvas) { + + 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: + paintCanvas.clearCanvas(); + break; + + case R.id.navigation_invite: + transitionInviteActivity(appCompatActivity); + break; + + } + } + }; + } + + //----------------------------------------------------------------- + // + public BottomNavigationView.OnNavigationItemReselectedListener getOnNavigationItemReselectedListener() { + return this.onNavigationItemReselectedListener; + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // 招待ページへ移動 + private void transitionInviteActivity(AppCompatActivity appCompatActivity) { + Acanthus acanthus = (Acanthus) appCompatActivity.getApplication(); + Intent intent = new Intent(acanthus, InviteActivity.class); + appCompatActivity.startActivity(intent); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + +}