Merge branch 'trunk' into feature/background-color-span-support-v3-upstream

Author: yuvalgnessin-qz

.buildkite/pipeline.yml

@@ -6,7 +6,7 @@ agents:
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/bash-cache#2.11.0
+    - automattic/a8c-ci-toolkit#2.14.0
 
 steps:
   - label: "Gradle Wrapper Validation"

README.md

@@ -5,7 +5,9 @@
 Aztec (which extends EditText) is a rich-text editor component for writing HTML
 documents in Android.
 
-Supports Android 4.1+ (API 16 - Jelly Bean)
+## Minimum Android Supported Version
+
+You can check the minimum Android version supported by looking at the `minSdkVersion` configuration within [build.gradle](https://github.com/wordpress-mobile/AztecEditor-Android/blob/trunk/build.gradle).
 
 <img align="center" width=360px height=640px src="https://github.com/wordpress-mobile/AztecEditor-Android/raw/trunk/visual_editor.png" alt="Visual Editor"/> <img align="center" width=360px height=640px src="https://github.com/wordpress-mobile/AztecEditor-Android/raw/trunk/code_editor.png" alt="Visual Editor"/>
 

app/src/main/AndroidManifest.xml

@@ -7,7 +7,16 @@
 
     <!-- Required for adding media and requested at runtime -->
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Allows for storing and retrieving screenshots, photos, videos and audios -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
     <application
         android:label="@string/app_name"
@@ -44,4 +53,12 @@
 
     </application>
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+        </intent>
+        <!-- required for Android 11 (API level 30) or higher -->
+        <package android:name="com.wordpress.aztec" />
+    </queries>
+
 </manifest>

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -14,18 +14,22 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.os.Handler
+import android.os.Looper
 import android.provider.MediaStore
 import android.util.DisplayMetrics
+import android.util.Log
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 import android.widget.PopupMenu
 import android.widget.ToggleButton
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
@@ -265,6 +269,7 @@ open class MainActivity : AppCompatActivity(),
                     val options = BitmapFactory.Options()
                     options.inDensity = DisplayMetrics.DENSITY_DEFAULT
                     val bitmap = BitmapFactory.decodeFile(mediaPath, options)
+                    Log.d("MediaPath", mediaPath)
                     insertImageAndSimulateUpload(bitmap, mediaPath)
                 }
                 REQUEST_MEDIA_PHOTO -> {
@@ -377,11 +382,11 @@ open class MainActivity : AppCompatActivity(),
             }
         }
 
-        Handler().post(runnable)
-        Handler().postDelayed(runnable, 2000)
-        Handler().postDelayed(runnable, 4000)
-        Handler().postDelayed(runnable, 6000)
-        Handler().postDelayed(runnable, 8000)
+        Handler(Looper.getMainLooper()).post(runnable)
+        Handler(Looper.getMainLooper()).postDelayed(runnable, 2000)
+        Handler(Looper.getMainLooper()).postDelayed(runnable, 4000)
+        Handler(Looper.getMainLooper()).postDelayed(runnable, 6000)
+        Handler(Looper.getMainLooper()).postDelayed(runnable, 8000)
 
         aztec.visualEditor.refreshText()
     }
@@ -390,6 +395,20 @@ open class MainActivity : AppCompatActivity(),
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                mIsKeyboardOpen = false
+                showActionBarIfNeeded()
+
+                // Disable the callback temporarily to allow the system to handle the back pressed event. This usage
+                // breaks predictive back gesture behavior and should be reviewed before enabling the predictive back
+                // gesture feature.
+                isEnabled = false
+                onBackPressedDispatcher.onBackPressed()
+                isEnabled = true
+            }
+        })
+
         // Setup hiding the action bar when the soft keyboard is displayed for narrow viewports
         if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
                 && !resources.getBoolean(R.bool.is_large_tablet_landscape)) {
@@ -486,7 +505,7 @@ open class MainActivity : AppCompatActivity(),
             aztec.initSourceEditorHistory()
         }
 
-        invalidateOptionsHandler = Handler()
+        invalidateOptionsHandler = Handler(Looper.getMainLooper())
         invalidateOptionsRunnable = Runnable { invalidateOptionsMenu() }
     }
 
