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 d213476..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 @@ -9,6 +9,8 @@ import android.view.View; import android.widget.TextView; +import com.google.android.material.bottomnavigation.BottomNavigationView; + import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.ActivityPaintBinding; @@ -18,6 +20,7 @@ public class PaintActivity extends AppCompatActivity { private PaintCanvas paintCanvas; + private PaintToolBar paintToolBar; private ActivityPaintBinding binding; private PaintViewModel paintViewModel; @@ -85,6 +88,7 @@ paintCanvas = (PaintCanvas) findViewById(R.id.myCanvas); paintCanvas.setPaintViewModel(paintViewModel); + 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 new file mode 100644 index 0000000..6ea82bf --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java @@ -0,0 +1,66 @@ +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; +import org.ntlab.acanthus_client.views.MainActivity; + +//----------------------------------------------------------------- +// 描画シーンの下部のツールバー +public class PaintToolBar { + private BottomNavigationView bottomNavigationView; + private BottomNavigationView.OnNavigationItemSelectedListener onNavigationItemSelectedListener; + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + public PaintToolBar(AppCompatActivity appCompatActivity, PaintCanvas paintCanvas) { + this.bottomNavigationView = (BottomNavigationView) appCompatActivity.findViewById(R.id.navPaint); + + setNavigationListener(appCompatActivity, paintCanvas); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // ナビゲーションバーのタッチ監視 + private void setNavigationListener(AppCompatActivity appCompatActivity, PaintCanvas paintCanvas) { + this.onNavigationItemSelectedListener = new BottomNavigationView.OnNavigationItemSelectedListener() { + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + switch (item.getItemId()) { + //----------------------------------------------------------------- + // + case R.id.navigation_clear: + paintCanvas.clearCanvas(); + return true; + //----------------------------------------------------------------- + // + case R.id.navigation_invite: + transitionInviteActivity(appCompatActivity); + return true; + } + + return true; + } + }; + + bottomNavigationView.setOnNavigationItemSelectedListener(this.onNavigationItemSelectedListener); + } + + //----------------------------------------------------------------- + // 招待ページへ移動 + private void transitionInviteActivity(AppCompatActivity appCompatActivity) { + Acanthus acanthus = (Acanthus) appCompatActivity.getApplication(); + Intent intent = new Intent(acanthus, MainActivity.class); + appCompatActivity.startActivity(intent); + } + //----------------------------------------------------------------- + +} diff --git a/app/src/main/res/layout/activity_paint.xml b/app/src/main/res/layout/activity_paint.xml index d0a2f8f..93059f5 100644 --- a/app/src/main/res/layout/activity_paint.xml +++ b/app/src/main/res/layout/activity_paint.xml @@ -10,11 +10,13 @@ + app:layout_constraintBottom_toTopOf="@+id/navPaint" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" />