diff --git a/.idea/misc.xml b/.idea/misc.xml
index bb506a3..13e7453 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,12 +3,10 @@
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java
index cde184d..b56eb3c 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java
@@ -1,11 +1,20 @@
package org.ntlab.acanthus_client.views;
+import android.content.Intent;
import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
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.ActivityMainBinding;
+import org.ntlab.acanthus_client.views.main_menu_ui.mypage.MyPageFragment;
+import org.ntlab.acanthus_client.views.paint.SendScreenShotActivity;
+import org.ntlab.acanthus_client.views.userpage.UserPageActivity;
import androidx.appcompat.app.AppCompatActivity;
import androidx.navigation.NavController;
@@ -17,6 +26,7 @@
public class MainActivity extends AppCompatActivity {
private ActivityMainBinding binding;
+ Intent intent;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -37,4 +47,22 @@
NavigationUI.setupWithNavController(binding.navView, navController);
}
+ // ツールバーにIconを表示
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.botton_nav_icon, menu);
+ return true;
+ }
+ // Iconを押したときMyPageに遷移させたい
+// @Override
+// public boolean onOptionsItemSelected(MenuItem item) {
+// switch (item.getItemId()) {
+// case R.id.icon:
+// intent = new Intent(getApplication(), MyPageFragment.class);
+// startActivity(intent);
+// return true;
+// }
+// return super.onOptionsItemSelected(item);
+// }
+
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_jen_1007042258.png b/app/src/main/res/drawable/icon_jen_1007042258.png
new file mode 100644
index 0000000..1253e7a
--- /dev/null
+++ b/app/src/main/res/drawable/icon_jen_1007042258.png
Binary files differ
diff --git a/app/src/main/res/menu/botton_nav_icon.xml b/app/src/main/res/menu/botton_nav_icon.xml
new file mode 100644
index 0000000..fc8a6d4
--- /dev/null
+++ b/app/src/main/res/menu/botton_nav_icon.xml
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8d59bd..89a98a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,4 +14,5 @@
Not a valid username
Password must be >5 characters
"Login failed"
+ Icon
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 79c656c..95dae99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:7.0.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a813658..ce2cae2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri May 28 14:05:07 JST 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME