show alert dialog instead of snackbar

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

@@ -53,6 +53,7 @@ import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.adapter.SyncedFolderAdapter
 import com.owncloud.android.ui.decoration.MediaGridItemDecoration
+import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
 import com.owncloud.android.ui.dialog.SyncedFolderPreferencesDialogFragment
 import com.owncloud.android.ui.dialog.SyncedFolderPreferencesDialogFragment.OnSyncedFolderPreferenceListener
 import com.owncloud.android.ui.dialog.parcel.SyncedFolderParcelable
@@ -77,6 +78,7 @@ class SyncedFoldersActivity :
 
     companion object {
         private const val SYNCED_FOLDER_PREFERENCES_DIALOG_TAG = "SYNCED_FOLDER_PREFERENCES_DIALOG"
+        private const val SUB_FOLDER_WARNING_DIALOG_TAG = "SUB_FOLDER_WARNING_DIALOG_TAG"
 
         // yes, there is a typo in this value
         private const val KEY_SYNCED_FOLDER_INITIATED_PREFIX = "syncedFolderIntitiated_"
@@ -714,6 +716,21 @@ class SyncedFoldersActivity :
         }
     }
 
+    override fun showSubFolderWarningDialog() {
+        val dialog = ConfirmationDialogFragment.newInstance(
+            R.string.auto_upload_sub_folder_warning,
+            null,
+            0,
+            R.string.common_ok,
+            -1,
+            -1
+        )
+
+        if (isDialogFragmentReady(dialog)) {
+            dialog.show(supportFragmentManager, SUB_FOLDER_WARNING_DIALOG_TAG)
+        }
+    }
+
     private fun saveOrUpdateSyncedFolder(item: SyncedFolderDisplayItem) {
         if (item.id == SyncedFolder.UNPERSISTED_ID) {
             // newly set up folder sync config

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

@@ -28,7 +28,6 @@
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.core.Clock;
 import com.nextcloud.client.di.Injectable;
@@ -64,6 +63,7 @@
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.view.MenuItemCompat;
@@ -94,6 +94,7 @@ public class UploadFilesActivity extends DrawerActivity implements LocalFileList
     private static final String ENCRYPTED_FOLDER_KEY = "encrypted_folder";
 
     private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
+    private static final String SUB_FOLDER_WARNING_DIALOG_TAG = "SUB_FOLDER_WARNING_DIALOG";
     private static final String TAG = "UploadFilesActivity";
     private static final String WAIT_DIALOG_TAG = "WAIT";
 
@@ -659,9 +660,7 @@ public void onClick(View v) {
                     setResult(RESULT_OK, data);
 
                     if (isGivenLocalPathHasEnabledParent()) {
-                        Snackbar.make(findViewById(android.R.id.content), getString(R.string.auto_upload_sub_folder_warning), Snackbar.LENGTH_LONG)
-                            .setAction(getString(R.string.common_ok), snackBarView -> finish())
-                            .show();
+                        showSubFolderWarningDialog();
                     } else {
                         finish();
                     }
@@ -676,6 +675,32 @@ public void onClick(View v) {
         }
     }
 
+    private void showSubFolderWarningDialog() {
+        final var dialog = ConfirmationDialogFragment.newInstance(
+            R.string.auto_upload_sub_folder_warning, null, 0, R.string.common_ok,  R.string.common_cancel, -1);
+        dialog.setOnConfirmationListener(new ConfirmationDialogFragmentListener() {
+            @Override
+            public void onConfirmation(@Nullable String callerTag) {
+                finish();
+            }
+
+            @Override
+            public void onNeutral(@Nullable String callerTag) {
+
+            }
+
+            @Override
+            public void onCancel(@Nullable String callerTag) {
+
+            }
+        });
+
+        final var isDialogFragmentReady = ActivityExtensionsKt.isDialogFragmentReady(this, dialog);
+        if (isDialogFragmentReady) {
+            dialog.show(getSupportFragmentManager(), SUB_FOLDER_WARNING_DIALOG_TAG);
+        }
+    }
+
     @Override
     public void onConfirmation(String callerTag) {
         Log_OC.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag);

app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt

@@ -34,7 +34,6 @@ import com.owncloud.android.datamodel.SyncedFolderDisplayItem
 import com.owncloud.android.datamodel.ThumbnailsCacheManager
 import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncMediaThumbnailDrawable
 import com.owncloud.android.datamodel.ThumbnailsCacheManager.MediaThumbnailGenerationTask
-import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
 import java.util.Locale
@@ -302,8 +301,7 @@ class SyncedFolderAdapter(
             if (isVisible) {
                 viewThemeUtils.platform.themeImageButton(this)
                 setOnClickListener {
-                    val message = context.getString(R.string.auto_upload_sub_folder_warning)
-                    DisplayUtils.showSnackMessage(holder.itemView, message)
+                    clickListener.showSubFolderWarningDialog()
                 }
             }
         }
@@ -444,6 +442,7 @@ class SyncedFolderAdapter(
         fun onSyncStatusToggleClick(section: Int, syncedFolderDisplayItem: SyncedFolderDisplayItem?)
         fun onSyncFolderSettingsClick(section: Int, syncedFolderDisplayItem: SyncedFolderDisplayItem?)
         fun onVisibilityToggleClick(section: Int, item: SyncedFolderDisplayItem?)
+        fun showSubFolderWarningDialog()
     }
 
     internal class HeaderViewHolder(var binding: SyncedFoldersItemHeaderBinding) : SectionedViewHolder(