diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt index 2ef90184a..687e18aff 100644 --- a/app/src/main/java/com/github/libretube/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt @@ -19,8 +19,9 @@ import com.github.libretube.adapters.ChannelAdapter import com.github.libretube.obj.Subscribe import com.google.android.material.button.MaterialButton import com.squareup.picasso.Picasso -import java.io.IOException import retrofit2.HttpException +import java.io.IOException + class ChannelFragment : Fragment() { @@ -195,10 +196,11 @@ class ChannelFragment : Fragment() { runOnUiThread { view.findViewById(R.id.channel_scrollView).visibility = View.VISIBLE val channelName = view.findViewById(R.id.channel_name) - channelName.text = if (response.name?.length!! > 18) response.name.toString() - .substring(0, 16) + "..." else response.name - val channelVerified = view.findViewById(R.id.channel_verified) - if (response.verified) channelVerified.visibility = View.VISIBLE + channelName.text = response.name + if (response.verified) { + channelName.setCompoundDrawablesWithIntrinsicBounds( + 0, 0, R.drawable.ic_verified, 0); + } view.findViewById(R.id.channel_subs).text = resources.getString( R.string.subscribers, response.subscriberCount.formatShort() diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt index f9e9f87b0..faaaddadd 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -66,8 +66,7 @@ class CustomViewHolder1(private val v: View) : RecyclerView.ViewHolder(v) { val channelImage = v.findViewById(R.id.search_channel_image) Picasso.get().load(item.uploaderAvatar).fit().centerCrop().into(channelImage) val title = v.findViewById(R.id.search_description) - title.text = - if (item.title!!.length > 60) item.title?.substring(0, 60) + "..." else item.title + title.text = item.title val views = v.findViewById(R.id.search_views) val viewsString = if (item.views?.toInt() != -1) item.views.formatShort() else "" val uploadDate = if (item.uploadedDate != null) item.uploadedDate else "" diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml index bbb482627..259f68822 100644 --- a/app/src/main/res/drawable/ic_verified.xml +++ b/app/src/main/res/drawable/ic_verified.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/channel_search_row.xml b/app/src/main/res/layout/channel_search_row.xml index 6cbc373a5..a97aa6777 100644 --- a/app/src/main/res/layout/channel_search_row.xml +++ b/app/src/main/res/layout/channel_search_row.xml @@ -31,6 +31,8 @@ android:layout_height="wrap_content" android:text="TextView" android:textSize="16sp" + android:maxLines="1" + android:ellipsize="end" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index ebd90c0f7..9b418dd5d 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/app/src/main/res/layout/fragment_channel.xml @@ -33,16 +33,18 @@ android:id="@+id/channel_image" android:layout_width="50dp" android:layout_height="50dp" - android:layout_gravity="center_horizontal" - android:layout_marginRight="10dp" /> + android:layout_gravity="center_horizontal" /> + android:orientation="vertical" + android:layout_marginLeft="10dp" + android:layout_marginRight="5dp"> @@ -51,18 +53,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" - android:layout_marginTop="2dp" android:text="Channel Name" - android:textSize="20sp" - android:textStyle="bold" /> - - + android:drawablePadding="3dip" + android:textSize="16sp" + android:textStyle="bold" + android:maxLines="1" + android:ellipsize="end" + /> diff --git a/app/src/main/res/layout/playlist_search_row.xml b/app/src/main/res/layout/playlist_search_row.xml index 2b3eb1086..f7acbeeb4 100644 --- a/app/src/main/res/layout/playlist_search_row.xml +++ b/app/src/main/res/layout/playlist_search_row.xml @@ -72,6 +72,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" + android:maxLines="1" + android:ellipsize="end" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/card_playlist" app:layout_constraintTop_toBottomOf="@+id/search_description" /> diff --git a/app/src/main/res/layout/video_search_row.xml b/app/src/main/res/layout/video_search_row.xml index 5d26d04b3..1782042c5 100644 --- a/app/src/main/res/layout/video_search_row.xml +++ b/app/src/main/res/layout/video_search_row.xml @@ -54,6 +54,8 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" + android:maxLines="2" + android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/card_search_thumbnail" app:layout_constraintTop_toTopOf="parent" /> @@ -82,6 +84,8 @@ android:layout_marginStart="8dp" android:layout_marginTop="12dp" app:layout_constraintEnd_toEndOf="parent" + android:maxLines="1" + android:ellipsize="end" app:layout_constraintStart_toEndOf="@+id/search_channel_image" app:layout_constraintTop_toBottomOf="@+id/search_views" />