diff --git a/.idea/misc.xml b/.idea/misc.xml index 7631aec3..84da703c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c78d9f02..94a25f7f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt index dd4422e6..64284234 100644 --- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt @@ -24,6 +24,7 @@ import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.core.content.res.ResourcesCompat +import androidx.core.view.GravityCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.arlib.floatingsearchview.FloatingSearchView @@ -31,6 +32,7 @@ import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion import com.arlib.floatingsearchview.util.view.SearchInputView import com.google.android.material.appbar.AppBarLayout import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.activity_main_content.* import kotlinx.coroutines.* import xyz.quaver.hitomi.* import xyz.quaver.pupil.adapters.GalleryBlockAdapter @@ -80,11 +82,24 @@ class MainActivity : AppCompatActivity() { } } + main_nav_view.setNavigationItemSelectedListener { + Log.d("Pupil", it.itemId.toString()) + + true + } + setupRecyclerView() setupSearchBar() fetchGalleries(query) } + override fun onBackPressed() { + if (main_drawer_layout.isDrawerOpen(GravityCompat.START)) + main_drawer_layout.closeDrawer(GravityCompat.START) + else + super.onBackPressed() + } + private fun checkPermission() { val permissions = arrayOf( Manifest.permission.WRITE_EXTERNAL_STORAGE @@ -299,6 +314,8 @@ class MainActivity : AppCompatActivity() { } } }) + + attachNavigationDrawerToMenuButton(main_drawer_layout) } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 77677f3d..3d702355 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,83 +1,25 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main_drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:openDrawer="start"> - + android:layout_height="match_parent"/> - - - - - - - - - - - - - - - - - - - + android:layout_gravity="start" + android:fitsSystemWindows="true" + app:headerLayout="@layout/nav_header_main" + app:menu="@menu/activity_main_drawer"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml new file mode 100644 index 00000000..f0d84786 --- /dev/null +++ b/app/src/main/res/layout/activity_main_content.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml new file mode 100644 index 00000000..d801cf79 --- /dev/null +++ b/app/src/main/res/layout/nav_header_main.xml @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml new file mode 100644 index 00000000..71a9e813 --- /dev/null +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index ccfb842f..e0995224 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -2,4 +2,9 @@ 64dp 80dp + + 16dp + 16dp + 8dp + 176dp \ No newline at end of file