MOBILEAPPS-2038 (#281)

* accessibility action sheet issue fixed * fixed internet issue
Alfresco · Jul 28, 2023 · 8186c8d · 8186c8d
1 parent 913bf7b
commit 8186c8d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/actions/src/main/kotlin/com/alfresco/content/actions/ContextualActionsSheet.kt b/actions/src/main/kotlin/com/alfresco/content/actions/ContextualActionsSheet.kt
@@ -93,7 +93,7 @@ class ContextualActionsSheet : BottomSheetDialogFragment(), MavericksView {
                     performMultiAction(action)
                     dismiss()
                 } else {
-                    Snackbar.make(binding.root, R.string.message_no_internet, Snackbar.LENGTH_SHORT).show()
+                    dialog?.window?.decorView?.let { Snackbar.make(it, R.string.message_no_internet, Snackbar.LENGTH_SHORT).show() }
                 }
             }
         }

diff --git a/actions/src/main/kotlin/com/alfresco/content/actions/ContextualActionsSheetExtension.kt b/actions/src/main/kotlin/com/alfresco/content/actions/ContextualActionsSheetExtension.kt
@@ -16,7 +16,7 @@ fun ContextualActionsSheet.setHeader(state: ContextualActionsState) {
         val titleHeader = SpannableString(getString(R.string.title_action_mode, state.entries.size))
         titleHeader.setSpan(ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.colorActionMode)), 0, titleHeader.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         binding.header.apply {
-            parentTitle.contentDescription = title.toString()
+            parentTitle.contentDescription = titleHeader
             icon.visibility = View.GONE
             title.text = titleHeader
             title.updateLayoutParams<LinearLayout.LayoutParams> {

diff --git a/app/src/main/java/com/alfresco/content/app/activity/MainActivity.kt b/app/src/main/java/com/alfresco/content/app/activity/MainActivity.kt
@@ -51,6 +51,7 @@ import com.alfresco.download.DownloadMonitor
 import com.alfresco.ui.getColorForAttribute
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
@@ -283,8 +284,8 @@ class MainActivity : AppCompatActivity(), MavericksView, ActionMode.Callback {
     }
 
     override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-        mode?.let {
-            val inflater: MenuInflater = it.menuInflater
+        mode?.apply {
+            val inflater: MenuInflater = menuInflater
             inflater.inflate(R.menu.menu_action_multi_selection, menu)
             return true
         }
@@ -301,8 +302,14 @@ class MainActivity : AppCompatActivity(), MavericksView, ActionMode.Callback {
     override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
         when (item?.itemId) {
             R.id.move -> {
-                viewModel.moveFilesFolder()
-                disableMultiSelection()
+                withState(viewModel) { state ->
+                    if (state.isOnline) {
+                        viewModel.moveFilesFolder()
+                        disableMultiSelection()
+                    } else {
+                        Snackbar.make(bottomNav, com.alfresco.content.actions.R.string.message_no_internet, Snackbar.LENGTH_SHORT).show()
+                    }
+                }
                 return true
             }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -34,6 +34,7 @@
     <string name="accessibility_text_user_profile">User Profile Button</string>
     <string name="accessibility_text_user_info">Username: %s Email: %s</string>
     <string name="accessibility_text_close">Close</string>
+    <string name="close_button_content_description">Clear Selection</string>
 
     <string-array name="settings_sync_network_value_labels">
         <item>Wi-Fi only</item>

diff --git a/build.gradle b/build.gradle
@@ -49,8 +49,8 @@ subprojects {
                     targetSdkVersion 33
                 }
                 compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_18
-                    targetCompatibility JavaVersion.VERSION_18
+                    sourceCompatibility JavaVersion.VERSION_17
+                    targetCompatibility JavaVersion.VERSION_17
                 }
                 sourceSets['main'].java.srcDir('src/main/kotlin')
 
@@ -84,8 +84,8 @@ subprojects {
 
             freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 
-            // Set JVM target to 18
-            jvmTarget = "18"
+            // Set JVM target to 17
+            jvmTarget = "17"
         }
     }
 }