diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3a2ab9b..5dfb9c6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,15 +3,22 @@
-
+
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..cccca2b 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,17 +1,22 @@
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;
+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;
+import org.ntlab.acanthus_client.views.MainActivity;
//-----------------------------------------------------------------
// 描画ページ
@@ -20,6 +25,24 @@
private PaintCanvas paintCanvas;
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;
+
+ }
+ }
+ };
//-----------------------------------------------------------------
//-----------------------------------------------------------------
@@ -74,6 +97,8 @@
paintViewModel.init(acanthus);
startObserve();
+
+
}
//-----------------------------------------------------------------
@@ -85,7 +110,8 @@
paintCanvas = (PaintCanvas) findViewById(R.id.myCanvas);
paintCanvas.setPaintViewModel(paintViewModel);
-
+ BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navPaint);
+ navigation.setOnNavigationItemReselectedListener(onNavigationItemReselectedListener);
}
//-----------------------------------------------------------------
diff --git a/app/src/main/res/layout/activity_paint.xml b/app/src/main/res/layout/activity_paint.xml
index abcf863..b799275 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" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="parent" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_nav_paint.xml b/app/src/main/res/menu/bottom_nav_paint.xml
new file mode 100644
index 0000000..f59c79c
--- /dev/null
+++ b/app/src/main/res/menu/bottom_nav_paint.xml
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file