Build: Automatically migrate to non-transitive r classes

The changes in this commit was automatically applied on triggering the
"Refactor" -> "Migration to Non-Transitive R Classes..." migration
process via AS.

Author: ParaskP7

app/src/androidTest/kotlin/org/wordpress/aztec/demo/pages/EditLinkPage.kt

@@ -9,7 +9,6 @@ import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import org.wordpress.aztec.demo.BasePage
-import org.wordpress.aztec.demo.R
 
 class EditLinkPage : BasePage() {
 
@@ -24,9 +23,9 @@ class EditLinkPage : BasePage() {
         get() = onView(withText("Insert link"))
 
     init {
-        urlField = onView(withId(R.id.linkURL))
-        nameField = onView(withId(R.id.linkText))
-        openInNewWindowCheckbox = onView(withId(R.id.openInNewWindow))
+        urlField = onView(withId(org.wordpress.aztec.R.id.linkURL))
+        nameField = onView(withId(org.wordpress.aztec.R.id.linkText))
+        openInNewWindowCheckbox = onView(withId(org.wordpress.aztec.R.id.openInNewWindow))
         okButton = onView(withId(android.R.id.button1))
         cancelButton = onView(withId(android.R.id.button2))
         removeButton = onView(withId(android.R.id.button3))

app/src/androidTest/kotlin/org/wordpress/aztec/demo/pages/EditorPage.kt

@@ -58,20 +58,20 @@ class EditorPage : BasePage() {
         undoButton = onView(withId(R.id.undo))
         redoButton = onView(withId(R.id.redo))
 
-        openMediaToolbarButton = onView(withId(R.id.format_bar_button_media_collapsed))
-        closeMediaToolbarButton = onView(withId(R.id.format_bar_button_media_expanded))
-        headingButton = onView(withId(R.id.format_bar_button_heading))
-        listButton = onView(withId(R.id.format_bar_button_list))
-        quoteButton = onView(withId(R.id.format_bar_button_quote))
-        boldButton = onView(withId(R.id.format_bar_button_bold))
-        italicsButton = onView(withId(R.id.format_bar_button_italic))
-        linkButton = onView(withId(R.id.format_bar_button_link))
-        underlineButton = onView(withId(R.id.format_bar_button_underline))
-        strikethroughButton = onView(withId(R.id.format_bar_button_strikethrough))
-        horizontalRuleButton = onView(withId(R.id.format_bar_button_horizontal_rule))
-        moreRuleButton = onView(withId(R.id.format_bar_button_more))
-        pageButton = onView(withId(R.id.format_bar_button_page))
-        htmlButton = onView(withId(R.id.format_bar_button_html))
+        openMediaToolbarButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_media_collapsed))
+        closeMediaToolbarButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_media_expanded))
+        headingButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_heading))
+        listButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_list))
+        quoteButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_quote))
+        boldButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_bold))
+        italicsButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_italic))
+        linkButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_link))
+        underlineButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_underline))
+        strikethroughButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_strikethrough))
+        horizontalRuleButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_horizontal_rule))
+        moreRuleButton = onView(withId(org.wordpress.aztec.plugins.wpcomments.R.id.format_bar_button_more))
+        pageButton = onView(withId(org.wordpress.aztec.plugins.wpcomments.R.id.format_bar_button_page))
+        htmlButton = onView(withId(org.wordpress.aztec.R.id.format_bar_button_html))
 
         photoButton = onView(allOf(withId(android.R.id.title), withText("Photo from device")))
         galleryButton = onView(withId(R.id.media_bar_button_gallery))

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

@@ -489,7 +489,7 @@ open class MainActivity : AppCompatActivity(),
             aztec.visualEditor.setCalypsoMode(false)
             aztec.sourceEditor?.setCalypsoMode(false)
 
-            aztec.visualEditor.setBackgroundSpanColor(ContextCompat.getColor(this, R.color.blue_dark))
+            aztec.visualEditor.setBackgroundSpanColor(ContextCompat.getColor(this, org.wordpress.aztec.R.color.blue_dark))
 
             aztec.sourceEditor?.displayStyledAndFormattedHtml(EXAMPLE)
 
@@ -704,7 +704,7 @@ open class MainActivity : AppCompatActivity(),
                 startActivityForResult(intent, REQUEST_MEDIA_PHOTO)
             } catch (exception: ActivityNotFoundException) {
                 AppLog.e(AppLog.T.EDITOR, exception.message)
-                ToastUtils.showToast(this, getString(R.string.error_chooser_photo), ToastUtils.Duration.LONG)
+                ToastUtils.showToast(this, getString(org.wordpress.aztec.R.string.error_chooser_photo), ToastUtils.Duration.LONG)
             }
         }
     }
@@ -719,7 +719,7 @@ open class MainActivity : AppCompatActivity(),
                 startActivityForResult(intent, REQUEST_MEDIA_VIDEO)
             } catch (exception: ActivityNotFoundException) {
                 AppLog.e(AppLog.T.EDITOR, exception.message)
-                ToastUtils.showToast(this, getString(R.string.error_chooser_video), ToastUtils.Duration.LONG)
+                ToastUtils.showToast(this, getString(org.wordpress.aztec.R.string.error_chooser_video), ToastUtils.Duration.LONG)
             }
         }
     }
@@ -819,7 +819,7 @@ open class MainActivity : AppCompatActivity(),
         val mediaPending = aztec.visualEditor.getAllElementAttributes(uploadingPredicate).isNotEmpty()
 
         if (mediaPending) {
-            ToastUtils.showToast(this, R.string.media_upload_dialog_message)
+            ToastUtils.showToast(this, org.wordpress.aztec.R.string.media_upload_dialog_message)
         } else {
             aztec.toolbar.toggleEditorMode()
         }