diff --git a/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt index 57f84f3fa..c9137b104 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/TrendingAdapter.kt @@ -6,6 +6,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView +import com.github.libretube.R import com.github.libretube.databinding.TrendingRowBinding import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.setFormattedDuration @@ -15,6 +16,7 @@ import com.github.libretube.ui.sheets.VideoOptionsBottomSheet import com.github.libretube.ui.viewholders.SubscriptionViewHolder import com.github.libretube.util.ImageHelper import com.github.libretube.util.NavigationHelper +import org.chromium.base.ContextUtils.getApplicationContext class TrendingAdapter( private val streamItems: List, @@ -53,8 +55,9 @@ class TrendingAdapter( textViewTitle.text = trending.title textViewChannel.text = trending.uploaderName + " • " + - trending.views.formatShort() + " • " + - DateUtils.getRelativeTimeSpanString(trending.uploaded!!) + trending.views.formatShort() + " " + + getApplicationContext().resources.getString(R.string.views_placeholder) + + " • " + DateUtils.getRelativeTimeSpanString(trending.uploaded!!) thumbnailDuration.setFormattedDuration(trending.duration!!) channelImage.setOnClickListener { NavigationHelper.navigateChannel(root.context, trending.uploaderUrl) diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml index 149a38dd5..7ff5f5b6f 100644 --- a/app/src/main/res/layout/channel_subscription_row.xml +++ b/app/src/main/res/layout/channel_subscription_row.xml @@ -10,6 +10,7 @@ @@ -36,7 +37,7 @@ android:stateListAnimator="@null" android:text="@string/unsubscribe" android:textColor="?android:attr/textColorPrimary" + android:layout_marginEnd="8dp" android:textSize="12sp" - app:cornerRadius="20dp" - app:elevation="20dp" /> + app:cornerRadius="20dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index 3cec94d24..fd3d594a9 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -63,13 +63,11 @@ style="@style/Widget.Material3.CardView.Elevated" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="8dp" + android:layout_marginStart="14dp" android:layout_marginTop="5dp" - android:layout_marginEnd="8dp" + android:layout_marginEnd="14dp" android:layout_marginBottom="12dp" - android:visibility="gone" - app:cardCornerRadius="18dp" - app:cardElevation="20dp"> + app:cardCornerRadius="18dp"> Music folder Movie folder Share URL to + views %1$s views Default Lost legacy @@ -170,7 +171,7 @@ Fill in the name and the API URL. Clear added Please enter a URL that works - V %1$s + Version %1$s Get to know team LibreTube and how it all happens. Related content Show similar streams alongside what you watch. @@ -226,7 +227,7 @@ Chapters Playback speed App restart required - Restart the app ? + This change requires the app to be restarted. Press \'Ok\' to restart now. Navbar label visibility Always Selected @@ -314,7 +315,7 @@ Legacy subscriptions view Device Info Quality and format - Delete + Delete from downloads Alternative trending layout Rename playlist Wi-Fi