Skip to content

Commit 499459d

Browse files
irfanoirfano
authored
Merge pull request #1037 from wordpress-mobile/update-compile-sdk-to-33
Update compile sdk to 33
2 parents 9cd1615 + 2785da1 commit 499459d

File tree

13 files changed

+58
-51
lines changed

13 files changed

+58
-51
lines changed

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

+26-18
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import android.net.Uri
1717
import android.os.Bundle
1818
import android.os.Environment
1919
import android.os.Handler
20+
import android.os.Looper
2021
import android.provider.MediaStore
2122
import android.util.DisplayMetrics
2223
import android.view.Gravity
@@ -26,6 +27,7 @@ import android.view.MotionEvent
2627
import android.view.View
2728
import android.widget.PopupMenu
2829
import android.widget.ToggleButton
30+
import androidx.activity.OnBackPressedCallback
2931
import androidx.appcompat.app.AlertDialog
3032
import androidx.appcompat.app.AppCompatActivity
3133
import androidx.appcompat.content.res.AppCompatResources
@@ -372,11 +374,11 @@ open class MainActivity : AppCompatActivity(),
372374
}
373375
}
374376

375-
Handler().post(runnable)
376-
Handler().postDelayed(runnable, 2000)
377-
Handler().postDelayed(runnable, 4000)
378-
Handler().postDelayed(runnable, 6000)
379-
Handler().postDelayed(runnable, 8000)
377+
Handler(Looper.getMainLooper()).post(runnable)
378+
Handler(Looper.getMainLooper()).postDelayed(runnable, 2000)
379+
Handler(Looper.getMainLooper()).postDelayed(runnable, 4000)
380+
Handler(Looper.getMainLooper()).postDelayed(runnable, 6000)
381+
Handler(Looper.getMainLooper()).postDelayed(runnable, 8000)
380382

381383
aztec.visualEditor.refreshText()
382384
}
@@ -385,6 +387,20 @@ open class MainActivity : AppCompatActivity(),
385387
super.onCreate(savedInstanceState)
386388
setContentView(R.layout.activity_main)
387389

390+
onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
391+
override fun handleOnBackPressed() {
392+
mIsKeyboardOpen = false
393+
showActionBarIfNeeded()
394+
395+
// Disable the callback temporarily to allow the system to handle the back pressed event. This usage
396+
// breaks predictive back gesture behavior and should be reviewed before enabling the predictive back
397+
// gesture feature.
398+
isEnabled = false
399+
onBackPressedDispatcher.onBackPressed()
400+
isEnabled = true
401+
}
402+
})
403+
388404
// Setup hiding the action bar when the soft keyboard is displayed for narrow viewports
389405
if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
390406
&& !resources.getBoolean(R.bool.is_large_tablet_landscape)) {
@@ -477,7 +493,7 @@ open class MainActivity : AppCompatActivity(),
477493
aztec.initSourceEditorHistory()
478494
}
479495

480-
invalidateOptionsHandler = Handler()
496+
invalidateOptionsHandler = Handler(Looper.getMainLooper())
481497
invalidateOptionsRunnable = Runnable { invalidateOptionsMenu() }
482498
}
483499

@@ -511,15 +527,13 @@ open class MainActivity : AppCompatActivity(),
511527
}
512528
}
513529

514-
override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
530+
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
515531
super.onRestoreInstanceState(savedInstanceState)
516532

517533
aztec.initSourceEditorHistory()
518534

519-
savedInstanceState?.let {
520-
if (savedInstanceState.getBoolean("isMediaUploadDialogVisible")) {
521-
showMediaUploadDialog()
522-
}
535+
if (savedInstanceState.getBoolean("isMediaUploadDialogVisible")) {
536+
showMediaUploadDialog()
523537
}
524538
}
525539

@@ -577,13 +591,6 @@ open class MainActivity : AppCompatActivity(),
577591
return false
578592
}
579593

