Revert material update

Author: planarvoid

aztec/build.gradle

@@ -52,7 +52,7 @@ dependencies {
     implementation "org.jsoup:jsoup:$jSoupVersion"
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
 

aztec/src/main/java/org/wordpress/aztec/Html.java

@@ -45,8 +45,8 @@
 import org.wordpress.aztec.spans.AztecRelativeSizeSmallSpan;
 import org.wordpress.aztec.spans.AztecStyleBoldSpan;
 import org.wordpress.aztec.spans.AztecStyleCiteSpan;
-import org.wordpress.aztec.spans.AztecStyleEmphasisSpan;
 import org.wordpress.aztec.spans.AztecStyleItalicSpan;
+import org.wordpress.aztec.spans.AztecStyleEmphasisSpan;
 import org.wordpress.aztec.spans.AztecStyleStrongSpan;
 import org.wordpress.aztec.spans.AztecSubscriptSpan;
 import org.wordpress.aztec.spans.AztecSuperscriptSpan;
@@ -58,9 +58,9 @@
 import org.wordpress.aztec.spans.HighlightSpan;
 import org.wordpress.aztec.spans.IAztecInlineSpan;
 import org.wordpress.aztec.spans.IAztecParagraphStyle;
-import org.wordpress.aztec.spans.MarkSpan;
 import org.wordpress.aztec.spans.UnknownClickableSpan;
 import org.wordpress.aztec.spans.UnknownHtmlSpan;
+import org.wordpress.aztec.spans.MarkSpan;
 import org.wordpress.aztec.util.CleaningUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -76,6 +76,7 @@
 import java.util.regex.Pattern;
 
 import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 
 import static org.wordpress.aztec.util.ExtensionsKt.getLast;
 
@@ -243,14 +244,14 @@ class HtmlToSpannedConverter implements org.xml.sax.ContentHandler, LexicalHandl
     private boolean insidePreTag = false;
     private boolean insideCodeTag = false;
 
-    private final String source;
-    private final List<IAztecPlugin> plugins;
-    private final XMLReader reader;
-    private final SpannableStringBuilder spannableStringBuilder;
-    private final Html.TagHandler tagHandler;
-    private final Context context;
-    private final List<String> ignoredTags;
-    private final boolean shouldIgnoreWhitespace;
+    private String source;
+    private List<IAztecPlugin> plugins;
+    private XMLReader reader;
+    private SpannableStringBuilder spannableStringBuilder;
+    private Html.TagHandler tagHandler;
+    private Context context;
+    private List<String> ignoredTags;
+    private boolean shouldIgnoreWhitespace;
 
     public HtmlToSpannedConverter(
             String source, Html.TagHandler tagHandler,
@@ -643,7 +644,7 @@ private static void endFont(SpannableStringBuilder text) {
                     String name = color.substring(1);
                     int colorRes = res.getIdentifier(name, "color", "android");
                     if (colorRes != 0) {
-                        ColorStateList colors = res.getColorStateList(colorRes, res.newTheme());
+                        ColorStateList colors = res.getColorStateList(colorRes);
                         text.setSpan(new TextAppearanceSpan(null, 0, 0, colors, null),
                                 where, len,
                                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -866,10 +867,13 @@ private boolean processCommentHandlerPlugins(String comment) {
             for (IAztecPlugin plugin : plugins) {
                 if (plugin instanceof IHtmlCommentHandler) {
                     wasCommentHandled = ((IHtmlCommentHandler) plugin).handleComment(comment, spannableStringBuilder,
-                            nestingLevel, newNesting -> {
-                                nestingLevel = newNesting;
-                                return Unit.INSTANCE;
-                            });
+                            nestingLevel, new Function1<Integer, Unit>() {
+                        @Override
+                        public Unit invoke(Integer newNesting) {
+                            nestingLevel = newNesting;
+                            return Unit.INSTANCE;
+                        }
+                    });
                     if (wasCommentHandled) {
                         break;
                     }

aztec/src/main/kotlin/org/wordpress/aztec/util/Extensions.kt

@@ -74,11 +74,11 @@ fun ClipData.Item.coerceToHtmlText(parser: AztecParser): String {
  */
 fun ToggleButton.convertToButtonAccessibilityProperties() {
     ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
-        override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
+        override fun onInitializeAccessibilityNodeInfo(host: View?, info: AccessibilityNodeInfoCompat?) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info.className = Button::class.java.name
-            info.isCheckable = false
-            info.addAction(AccessibilityNodeInfoCompat.AccessibilityActionCompat(ACTION_CLICK, context.getString(R.string.accessibility_action_click_label)))
+            info?.className = Button::class.java.name
+            info?.isCheckable = false
+            info?.addAction(AccessibilityNodeInfoCompat.AccessibilityActionCompat(ACTION_CLICK, context.getString(R.string.accessibility_action_click_label)))
         }
     })
 }

media-placeholders/src/main/java/org/wordpress/aztec/placeholders/ImageWithCaptionAdapter.kt

@@ -5,10 +5,10 @@ import android.view.Gravity
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.Transformation
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.view.updateLayoutParams
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import kotlinx.coroutines.CoroutineScope
@@ -97,7 +97,7 @@ class ImageWithCaptionAdapter(
         private val startHeight: Int = view.height
 
         override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
-            view.updateLayoutParams {
+            (view.layoutParams as FrameLayout.LayoutParams).apply {
                 width = startWidth + ((newWidth - startWidth) * interpolatedTime).toInt()
                 height = startHeight + ((newHeight - startHeight) * interpolatedTime).toInt()
             }

media-placeholders/src/main/java/org/wordpress/aztec/placeholders/PlaceholderManager.kt

@@ -12,7 +12,6 @@ import android.view.View
 import android.view.ViewTreeObserver
 import android.widget.FrameLayout
 import androidx.core.content.ContextCompat
-import androidx.core.view.updateLayoutParams
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -377,9 +376,9 @@ class PlaceholderManager(
             paramsFlow.emit(Placeholder.ViewParams(newWidth, newHeight, attrs, initial = false))
         }
 
-        box.updateLayoutParams<FrameLayout.LayoutParams> {
+        (box.layoutParams as FrameLayout.LayoutParams).apply {
             leftMargin = newLeftPadding
-            topMargin = newTopPadding
+            topMargin = newLeftPadding
         }
 
         positionToIdMutex.withLock {
@@ -456,7 +455,13 @@ class PlaceholderManager(
     /**
      * This method handled a `placeholder` tag found in the HTML. It creates a placeholder and inserts a view over it.
      */
-    override fun handleTag(opening: Boolean, tag: String, output: Editable, attributes: Attributes, nestingLevel: Int): Boolean {
+    override fun handleTag(
+            opening: Boolean,
+            tag: String,
+            output: Editable,
+            attributes: Attributes,
+            nestingLevel: Int
+    ): Boolean {
         if (opening) {
             val type = attributes.getValue(TYPE_ATTRIBUTE)
             attributes.getValue(UUID_ATTRIBUTE)?.also { uuid ->

picasso-loader/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     implementation aztecProjectDependency
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation "com.squareup.picasso:picasso:$picassoVersion"
 }

wordpress-comments/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     implementation aztecProjectDependency
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
 
     testImplementation "junit:junit:$jUnitVersion"