fix git conflict

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

Author: alperozturk96

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

@@ -89,7 +89,7 @@ class ComposeActivity : DrawerActivity() {
 
     private fun setupActivityUIFor(destination: ComposeDestination) {
         if (destination is ComposeDestination.AssistantScreen) {
-            setupDrawer(R.id.nav_assistant)
+            setupDrawer(menuItemId)
             setupToolbarShowOnlyMenuButtonAndTitle(destination.title) {
                 openDrawer()
             }

app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -77,7 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
         viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList);
 
         // setup drawer
-        setupDrawer(R.id.nav_activity);
+        setupDrawer(getMenuItemId());
         updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_activities));
 
         binding.swipeContainingList.setOnRefreshListener(() -> {

app/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.kt

@@ -30,7 +30,7 @@ open class CommunityActivity : DrawerActivity() {
 
         setupToolbar()
         updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_community))
-        setupDrawer(R.id.nav_community)
+        setupDrawer(menuItemId)
         binding.communityReleaseCandidateText.movementMethod = LinkMovementMethod.getInstance()
         setupContributeForumView()
         setupContributeTranslationView()

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -279,8 +279,7 @@ class FileDisplayActivity :
         observeWorkerState()
         startMetadataSyncForRoot()
         handleBackPress()
-        setupDrawer(R.id.nav_all_files)
-        showToast("TEST APK")
+        setupDrawer(menuItemId)
     }
 
     /**

app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt

@@ -183,7 +183,7 @@ class SyncedFoldersActivity :
         // setup toolbar
         setupToolbar()
         updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_synced_folders))
-        setupDrawer(R.id.nav_settings)
+        setupDrawer(menuItemId)
         setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
         if (supportActionBar != null) {
             supportActionBar!!.setDisplayHomeAsUpEnabled(true)

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

@@ -120,7 +120,7 @@ protected void onCreate(Bundle savedInstanceState) {
         updateActionBarTitleAndHomeButtonByString(getString(R.string.uploads_view_title));
 
         // setup drawer
-        setupDrawer(R.id.nav_uploads);
+        setupDrawer(getMenuItemId());
 
         setupContent();
     }

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt

@@ -127,7 +127,7 @@ class TrashbinActivity :
             View.GONE
 
         updateActionBarTitleAndHomeButtonByString(getString(R.string.trashbin_activity_title))
-        setupDrawer(R.id.nav_trashbin)
+        setupDrawer(menuItemId)
         handleBackPress()
     }