580-
override fun onBackPressed() {
581-
mIsKeyboardOpen = false
582-
showActionBarIfNeeded()
583-
584-
return super.onBackPressed()
585-
}
586-
587594
/**
588595
* Intercept back button press while soft keyboard is visible.
589596
*/
@@ -643,6 +650,7 @@ open class MainActivity : AppCompatActivity(),
643650
val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
644651

645652
mediaFile = "wp-" + System.currentTimeMillis() + ".jpg"
653+
@Suppress("DEPRECATION")
646654
mediaPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString() +
647655
File.separator + "Camera" + File.separator + mediaFile
648656
intent.putExtra(MediaStore.EXTRA_OUTPUT, FileProvider.getUriForFile(this,

‎aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

+8-10
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import android.view.LayoutInflater
4949
import android.view.MotionEvent
5050
import android.view.View
5151
import android.view.View.OnLongClickListener
52-
import android.view.WindowManager
5352
import android.view.inputmethod.BaseInputConnection
5453
import android.view.inputmethod.EditorInfo
5554
import android.view.inputmethod.InputConnection
@@ -1926,8 +1925,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
19261925

19271926
val html = Format.removeSourceEditorFormatting(parser.toHtml(output), isInCalypsoMode, isInGutenbergMode)
19281927

1929-
val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
1930-
clipboard.primaryClip = ClipData.newHtmlText("aztec", output.toString(), html)
1928+
val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
1929+
clipboard.setPrimaryClip(ClipData.newHtmlText("aztec", output.toString(), html))
19311930
}
19321931

19331932
// copied from TextView with some changes
@@ -1993,7 +1992,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
19931992
plugin.itemToHtml(itemToPaste, acc ?: selectedText?.takeIf { it.isNotBlank() }) ?: acc
19941993
} ?: when (itemToPaste) {
19951994
is IClipboardPastePlugin.PastedItem.HtmlText -> itemToPaste.text
1996-
is IClipboardPastePlugin.PastedItem.Url -> itemToPaste.uri.path
1995+
is IClipboardPastePlugin.PastedItem.Url -> itemToPaste.uri.path.toString()
19971996
is IClipboardPastePlugin.PastedItem.PastedIntent -> itemToPaste.intent.toString()
19981997
}
19991998

@@ -2099,7 +2098,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
20992098

21002099
@SuppressLint("InflateParams")
21012100
fun showBlockEditorDialog(unknownHtmlSpan: UnknownHtmlSpan, html: String = "") {
2102-
val builder = AlertDialog.Builder(context)
2101+
val builder = AlertDialog.Builder(context, R.style.ResizableDialogTheme)
21032102

21042103
val dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_block_editor, null)
21052104
val source = dialogView.findViewById<SourceViewEditText>(R.id.source)
@@ -2112,7 +2111,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
21122111
source.displayStyledAndFormattedHtml(editHtml)
21132112
builder.setView(dialogView)
21142113

2115-
builder.setPositiveButton(R.string.block_editor_dialog_button_save, { _, _ ->
2114+
builder.setPositiveButton(R.string.block_editor_dialog_button_save) { _, _ ->
21162115
val spanStart = text.getSpanStart(unknownHtmlSpan)
21172116

21182117
val textBuilder = SpannableStringBuilder()
@@ -2137,15 +2136,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
21372136
enableTextChangedListener()
21382137

21392138
inlineFormatter.joinStyleSpans(0, text.length)
2140-
})
2139+
}
21412140

2142-
builder.setNegativeButton(R.string.block_editor_dialog_button_cancel, { dialogInterface, _ ->
2141+
builder.setNegativeButton(R.string.block_editor_dialog_button_cancel) { dialogInterface, _ ->
21432142
dialogInterface.dismiss()
2144-
})
2143+
}
21452144

21462145
unknownBlockSpanStart = text.getSpanStart(unknownHtmlSpan)
21472146
blockEditorDialog = builder.create()
2148-
blockEditorDialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
21492147
blockEditorDialog?.show()
21502148
}
21512149

‎aztec/src/main/kotlin/org/wordpress/aztec/History.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ class History(val historyEnabled: Boolean, val historySize: Int) {
3333
}
3434

