From 8f9d6b45ca69255cea38d64067e67faea113cb60 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Mon, 11 Feb 2019 18:12:07 +0100 Subject: [PATCH 1/8] Update supportLib version to 28.0.0 --- WordPress/build.gradle | 30 ++++++++++++++-------- libs/editor/WordPressEditor/build.gradle | 12 +++++---- libs/login/WordPressLoginFlow/build.gradle | 12 ++++++--- libs/utils/WordPressUtils/build.gradle | 8 +++--- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 9526c61d5293..d8e684479fc3 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -36,7 +36,7 @@ android { dexInProcess = true } - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '28.0.3' defaultConfig { @@ -44,7 +44,7 @@ android { versionName "alpha-150" versionCode 674 minSdkVersion 21 - targetSdkVersion 26 + targetSdkVersion 28 multiDexEnabled true @@ -107,6 +107,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 @@ -127,17 +132,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' diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index aebae4ecbe2b..7271a01fd11f 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -30,14 +30,14 @@ apply from: 'https://gist.githubusercontent.com/hypest/e06f6097065728b6db7b7c462 apply from: 'https://gist.githubusercontent.com/hypest/f526fe0775dedce0ce0133f1400d22a4/raw/0008b271a0d28fc79957fd3c2a027f57e98f796a/wait-jitpack.gradle' android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '28.0.3' defaultConfig { versionCode 13 versionName "1.3" minSdkVersion 21 - targetSdkVersion 26 + targetSdkVersion 28 buildConfigField "boolean", "BUILD_GUTENBERG_FROM_SOURCE", rootProject.ext.buildGutenbergFromSource.toString() } buildTypes { @@ -58,9 +58,11 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:animated-vector-drawable:28.0.0' + implementation 'com.android.support:gridlayout-v7:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:design:28.0.0' implementation 'org.apache.commons:commons-lang3:3.5' implementation 'org.wordpress:utils:1.22' diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle index 52086cba4d3c..24f4c6cbe5d2 100644 --- a/libs/login/WordPressLoginFlow/build.gradle +++ b/libs/login/WordPressLoginFlow/build.gradle @@ -17,12 +17,12 @@ repositories { } android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 2 versionName "1.1" @@ -35,8 +35,12 @@ dependencies { exclude group: "com.mcxiaoke.volley" } - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:animated-vector-drawable:28.0.0' + implementation 'com.android.support:support-media-compat:28.0.0' + implementation 'com.android.support:support-v13:28.0.0' + implementation 'com.android.support:gridlayout-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' api 'com.google.android.gms:play-services-auth:15.0.1' diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index 32ede13bd340..3fa5011d308d 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -20,8 +20,8 @@ repositories { dependencies { implementation 'org.apache.commons:commons-text:1.1' implementation 'com.mcxiaoke.volley:library:1.0.18' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'org.greenrobot:eventbus:3.0.0' lintChecks 'org.wordpress:lint:1.0.1' @@ -30,13 +30,13 @@ dependencies { android { useLibrary 'org.apache.http.legacy' - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '28.0.3' defaultConfig { versionName "1.22" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 28 } } From 4c7ab31c7cc564cb9908821ca9b0ab352b8585b2 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Mon, 11 Feb 2019 18:12:42 +0100 Subject: [PATCH 2/8] Fix api changes in supportLib 28.0.0 --- .../android/ui/activitylog/list/ActivityLogListFragment.kt | 4 ++-- .../android/ui/sitecreation/NewSiteCreationActivity.kt | 2 +- .../android/ui/stats/refresh/StatsListItemDecoration.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt index 0e793c3d3421..23856dbd94a5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt +++ b/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() } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt index 6d61dd82bf89..4cfa6b43ae10 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt @@ -148,7 +148,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) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsListItemDecoration.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsListItemDecoration.kt index 30c221b80a94..910f3b0e7c32 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsListItemDecoration.kt +++ b/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, From 1bf18720cee0c1cb679c7a0ef20e67239948279c Mon Sep 17 00:00:00 2001 From: malinajirka Date: Mon, 11 Feb 2019 18:46:48 +0100 Subject: [PATCH 3/8] Fix bottomNavigation shift mode --- .../android/ui/main/WPMainNavigationView.kt | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt index 7f2206980fb6..9ebc32da02ed 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt +++ b/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) { From 54eadad5217526abade89d40d2c0953ad04cce86 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 12 Feb 2019 11:13:30 +0100 Subject: [PATCH 4/8] Revert update of targetSdkVersion --- WordPress/build.gradle | 2 +- libs/editor/WordPressEditor/build.gradle | 2 +- libs/login/WordPressLoginFlow/build.gradle | 2 +- libs/utils/WordPressUtils/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index d8e684479fc3..318d6f1e3764 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -44,7 +44,7 @@ android { versionName "alpha-150" versionCode 674 minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 26 multiDexEnabled true diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 7271a01fd11f..cc86ca5b942a 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -37,7 +37,7 @@ android { versionCode 13 versionName "1.3" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 26 buildConfigField "boolean", "BUILD_GUTENBERG_FROM_SOURCE", rootProject.ext.buildGutenbergFromSource.toString() } buildTypes { diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle index 24f4c6cbe5d2..9d6a5f848430 100644 --- a/libs/login/WordPressLoginFlow/build.gradle +++ b/libs/login/WordPressLoginFlow/build.gradle @@ -22,7 +22,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 26 versionCode 2 versionName "1.1" diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index 3fa5011d308d..fbf37dfd730f 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -36,7 +36,7 @@ android { defaultConfig { versionName "1.22" minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 26 } } From 43ff15de1c3f1cbe245b22bb3829c046e3d6565d Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 12 Feb 2019 15:48:59 +0100 Subject: [PATCH 5/8] Update api image in config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 67f3829618a3..a485ac8305b0 100644 --- a/.circleci/config.yml +++ b/.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 From d5a2013c5f654d307ae5fa57280f951d604ba0d4 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 12 Feb 2019 16:46:01 +0100 Subject: [PATCH 6/8] Update compileSdkVersion to 28 - Analytics and Networking --- libs/analytics/WordPressAnalytics/build.gradle | 2 +- libs/networking/WordPressNetworking/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle index ab9ca5284200..74bccdb6d4df 100644 --- a/libs/analytics/WordPressAnalytics/build.gradle +++ b/libs/analytics/WordPressAnalytics/build.gradle @@ -26,7 +26,7 @@ dependencies { } android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion "28.0.3" defaultConfig { diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle index f43203cf6425..b23211cbb53e 100644 --- a/libs/networking/WordPressNetworking/build.gradle +++ b/libs/networking/WordPressNetworking/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'com.android.library' apply plugin: 'maven' android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '28.0.3' defaultConfig { From da2dc8e3f37276a3a2dab40afe00b93219605fdc Mon Sep 17 00:00:00 2001 From: malinajirka Date: Tue, 12 Feb 2019 17:35:11 +0100 Subject: [PATCH 7/8] Replace resources marked as private with custom resources --- .../wordpress/android/ui/themes/ThemeBrowserAdapter.java | 6 ++---- .../res/layout-sw600dp/theme_grid_cardview_header.xml | 4 ++-- .../src/main/res/layout/edit_post_settings_fragment.xml | 8 ++++---- WordPress/src/main/res/layout/login_epilogue_header.xml | 2 +- WordPress/src/main/res/layout/media_settings_activity.xml | 6 +++--- WordPress/src/main/res/layout/my_site_fragment.xml | 2 +- WordPress/src/main/res/layout/plugin_browser_activity.xml | 8 ++++---- WordPress/src/main/res/layout/plugin_detail_activity.xml | 8 ++++---- WordPress/src/main/res/layout/plugin_ratings_cardview.xml | 2 +- WordPress/src/main/res/layout/post_cardview.xml | 2 +- WordPress/src/main/res/layout/post_cardview_skeleton.xml | 2 +- .../src/main/res/layout/post_settings_tags_activity.xml | 2 +- .../main/res/layout/publicize_button_prefs_fragment.xml | 8 ++++---- .../src/main/res/layout/publicize_detail_fragment.xml | 4 ++-- WordPress/src/main/res/layout/publicize_list_fragment.xml | 4 ++-- WordPress/src/main/res/layout/reader_cardview_post.xml | 2 +- .../src/main/res/layout/reader_cardview_removed_post.xml | 2 +- WordPress/src/main/res/layout/reader_cardview_xpost.xml | 2 +- WordPress/src/main/res/layout/signup_epilogue.xml | 2 +- .../src/main/res/layout/site_creation_category_screen.xml | 6 +++--- .../src/main/res/layout/site_creation_theme_item.xml | 2 +- .../main/res/layout/site_settings_tag_detail_fragment.xml | 2 +- WordPress/src/main/res/layout/stats_list_block.xml | 4 ++-- .../src/main/res/layout/theme_grid_cardview_header.xml | 4 ++-- WordPress/src/main/res/layout/theme_grid_item.xml | 6 +++--- WordPress/src/main/res/values/dimens.xml | 3 +++ 26 files changed, 52 insertions(+), 51 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java index 121dd13a814b..773a3127489a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java +++ b/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)); } } diff --git a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml index e2245359cced..d55a92663f98 100644 --- a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml +++ b/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"> diff --git a/WordPress/src/main/res/layout/edit_post_settings_fragment.xml b/WordPress/src/main/res/layout/edit_post_settings_fragment.xml index cc21a32517f4..3a73df47edb7 100644 --- a/WordPress/src/main/res/layout/edit_post_settings_fragment.xml +++ b/WordPress/src/main/res/layout/edit_post_settings_fragment.xml @@ -17,7 +17,7 @@ + card_view:cardCornerRadius="@dimen/default_cardview_radius"> @@ -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"> @@ -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"> @@ -159,7 +159,7 @@ + card_view:cardCornerRadius="@dimen/default_cardview_radius"> diff --git a/WordPress/src/main/res/layout/login_epilogue_header.xml b/WordPress/src/main/res/layout/login_epilogue_header.xml index 8243cf4a2398..e2ff112b469c 100644 --- a/WordPress/src/main/res/layout/login_epilogue_header.xml +++ b/WordPress/src/main/res/layout/login_epilogue_header.xml @@ -29,7 +29,7 @@ app:cardBackgroundColor="@color/white" app:cardElevation="@dimen/card_elevation" app:cardUseCompatPadding="true" - app:cardCornerRadius="@dimen/cardview_default_radius"> + app:cardCornerRadius="@dimen/default_cardview_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> @@ -221,7 +221,7 @@ android:id="@+id/plugin_card_site" style="@style/PluginCardView" card_view:cardBackgroundColor="@color/white" - card_view:cardCornerRadius="@dimen/cardview_default_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> @@ -260,7 +260,7 @@ + card_view:cardCornerRadius="@dimen/default_cardview_radius"> @@ -319,7 +319,7 @@ style="@style/PluginCardView" android:id="@+id/plugin_wp_org_details_container" card_view:cardBackgroundColor="@color/white" - card_view:cardCornerRadius="@dimen/cardview_default_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> diff --git a/WordPress/src/main/res/layout/plugin_ratings_cardview.xml b/WordPress/src/main/res/layout/plugin_ratings_cardview.xml index 50a372f288f8..bdc469d13912 100644 --- a/WordPress/src/main/res/layout/plugin_ratings_cardview.xml +++ b/WordPress/src/main/res/layout/plugin_ratings_cardview.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" style="@style/PluginCardView" card_view:cardBackgroundColor="@color/white" - card_view:cardCornerRadius="@dimen/cardview_default_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> + card_view:cardCornerRadius="@dimen/default_cardview_radius"> + app:cardCornerRadius="@dimen/default_cardview_radius" > + app:cardCornerRadius="@dimen/default_cardview_radius" > + app:cardCornerRadius="@dimen/default_cardview_radius" > diff --git a/WordPress/src/main/res/layout/site_creation_category_screen.xml b/WordPress/src/main/res/layout/site_creation_category_screen.xml index a6121c8bb1b7..c5b2b047fe1b 100644 --- a/WordPress/src/main/res/layout/site_creation_category_screen.xml +++ b/WordPress/src/main/res/layout/site_creation_category_screen.xml @@ -58,7 +58,7 @@ android:focusable="true" android:foreground="?android:attr/selectableItemBackground" app:cardBackgroundColor="@color/white" - app:cardCornerRadius="@dimen/cardview_default_radius" + app:cardCornerRadius="@dimen/default_cardview_radius" app:cardElevation="@dimen/card_elevation"> + android:layout_margin="@dimen/default_cardview_radius"> diff --git a/WordPress/src/main/res/layout/theme_grid_item.xml b/WordPress/src/main/res/layout/theme_grid_item.xml index 40e66b5887db..5f47d46e97d2 100644 --- a/WordPress/src/main/res/layout/theme_grid_item.xml +++ b/WordPress/src/main/res/layout/theme_grid_item.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/theme_browser_cardview_margin_large" - card_view:cardCornerRadius="@dimen/cardview_default_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"> @@ -18,7 +18,7 @@ + android:layout_margin="@dimen/default_cardview_radius"> + android:layout_marginTop="@dimen/default_cardview_radius"> 20dp + 2dp + 2dp + 128dp 220dp From 5aeafa2982030a4ddae7f54f9545e25ef63ed5da Mon Sep 17 00:00:00 2001 From: malinajirka Date: Mon, 18 Feb 2019 11:28:01 +0100 Subject: [PATCH 8/8] Fix androidTests --- WordPress/build.gradle | 4 ++++ .../wordpress/android/ui/screenshots/WPScreenshotTest.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 318d6f1e3764..b3f4c2b382b1 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -29,6 +29,10 @@ 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 diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java index ae2462094c8e..c1620da6d705 100644 --- a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java +++ b/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;