Skip to content

Commit 3bb5187

Browse files
StypoxStypox
authored
Merge pull request #9501 from Stypox/import-subscriptions-hint
Add hint to improve discoverability of subscription import
2 parents 281ac13 + 4022544 commit 3bb5187

76 files changed

Lines changed: 109 additions & 78 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ import org.schabi.newpipe.local.subscription.SubscriptionViewModel.SubscriptionS
4141
import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog
4242
import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialog
4343
import org.schabi.newpipe.local.subscription.item.ChannelItem
44-
import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem
4544
import org.schabi.newpipe.local.subscription.item.FeedGroupAddNewGridItem
4645
import org.schabi.newpipe.local.subscription.item.FeedGroupAddNewItem
4746
import org.schabi.newpipe.local.subscription.item.FeedGroupCardGridItem
4847
import org.schabi.newpipe.local.subscription.item.FeedGroupCardItem
4948
import org.schabi.newpipe.local.subscription.item.FeedGroupCarouselItem
5049
import org.schabi.newpipe.local.subscription.item.GroupsHeader
5150
import org.schabi.newpipe.local.subscription.item.Header
51+
import org.schabi.newpipe.local.subscription.item.ImportSubscriptionsHintPlaceholderItem
5252
import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService
5353
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
5454
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE
@@ -312,7 +312,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
312312
groupAdapter.add(this)
313313
}
314314

315-
subscriptionsSection.setPlaceholder(EmptyPlaceholderItem())
315+
subscriptionsSection.setPlaceholder(ImportSubscriptionsHintPlaceholderItem())
316316
subscriptionsSection.setHideWhenEmpty(true)
317317

