From 2bf8d1f943b1a5527eacc8e72623f064408d2262 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 28 Jun 2022 11:12:22 -0400 Subject: [PATCH 1/9] Update Gradle to 7.4.2 --- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1159fc54f39..92f06b50fd65 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2c33315b4be3511af4edf0539d4d152c77dcc0eb Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 28 Jun 2022 11:12:23 -0400 Subject: [PATCH 2/9] Update AGP to 7.2.1 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index f7aba9773297..387033d8b337 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { gradle.ext.kotlinVersion = '1.6.10' - gradle.ext.agpVersion = '7.1.1' + gradle.ext.agpVersion = '7.2.1' gradle.ext.daggerVersion = "2.41" gradle.ext.detektVersion = '1.15.0' gradle.ext.navComponentVersion = '2.4.2' From 84598d07a158f9924dab5ffb016605d6360ad226 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 29 Jun 2022 12:28:50 -0400 Subject: [PATCH 3/9] Removes unused TextDrawable widget --- .../android/widgets/TextDrawable.java | 442 ------------------ 1 file changed, 442 deletions(-) delete mode 100644 WordPress/src/main/java/org/wordpress/android/widgets/TextDrawable.java diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/TextDrawable.java b/WordPress/src/main/java/org/wordpress/android/widgets/TextDrawable.java deleted file mode 100644 index 1e30e3e16b74..000000000000 --- a/WordPress/src/main/java/org/wordpress/android/widgets/TextDrawable.java +++ /dev/null @@ -1,442 +0,0 @@ -package org.wordpress.android.widgets; - -/** - * A Drawable object used to display text content. - *

- * Based on https://github.com/devunwired/textdrawable - */ - -import android.content.Context; -import android.content.res.ColorStateList; -import android.content.res.Resources; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.ColorFilter; -import android.graphics.Paint; -import android.graphics.Path; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.graphics.drawable.Drawable; -import android.text.Layout; -import android.text.StaticLayout; -import android.text.TextPaint; -import android.util.TypedValue; - -/** - * A Drawable object that draws text. - * A TextDrawable accepts most of the same parameters that can be applied to - * {@link android.widget.TextView} for displaying and formatting text. - * - * Optionally, a {@link Path} may be supplied on which to draw the text. - * - * A TextDrawable has an intrinsic size equal to that required to draw all - * the text it has been supplied, when possible. In cases where a {@link Path} - * has been supplied, the caller must explicitly call - * {@link #setBounds(android.graphics.Rect) setBounds()} to provide the Drawable - * size based on the Path constraints. - */ -public class TextDrawable extends Drawable { - /* Platform XML constants for typeface */ - private static final int SANS = 1; - private static final int SERIF = 2; - private static final int MONOSPACE = 3; - - /* Resources for scaling values to the given device */ - private Resources mResources; - /* Paint to hold most drawing primitives for the text */ - private TextPaint mTextPaint; - /* Layout is used to measure and draw the text */ - private StaticLayout mTextLayout; - /* Alignment of the text inside its bounds */ - private Layout.Alignment mTextAlignment = Layout.Alignment.ALIGN_NORMAL; - /* Optional path on which to draw the text */ - private Path mTextPath; - /* Stateful text color list */ - private ColorStateList mTextColors; - /* Container for the bounds to be reported to widgets */ - private Rect mTextBounds; - /* Text string to draw */ - private CharSequence mText = ""; - - /* Attribute lists to pull default values from the current theme */ - private static final int[] THEME_ATTRIBUTES = { - android.R.attr.textAppearance - }; - private static final int[] APPEARANCE_ATTRIBUTES = { - android.R.attr.textSize, - android.R.attr.typeface, - android.R.attr.textStyle, - android.R.attr.textColor - }; - - - public TextDrawable(Context context) { - super(); - // Used to load and scale resource items - mResources = context.getResources(); - // Definition of this drawables size - mTextBounds = new Rect(); - // Paint to use for the text - mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG); - mTextPaint.density = mResources.getDisplayMetrics().density; - mTextPaint.setDither(true); - - int textSize = 15; - ColorStateList textColor = null; - int styleIndex = -1; - int typefaceIndex = -1; - - // Set default parameters from the current theme - TypedArray a = context.getTheme().obtainStyledAttributes(THEME_ATTRIBUTES); - int appearanceId = a.getResourceId(0, -1); - a.recycle(); - - TypedArray ap = null; - if (appearanceId != -1) { - ap = context.obtainStyledAttributes(appearanceId, APPEARANCE_ATTRIBUTES); - } - if (ap != null) { - for (int i = 0; i < ap.getIndexCount(); i++) { - int attr = ap.getIndex(i); - switch (attr) { - case 0: // Text Size - textSize = a.getDimensionPixelSize(attr, textSize); - break; - case 1: // Typeface - typefaceIndex = a.getInt(attr, typefaceIndex); - break; - case 2: // Text Style - styleIndex = a.getInt(attr, styleIndex); - break; - case 3: // Text Color - textColor = a.getColorStateList(attr); - break; - default: - break; - } - } - - ap.recycle(); - } - - setTextColor(textColor != null ? textColor : ColorStateList.valueOf(0xFF000000)); - setRawTextSize(textSize); - - Typeface tf = null; - switch (typefaceIndex) { - case SANS: - tf = Typeface.SANS_SERIF; - break; - - case SERIF: - tf = Typeface.SERIF; - break; - - case MONOSPACE: - tf = Typeface.MONOSPACE; - break; - } - - setTypeface(tf, styleIndex); - } - - - public void setText(int text) { - this.setText(String.valueOf(text)); - } - - /** - * Set the text that will be displayed - * @param text Text to display - */ - public void setText(CharSequence text) { - if (text == null) { - text = ""; - } - - mText = text; - - measureContent(); - } - - /** - * Return the text currently being displayed - */ - public CharSequence getText() { - return mText; - } - - /** - * Return the current text size, in pixels - */ - public float getTextSize() { - return mTextPaint.getTextSize(); - } - - /** - * Set the text size. The value will be interpreted in "sp" units - * @param size Text size value, in sp - */ - public void setTextSize(float size) { - setTextSize(TypedValue.COMPLEX_UNIT_SP, size); - } - - /** - * Set the text size, using the supplied complex units - * @param unit Units for the text size, such as dp or sp - * @param size Text size value - */ - public void setTextSize(int unit, float size) { - float dimension = TypedValue.applyDimension(unit, size, - mResources.getDisplayMetrics()); - setRawTextSize(dimension); - } - - /* - * Set the text size, in raw pixels - */ - private void setRawTextSize(float size) { - if (size != mTextPaint.getTextSize()) { - mTextPaint.setTextSize(size); - - measureContent(); - } - } - - /** - * Return the horizontal stretch factor of the text - */ - public float getTextScaleX() { - return mTextPaint.getTextScaleX(); - } - - /** - * Set the horizontal stretch factor of the text - * @param size Text scale factor - */ - public void setTextScaleX(float size) { - if (size != mTextPaint.getTextScaleX()) { - mTextPaint.setTextScaleX(size); - measureContent(); - } - } - - /** - * Return the current text alignment setting - */ - public Layout.Alignment getTextAlign() { - return mTextAlignment; - } - - /** - * Set the text alignment. The alignment itself is based on the text layout direction. - * For LTR text NORMAL is left aligned and OPPOSITE is right aligned. - * For RTL text, those alignments are reversed. - * @param align Text alignment value. Should be set to one of: - * - * {@link Layout.Alignment#ALIGN_NORMAL}, - * {@link Layout.Alignment#ALIGN_NORMAL}, - * {@link Layout.Alignment#ALIGN_OPPOSITE}. - */ - public void setTextAlign(Layout.Alignment align) { - if (mTextAlignment != align) { - mTextAlignment = align; - measureContent(); - } - } - - /** - * Sets the typeface and style in which the text should be displayed. - * Note that not all Typeface families actually have bold and italic - * variants, so you may need to use - * {@link #setTypeface(Typeface, int)} to get the appearance - * that you actually want. - */ - public void setTypeface(Typeface tf) { - if (mTextPaint.getTypeface() != tf) { - mTextPaint.setTypeface(tf); - - measureContent(); - } - } - - /** - * Sets the typeface and style in which the text should be displayed, - * and turns on the fake bold and italic bits in the Paint if the - * Typeface that you provided does not have all the bits in the - * style that you specified. - * - */ - public void setTypeface(Typeface tf, int style) { - if (style > 0) { - if (tf == null) { - tf = Typeface.defaultFromStyle(style); - } else { - tf = Typeface.create(tf, style); - } - - setTypeface(tf); - // now compute what (if any) algorithmic styling is needed - int typefaceStyle = tf != null ? tf.getStyle() : 0; - int need = style & ~typefaceStyle; - mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0); - mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0); - } else { - mTextPaint.setFakeBoldText(false); - mTextPaint.setTextSkewX(0); - setTypeface(tf); - } - } - - /** - * Return the current typeface and style that the Paint - * using for display. - */ - public Typeface getTypeface() { - return mTextPaint.getTypeface(); - } - - /** - * Set a single text color for all states - * @param color Color value such as {@link Color#WHITE} or {@link Color#argb(int, int, int, int)} - */ - public void setTextColor(int color) { - setTextColor(ColorStateList.valueOf(color)); - } - - /** - * Set the text color as a state list - * @param colorStateList ColorStateList of text colors, such as inflated from an R.color resource - */ - public void setTextColor(ColorStateList colorStateList) { - mTextColors = colorStateList; - updateTextColors(getState()); - } - - /** - * Optional Path object on which to draw the text. If this is set, - * TextDrawable cannot properly measure the bounds this drawable will need. - * You must call {@link #setBounds(int, int, int, int) setBounds()} before - * applying this TextDrawable to any View. - * - * Calling this method with null will remove any Path currently attached. - */ - public void setTextPath(Path path) { - if (mTextPath != path) { - mTextPath = path; - measureContent(); - } - } - - /** - * Internal method to take measurements of the current contents and apply - * the correct bounds when possible. - */ - private void measureContent() { - // If drawing to a path, we cannot measure intrinsic bounds - // We must resly on setBounds being called externally - if (mTextPath != null) { - // Clear any previous measurement - mTextLayout = null; - mTextBounds.setEmpty(); - } else { - // Measure text bounds - double desired = Math.ceil(Layout.getDesiredWidth(mText, mTextPaint)); - mTextLayout = new StaticLayout(mText, mTextPaint, (int) desired, - mTextAlignment, 1.0f, 0.0f, false); - mTextBounds.set(0, 0, mTextLayout.getWidth(), mTextLayout.getHeight()); - } - - // We may need to be redrawn - invalidateSelf(); - } - - /** - * Internal method to apply the correct text color based on the drawable's state - */ - private boolean updateTextColors(int[] stateSet) { - int newColor = mTextColors.getColorForState(stateSet, Color.WHITE); - if (mTextPaint.getColor() != newColor) { - mTextPaint.setColor(newColor); - return true; - } - - return false; - } - - @Override - protected void onBoundsChange(Rect bounds) { - // Update the internal bounds in response to any external requests - mTextBounds.set(bounds); - } - - @Override - public boolean isStateful() { - /* - * The drawable's ability to represent state is based on - * the text color list set - */ - return mTextColors.isStateful(); - } - - @Override - protected boolean onStateChange(int[] state) { - // Upon state changes, grab the correct text color - return updateTextColors(state); - } - - @Override - public int getIntrinsicHeight() { - // Return the vertical bounds measured, or -1 if none - if (mTextBounds.isEmpty()) { - return -1; - } else { - return (mTextBounds.bottom - mTextBounds.top); - } - } - - @Override - public int getIntrinsicWidth() { - // Return the horizontal bounds measured, or -1 if none - if (mTextBounds.isEmpty()) { - return -1; - } else { - return (mTextBounds.right - mTextBounds.left); - } - } - - @Override - public void draw(Canvas canvas) { - final Rect bounds = getBounds(); - final int count = canvas.save(); - canvas.translate(bounds.left, bounds.top); - if (mTextPath == null) { - // Allow the layout to draw the text - mTextLayout.draw(canvas); - } else { - // Draw directly on the canvas using the supplied path - canvas.drawTextOnPath(mText.toString(), mTextPath, 0, 0, mTextPaint); - } - canvas.restoreToCount(count); - } - - @Override - public void setAlpha(int alpha) { - if (mTextPaint.getAlpha() != alpha) { - mTextPaint.setAlpha(alpha); - } - } - - @Override - public int getOpacity() { - return mTextPaint.getAlpha(); - } - - @Override - public void setColorFilter(ColorFilter cf) { - if (mTextPaint.getColorFilter() != cf) { - mTextPaint.setColorFilter(cf); - } - } -} From d1eeb1ee2c2523ab1fddf80251e5af8dfaf6e67c Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 29 Jun 2022 12:33:23 -0400 Subject: [PATCH 4/9] Use DividerItemDecoration instead of custom divider in people list --- .../android/ui/people/PeopleListFragment.java | 54 ++----------------- WordPress/src/main/res/values/dimens.xml | 1 - 2 files changed, 5 insertions(+), 50 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java index 9d9c06a90ce8..65b7fbe1e4f7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java @@ -1,10 +1,6 @@ package org.wordpress.android.ui.people; import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.InsetDrawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -19,15 +15,14 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.google.android.material.appbar.AppBarLayout; import org.apache.commons.text.StringEscapeUtils; -import org.jetbrains.annotations.NotNull; import org.wordpress.android.R; import org.wordpress.android.WordPress; import org.wordpress.android.analytics.AnalyticsTracker; @@ -47,7 +42,6 @@ import org.wordpress.android.util.AppLog; import org.wordpress.android.util.GravatarUtils; import org.wordpress.android.util.NetworkUtils; -import org.wordpress.android.util.RtlUtils; import org.wordpress.android.util.image.ImageManager; import org.wordpress.android.util.image.ImageType; @@ -108,6 +102,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { setHasOptionsMenu(true); + Context context = getContext(); final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.people_list_fragment, container, false); Toolbar toolbar = rootView.findViewById(R.id.toolbar_main); @@ -124,10 +119,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mActionableEmptyView = rootView.findViewById(R.id.actionable_empty_view); mFilteredRecyclerView = rootView.findViewById(R.id.filtered_recycler_view); - mFilteredRecyclerView - .addItemDecoration(new PeopleItemDecoration(getActivity())); mFilteredRecyclerView.setLogT(AppLog.T.PEOPLE); mFilteredRecyclerView.setSwipeToRefreshEnabled(false); + if (context != null) { + mFilteredRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); + } // the following will change the look and feel of the toolbar to match the current design mFilteredRecyclerView.setToolbarLeftAndRightPadding( @@ -478,44 +474,4 @@ public void onClick(View v) { } } } - - // Taken from http://stackoverflow.com/a/27037230 - private class PeopleItemDecoration extends RecyclerView.ItemDecoration { - private InsetDrawable mDivider; - - // use a custom drawable - PeopleItemDecoration(Context context) { - int[] attrs = {android.R.attr.listDivider}; - TypedArray ta = context.obtainStyledAttributes(attrs); - Drawable drawable = ta.getDrawable(0); - ta.recycle(); - - int inset = context.getResources().getDimensionPixelOffset(R.dimen.people_list_divider_left_margin); - - if (RtlUtils.isRtl(context)) { - mDivider = new InsetDrawable(drawable, 0, 0, inset, 0); - } else { - mDivider = new InsetDrawable(drawable, inset, 0, 0, 0); - } - } - - @Override - public void onDraw(@NotNull Canvas c, @NotNull RecyclerView parent, @NotNull RecyclerView.State state) { - int left = ViewCompat.getPaddingStart(parent); - int right = parent.getWidth() - ViewCompat.getPaddingEnd(parent); - - int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - View child = parent.getChildAt(i); - - RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); - - int top = child.getBottom() + params.bottomMargin; - int bottom = top + mDivider.getIntrinsicHeight(); - - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - } } diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index 1f56cf0938a6..2e1f490e54a1 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -383,7 +383,6 @@ 40dp 72dp 20dp - 72dp 40dp 5dp From 9988ff81ba20abdf20dab20a6701d78fd0336354 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 29 Jun 2022 12:42:03 -0400 Subject: [PATCH 5/9] Addresses Obsolete SDK_INT version checks --- .../services/NotificationsUpdateJobService.java | 2 -- .../service/InstallationReferrerJobService.java | 2 -- .../main/res/layout/activity_log_list_activity.xml | 3 +-- .../src/main/res/values-night/styles_zendesk.xml | 2 +- libs/editor/src/main/res/values/styles.xml | 12 ++++++------ 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java index 574d97da30ee..f2ed15e62076 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java @@ -1,6 +1,5 @@ package org.wordpress.android.ui.notifications.services; -import android.annotation.TargetApi; import android.app.job.JobParameters; import android.app.job.JobService; import android.content.Context; @@ -20,7 +19,6 @@ protected void attachBaseContext(Context newBase) { super.attachBaseContext(LocaleManager.setLocale(newBase)); } - @TargetApi(22) @Override public boolean onStartJob(JobParameters params) { String noteId = null; diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java index 8cc9ecc562c1..8d4d43d44f72 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java +++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java @@ -1,6 +1,5 @@ package org.wordpress.android.util.analytics.service; -import android.annotation.TargetApi; import android.app.job.JobParameters; import android.app.job.JobService; import android.os.Bundle; @@ -19,7 +18,6 @@ * https://developer.android.com/guide/components/broadcasts.html#receiving_broadcasts * https://developer.android.com/guide/components/broadcasts#effects-on-process-state */ -@TargetApi(21) public class InstallationReferrerJobService extends JobService implements InstallationReferrerServiceLogic.ServiceCompletionListener { @Override diff --git a/WordPress/src/main/res/layout/activity_log_list_activity.xml b/WordPress/src/main/res/layout/activity_log_list_activity.xml index 0648d351929c..42e4f5fe1480 100644 --- a/WordPress/src/main/res/layout/activity_log_list_activity.xml +++ b/WordPress/src/main/res/layout/activity_log_list_activity.xml @@ -30,8 +30,7 @@ android:scrollIndicators="none" android:visibility="gone" app:layout_scrollFlags="noScroll" - android:scrollbars="none" - tools:targetApi="m"> + android:scrollbars="none"> @style/Widget.AppCompat.Toolbar.Button.Navigation - false + false @android:color/black diff --git a/libs/editor/src/main/res/values/styles.xml b/libs/editor/src/main/res/values/styles.xml index f51414cb9d8b..83e5b6076627 100755 --- a/libs/editor/src/main/res/values/styles.xml +++ b/libs/editor/src/main/res/values/styles.xml @@ -14,13 +14,13 @@ From 0e12fd62d4f234351c8ea49a79d8ae5638744c64 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 6 Jul 2022 10:25:09 +0300 Subject: [PATCH 6/9] Refactor: Replace context with recycler view context for people list --- .../wordpress/android/ui/people/PeopleListFragment.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java index 65b7fbe1e4f7..e01c45dbf509 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java @@ -102,7 +102,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { setHasOptionsMenu(true); - Context context = getContext(); final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.people_list_fragment, container, false); Toolbar toolbar = rootView.findViewById(R.id.toolbar_main); @@ -121,9 +120,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mFilteredRecyclerView = rootView.findViewById(R.id.filtered_recycler_view); mFilteredRecyclerView.setLogT(AppLog.T.PEOPLE); mFilteredRecyclerView.setSwipeToRefreshEnabled(false); - if (context != null) { - mFilteredRecyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); - } + mFilteredRecyclerView.addItemDecoration( + new DividerItemDecoration(mFilteredRecyclerView.getContext(), DividerItemDecoration.VERTICAL) + ); // the following will change the look and feel of the toolbar to match the current design mFilteredRecyclerView.setToolbarLeftAndRightPadding( From 48274592ada0899030bd86352abd5d708ad422f1 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 6 Jul 2022 13:24:00 -0400 Subject: [PATCH 7/9] Update our dependencies to AGP 7.2.1 PRs --- build.gradle | 12 ++++++------ libs/editor/build.gradle | 2 +- .../android/editor/AztecEditorFragment.java | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 360b799fe174..c1003ec83511 100644 --- a/build.gradle +++ b/build.gradle @@ -8,11 +8,11 @@ plugins { } ext { - wordPressUtilsVersion = '2.5.0' - wordPressLoginVersion = '0.14.0' - gutenbergMobileVersion = 'v1.78.1' - storiesVersion = '1.3.0' - aboutAutomatticVersion = '0.0.5' + wordPressUtilsVersion = '107-a37619ac2b7703becf2554d31c09c6487c04b56f' + wordPressLoginVersion = '86-9966060c0483344c699636ee53def4bcd3603c65' + gutenbergMobileVersion = '5002-bb578bb2669cea49f48719ca788931f5ad6591ca' + storiesVersion = '722-7cc16bbe2995562cafc2fff1cb4096e84da98077' + aboutAutomatticVersion = '36-e6c8e93e564a857b3c1dd3d2588a0114c36fad40' minSdkVersion = 24 compileSdkVersion = 31 @@ -21,7 +21,7 @@ ext { coroutinesVersion = '1.5.2' androidxWorkVersion = "2.7.0" - fluxCVersion = '1.46.0' + fluxCVersion = '2454-3457772fa66619f4e33ac7bb318c49fc4540500a' appCompatVersion = '1.0.2' androidxCoreVersion = '1.3.2' diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 2c2472414ad9..77c08127625e 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -4,7 +4,7 @@ plugins { id "org.jetbrains.kotlin.plugin.parcelize" } -ext.aztecVersion = 'v1.5.8' +ext.aztecVersion = '991-c2bd0d94bbecbc6e78d91c8951907e0a9b0bbb7a' repositories { maven { diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java b/libs/editor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java index 1e03b15a0064..984e8b819ac0 100644 --- a/libs/editor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java +++ b/libs/editor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java @@ -1297,6 +1297,10 @@ public void onMediaUploadSucceeded(final String localMediaId, final MediaFile me } } + @Override + public void beforeMediaDeleted(AztecAttributes aztecAttributes) { + } + @Override public void onMediaDeleted(AztecAttributes aztecAttributes) { String localMediaId = aztecAttributes.getValue(ATTR_ID_WP); From 1c9dc4d94ab68ae2dd1328adfe33fbde664cf0b2 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 7 Jul 2022 11:21:31 -0400 Subject: [PATCH 8/9] Update Dagger to 2.42 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 387033d8b337..1cf6210e5e95 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { gradle.ext.kotlinVersion = '1.6.10' gradle.ext.agpVersion = '7.2.1' - gradle.ext.daggerVersion = "2.41" + gradle.ext.daggerVersion = "2.42" gradle.ext.detektVersion = '1.15.0' gradle.ext.navComponentVersion = '2.4.2' From 137d13dd1e59a7026c092102e2bab4b5d835d41a Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Thu, 7 Jul 2022 12:08:50 -0400 Subject: [PATCH 9/9] Update our dependencies to AGP 7.2.1 tagged version --- build.gradle | 12 ++++++------ libs/editor/build.gradle | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index c1003ec83511..400cfb86f135 100644 --- a/build.gradle +++ b/build.gradle @@ -8,11 +8,11 @@ plugins { } ext { - wordPressUtilsVersion = '107-a37619ac2b7703becf2554d31c09c6487c04b56f' - wordPressLoginVersion = '86-9966060c0483344c699636ee53def4bcd3603c65' - gutenbergMobileVersion = '5002-bb578bb2669cea49f48719ca788931f5ad6591ca' - storiesVersion = '722-7cc16bbe2995562cafc2fff1cb4096e84da98077' - aboutAutomatticVersion = '36-e6c8e93e564a857b3c1dd3d2588a0114c36fad40' + wordPressUtilsVersion = '2.6.0' + wordPressLoginVersion = '0.15.0' + gutenbergMobileVersion = 'v1.78.1' + storiesVersion = '1.4.0' + aboutAutomatticVersion = '0.0.6' minSdkVersion = 24 compileSdkVersion = 31 @@ -21,7 +21,7 @@ ext { coroutinesVersion = '1.5.2' androidxWorkVersion = "2.7.0" - fluxCVersion = '2454-3457772fa66619f4e33ac7bb318c49fc4540500a' + fluxCVersion = 'trunk-f44a381615f6d850e9c95071469424fbde6daff8' appCompatVersion = '1.0.2' androidxCoreVersion = '1.3.2' diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 77c08127625e..f81acbd83106 100644 --- a/libs/editor/build.gradle +++ b/libs/editor/build.gradle @@ -4,7 +4,7 @@ plugins { id "org.jetbrains.kotlin.plugin.parcelize" } -ext.aztecVersion = '991-c2bd0d94bbecbc6e78d91c8951907e0a9b0bbb7a' +ext.aztecVersion = 'v1.6.0' repositories { maven {