Skip to content

Commit c7510c6

Browse files
authored
Merge pull request #6189 from mhmdanas/fix-some-warnings
Fix some warnings
2 parents 3ca1e55 + 7f6674a commit c7510c6

6 files changed

Lines changed: 8 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
208208
if (data != null && data.data != null && resultCode == Activity.RESULT_OK) {
209209
if (requestCode == REQUEST_EXPORT_CODE) {
210210
val exportFile = Utils.getFileForUri(data.data!!)
211-
if (!exportFile.parentFile.canWrite() || !exportFile.parentFile.canRead()) {
211+
val parentFile = exportFile.parentFile!!
212+
if (!parentFile.canWrite() || !parentFile.canRead()) {
212213
Toast.makeText(activity, R.string.invalid_directory, Toast.LENGTH_SHORT).show()
213214
} else {
214215
activity.startService(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.view.View
99
import android.view.ViewGroup
1010
import android.view.inputmethod.InputMethodManager
1111
import android.widget.Toast
12+
import androidx.core.content.ContextCompat
1213
import androidx.core.content.getSystemService
1314
import androidx.core.os.bundleOf
1415
import androidx.core.view.isGone
@@ -127,7 +128,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
127128

128129
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
129130
// KitKat doesn't apply container's theme to <include> content
130-
val contrastColor = ColorStateList.valueOf(resources.getColor(R.color.contrastColor))
131+
val contrastColor = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.contrastColor))
131132
searchLayoutBinding.toolbarSearchEditText.setTextColor(contrastColor)
132133
searchLayoutBinding.toolbarSearchEditText.setHintTextColor(contrastColor.withAlpha(128))
133134
ImageViewCompat.setImageTintList(searchLayoutBinding.toolbarSearchClearIcon, contrastColor)
@@ -385,7 +386,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
385386

386387
private fun setupIconPicker() {
387388
val groupAdapter = GroupAdapter<GroupieViewHolder>()
388-
groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(requireContext(), it) })
389+
groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(it) })
389390

390391
feedGroupCreateBinding.iconSelector.apply {
391392
layoutManager = GridLayoutManager(requireContext(), 7, RecyclerView.VERTICAL, false)

app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.schabi.newpipe.local.subscription.item
22

3-
import android.content.Context
43
import android.view.View
54
import androidx.annotation.DrawableRes
65
import com.xwray.groupie.viewbinding.BindableItem
@@ -9,7 +8,6 @@ import org.schabi.newpipe.databinding.PickerIconItemBinding
98
import org.schabi.newpipe.local.subscription.FeedGroupIcon
109

1110
class PickerIconItem(
12-
context: Context,
1311
val icon: FeedGroupIcon
1412
) : BindableItem<PickerIconItemBinding>() {
1513
@DrawableRes

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
<string name="title_activity_history">Dîrok</string>
201201
<string name="read_full_license">Destûrê bixwînin</string>
202202
<string name="app_license">NewPipe nermalava kopîleft libre ye: Hûn dikarin li gorî kêfa xwe bikar bînin, parve bikin û baştir bikin. Bi taybetî hûn dikarin wê di bin mercên Lîsansa Giştî ya GNU ya Giştî ya ku ji hêla Weqfa Nermalava Azad ve hatî weşandin de, an guhertoya 3 ya Lîsansê, an jî (li gorî vebijarka we) guhertoyek paşîn ji nû ve belav bikin û / an biguherînin.</string>
203-
<string name="popup_resizing_indicator_title">Mezinahî kirin</string>
204203
<string name="clear">Zelal</string>
205204
<string name="refresh">Hênikkirin</string>
206205
<string name="filter">Parzûn</string>
@@ -664,4 +663,4 @@
664663
<string name="action_about">Derbar</string>
665664
<string name="action_settings">Mîhengên</string>
666665
<string name="crash_the_app">Serlêdanê kilît bikin</string>
667-
</resources>
666+
</resources>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@
277277
<string name="file_deleted">Fails izdzēsts</string>
278278
<string name="undo">Atsaukt</string>
279279
<string name="best_resolution">Labākā izšķirtspēja</string>
280-
<string name="popup_resizing_indicator_title">Maina izmēru</string>
281280
<string name="clear">Notīrīt</string>
282281
<string name="refresh">Atsvaidzināt</string>
283282
<string name="filter">Filtrēt</string>
@@ -690,4 +689,4 @@
690689
<string name="restricted_video_no_stream">Šis video ir ierobežots ar vecumu.
691690
\nŅemot vērā jauno YouTube politiku ar vecuma ierobežotiem videoklipiem, Newpipe nevar piekļūt šim videoklipam.</string>
692691
<string name="night_theme_title">Nakts Motīvs</string>
693-
</resources>
692+
</resources>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@
489489
<string name="drawer_header_description">Укључи / искључи услугу, која је тренутно изабрана:</string>
490490
<string name="detail_drag_description">Превуците за преуређивање</string>
491491
<string name="description_tab_description">Опис</string>
492-
<string name="related_streams_tab_description">Повезани стримови</string>
493492
<string name="comments_tab_description">Коментари</string>
494493
<string name="error_report_open_github_notice">Проверите да ли већ постоји проблем који говори о вашем паду апликације. Када правите дупликате карата, одузимате нам време које бисмо могли потрошити на исправљање стварне грешке.</string>
495494
<string name="error_report_open_issue_button_text">Пријави на GitHub-у</string>
@@ -690,4 +689,4 @@
690689
</plurals>
691690
<string name="show_channel_details">Прикажи детаље о каналу</string>
692691
<string name="related_items_tab_description">Повезани предмети</string>
693-
</resources>
692+
</resources>

0 commit comments

Comments
 (0)