@@ -520,15 +539,13 @@ open class MainActivity : AppCompatActivity(),
         }
     }
 
-    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
 
         aztec.initSourceEditorHistory()
 
-        savedInstanceState?.let {
-            if (savedInstanceState.getBoolean("isMediaUploadDialogVisible")) {
-                showMediaUploadDialog()
-            }
+        if (savedInstanceState.getBoolean("isMediaUploadDialogVisible")) {
+            showMediaUploadDialog()
         }
     }
 
@@ -586,13 +603,6 @@ open class MainActivity : AppCompatActivity(),
         return false
     }
 
-    override fun onBackPressed() {
-        mIsKeyboardOpen = false
-        showActionBarIfNeeded()
-
-        return super.onBackPressed()
-    }
-
     /**
      * Intercept back button press while soft keyboard is visible.
      */
@@ -651,9 +661,20 @@ open class MainActivity : AppCompatActivity(),
         if (PermissionUtils.checkAndRequestCameraAndStoragePermissions(this, MEDIA_CAMERA_PHOTO_PERMISSION_REQUEST_CODE)) {
             val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
 
-            mediaFile = "wp-" + System.currentTimeMillis() + ".jpg"
-            mediaPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString() +
-                    File.separator + "Camera" + File.separator + mediaFile
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                mediaFile = "wp-" + System.currentTimeMillis()
+                mediaPath = File.createTempFile(
+                        mediaFile,
+                        ".jpg",
+                        getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+                ).absolutePath
+
+            } else {
+                mediaFile = "wp-" + System.currentTimeMillis() + ".jpg"
+                @Suppress("DEPRECATION")
+                mediaPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString() +
+                        File.separator + "Camera" + File.separator + mediaFile
+            }
             intent.putExtra(MediaStore.EXTRA_OUTPUT, FileProvider.getUriForFile(this,
                     BuildConfig.APPLICATION_ID + ".provider", File(mediaPath)))
 

aztec/src/main/kotlin/org/wordpress/aztec/Aztec.kt

@@ -36,6 +36,12 @@ open class Aztec private constructor(
             onMediaDeletedListeners.forEach { it.beforeMediaDeleted(attrs) }
         }
     }
+    private var beforeBackSpaceListeners: MutableList<AztecText.BeforeBackSpaceListener> = mutableListOf()
+    private val beforeBackSpaceListener = object : AztecText.BeforeBackSpaceListener {
+        override fun shouldOverrideBackSpace(position: Int): Boolean {
+            return beforeBackSpaceListeners.any { it.shouldOverrideBackSpace(position) }
+        }
+    }
     private var onVideoInfoRequestedListener: AztecText.OnVideoInfoRequestedListener? = null
     private var onLinkTappedListener: AztecText.OnLinkTappedListener? = null
     private var isLinkTapEnabled: Boolean = false
@@ -145,6 +151,12 @@ open class Aztec private constructor(
         return this
     }
 
+    fun addBeforeBackSpaceListener(beforeBackSpaceListener: AztecText.BeforeBackSpaceListener): Aztec {
+        this.beforeBackSpaceListeners.add(beforeBackSpaceListener)
+        initBeforeBackSpaceListener()
+        return this
+    }
+
     fun setOnVideoInfoRequestedListener(onVideoInfoRequestedListener: AztecText.OnVideoInfoRequestedListener): Aztec {
         this.onVideoInfoRequestedListener = onVideoInfoRequestedListener
         initVideoInfoRequestedListener()
@@ -253,6 +265,10 @@ open class Aztec private constructor(
         visualEditor.setOnMediaDeletedListener(onMediaDeletedListener)
     }
 
+    private fun initBeforeBackSpaceListener() {
+        visualEditor.setBeforeBackSpaceListener(beforeBackSpaceListener)
+    }
+
     private fun initVideoInfoRequestedListener() {
         if (onVideoInfoRequestedListener != null) {
             visualEditor.setOnVideoInfoRequestedListener(onVideoInfoRequestedListener!!)