318318
groupAdapter.add(

‎app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.
3535
import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialog.ScreenState.SubscriptionsPickerScreen
3636
import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialogViewModel.DialogEvent.ProcessingEvent
3737
import org.schabi.newpipe.local.subscription.dialog.FeedGroupDialogViewModel.DialogEvent.SuccessEvent
38-
import org.schabi.newpipe.local.subscription.item.EmptyPlaceholderItem
38+
import org.schabi.newpipe.local.subscription.item.ImportSubscriptionsHintPlaceholderItem
3939
import org.schabi.newpipe.local.subscription.item.PickerIconItem
4040
import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem
4141
import org.schabi.newpipe.util.DeviceUtils
@@ -338,7 +338,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
338338

339339
if (subscriptions.isEmpty()) {
340340
subscriptionEmptyFooter.clear()
341-
subscriptionEmptyFooter.add(EmptyPlaceholderItem())
341+
subscriptionEmptyFooter.add(ImportSubscriptionsHintPlaceholderItem())
342342
} else {
343343
subscriptionEmptyFooter.clear()
344344
}

app/src/main/java/org/schabi/newpipe/local/subscription/item/EmptyPlaceholderItem.kt renamed to app/src/main/java/org/schabi/newpipe/local/subscription/item/ImportSubscriptionsHintPlaceholderItem.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ import com.xwray.groupie.viewbinding.BindableItem
55
import org.schabi.newpipe.R
66
import org.schabi.newpipe.databinding.ListEmptyViewBinding
77

8-
class EmptyPlaceholderItem : BindableItem<ListEmptyViewBinding>() {
9-
override fun getLayout(): Int = R.layout.list_empty_view
8+
/**
9+
* When there are no subscriptions, show a hint to the user about how to import subscriptions
10+
*/
11+
class ImportSubscriptionsHintPlaceholderItem : BindableItem<ListEmptyViewBinding>() {
12+
override fun getLayout(): Int = R.layout.list_empty_view_subscriptions
1013
override fun bind(viewBinding: ListEmptyViewBinding, position: Int) {}
1114
override fun getSpanSize(spanCount: Int, position: Int): Int = spanCount
1215
override fun initializeViewBinding(view: View) = ListEmptyViewBinding.bind(view)

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@
1919
android:layout_height="wrap_content"
2020
android:layout_gravity="center"
2121
android:layout_marginTop="6dp"
22-
android:text="@string/empty_subscription_feed_subtitle" />
22+
android:gravity="center"
23+
android:paddingHorizontal="16dp"
24+
android:text="@string/empty_list_subtitle" />
2325
</LinearLayout>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:gravity="center"
7+
android:minHeight="128dp"
8+
android:orientation="vertical">
9+
10+
<org.schabi.newpipe.views.NewPipeTextView
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:text="¯\\_(ツ)_/¯"
14+
android:textAppearance="?android:attr/textAppearanceLarge"
15+
tools:ignore="HardcodedText" />
16+
17+
<org.schabi.newpipe.views.NewPipeTextView
18+
android:layout_width="wrap_content"
19+
android:layout_height="wrap_content"
20+
android:layout_gravity="center"
21+
android:layout_marginTop="6dp"
22+
android:gravity="center"
23+
android:paddingHorizontal="16dp"
24+
android:text="@string/import_subscriptions_hint" />
25+
</LinearLayout>

‎app/src/main/res/values-ar/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<string name="your_comment">تعليقك (باللغة الإنجليزية):</string>
115115
<string name="error_details_headline">التفاصيل:</string>
116116
<string name="search_no_results">لم يتم العثور على نتائج</string>
117-
<string name="empty_subscription_feed_subtitle">لا شيء هنا سوى الصراصير</string>
117+
<string name="empty_list_subtitle">لا شيء هنا سوى الصراصير</string>
118118
<string name="audio">الصوت</string>
119119
<string name="retry">إعادة المحاولة</string>
120120
<string name="short_thousand">ألف</string>

‎app/src/main/res/values-az/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
<string name="video_streams_empty">Video yayımı tapılmadı</string>
280280
<string name="comments_tab_description">Şərhlər</string>
281281
<string name="description_tab_description">Açıqlama</string>
282-
<string name="empty_subscription_feed_subtitle">Burada kriketlərdən başqa heç nə yoxdur</string>
282+
<string name="empty_list_subtitle">Burada kriketlərdən başqa heç nə yoxdur</string>
283283
<string name="search_no_results">Nəticə yoxdur</string>
284284
<string name="restore_defaults">İlkin tənzimləmələri qaytar</string>
285285
<string name="missing_file">Fayl köçürüldü və ya silindi</string>

‎app/src/main/res/values-b+ast/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<string name="best_resolution">La meyor resolución</string>
7474
<string name="notification_channel_name">Avisu permanente de NewPipe</string>
7575
<string name="search_no_results">Nun hai resultaos</string>
76-
<string name="empty_subscription_feed_subtitle">Equí nun hai más que grillos</string>
76+
<string name="empty_list_subtitle">Equí nun hai más que grillos</string>
7777
<plurals name="subscribers">
7878
<item quantity="one">%s soscriptor</item>
7979
<item quantity="other">%s soscriptores</item>

‎app/src/main/res/values-b+uz+Latn/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
<string name="audio">Audio</string>
282282
<string name="video">Video</string>
283283
<string name="detail_drag_description">Qayta tartiblash uchun tortish</string>
284-
<string name="empty_subscription_feed_subtitle">Bu erda kriketlardan boshqa hech narsa yo\'q</string>
284+
<string name="empty_list_subtitle">Bu erda kriketlardan boshqa hech narsa yo\'q</string>
285285
<string name="search_no_results">Natija yo\'q</string>
286286
<string name="detail_dislikes_img_view_description">Dislayklar</string>
287287
<string name="detail_likes_img_view_description">Layklar</string>

‎app/src/main/res/values-be/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<string name="detail_likes_img_view_description">Спадабалася</string>
158158
<string name="detail_dislikes_img_view_description">Не спадабалася</string>
159159
<string name="search_no_results">Няма вынікаў</string>
160-
<string name="empty_subscription_feed_subtitle">Нічога няма</string>
160+
<string name="empty_list_subtitle">Нічога няма</string>
161161
<string name="detail_drag_description">Перацягніце, каб змяніць парадак</string>
162162
<string name="video">Відэа</string>
163163
<string name="audio">Аўдыё</string>

0 commit comments

Comments
 (0)