Use all files as default menuItem

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt

@@ -36,7 +36,7 @@ import java.lang.ref.WeakReference
 class ComposeActivity : DrawerActivity() {
 
     lateinit var binding: ActivityComposeBinding
-    private var menuItemId: Int? = null
+    private var menuItemId: Int = R.id.nav_all_files
 
     companion object {
         const val DESTINATION = "DESTINATION"
@@ -51,13 +51,9 @@ class ComposeActivity : DrawerActivity() {
 
         val destination = intent.getSerializableArgument(DESTINATION, ComposeDestination::class.java)
         val titleId = intent.getIntExtra(TITLE, R.string.empty)
-        menuItemId = intent.getIntExtra(MENU_ITEM, -1)
+        menuItemId = intent.getIntExtra(MENU_ITEM, R.id.nav_all_files)
 
-        if (menuItemId != -1) {
-            setupDrawer(menuItemId!!)
-        } else {
-            setupDrawer()
-        }
+        setupDrawer(menuItemId)
 
         setupToolbarShowOnlyMenuButtonAndTitle(getString(titleId)) {
             toggleDrawer()
@@ -75,9 +71,7 @@ class ComposeActivity : DrawerActivity() {
 
     override fun onResume() {
         super.onResume()
-        if (menuItemId != -1) {
-            setDrawerMenuItemChecked(R.id.nav_assistant)
-        }
+        setDrawerMenuItemChecked(menuItemId)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -29,8 +29,10 @@ import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.SystemClock;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -484,6 +486,8 @@ public abstract class DrawerActivity extends ToolbarActivity
     }
 
     private void onNavigationItemClicked(final MenuItem menuItem) {
+        closeDrawer();
+
         setDrawerMenuItemChecked(menuItem.getItemId());
 
         int itemId = menuItem.getItemId();