[stable-3.34] Bottom sheet theming & Collabora

app/src/androidTest/java/com/nmc/android/OCFileListBottomSheetDialogIT.kt

@@ -0,0 +1,113 @@
+package com.nmc.android
+
+import android.os.Looper
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.gson.Gson
+import com.nextcloud.client.device.DeviceInfo
+import com.nextcloud.client.documentscan.AppScanOptionalFeature
+import com.nextcloud.utils.EditorUtils
+import com.owncloud.android.AbstractIT
+import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
+import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.lib.common.Creator
+import com.owncloud.android.lib.common.DirectEditing
+import com.owncloud.android.lib.resources.status.CapabilityBooleanType
+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.utils.MimeTypeUtil
+import com.owncloud.android.utils.theme.CapabilityUtils
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+
+class OCFileListBottomSheetDialogIT : AbstractIT() {
+
+    @Mock
+    private lateinit var actions: OCFileListBottomSheetActions
+
+    @get:Rule
+    val activityRule = IntentsTestRule(FileDisplayActivity::class.java, true, true)
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.initMocks(this)
+    }
+
+    @Test
+    fun validateCreateTextDocumentMenuOption() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare()
+        }
+
+        val info = DeviceInfo()
+        val ocFile = OCFile("/test.md")
+
+        // add direct editing info
+        val creatorMap = mutableMapOf<String, Creator>()
+        creatorMap["1"] = Creator(
+            "1",
+            "md",
+            "markdown file",
+            ".md",
+            MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN,
+            false
+        )
+
+        val directEditing = DirectEditing(
+            creators = creatorMap
+        )
+
+        val json = Gson().toJson(directEditing)
+        ArbitraryDataProviderImpl(targetContext).storeOrUpdateKeyValue(
+            user.accountName,
+            ArbitraryDataProvider.DIRECT_EDITING,
+            json
+        )
+
+        val capability = activityRule.activity.capabilities
+        capability.richDocuments = CapabilityBooleanType.TRUE
+        capability.richDocumentsDirectEditing = CapabilityBooleanType.TRUE
+        capability.richDocumentsTemplatesAvailable = CapabilityBooleanType.TRUE
+        capability.accountName = user.accountName
+        CapabilityUtils.updateCapability(capability)
+
+        val appScanOptionalFeature: AppScanOptionalFeature = object : AppScanOptionalFeature() {
+            override fun getScanContract(): ActivityResultContract<Unit, String?> {
+                throw UnsupportedOperationException("Document scan is not available")
+            }
+        }
+
+        val editorUtils = EditorUtils(ArbitraryDataProviderImpl(targetContext))
+        val sut = OCFileListBottomSheetDialog(
+            activityRule.activity,
+            actions,
+            info,
+            user,
+            ocFile,
+            activityRule.activity.themeUtils,
+            activityRule.activity.viewThemeUtils,
+            editorUtils,
+            appScanOptionalFeature
+        )
+
+        activityRule.activity.runOnUiThread { sut.show() }
+
+        waitForIdleSync()
+
+        sut.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        shortSleep()
+
+        onView(withText("Create text document")).check(matches(isCompletelyDisplayed()))
+    }
+}

app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt

@@ -18,9 +18,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.IdRes
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.os.bundleOf
 import androidx.core.view.isEmpty
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.setFragmentResult
@@ -98,8 +98,6 @@ class FileActionsBottomSheet :
         bottomSheetDialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
         bottomSheetDialog.behavior.skipCollapsed = true
 
-        viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
-
         return binding.root
     }
 
@@ -151,7 +149,11 @@ class FileActionsBottomSheet :
 
     private fun setMultipleFilesThumbnail() {
         context?.let {
-            val drawable = viewThemeUtils.platform.tintDrawable(it, R.drawable.file_multiple, ColorRole.PRIMARY)
+            // NMC Customization
+            val drawable = viewThemeUtils.platform.colorDrawable(
+                ResourcesCompat.getDrawable(it.resources, R.drawable.file_multiple, null)!!,
+                it.resources.getColor(R.color.primary, null)
+            )
             binding.thumbnailLayout.thumbnail.setImageDrawable(drawable)
         }
     }
