Put OCFileListBottomSheetDialog into a DialogFragment

Can't inject things into a Dialog

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java

@@ -57,7 +57,7 @@ import com.owncloud.android.lib.resources.users.Status;
 import com.owncloud.android.lib.resources.users.StatusType;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.fragment.OCFileListBottomSheetActions;
-import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialog;
+import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialogFragment;
 import com.owncloud.android.ui.fragment.ProfileBottomSheetDialog;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ScreenshotTest;
@@ -391,17 +391,13 @@ public class DialogFragmentIT extends AbstractIT {
         capability.setRichDocumentsDirectEditing(CapabilityBooleanType.TRUE);
         capability.setRichDocumentsTemplatesAvailable(CapabilityBooleanType.TRUE);
 
-        OCFileListBottomSheetDialog sut = new OCFileListBottomSheetDialog(fda,
-                                                                          action,
-                                                                          info,
-                                                                          user,
-                                                                          ocFile);
+        OCFileListBottomSheetDialogFragment sut = new OCFileListBottomSheetDialogFragment(fda,
+                                                                                  action,
+                                                                                  info,
+                                                                                  user,
+                                                                                  ocFile);
 
-        fda.runOnUiThread(sut::show);
-
-        waitForIdleSync();
-
-        screenshot(sut.getWindow().getDecorView());
+        showDialog(fda, sut);
     }
 
     @Test

app/src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -100,6 +100,7 @@ import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.FileDetailSharingFragment;
 import com.owncloud.android.ui.fragment.GalleryFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;
+import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialogFragment;
 import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialog;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.fragment.SharedListFragment;
@@ -418,4 +419,7 @@ abstract class ComponentsModule {
 
     @ContributesAndroidInjector
     abstract StoragePermissionDialogFragment storagePermissionDialogFragment();
+
+    @ContributesAndroidInjector
+    abstract OCFileListBottomSheetDialogFragment ocfileListBottomSheetDialogFragment();
 }

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java

@@ -52,9 +52,6 @@ import javax.inject.Inject;
  * FAB menu {@link android.app.Dialog} styled as a bottom sheet for main actions.
  */
 public class OCFileListBottomSheetDialog extends BottomSheetDialog implements Injectable {
-    @Inject ThemeColorUtils themeColorUtils;
-    @Inject ThemeUtils themeUtils;
-    @Inject ThemeDrawableUtils themeDrawableUtils;
 
     private FileListActionsBottomSheetFragmentBinding binding;
     private final OCFileListBottomSheetActions actions;
@@ -62,18 +59,28 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog implements In
     private final DeviceInfo deviceInfo;
     private final User user;
     private final OCFile file;
+    private final ThemeColorUtils themeColorUtils;
+    private final ThemeUtils themeUtils;
+    private final ThemeDrawableUtils themeDrawableUtils;
+
 
     public OCFileListBottomSheetDialog(FileActivity fileActivity,
                                        OCFileListBottomSheetActions actions,
                                        DeviceInfo deviceInfo,
                                        User user,
-                                       OCFile file) {
+                                       OCFile file,
+                                       ThemeColorUtils themeColorUtils,
+                                       ThemeUtils themeUtils,
+                                       ThemeDrawableUtils themeDrawableUtils) {
         super(fileActivity);
         this.actions = actions;
         this.fileActivity = fileActivity;
         this.deviceInfo = deviceInfo;
         this.user = user;
         this.file = file;
+        this.themeColorUtils = themeColorUtils;
+        this.themeUtils = themeUtils;
+        this.themeDrawableUtils = themeDrawableUtils;
     }
 
     @Override

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialogFragment.kt

@@ -0,0 +1,66 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Álvaro Brey Vilas
+ * Copyright (C) 2022 Álvaro Brey Vilas
+ * Copyright (C) 2022 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.fragment
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.nextcloud.client.account.User
+import com.nextcloud.client.device.DeviceInfo
+import com.nextcloud.client.di.Injectable
+import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.ui.activity.FileActivity
+import com.owncloud.android.utils.theme.ThemeColorUtils
+import com.owncloud.android.utils.theme.ThemeDrawableUtils
+import com.owncloud.android.utils.theme.ThemeUtils
+import javax.inject.Inject
+
+class OCFileListBottomSheetDialogFragment(
+    private val fileActivity: FileActivity,
+    private val actions: OCFileListBottomSheetActions,
+    private val deviceInfo: DeviceInfo,
+    private val user: User,
+    private val file: OCFile
+) : DialogFragment(), Injectable {
+
+    @Inject
+    lateinit var themeColorUtils: ThemeColorUtils
+
+    @Inject
+    lateinit var themeUtils: ThemeUtils
+
+    @Inject
+    lateinit var themeDrawableUtils: ThemeDrawableUtils
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return OCFileListBottomSheetDialog(
+            fileActivity,
+            actions,
+            deviceInfo,
+            user,
+            file,
+            themeColorUtils,
+            themeUtils,
+            themeDrawableUtils
+        )
+    }
+}

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -180,6 +180,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     private static final String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
     private static final String DIALOG_CREATE_DOCUMENT = "DIALOG_CREATE_DOCUMENT";
+    private static final String DIALOG_BOTTOM_SHEET = "DIALOG_BOTTOM_SHEET";
 
     private static final int SINGLE_SELECTION = 1;
     private static final int NOT_ENOUGH_SPACE_FRAG_REQUEST_CODE = 2;
@@ -462,12 +463,15 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
         if (mFabMain != null) { // is not available in FolderPickerActivity
             themeFabUtils.colorFloatingActionButton(mFabMain, R.drawable.ic_plus, requireContext());
-            mFabMain.setOnClickListener(v -> new OCFileListBottomSheetDialog(activity,
-                                                                             this,
-                                                                             deviceInfo,
-                                                                             accountManager.getUser(),
-                                                                             getCurrentFile())
-                .show());
+            mFabMain.setOnClickListener(v -> {
+                final OCFileListBottomSheetDialogFragment dialog =
+                    new OCFileListBottomSheetDialogFragment(activity,
+                                                            this,
+                                                            deviceInfo,
+                                                            accountManager.getUser(),
+                                                            getCurrentFile());
+                dialog.show(getActivity().getSupportFragmentManager(), DIALOG_BOTTOM_SHEET);
+            });
         }
     }