diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c338..7b71903 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,7 +3,20 @@ - + + + + + + + + + + + + + + diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index 968a7fe..0bb5d3f 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -4,13 +4,17 @@ import android.content.Intent; import android.os.Bundle; import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.FragmentManager; import androidx.navigation.NavController; import androidx.navigation.fragment.NavHostFragment; +import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -51,6 +55,18 @@ public class MainActivity extends AppCompatActivity { return insets; }); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + DrawerLayout drawerLayout = findViewById(R.id.drawerLayout); + drawerLayout.open(); + + ActionBarDrawerToggle actionBarDrawerToggle = + new ActionBarDrawerToggle( + this, drawerLayout, toolbar, R.string.drawer_open, R.string.drawer_close); + drawerLayout.addDrawerListener(actionBarDrawerToggle); + actionBarDrawerToggle.syncState(); + logger = loggerFactory.create("MainActivity"); logger.info("MainActivity started!"); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8405d79..8ef181e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,35 +7,69 @@ android:layout_height="match_parent" tools:context=".MainActivity"> - - - + android:layout_height="match_parent"> - - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml new file mode 100644 index 0000000..8aabc15 --- /dev/null +++ b/app/src/main/res/layout/nav_header.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml new file mode 100644 index 0000000..3836037 --- /dev/null +++ b/app/src/main/res/menu/nav_menu.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 547ac12..07c8fe9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,6 @@ KidShift + + ドロワーを開く + ドロワーを閉じる \ No newline at end of file