Skip to content

Commit

Permalink
refactor: fix lint errors and address some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
kelsos committed Jan 1, 2025
1 parent 51ba65b commit f2fd8be
Show file tree
Hide file tree
Showing 28 changed files with 48 additions and 185 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.net.Uri
import android.util.AttributeSet
import android.widget.ImageView
import androidx.annotation.ColorInt
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import androidx.appcompat.widget.AppCompatImageView
import androidx.core.content.ContextCompat
import com.kelsos.mbrc.R

class CircleImageView : ImageView {
class CircleImageView : AppCompatImageView {
private val mDrawableRect = RectF()
private val mBorderRect = RectF()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package com.kelsos.mbrc.common.ui

import android.content.Context
import android.util.AttributeSet
import android.widget.ImageButton
import androidx.appcompat.widget.AppCompatImageButton
import com.kelsos.mbrc.R

class SquareImageButton : ImageButton {
class SquareImageButton : AppCompatImageButton {
private var useHeight: Boolean = false

constructor(context: Context) : super(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.kelsos.mbrc.common.ui

import android.content.Context
import android.util.AttributeSet
import android.widget.ImageView
import androidx.appcompat.widget.AppCompatImageView

class SquareImageView : ImageView {
class SquareImageView : AppCompatImageView {
constructor(context: Context) : super(context)

constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class LibraryActivity :
return true
}

private fun closeSearch(): Boolean {
internal fun closeSearch(): Boolean {
searchView?.let {
if (it.isShown) {
it.isIconified = true
Expand Down Expand Up @@ -206,7 +206,7 @@ class LibraryActivity :
}

override fun updateArtistOnlyPreference(albumArtistOnly: Boolean?) {
this.albumArtistOnly?.isChecked = albumArtistOnly ?: false
this.albumArtistOnly?.isChecked = albumArtistOnly == true
}

override fun active(): Int = R.id.nav_library
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class NowPlayingActivity :
return true
}

private fun closeSearch(): Boolean {
internal fun closeSearch(): Boolean {
searchView?.let {
if (it.isShown) {
it.isIconified = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.kelsos.mbrc.features.output
import android.annotation.SuppressLint
import android.app.Dialog
import android.os.Bundle
import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.widget.AdapterView
Expand Down Expand Up @@ -100,8 +99,7 @@ class OutputSelectionDialog :
@SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val context = requireContext()
val inflater = LayoutInflater.from(context)
val view = inflater.inflate(R.layout.dialog__output_selection, null, false)
val view = layoutInflater.inflate(R.layout.dialog__output_selection, null, false)

availableOutputs = view.findViewById(R.id.output_selection__available_outputs)
loadingProgress = view.findViewById(R.id.output_selection__loading_outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import timber.log.Timber
import java.io.IOException
import javax.inject.Inject

private val Context.cacheDataStore: DataStore<Store> by dataStore(
internal val Context.cacheDataStore: DataStore<Store> by dataStore(
fileName = "cache_store.db",
serializer = PlayerStateSerializer,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.kelsos.mbrc.features.settings

import android.R
import android.R.string.ok
import android.app.Dialog
import android.os.Bundle
import android.webkit.WebView
Expand All @@ -18,7 +18,7 @@ class WebViewDialog : DialogFragment() {
WebView(requireActivity()).apply {
loadUrl(url)
},
).setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
).setPositiveButton(ok) { dialog, _ -> dialog.dismiss() }
.show()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class WidgetNormal : AppWidgetProvider() {
for (appWidgetId in appWidgetIds) {
// Create an Intent to launch ExampleActivity
val intent = Intent(context, PlayerActivity::class.java)
val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)

// Get the layout for the App Widget and attach an on-click listener
// to the button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class WidgetSmall : AppWidgetProvider() {
for (appWidgetId in appWidgetIds) {
// Create an Intent to launch ExampleActivity
val intent = Intent(context, PlayerActivity::class.java)
val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)

// Get the layout for the App Widget and attach an on-click listener
// to the button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class RemoteSessionManager
}
}

private fun postAction(action: UserAction) {
internal fun postAction(action: UserAction) {
bus.post(MessageEvent(ProtocolEventType.USER_ACTION, action))
}

Expand Down
31 changes: 15 additions & 16 deletions app/src/main/res/drawable/connect_background_offline.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>

<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<padding android:top="0dp" android:right="1dp" android:bottom="1dp" android:left="0dp" />
<shape android:shape="oval">
<padding
android:top="0dp"
android:right="1dp"
android:bottom="1dp"
android:left="0dp" />
<size
android:width="32dp"
android:height="32dp"/>
<solid android:color="#3E000000"/>
<corners android:radius="1dp"/>
android:width="32dp"
android:height="32dp" />
<solid android:color="#3E000000" />
<corners android:radius="1dp" />

</shape>
</item>
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<shape android:shape="oval">
<size
android:width="32dp"
android:height="32dp"/>
<solid android:color="@color/light_gray"/>
<corners android:radius="1dp"/>

android:width="32dp"
android:height="32dp" />
<solid android:color="@color/light_gray" />
<corners android:radius="1dp" />
</shape>
</item>
</layer-list>
Expand Down
30 changes: 0 additions & 30 deletions app/src/main/res/drawable/recycler_view_fast_scroller_handle.xml

This file was deleted.

12 changes: 6 additions & 6 deletions app/src/main/res/layout-land/content_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
android:contentDescription="@string/main_button_mute_description"
android:scaleType="centerInside"
android:src="@drawable/ic_volume_off_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/main_repeat_button"
app:layout_constraintTop_toTopOf="@+id/main_volume_seeker"
Expand All @@ -192,7 +192,7 @@
android:contentDescription="@string/main_button_repeat_description"
android:scaleType="centerInside"
android:src="@drawable/ic_repeat_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_weight="1"
Expand All @@ -214,7 +214,7 @@
android:contentDescription="@string/main_button_previous_description"
android:scaleType="centerInside"
android:src="@drawable/ic_skip_previous_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_repeat_button"
Expand All @@ -232,7 +232,7 @@
android:contentDescription="@string/main_button_play_pause_description"
android:scaleType="fitCenter"
android:src="@drawable/ic_play_circle_filled_black_24dp"
android:tint="@color/accent"
app:tint="@color/accent"
app:layout_constraintBottom_toTopOf="@+id/main_volume_seeker"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_button_previous"
Expand All @@ -248,7 +248,7 @@
android:contentDescription="@string/main_button_next_description"
android:scaleType="centerInside"
android:src="@drawable/ic_skip_next_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_button_play_pause"
Expand All @@ -264,7 +264,7 @@
android:contentDescription="@string/main_button_shuffle_description"
android:scaleType="centerInside"
android:src="@drawable/ic_shuffle_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_weight="1"
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/res/layout/content_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
android:contentDescription="@string/main_button_mute_description"
android:padding="@dimen/small_margin"
android:src="@drawable/ic_volume_off_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toTopOf="@+id/main_repeat_button"
app:layout_constraintLeft_toLeftOf="parent"
tools:ignore="RtlHardcoded,RtlSymmetry" />
Expand Down Expand Up @@ -186,7 +186,7 @@
android:contentDescription="@string/main_button_repeat_description"
android:scaleType="centerInside"
android:src="@drawable/ic_repeat_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
Expand All @@ -201,7 +201,7 @@
android:contentDescription="@string/main_button_previous_description"
android:scaleType="centerInside"
android:src="@drawable/ic_skip_previous_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_repeat_button"
Expand All @@ -219,7 +219,7 @@
android:padding="@dimen/small_margin"
android:scaleType="fitCenter"
android:src="@drawable/ic_play_circle_filled_black_24dp"
android:tint="@color/accent"
app:tint="@color/accent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_button_previous"
Expand All @@ -233,7 +233,7 @@
android:contentDescription="@string/main_button_next_description"
android:scaleType="centerInside"
android:src="@drawable/ic_skip_next_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_button_play_pause"
Expand All @@ -250,7 +250,7 @@
android:contentDescription="@string/main_button_shuffle_description"
android:scaleType="centerInside"
android:src="@drawable/ic_shuffle_black_24dp"
android:tint="@color/button_dark"
app:tint="@color/button_dark"
app:layout_constraintBottom_toBottomOf="@+id/main_button_play_pause"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@+id/main_button_next"
Expand Down
19 changes: 0 additions & 19 deletions app/src/main/res/layout/list_section_header.xml

This file was deleted.

2 changes: 0 additions & 2 deletions app/src/main/res/layout/listitem_single.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_single_height"
android:layout_gravity="center_vertical"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical">

<LinearLayout
android:id="@+id/ui_item_context_indicator"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:paddingLeft="@dimen/normal_margin"
android:paddingRight="@dimen/normal_margin"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/mini_control_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
android:elevation="2dp"
android:gravity="bottom"
android:orientation="vertical"
tools:showIn="@layout/activity_lyrics"
tools:targetApi="lollipop">
tools:showIn="@layout/activity_lyrics">

<View
android:layout_width="match_parent"
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/layout/toolbar.xml

This file was deleted.

Loading

0 comments on commit f2fd8be

Please sign in to comment.