Skip to content

Commit fb75519

Browse files
litetexlitetex
authored
Merge pull request #7925 from TacoTheDank/removeCircleImageView
Replace CircleImageView with ShapeableImageView
2 parents 3d47d73 + 1a000fe commit fb75519

21 files changed

Lines changed: 95 additions & 51 deletions

‎app/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ dependencies {
246246
implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
247247
implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
248248

249-
// Circular ImageView
250-
implementation "de.hdodenhof:circleimageview:3.1.0"
251249
// Image loading
252250
//noinspection GradleDependency --> 2.8 is the last version, not 2.71828!
253251
implementation "com.squareup.picasso:picasso:2.8"

‎app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ class AboutActivity : AppCompatActivity() {
117117
"AndroidX", "2005 - 2011", "The Android Open Source Project",
118118
"https://developer.android.com/jetpack", StandardLicenses.APACHE2
119119
),
120-
SoftwareComponent(
121-
"CircleImageView", "2014 - 2020", "Henning Dodenhof",
122-
"https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2
123-
),
124120
SoftwareComponent(
125121
"ExoPlayer", "2014 - 2020", "Google, Inc.",
126122
"https://github.com/google/ExoPlayer", StandardLicenses.APACHE2

‎app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import android.app.Activity;
88
import android.content.Context;
9+
import android.content.res.ColorStateList;
910
import android.os.Bundle;
1011
import android.text.TextUtils;
1112
import android.util.Log;
@@ -19,6 +20,10 @@
1920
import androidx.annotation.NonNull;
2021
import androidx.annotation.Nullable;
2122
import androidx.appcompat.content.res.AppCompatResources;
23+
import androidx.core.content.ContextCompat;
24+
25+
import com.google.android.material.shape.CornerFamily;
26+
import com.google.android.material.shape.ShapeAppearanceModel;
2227

2328
import org.reactivestreams.Subscriber;
2429
import org.reactivestreams.Subscription;
@@ -328,9 +333,14 @@ public void handleResult(@NonNull final PlaylistInfo result) {
328333
&& (YoutubeParsingHelper.isYoutubeMixId(result.getId())
329334
|| YoutubeParsingHelper.isYoutubeMusicMixId(result.getId()))) {
330335
// this is an auto-generated playlist (e.g. Youtube mix), so a radio is shown
331-
headerBinding.uploaderAvatarView.setDisableCircularTransformation(true);
332-
headerBinding.uploaderAvatarView.setBorderColor(
333-
getResources().getColor(R.color.transparent_background_color));
336+
final ShapeAppearanceModel model = ShapeAppearanceModel.builder()
337+
.setAllCorners(CornerFamily.ROUNDED, 0f)
338+
.build(); // this turns the image back into a square
339+
headerBinding.uploaderAvatarView.setShapeAppearanceModel(model);
340+
headerBinding.uploaderAvatarView.setStrokeColor(
341+
ColorStateList.valueOf(ContextCompat.getColor(
342+
requireContext(), R.color.transparent_background_color))
343+
);
334344
headerBinding.uploaderAvatarView.setImageDrawable(
335345
AppCompatResources.getDrawable(requireContext(),
336346
R.drawable.ic_radio)

‎app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.schabi.newpipe.info_list.holder;
22

33
import android.view.ViewGroup;
4+
import android.widget.ImageView;
45
import android.widget.TextView;
56

67
import org.schabi.newpipe.R;
@@ -11,10 +12,8 @@
1112
import org.schabi.newpipe.util.PicassoHelper;
1213
import org.schabi.newpipe.util.Localization;
1314

14-
import de.hdodenhof.circleimageview.CircleImageView;
15-
1615
public class ChannelMiniInfoItemHolder extends InfoItemHolder {
17-
public final CircleImageView itemThumbnailView;
16+
public final ImageView itemThumbnailView;
1817
public final TextView itemTitleView;
1918
private final TextView itemAdditionalDetailView;
2019

‎app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.util.Log;
88
import android.view.View;
99
import android.view.ViewGroup;
10+
import android.widget.ImageView;
1011
import android.widget.RelativeLayout;
1112
import android.widget.TextView;
1213

@@ -28,8 +29,6 @@
2829

2930
import java.util.regex.Matcher;
3031

31-
import de.hdodenhof.circleimageview.CircleImageView;
32-
3332
public class CommentsMiniInfoItemHolder extends InfoItemHolder {
3433
private static final String TAG = "CommentsMiniIIHolder";
3534

@@ -40,7 +39,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
4039
private final int commentVerticalPadding;
4140

4241
private final RelativeLayout itemRoot;
43-
public final CircleImageView itemThumbnailView;
42+
public final ImageView itemThumbnailView;
4443
private final TextView itemContentView;
4544
private final TextView itemLikesCountView;
4645
private final TextView itemPublishedTime;

‎app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;
8+
import android.widget.ImageView;
89
import android.widget.ProgressBar;
910
import android.widget.TextView;
1011

@@ -24,7 +25,6 @@
2425
import java.util.List;
2526
import java.util.Vector;
2627

27-
import de.hdodenhof.circleimageview.CircleImageView;
2828
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
2929
import io.reactivex.rxjava3.core.Observer;
3030
import io.reactivex.rxjava3.disposables.Disposable;
@@ -200,7 +200,7 @@ public int getItemCount() {
200200

201201
public class SelectChannelItemHolder extends RecyclerView.ViewHolder {
202202
public final View view;
203-
final CircleImageView thumbnailView;
203+
final ImageView thumbnailView;
204204
final TextView titleView;
205205
SelectChannelItemHolder(final View v) {
206206
super(v);

‎app/src/main/res/layout-large-land/fragment_video_detail.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,21 +266,23 @@
266266
android:layout_width="wrap_content"
267267
android:layout_height="wrap_content">
268268

269-
<de.hdodenhof.circleimageview.CircleImageView
269+
<com.google.android.material.imageview.ShapeableImageView
270270
android:id="@+id/detail_uploader_thumbnail_view"
271271
android:layout_width="@dimen/video_item_detail_uploader_image_size"
272272
android:layout_height="@dimen/video_item_detail_uploader_image_size"
273273
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
274-
android:src="@drawable/buddy" />
274+
android:src="@drawable/buddy"
275+
app:shapeAppearance="@style/CircularImageView" />
275276

276-
<de.hdodenhof.circleimageview.CircleImageView
277+
<com.google.android.material.imageview.ShapeableImageView
277278
android:id="@+id/detail_sub_channel_thumbnail_view"
278279
android:layout_width="@dimen/video_item_detail_sub_channel_image_size"
279280
android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
280281
android:layout_gravity="bottom|right"
281282
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
282283
android:src="@drawable/buddy"
283284
android:visibility="gone"
285+
app:shapeAppearance="@style/CircularImageView"
284286
tools:visibility="visible" />
285287

286288
</FrameLayout>

‎app/src/main/res/layout/channel_header.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,27 @@
2828
android:layout_marginLeft="8dp"
2929
android:layout_marginTop="50dp">
3030

31-
<de.hdodenhof.circleimageview.CircleImageView
31+
<com.google.android.material.imageview.ShapeableImageView
3232
android:id="@+id/channel_avatar_view"
3333
android:layout_width="@dimen/channel_avatar_size"
3434
android:layout_height="@dimen/channel_avatar_size"
35+
android:padding="1dp"
3536
android:src="@drawable/buddy"
36-
app:civ_border_color="#ffffff"
37-
app:civ_border_width="2dp" />
37+
app:shapeAppearance="@style/CircularImageView"
38+
app:strokeColor="#ffffff"
39+
app:strokeWidth="2dp" />
3840

39-
<de.hdodenhof.circleimageview.CircleImageView
41+
<com.google.android.material.imageview.ShapeableImageView
4042
android:id="@+id/sub_channel_avatar_view"
4143
android:layout_width="@dimen/sub_channel_avatar_size"
4244
android:layout_height="@dimen/sub_channel_avatar_size"
4345
android:layout_gravity="bottom|right"
46+
android:padding="1dp"
4447
android:src="@drawable/buddy"
4548
android:visibility="gone"
46-
app:civ_border_color="#ffffff"
47-
app:civ_border_width="2dp"
49+
app:shapeAppearance="@style/CircularImageView"
50+
app:strokeColor="#ffffff"
51+
app:strokeWidth="2dp"
4852
tools:ignore="RtlHardcoded"
4953
tools:visibility="visible" />
5054
</FrameLayout>

‎app/src/main/res/layout/fragment_video_detail.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,21 +253,23 @@
253253
android:layout_width="wrap_content"
254254
android:layout_height="wrap_content">
255255

256-
<de.hdodenhof.circleimageview.CircleImageView
256+
<com.google.android.material.imageview.ShapeableImageView
257257
android:id="@+id/detail_uploader_thumbnail_view"
258258
android:layout_width="@dimen/video_item_detail_uploader_image_size"
259259
android:layout_height="@dimen/video_item_detail_uploader_image_size"
260260
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
261-
android:src="@drawable/buddy" />
261+
android:src="@drawable/buddy"
262+
app:shapeAppearance="@style/CircularImageView" />
262263

263-
<de.hdodenhof.circleimageview.CircleImageView
264+
<com.google.android.material.imageview.ShapeableImageView
264265
android:id="@+id/detail_sub_channel_thumbnail_view"
265266
android:layout_width="@dimen/video_item_detail_sub_channel_image_size"
266267
android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
267268
android:layout_gravity="bottom|right"
268269
android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
269270
android:src="@drawable/buddy"
270271
android:visibility="gone"
272+
app:shapeAppearance="@style/CircularImageView"
271273
tools:ignore="RtlHardcoded"
272274
tools:visibility="visible" />
273275

‎app/src/main/res/layout/list_channel_grid_item.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:id="@+id/itemRoot"
56
android:layout_width="match_parent"
@@ -10,14 +11,15 @@
1011
android:minWidth="@dimen/channel_item_grid_min_width"
1112
android:padding="@dimen/channel_item_grid_padding">
1213

13-
<de.hdodenhof.circleimageview.CircleImageView
14+
<com.google.android.material.imageview.ShapeableImageView
1415
android:id="@+id/itemThumbnailView"
1516
android:layout_width="@dimen/channel_item_grid_thumbnail_image_size"
1617
android:layout_height="@dimen/channel_item_grid_thumbnail_image_size"
1718
android:layout_centerHorizontal="true"
1819
android:layout_margin="2dp"
1920
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
2021
android:src="@drawable/buddy_channel_item"
22+
app:shapeAppearance="@style/CircularImageView"
2123
tools:ignore="RtlHardcoded" />
2224

2325
<TextView

0 commit comments

Comments
 (0)