Skip to content

[Reader Improvements] Udate follow button design on "Manage Topics & Sites" screen #19330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: [Feature] Reader Improvements
merged 3 commits into from
Oct 10, 2023
Merged

[Reader Improvements] Udate follow button design on "Manage Topics & Sites" screen #19330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
751f22c
Replace follow button with new design on manage followed topics
RenanLukas Oct 6, 2023
7b95b8e
Replace follow button with new design on manage followed sites
RenanLukas Oct 6, 2023
49b375c
Remove unused dimension: reader_remove_button_extra_padding
RenanLukas Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderTagAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.TextView;

import androidx.annotation.NonNull;
Expand All @@ -21,12 +20,11 @@
import org.wordpress.android.ui.reader.ReaderInterfaces;
import org.wordpress.android.ui.reader.actions.ReaderActions;
import org.wordpress.android.ui.reader.actions.ReaderTagActions;
import org.wordpress.android.ui.reader.utils.ReaderUtils;
import org.wordpress.android.ui.reader.views.ReaderFollowButton;
import org.wordpress.android.util.AppLog;
import org.wordpress.android.util.AppLog.T;
import org.wordpress.android.util.NetworkUtils;
import org.wordpress.android.util.ToastUtils;
import org.wordpress.android.util.extensions.ViewExtensionsKt;

import java.lang.ref.WeakReference;

Expand Down Expand Up @@ -99,12 +97,7 @@ public TagViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public void onBindViewHolder(TagViewHolder holder, int position) {
final ReaderTag tag = mTags.get(position);
holder.mTxtTagName.setText(tag.getLabel());
holder.mBtnRemove.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
performDeleteTag(tag);
}
});
holder.mRemoveFollowButton.setOnClickListener(v -> performDeleteTag(tag));
}

private void performDeleteTag(@NonNull ReaderTag tag) {
Expand Down Expand Up @@ -138,14 +131,13 @@ public void onActionResult(boolean succeeded) {

class TagViewHolder extends RecyclerView.ViewHolder {
private final TextView mTxtTagName;
private final ImageButton mBtnRemove;
private final ReaderFollowButton mRemoveFollowButton;

TagViewHolder(View view) {
super(view);
mTxtTagName = (TextView) view.findViewById(R.id.text_topic);
mBtnRemove = (ImageButton) view.findViewById(R.id.btn_remove);
ReaderUtils.setBackgroundToRoundRipple(mBtnRemove);
ViewExtensionsKt.expandTouchTargetArea(mBtnRemove, R.dimen.reader_remove_button_extra_padding, false);
mRemoveFollowButton = (ReaderFollowButton) view.findViewById(R.id.remove_button);
mRemoveFollowButton.setIsFollowed(true);
}
}

Expand Down
6 changes: 2 additions & 4 deletions WordPress/src/main/res/layout/reader_listitem_blog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@

<org.wordpress.android.ui.reader.views.ReaderFollowButton
android:id="@+id/follow_button"
style="@style/Reader.Follow.Button.Icon"
style="@style/Reader.Follow.Button.New"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_medium"
android:layout_marginEnd="@dimen/margin_medium"/>
android:layout_height="wrap_content" />

</LinearLayout>
12 changes: 4 additions & 8 deletions WordPress/src/main/res/layout/reader_listitem_tag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,10 @@
android:textAppearance="?attr/textAppearanceSubtitle1"
tools:text="text_topic" />

<ImageButton
android:id="@+id/btn_remove"
<org.wordpress.android.ui.reader.views.ReaderFollowButton
android:id="@+id/remove_button"
style="@style/Reader.Follow.Button.New"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/remove"
android:padding="@dimen/margin_small"
android:src="@drawable/ic_reader_following_white_24dp"
app:tint="?attr/wpColorOnSurfaceMedium" />
android:contentDescription="@string/remove" />
</LinearLayout>
1 change: 0 additions & 1 deletion WordPress/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@

<!-- Increased touch targets to make views more accessible -->
<dimen name="reader_discover_layout_extra_padding">16dp</dimen>
<dimen name="reader_remove_button_extra_padding">12dp</dimen>
<dimen name="reader_more_image_extra_padding">12dp</dimen>

<dimen name="reader_chip_radius">8dp</dimen>
Expand Down