@@ -292,12 +294,8 @@ class FileActionsBottomSheet :
                 }
                 text.setText(action.title)
                 if (action.icon != null) {
-                    val drawable =
-                        viewThemeUtils.platform.tintDrawable(
-                            requireContext(),
-                            AppCompatResources.getDrawable(requireContext(), action.icon)!!
-                        )
-                    icon.setImageDrawable(drawable)
+                    // NMC customization
+                    icon.setImageResource(action.icon)
                 }
             }
         return itemBinding.root

app/src/main/java/com/nextcloud/ui/trashbinFileActions/TrashbinFileActionsBottomSheet.kt

@@ -12,7 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.IdRes
-import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.isEmpty
 import androidx.core.view.isVisible
@@ -136,7 +136,11 @@ class TrashbinFileActionsBottomSheet :
 
     private fun setMultipleFilesThumbnail() {
         context?.let {
-            val drawable = viewThemeUtils.platform.tintDrawable(it, R.drawable.file_multiple, ColorRole.PRIMARY)
+            // NMC Customization
+            val drawable = viewThemeUtils.platform.colorDrawable(
+                ResourcesCompat.getDrawable(it.resources, R.drawable.file_multiple, null)!!,
+                it.resources.getColor(R.color.primary, null)
+            )
             binding.thumbnailLayout.thumbnail.setImageDrawable(drawable)
         }
     }
@@ -198,12 +202,8 @@ class TrashbinFileActionsBottomSheet :
                 }
                 text.setText(action.title)
                 if (action.icon != null) {
-                    val drawable =
-                        viewThemeUtils.platform.tintDrawable(
-                            requireContext(),
-                            AppCompatResources.getDrawable(requireContext(), action.icon)!!
-                        )
-                    icon.setImageDrawable(drawable)
+                    // NMC customization
+                    icon.setImageResource(action.icon)
                 }
             }
         return itemBinding.root

app/src/main/java/com/nextcloud/utils/BuildHelper.kt

@@ -6,10 +6,9 @@
  */
 package com.nextcloud.utils
 
-import com.owncloud.android.BuildConfig
-
 object BuildHelper {
     const val GPLAY: String = "gplay"
 
-    fun isFlavourGPlay(): Boolean = GPLAY == BuildConfig.FLAVOR
+    // NMC Customization to have it false always
+    fun isFlavourGPlay(): Boolean = false
 }

app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt

@@ -19,7 +19,6 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.utils.IntentUtil.createSendIntent
 import com.owncloud.android.R
@@ -58,7 +57,6 @@ class SendFilesDialog :
         binding = SendFilesFragmentBinding.inflate(inflater, container, false)
 
         setupSendButtonRecyclerView()
-        viewThemeUtils?.platform?.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
 
         return binding.root
     }

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

