diff --git a/app/build.gradle b/app/build.gradle index c0afb82cf..2bf05177f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,18 +62,18 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7' implementation 'androidx.core:core-ktx:1.5.0-alpha01' - implementation 'androidx.activity:activity-ktx:1.2.0-alpha06' - implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha06' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha05' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8' + implementation 'androidx.activity:activity-ktx:1.2.0-alpha07' + implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha07' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha06' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04' + implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05' implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'androidx.work:work-runtime-ktx:2.4.0-rc01' - implementation 'com.google.android.material:material:1.3.0-alpha01' + implementation 'androidx.work:work-runtime-ktx:2.4.0' + implementation 'com.google.android.material:material:1.3.0-alpha02' //noinspection LifecycleAnnotationProcessorWithJava8 - kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha05' + kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha06' implementation 'androidx.room:room-runtime:2.2.5' implementation 'androidx.room:room-ktx:2.2.5' diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt index 06442c4df..17633fbc1 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt @@ -92,6 +92,14 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList drawerToggle.onConfigurationChanged(newConfig) } + override fun onBackPressed() { + if (drawer.isDrawerOpen(navigationView)) { + drawer.closeDrawer(navigationView) + } else { + super.onBackPressed() + } + } + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.opt_main, menu) menu.findItem(R.id.action_search)?.let { menuItem -> diff --git a/build.gradle b/build.gradle index 5c3adc9ae..db899757f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-alpha04' + classpath 'com.android.tools.build:gradle:4.2.0-alpha07' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong