Merge pull request #1464 from GilesMunn/master

Aesthetic changes

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<com.github.libretube.api.obj.StreamItem>,
@@ -53,8 +55,9 @@ class TrendingAdapter(
             textViewTitle.text = trending.title
             textViewChannel.text =
                 trending.uploaderName + " • " +
-                trending.views.formatShort() + " • " +
+                trending.views.formatShort() + " " +
-                DateUtils.getRelativeTimeSpanString(trending.uploaded!!)
+                getApplicationContext().resources.getString(R.string.views_placeholder) +
+                " • " + DateUtils.getRelativeTimeSpanString(trending.uploaded!!)
             thumbnailDuration.setFormattedDuration(trending.duration!!)
             channelImage.setOnClickListener {
                 NavigationHelper.navigateChannel(root.context, trending.uploaderUrl)

app/src/main/res/layout/channel_subscription_row.xml

@@ -10,6 +10,7 @@
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/subscription_channel_image"
+        android:layout_marginStart="8dp"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_centerVertical="true" />
@@ -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:cornerRadius="20dp"/>
-        app:elevation="20dp" />
 </RelativeLayout>

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:cardCornerRadius="18dp"
-                    app:cardElevation="20dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -153,6 +153,7 @@
     <string name="music_directory">Music folder</string>
     <string name="movies_directory">Movie folder</string>
     <string name="shareTo">Share URL to</string>
+    <string name="views_placeholder">views</string>
     <string name="views">%1$s views</string>
     <string name="defaultIcon">Default</string>
     <string name="legacyIcon">Lost legacy</string>
@@ -170,7 +171,7 @@
     <string name="empty_instance">Fill in the name and the API URL.</string>
     <string name="clear_customInstances">Clear added</string>
     <string name="invalid_url">Please enter a URL that works</string>
-    <string name="version">V %1$s</string>
+    <string name="version">Version %1$s</string>
     <string name="about_summary">Get to know team LibreTube and how it all happens.</string>
     <string name="related_streams">Related content</string>
     <string name="related_streams_summary">Show similar streams alongside what you watch.</string>
@@ -226,7 +227,7 @@
     <string name="chapters">Chapters</string>
     <string name="change_playback_speed">Playback speed</string>
     <string name="require_restart">App restart required</string>
-    <string name="require_restart_message">Restart the app ?</string>
+    <string name="require_restart_message">This change requires the app to be restarted. Press \'Ok\' to restart now.</string>
     <string name="navLabelVisibility">Navbar label visibility</string>
     <string name="always">Always</string>
     <string name="selected">Selected</string>
@@ -314,7 +315,7 @@
     <string name="legacy_subscriptions">Legacy subscriptions view</string>
     <string name="device_info">Device Info</string>
     <string name="audio_video_summary">Quality and format</string>
-    <string name="delete">Delete</string>
+    <string name="delete">Delete from downloads</string>
     <string name="trending_layout">Alternative trending layout</string>
     <string name="renamePlaylist">Rename playlist</string>
     <string name="wifi">Wi-Fi</string>