diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 17e4369..1719529 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,7 +43,11 @@ implementation(libs.recyclerview) implementation(libs.retrofit2.retrofit) implementation(libs.converter.jackson) + implementation(libs.navigation.runtime.android) testImplementation(libs.junit) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) + implementation(libs.navigation.fragment) + implementation(libs.navigation.ui) + } \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendActivity.java b/app/src/main/java/com/example/tampopo_client/views/FriendActivity.java index d595f25..8aae1a7 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendActivity.java @@ -11,16 +11,18 @@ import androidx.navigation.NavController; import androidx.navigation.Navigation; import com.example.tampopo_client.databinding.ActivityFriendBinding; +import androidx.navigation.ui.AppBarConfiguration; +import androidx.navigation.ui.NavigationUI; import com.example.tampopo_client.R; import com.google.android.material.bottomnavigation.BottomNavigationView; public class FriendActivity extends AppCompatActivity { - private FriendActivity binding; + private ActivityFriendBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + // EdgeToEdge.enable(this); // setContentView(R.layout.activity_friend); // ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { @@ -29,7 +31,7 @@ // return insets; // }); // } - ActivityFriendBinding binding = FriendActivity.inflate(getLayoutInflater()); + ActivityFriendBinding binding = ActivityFriendBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); BottomNavigationView navView = findViewById(R.id.nav_view); diff --git a/app/src/main/res/layout/activity_friend.xml b/app/src/main/res/layout/activity_friend.xml index ef980a5..85365a5 100644 --- a/app/src/main/res/layout/activity_friend.xml +++ b/app/src/main/res/layout/activity_friend.xml @@ -1,45 +1,79 @@ - - + android:paddingTop="?attr/actionBarSize"> + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:menu="@menu/bottom_nav_menu" /> - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index fb6d040..1736064 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -3,17 +3,23 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index a8fab43..c32545f 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -3,10 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/mobile_navigation.xml" - app:startDestination="@id/FriendActivity"> + app:startDestination="@id/title_home"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3361ad6..69c41d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,8 @@ tampopo-client + ホーム + ダッシュボード + 通知 + 友達リスト + \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7db8943..d340e83 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,6 +12,8 @@ retrofit = "3.1.0-SNAPSHOT" retrofitVersion = "3.0.0" converterJackson = "3.0.0" +navigationRuntimeAndroid = "2.9.0" +navigation = "2.6.0" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } @@ -26,6 +28,10 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } retrofit2-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofitVersion" } converter-jackson = { group = "com.squareup.retrofit2", name = "converter-jackson", version.ref = "converterJackson" } +navigation-runtime-android = { group = "androidx.navigation", name = "navigation-runtime-android", version.ref = "navigationRuntimeAndroid" } +navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "navigation" } +navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "navigation" } + [plugins] android-application = { id = "com.android.application", version.ref = "agp" }