Skip to content

Commit e7ae215

Browse files
committed
Fix some warnings
1 parent e52048c commit e7ae215

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
207207
super.onActivityResult(requestCode, resultCode, data)
208208
if (data != null && data.data != null && resultCode == Activity.RESULT_OK) {
209209
if (requestCode == REQUEST_EXPORT_CODE) {
210-
val exportFile = Utils.getFileForUri(data.data!!)
210+
val exportFile = Utils.getFileForUri(data.data!!)!!
211211
if (!exportFile.parentFile.canWrite() || !exportFile.parentFile.canRead()) {
212212
Toast.makeText(activity, R.string.invalid_directory, Toast.LENGTH_SHORT).show()
213213
} else {

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

0 commit comments

Comments
 (0)