Merge pull request #9215 from wordpress-mobile/feature/update-support-lib-28

Update support library to 28

Author: kwonye

.circleci/config.yml

@@ -1,6 +1,6 @@
 android_config: &android_config
   docker:
-    - image: circleci/android:api-27-alpha
+    - image: circleci/android:api-28-alpha
   environment:
     # kotlin.incremental=false and kotlin.compiler.execution.strategy=in-process are required due to an issue with the Kotlin compiler in
     # memory constrained environments: https://youtrack.jetbrains.com/issue/KT-15562

WordPress/build.gradle

@@ -29,14 +29,18 @@ android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompi
 
 android {
     useLibrary 'org.apache.http.legacy'
+    useLibrary 'android.test.runner'
+
+    useLibrary 'android.test.base'
+    useLibrary 'android.test.mock'
 
     dexOptions {
         jumboMode = true
         javaMaxHeapSize = project.properties.getOrDefault("javaMaxHeapSize", "6g")
         dexInProcess = true
     }
 
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
     defaultConfig {
@@ -105,6 +109,11 @@ android {
         lintConfig file('lint.xml')
         baseline file("lint-baseline.xml")
     }
+
+    packagingOptions {
+        // MPAndroidChart uses androidX - remove this line when we migrate everything to androidX
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
 }
 
 // allows us to use cool things like @Parcelize annotations
@@ -125,17 +134,20 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.6.2'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
 
-    implementation 'com.android.support:support-compat:27.1.1'
-    implementation 'com.android.support:support-core-ui:27.1.1'
-    implementation 'com.android.support:support-fragment:27.1.1'
+    implementation 'com.android.support:support-compat:28.0.0'
+    implementation 'com.android.support:support-core-ui:28.0.0'
+    implementation 'com.android.support:support-fragment:28.0.0'
 
     implementation 'com.android.support:multidex:1.0.2'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:percent:27.1.1'
-    implementation 'com.android.support:preference-v7:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:exifinterface:28.0.0'
+    implementation'com.android.support:support-media-compat:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:percent:28.0.0'
+    implementation 'com.android.support:preference-v7:28.0.0'
 
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 

WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java

@@ -3,7 +3,7 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v7.widget.CardView;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import org.junit.ClassRule;
 import org.junit.Rule;

WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt

@@ -65,8 +65,8 @@ class ActivityLogListFragment : Fragment() {
 
         log_list_view.setEmptyView(actionable_empty_view)
         log_list_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) {
-                if (!recyclerView!!.canScrollVertically(1) && dy != 0) {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                if (!recyclerView.canScrollVertically(1) && dy != 0) {
                     viewModel.onScrolledToBottom()
                 }
             }

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt

@@ -1,10 +1,10 @@
 package org.wordpress.android.ui.main
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.support.annotation.DrawableRes
 import android.support.annotation.IdRes
 import android.support.annotation.StringRes
+import android.support.design.bottomnavigation.LabelVisibilityMode
 import android.support.design.internal.BottomNavigationItemView
 import android.support.design.internal.BottomNavigationMenuView
 import android.support.design.widget.BottomNavigationView
@@ -27,8 +27,6 @@ import org.wordpress.android.ui.prefs.AppPrefs
 import org.wordpress.android.ui.reader.ReaderPostListFragment
 import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.AniUtils.Duration
-import org.wordpress.android.util.AppLog
-import org.wordpress.android.util.AppLog.T
 
 /*
  * Bottom navigation view and related adapter used by the main activity for the
@@ -95,30 +93,8 @@ class WPMainNavigationView @JvmOverloads constructor(
         currentPosition = AppPrefs.getMainPageIndex()
     }
 
-    /*
-     * uses reflection to disable "shift mode" so the item are equal width
-     */
-    @SuppressLint("RestrictedApi")
     private fun disableShiftMode() {
-        val menuView = getChildAt(0) as BottomNavigationMenuView
-        try {
-            menuView.javaClass.getDeclaredField("mShiftingMode").apply {
-                isAccessible = true
-                setBoolean(menuView, false)
-                isAccessible = false
-            }
-            for (i in 0 until menuView.childCount) {
-                (menuView.getChildAt(i) as BottomNavigationItemView).apply {
-                    setShiftingMode(false)
-                    // force the view to update
-                    setChecked(itemData.isChecked)
-                }
-            }
-        } catch (e: NoSuchFieldException) {
-            AppLog.e(T.MAIN, "Unable to disable shift mode", e)
-        } catch (e: IllegalAccessException) {
-            AppLog.e(T.MAIN, "Unable to disable shift mode", e)
-        }
+        labelVisibilityMode = LabelVisibilityMode.LABEL_VISIBILITY_LABELED
     }
 
     private fun assignNavigationListeners(assign: Boolean) {

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt

@@ -179,7 +179,7 @@ class NewSiteCreationActivity : AppCompatActivity(),
         }
     }
 
-    private fun slideInFragment(fragment: Fragment?, tag: String) {
+    private fun slideInFragment(fragment: Fragment, tag: String) {
         val fragmentTransaction = supportFragmentManager.beginTransaction()
         fragmentTransaction.replace(R.id.fragment_container, fragment, tag)
         if (supportFragmentManager.findFragmentById(R.id.fragment_container) != null) {

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsListItemDecoration.kt

@@ -6,10 +6,10 @@ import android.view.View
 
 data class StatsListItemDecoration(val horizontalSpacing: Int, val verticalSpacing: Int, val columnCount: Int) :
         RecyclerView.ItemDecoration() {
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State?) {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
         super.getItemOffsets(outRect, view, parent, state)
         val isFirst = parent.getChildAdapterPosition(view) == 0
-        val isLast = parent.getChildAdapterPosition(view) == parent.adapter.itemCount - 1
+        val isLast = parent.adapter?.let { parent.getChildAdapterPosition(view) == it.itemCount - 1 } ?: false
         outRect.set(
                 if (columnCount == 1) 2 * horizontalSpacing else horizontalSpacing,
                 if (isFirst) 2 * verticalSpacing else verticalSpacing,

WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java

@@ -162,12 +162,10 @@ private void configureCardView(ThemeViewHolder themeViewHolder, boolean isCurren
             themeViewHolder.mActiveView.setVisibility(View.VISIBLE);
             themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(R.color.blue_wordpress));
         } else {
-            themeViewHolder.mDetailsView.setBackgroundColor(resources.getColor(
-                    android.support.v7.cardview.R.color.cardview_light_background));
+            themeViewHolder.mDetailsView.setBackgroundColor(resources.getColor(R.color.white));
             themeViewHolder.mNameView.setTextColor(resources.getColor(R.color.black));
             themeViewHolder.mActiveView.setVisibility(View.GONE);
-            themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(
-                    android.support.v7.cardview.R.color.cardview_light_background));
+            themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(R.color.white));
         }
     }
 

WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml

@@ -8,8 +8,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="@dimen/theme_browser_cardview_margin_large"
-        android:layout_marginBottom="@dimen/cardview_default_radius"
-        card_view:cardCornerRadius="@dimen/cardview_default_radius"
+        android:layout_marginBottom="@dimen/default_cardview_radius"
+        card_view:cardCornerRadius="@dimen/default_cardview_radius"
         card_view:cardElevation="@dimen/card_elevation"
         android:layout_marginStart="@dimen/theme_browser_cardview_margin_large"
         android:layout_marginEnd="@dimen/theme_browser_cardview_margin_large">

WordPress/src/main/res/layout/edit_post_settings_fragment.xml

@@ -17,7 +17,7 @@
         <android.support.v7.widget.CardView
             style="@style/PostSettingsCardView"
             card_view:cardBackgroundColor="@color/white"
-            card_view:cardCornerRadius="@dimen/cardview_default_radius">
+            card_view:cardCornerRadius="@dimen/default_cardview_radius">
 
             <LinearLayout
                 style="@style/PostSettingsCardViewInnerLayout">
@@ -75,7 +75,7 @@
             style="@style/PostSettingsCardView"
             android:id="@+id/post_categories_and_tags_card"
             card_view:cardBackgroundColor="@color/white"
-            card_view:cardCornerRadius="@dimen/cardview_default_radius">
+            card_view:cardCornerRadius="@dimen/default_cardview_radius">
 
             <LinearLayout
                 style="@style/PostSettingsCardViewInnerLayout">
@@ -122,7 +122,7 @@
             android:id="@+id/post_featured_image_card_view"
             style="@style/PostSettingsCardView"
             card_view:cardBackgroundColor="@color/white"
-            card_view:cardCornerRadius="@dimen/cardview_default_radius">
+            card_view:cardCornerRadius="@dimen/default_cardview_radius">
 
             <LinearLayout
                 style="@style/PostSettingsCardViewInnerLayout">
@@ -159,7 +159,7 @@
         <android.support.v7.widget.CardView
             style="@style/PostSettingsCardView"
             card_view:cardBackgroundColor="@color/white"
-            card_view:cardCornerRadius="@dimen/cardview_default_radius">
+            card_view:cardCornerRadius="@dimen/default_cardview_radius">
 
             <LinearLayout
                 style="@style/PostSettingsCardViewInnerLayout">