3535
fun beforeTextChanged(editText: EditText) {
36-
if (historyEnabled && !historyWorking) {
36+
if (historyRunnable != null && historyEnabled && !historyWorking) {
3737
mainHandler.removeCallbacks(historyRunnable)
3838
if (!textChangedPending) {
3939
textChangedPending = true
40-
historyRunnable?.text =
40+
historyRunnable.text =
4141
when (editText) {
4242
is AztecText -> editText.toFormattedHtml()
4343
is SourceViewEditText -> editText.text.toString()
4444
else -> ""
4545
}
46-
historyRunnable?.editText = editText
46+
historyRunnable.editText = editText
4747
}
4848
mainHandler.postDelayed(historyRunnable, historyThrottleTime)
4949
}

‎aztec/src/main/kotlin/org/wordpress/aztec/InputConnectionWrapper.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ abstract class InputConnectionWrapper(private val inputConnection: InputConnecti
106106
return inputConnection.getSelectedText(flags)
107107
}
108108

109-
override fun getTextAfterCursor(length: Int, flags: Int): CharSequence {
109+
override fun getTextAfterCursor(length: Int, flags: Int): CharSequence? {
110110
return inputConnection.getTextAfterCursor(length, flags)
111111
}
112112

113-
override fun getTextBeforeCursor(length: Int, flags: Int): CharSequence {
113+
override fun getTextBeforeCursor(length: Int, flags: Int): CharSequence? {
114114
return inputConnection.getTextBeforeCursor(length, flags)
115115
}
116116

‎aztec/src/main/kotlin/org/wordpress/aztec/SamsungInputConnection.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.os.Bundle
55
import android.text.Editable
66
import android.text.Selection
77
import android.text.Spanned
8-
import android.text.TextUtils
98
import android.text.style.SuggestionSpan
109
import android.view.KeyEvent
1110
import android.view.inputmethod.BaseInputConnection
@@ -22,7 +21,7 @@ import android.view.inputmethod.InputContentInfo
2221
*/
2322
class SamsungInputConnection(
2423
private val mTextView: AztecText,
25-
private val baseInputConnection: InputConnection,
24+
private val baseInputConnection: InputConnection
2625
) : BaseInputConnection(mTextView, true) {
2726

2827
override fun getEditable(): Editable {
@@ -178,11 +177,11 @@ class SamsungInputConnection(
178177
return baseInputConnection.getSelectedText(flags)
179178
}
180179

181-
override fun getTextAfterCursor(length: Int, flags: Int): CharSequence {
180+
override fun getTextAfterCursor(length: Int, flags: Int): CharSequence? {
182181
return baseInputConnection.getTextAfterCursor(length, flags)
183182
}
184183

185-
override fun getTextBeforeCursor(length: Int, flags: Int): CharSequence {
184+
override fun getTextBeforeCursor(length: Int, flags: Int): CharSequence? {
186185
return baseInputConnection.getTextBeforeCursor(length, flags)
187186
}
188187
}

‎aztec/src/main/kotlin/org/wordpress/aztec/source/CssStyleFormatter.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.wordpress.aztec.source
22

3-
import androidx.core.text.TextDirectionHeuristicsCompat
43
import android.text.Editable
54
import android.text.Layout
65
import android.text.Spannable
76
import android.text.style.BackgroundColorSpan
87
import android.text.style.ForegroundColorSpan
8+
import androidx.core.text.TextDirectionHeuristicsCompat
99
import org.wordpress.aztec.AztecAttributes
1010
import org.wordpress.aztec.spans.IAztecAlignmentSpan
1111
import org.wordpress.aztec.spans.IAztecAttributedSpan
@@ -121,7 +121,7 @@ class CssStyleFormatter {
121121

122122
var styleAttributeValue = ""
123123
if (m.find()) {
124-
styleAttributeValue = m.group(1)
124+
m.group(1)?.let { styleAttributeValue = it }
125125
}
126126
return styleAttributeValue
127127
}

‎aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecCodeSpan.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class AztecCodeSpan(override var attributes: AztecAttributes = AztecAttributes()
3333
this.codeStyle = codeStyle
3434
}
3535

36-
override fun updateDrawState(tp: TextPaint?) {
36+
override fun updateDrawState(tp: TextPaint) {
3737
configureTextPaint(tp)
3838
}
3939

40-
override fun updateMeasureState(tp: TextPaint?) {
40+
override fun updateMeasureState(tp: TextPaint) {
4141
configureTextPaint(tp)
4242
}
4343

44-
private fun configureTextPaint(tp: TextPaint?) {
44+
private fun configureTextPaint(tp: TextPaint) {
4545
val alpha: Int = (codeStyle.codeBackgroundAlpha * 255).toInt()
46-
tp?.typeface = Typeface.MONOSPACE
47-
tp?.bgColor = Color.argb(
46+
tp.typeface = Typeface.MONOSPACE
47+
tp.bgColor = Color.argb(
4848
alpha,
4949
Color.red(codeStyle.codeBackground),
5050
Color.green(codeStyle.codeBackground),
5151
Color.blue(codeStyle.codeBackground))
52-
tp?.color = codeStyle.codeColor
52+
tp.color = codeStyle.codeColor
5353
}
5454
}

‎aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecPreformatSpan.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ open class AztecPreformatSpan(
125125
}
126126

127127
override fun drawBackground(canvas: Canvas, paint: Paint, left: Int, right: Int, top: Int, baseline: Int,
128-
bottom: Int, text: CharSequence?, start: Int, end: Int, lnum: Int) {
128+
bottom: Int, text: CharSequence, start: Int, end: Int, lnum: Int) {
129129
val spanned = text as Spanned
130130
val spanStart = spanned.getSpanStart(this)
131131
val spanEnd = spanned.getSpanEnd(this)

‎aztec/src/main/kotlin/org/wordpress/aztec/util/InstanceStateUtils.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.wordpress.aztec.util
22

33
import android.content.Context
44
import android.os.Bundle
5-
import android.text.TextUtils
65
import org.wordpress.android.util.AppLog
76
import java.io.File
87
import java.io.FileInputStream
@@ -50,7 +49,7 @@ class InstanceStateUtils {
5049
// the full path is kept in the bundle so, get it from there
5150
val filename = bundle.getString(cacheFilenameKey(varName))
5251

53-
if (TextUtils.isEmpty(filename)) {
52+
if (filename.isNullOrEmpty()) {
5453
return defaultValue
5554
}
5655

‎aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherAPI25AndHigher.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DeleteMediaElementWatcherAPI25AndHigher(aztecText: AztecText) : TextWatche
3939
// real user deletions.
4040
aztecTextRef.get()?.postDelayed({
4141
while (!queueHasBeenPopulatedInThisTimeframe && deletedSpans.isNotEmpty()) {
42-
deletedSpans.poll().onMediaDeleted()
42+
deletedSpans.poll()?.onMediaDeleted()
4343
}
4444
queueHasBeenPopulatedInThisTimeframe = false
4545
}, 500)

‎aztec/src/main/res/values/styles.xml

+3
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,7 @@
119119
<item name="android:layout_alignParentLeft">true</item>
120120
</style>
121121

122+
<style name="ResizableDialogTheme" parent="Theme.AppCompat.Dialog.Alert">
123+
<item name="android:windowSoftInputMode">adjustResize</item>
124+
</style>
122125
</resources>

‎aztec/src/test/kotlin/org/wordpress/aztec/ClipboardTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ class ClipboardTest {
346346

347347
editText.setSelection(0)
348348
val clipboard = editText.context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
349-
clipboard.primaryClip = ClipData.newPlainText("aztec", "Heading")
349+
clipboard.setPrimaryClip(ClipData.newPlainText("aztec", "Heading"))
350350

351351
TestUtils.pasteFromClipboard(editText)
352352

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ subprojects {
6464

6565
ext {
6666
minSdkVersion = 24
67-
compileSdkVersion = 28
67+
compileSdkVersion = 33
6868
targetSdkVersion = 31
6969
}
7070

0 commit comments

Comments
 (0)