Close drawer if user presses back and it is open. Fix visibility of some menu items

app/src/main/java/com/commit451/gitlab/activity/ActivityActivity.kt

@@ -67,6 +67,14 @@ class ActivityActivity : BaseActivity() {
         return true
     }
+    override fun onBackPressed() {
+        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            drawerLayout.closeDrawer(GravityCompat.START)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         App.bus().unregister(this)

app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.kt

@@ -91,6 +91,14 @@ class GroupsActivity : BaseActivity() {
         load()
     }
+    override fun onBackPressed() {
+        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            drawerLayout.closeDrawer(GravityCompat.START)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         App.bus().unregister(this)

app/src/main/java/com/commit451/gitlab/activity/ProjectsActivity.kt

@@ -66,6 +66,14 @@ class ProjectsActivity : BaseActivity() {
         App.bus().unregister(this)
     }
+    override fun onBackPressed() {
+        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            drawerLayout.closeDrawer(GravityCompat.START)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
     @Subscribe
     fun onEvent(event: CloseDrawerEvent) {
         drawerLayout.closeDrawers()

app/src/main/java/com/commit451/gitlab/activity/TodosActivity.kt

@@ -49,6 +49,14 @@ class TodosActivity : BaseActivity() {
         tabLayout.setupWithViewPager(viewPager)
     }
+    override fun onBackPressed() {
+        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            drawerLayout.closeDrawer(GravityCompat.START)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         App.bus().unregister(this)

app/src/main/res/menu/close.xml

@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_close"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
         android:title="@string/action_close"/>
 </menu>
\ No newline at end of file

app/src/main/res/menu/create.xml

@@ -5,7 +5,6 @@
     <item
         android:id="@+id/action_create"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_add_24dp"
         android:title="@string/action_create"/>
 </menu>
\ No newline at end of file

app/src/main/res/menu/delete.xml

@@ -4,7 +4,7 @@
     <item
         android:id="@+id/action_delete"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
         android:title="@string/action_delete"/>
 </menu>
\ No newline at end of file