@@ -42,23 +42,6 @@ class GalleryFragmentBottomSheetDialog(private val actions: GalleryFragmentBotto
     }
 
     private fun setupLayout() {
-        viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
-
-        listOf(
-            binding.tickMarkShowImages,
-            binding.tickMarkShowVideos
-        ).forEach {
-            viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY)
-        }
-
-        listOf(
-            binding.btnSelectMediaFolder,
-            binding.btnHideVideos,
-            binding.btnHideImages
-        ).forEach {
-            viewThemeUtils.material.colorMaterialButtonText(it)
-        }
-
         when (currentMediaState) {
             MediaState.MEDIA_STATE_PHOTOS_ONLY -> {
                 binding.tickMarkShowImages.visibility = View.VISIBLE

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

@@ -11,7 +11,6 @@ import android.os.Bundle
 import android.view.View
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.gson.Gson
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.User
 import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.di.Injectable
@@ -28,6 +27,7 @@ import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ThemeUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
+import androidx.core.content.ContextCompat
 
 @Suppress("LongParameterList")
 class OCFileListBottomSheetDialog(
@@ -50,7 +50,8 @@ class OCFileListBottomSheetDialog(
         binding = FileListActionsBottomSheetFragmentBinding.inflate(layoutInflater)
         setContentView(binding.getRoot())
 
-        applyBranding()
+        // NMC Customization
+        reorderUploadFromOtherAppsView()
         binding.addToCloud.text = context.resources.getString(
             R.string.add_to_cloud,
             themeUtils.getDefaultDisplayNameForRootFolder(context)
@@ -63,24 +64,10 @@ class OCFileListBottomSheetDialog(
             binding.menuDirectCameraUpload.visibility = View.GONE
         }
 
-        createRichWorkspace()
         setupClickListener()
         filterActionsForOfflineOperations()
     }
 
-    private fun applyBranding() {
-        viewThemeUtils.platform.run {
-            binding.run {
-                colorImageView(menuIconUploadFiles, ColorRole.PRIMARY)
-                colorImageView(menuIconUploadFromApp, ColorRole.PRIMARY)
-                colorImageView(menuIconDirectCameraUpload, ColorRole.PRIMARY)
-                colorImageView(menuIconScanDocUpload, ColorRole.PRIMARY)
-                colorImageView(menuIconMkdir, ColorRole.PRIMARY)
-                colorImageView(menuIconAddFolderInfo, ColorRole.PRIMARY)
-            }
-        }
-    }
-
     @Suppress("ComplexCondition")
     private fun checkTemplateVisibility() {
         val capability = fileActivity.capabilities
@@ -112,21 +99,24 @@ class OCFileListBottomSheetDialog(
                     FileListActionsBottomSheetCreatorBinding.inflate(layoutInflater)
 
                 val creatorView: View = creatorViewBinding.getRoot()
-
-                creatorViewBinding.creatorName.text = String.format(
-                    fileActivity.getString(R.string.editor_placeholder),
-                    fileActivity.getString(R.string.create_new),
-                    creator.name
-                )
-
-                creatorViewBinding.creatorThumbnail.setImageDrawable(
-                    MimeTypeUtil.getFileTypeIcon(
-                        creator.mimetype,
-                        creator.extension,
-                        creatorViewBinding.creatorThumbnail.context,
-                        viewThemeUtils
-                    )
-                )
+                //for NMC we have different text and icon for Markdown(.md) menu
+                if (creator.mimetype == MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) {
+                    creatorViewBinding.creatorName.text = fileActivity.getString(R.string.create_text_document)
+                    creatorViewBinding.creatorThumbnail.setImageDrawable(
+                        ContextCompat.getDrawable(
+                            context,
+                        R.drawable.ic_new_txt_doc))
+                } else {
+                    creatorViewBinding.creatorName.text = String.format(fileActivity.getString(R.string.editor_placeholder),
+                        fileActivity.getString(R.string.create_new),
+                        creator.name)
+
+                    creatorViewBinding.creatorThumbnail.setImageDrawable(
+                        MimeTypeUtil.getFileTypeIcon(creator.mimetype,
+                            creator.extension,
+                            creatorViewBinding.creatorThumbnail.context,
+                            viewThemeUtils))
+                }
 
                 creatorView.setOnClickListener {
                     actions.showTemplate(creator, creatorViewBinding.creatorName.text.toString())
@@ -138,25 +128,6 @@ class OCFileListBottomSheetDialog(
         }
     }
 
-    private fun createRichWorkspace() {
-        if (editorUtils.isEditorAvailable(user, MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) && !file.isEncrypted) {
-            // richWorkspace
-            // == "": no info set -> show button
-            // == null: disabled on server side -> hide button
-            // != "": info set -> hide button
-            if (file.richWorkspace == null || "" != file.richWorkspace) {
-                binding.menuCreateRichWorkspace.visibility = View.GONE
-                binding.menuCreateRichWorkspaceDivider.visibility = View.GONE
-            } else {
-                binding.menuCreateRichWorkspace.visibility = View.VISIBLE
-                binding.menuCreateRichWorkspaceDivider.visibility = View.VISIBLE
-            }
-        } else {
-            binding.menuCreateRichWorkspace.visibility = View.GONE
-            binding.menuCreateRichWorkspaceDivider.visibility = View.GONE
-        }
-    }
-
     private fun setupClickListener() {
         binding.run {
             menuCreateRichWorkspace.setOnClickListener {
@@ -210,6 +181,17 @@ class OCFileListBottomSheetDialog(
         }
     }
 
+    private fun reorderUploadFromOtherAppsView() {
+        // move the upload from other app option
+        // below Create new folder or Create new e2ee folder
+        // NMC-3095 requirement
+        binding.actionLinear.removeView(binding.menuUploadFromApp)
+        binding.actionLinear.addView(
+            binding.menuUploadFromApp,
+            binding.actionLinear.indexOfChild(binding.menuEncryptedMkdir) + 1
+        )
+    }
+
     private fun filterActionsForOfflineOperations() {
         fileActivity.connectivityService.isNetworkAndServerAvailable { result: Boolean? ->
             if (file.isRootDirectory) {