Skip to content

Commit fff09c1

Browse files
OxygenCobaltOxygenCobalt
committed
all: reformat
1 parent 1c456d1 commit fff09c1

8 files changed

Lines changed: 84 additions & 88 deletions

File tree

‎app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import org.oxycblt.auxio.util.navigateSafe
4343
import org.oxycblt.auxio.util.showToast
4444
import org.oxycblt.auxio.util.unlikelyToBeNull
4545
import org.oxycblt.musikr.Album
46-
import org.oxycblt.musikr.Artist
4746
import org.oxycblt.musikr.Music
4847
import org.oxycblt.musikr.MusicParent
4948
import org.oxycblt.musikr.Song

‎app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ import org.oxycblt.auxio.music.MusicViewModel
4141
import org.oxycblt.auxio.playback.PlaybackViewModel
4242
import org.oxycblt.auxio.util.getDimenPixels
4343
import org.oxycblt.auxio.util.setFullWidthLookup
44-
import org.oxycblt.musikr.Album
45-
import org.oxycblt.musikr.Artist
46-
import org.oxycblt.musikr.Genre
4744
import org.oxycblt.musikr.Music
4845
import org.oxycblt.musikr.MusicParent
49-
import org.oxycblt.musikr.Playlist
5046

5147
abstract class DetailFragment<P : MusicParent, C : Music> :
5248
ListFragment<C, FragmentDetailBinding>(),
@@ -128,7 +124,10 @@ abstract class DetailFragment<P : MusicParent, C : Music> :
128124

129125
val inRatio = max(ratio - 0.5f, 0f) * 2
130126
animateToolbarView(binding.detailNormalToolbar.getTitleContainer(), inRatio)
131-
animateToolbarActionButton(binding.detailNormalToolbar.getMenuButton(R.id.action_play), inRatio)
127+
animateToolbarActionButton(
128+
binding.detailNormalToolbar.getMenuButton(R.id.action_play),
129+
inRatio,
130+
)
132131
animateToolbarActionButton(
133132
binding.detailNormalToolbar.getMenuButton(R.id.action_shuffle),
134133
inRatio,

‎app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import org.oxycblt.auxio.util.getPlural
3939
import org.oxycblt.auxio.util.navigateSafe
4040
import org.oxycblt.auxio.util.showToast
4141
import org.oxycblt.auxio.util.unlikelyToBeNull
42-
import org.oxycblt.musikr.Album
4342
import org.oxycblt.musikr.Artist
4443
import org.oxycblt.musikr.Genre
4544
import org.oxycblt.musikr.Music

‎app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import org.oxycblt.auxio.util.getPlural
4848
import org.oxycblt.auxio.util.navigateSafe
4949
import org.oxycblt.auxio.util.showToast
5050
import org.oxycblt.auxio.util.unlikelyToBeNull
51-
import org.oxycblt.musikr.Genre
5251
import org.oxycblt.musikr.Music
5352
import org.oxycblt.musikr.MusicParent
5453
import org.oxycblt.musikr.Playlist
@@ -279,10 +278,12 @@ class PlaylistDetailFragment :
279278

280279
if (editedPlaylist != null) {
281280
L.d("Updating save button state")
282-
requireBinding().detailEditToolbar.setMenuItemEnabled(
283-
R.id.action_save,
284-
editedPlaylist != detailModel.currentPlaylist.value?.songs,
285-
)
281+
requireBinding()
282+
.detailEditToolbar
283+
.setMenuItemEnabled(
284+
R.id.action_save,
285+
editedPlaylist != detailModel.currentPlaylist.value?.songs,
286+
)
286287
}
287288

288289
updateMultiToolbar()

‎app/src/main/java/org/oxycblt/auxio/home/ThemedSpeedDialView.kt‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
package org.oxycblt.auxio.home
2020

2121
import android.animation.ArgbEvaluator
22+
import android.content.Context
23+
import android.content.res.ColorStateList
2224
import android.graphics.Canvas
2325
import android.graphics.ColorFilter
2426
import android.graphics.PixelFormat
2527
import android.graphics.PorterDuff
2628
import android.graphics.Rect
2729
import android.graphics.drawable.Drawable
28-
import android.content.Context
29-
import android.content.res.ColorStateList
3030
import android.os.Bundle
3131
import android.os.Parcelable
3232
import android.util.AttributeSet
@@ -156,20 +156,26 @@ class ThemedSpeedDialView : SpeedDialView {
156156
startColor =
157157
if (isOpen) mainFabClosedBackgroundColor else mainFabOpenedBackgroundColor,
158158
endColor = targetBackgroundTint,
159-
) { mainFab.backgroundTintList = ColorStateList.valueOf(it) }
159+
) {
160+
mainFab.backgroundTintList = ColorStateList.valueOf(it)
161+
}
160162
val imageTintAnimation =
161163
createColorSpringAnimation(
162164
startColor = if (isOpen) mainFabClosedIconColor else mainFabOpenedIconColor,
163165
endColor = targetImageTint,
164-
) { mainFab.imageTintList = ColorStateList.valueOf(it) }
166+
) {
167+
mainFab.imageTintList = ColorStateList.valueOf(it)
168+
}
165169
val rotationAnimation =
166170
createSpringAnimation(
167171
startValue = mainFabDrawable.rotationDegrees,
168172
finalValue = if (isOpen) MAIN_FAB_OPEN_ROTATION_DEGREES else 0f,
169173
springTemplate = mainFabSpatialSpring,
170174
minimumVisibleChange = MAIN_FAB_ROTATION_MIN_VISIBLE_CHANGE,
171175
dampingRatioOverride = MAIN_FAB_ROTATION_DAMPING_RATIO_OVERRIDE,
172-
) { mainFabDrawable.rotationDegrees = it }
176+
) {
177+
mainFabDrawable.rotationDegrees = it
178+
}
173179

174180
return MainFabAnimation(
175181
listOf(backgroundTintAnimation, imageTintAnimation, rotationAnimation)
@@ -212,9 +218,7 @@ class ThemedSpeedDialView : SpeedDialView {
212218
setStartValue(startValue)
213219
setMinimumVisibleChange(minimumVisibleChange)
214220
addUpdateListener { _, value, _ -> update(value) }
215-
addEndListener { _, canceled, value, _ ->
216-
update(if (canceled) value else finalValue)
217-
}
221+
addEndListener { _, canceled, value, _ -> update(if (canceled) value else finalValue) }
218222
}
219223

220224
override fun onAttachedToWindow() {
@@ -331,8 +335,7 @@ class ThemedSpeedDialView : SpeedDialView {
331335
innerChangeListener = listener
332336
}
333337

334-
@Parcelize
335-
private class State(val superState: Parcelable?, val isOpen: Boolean) : Parcelable
338+
@Parcelize private class State(val superState: Parcelable?, val isOpen: Boolean) : Parcelable
336339

337340
private class MainFabAnimation(
338341
private val animations: List<SpringAnimation>,
@@ -373,9 +376,7 @@ class ThemedSpeedDialView : SpeedDialView {
373376
}
374377
}
375378

376-
private class RotatingDrawable(
377-
drawable: Drawable,
378-
) : Drawable(), Drawable.Callback {
379+
private class RotatingDrawable(drawable: Drawable) : Drawable(), Drawable.Callback {
379380
private var wrappedDrawable = drawable
380381

381382
var rotationDegrees = 0f

‎app/src/main/java/org/oxycblt/auxio/ui/Animations.kt‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@ private object MotionSpringTokens {
117117
MR.attr.motionSpringFastEffects,
118118
MR.style.Motion_Material3_Spring_Standard_Fast_Effects,
119119
)
120-
// val DEFAULT_EFFECTS =
121-
// SpringToken(
122-
// MR.attr.motionSpringDefaultEffects,
123-
// MR.style.Motion_Material3_Spring_Standard_Default_Effects,
124-
// )
125-
// val SLOW_EFFECTS =
126-
// SpringToken(
127-
// MR.attr.motionSpringSlowEffects,
128-
// MR.style.Motion_Material3_Spring_Standard_Slow_Effects,
129-
// )
120+
// val DEFAULT_EFFECTS =
121+
// SpringToken(
122+
// MR.attr.motionSpringDefaultEffects,
123+
// MR.style.Motion_Material3_Spring_Standard_Default_Effects,
124+
// )
125+
// val SLOW_EFFECTS =
126+
// SpringToken(
127+
// MR.attr.motionSpringSlowEffects,
128+
// MR.style.Motion_Material3_Spring_Standard_Slow_Effects,
129+
// )
130130
val FAST_SPATIAL =
131131
SpringToken(
132132
MR.attr.motionSpringFastSpatial,
@@ -137,11 +137,11 @@ private object MotionSpringTokens {
137137
MR.attr.motionSpringDefaultSpatial,
138138
MR.style.Motion_Material3_Spring_Standard_Default_Spatial,
139139
)
140-
// val SLOW_SPATIAL =
141-
// SpringToken(
142-
// MR.attr.motionSpringSlowSpatial,
143-
// MR.style.Motion_Material3_Spring_Standard_Slow_Spatial,
144-
// )
140+
// val SLOW_SPATIAL =
141+
// SpringToken(
142+
// MR.attr.motionSpringSlowSpatial,
143+
// MR.style.Motion_Material3_Spring_Standard_Slow_Spatial,
144+
// )
145145
}
146146

147147
private class MotionSpring(
@@ -209,18 +209,10 @@ private constructor(
209209
) {
210210
private val alphaOutSpring = MotionSpring(context, alphaOutToken)
211211
private val scaleOutSpring =
212-
MotionSpring(
213-
context,
214-
scaleOutToken,
215-
dampingRatioOverride = scaleOutDampingRatioOverride,
216-
)
212+
MotionSpring(context, scaleOutToken, dampingRatioOverride = scaleOutDampingRatioOverride)
217213
private val alphaInSpring = MotionSpring(context, alphaInToken)
218214
private val scaleInSpring =
219-
MotionSpring(
220-
context,
221-
scaleInToken,
222-
dampingRatioOverride = scaleInDampingRatioOverride,
223-
)
215+
MotionSpring(context, scaleInToken, dampingRatioOverride = scaleInDampingRatioOverride)
224216

225217
fun jumpToFadeOut(view: View) {
226218
view.apply {

‎app/src/main/java/org/oxycblt/auxio/ui/AuxioToolbar.kt‎

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2026 Auxio Project
3-
* ButtonGroupToolbar.kt is part of Auxio.
3+
* AuxioToolbar.kt is part of Auxio.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
*/
18-
18+
1919
package org.oxycblt.auxio.ui
2020

2121
import android.annotation.SuppressLint
@@ -45,7 +45,6 @@ import androidx.appcompat.widget.TooltipCompat
4545
import androidx.core.view.MenuCompat
4646
import androidx.core.view.children
4747
import androidx.core.view.isVisible
48-
import androidx.core.view.updateLayoutParams
4948
import androidx.core.widget.TextViewCompat
5049
import com.google.android.material.R as MR
5150
import org.oxycblt.auxio.R
@@ -54,7 +53,8 @@ import org.oxycblt.auxio.databinding.ViewToolbarBinding
5453
/**
5554
* A compound toolbar view that owns its entire layout instead of piggybacking on AppCompat's
5655
* internal Toolbar structure. It preserves the small API surface Auxio actually uses while
57-
* rendering action items as an M3 Expressive [com.google.android.material.button.MaterialButtonGroup].
56+
* rendering action items as an M3 Expressive
57+
* [com.google.android.material.button.MaterialButtonGroup].
5858
*/
5959
class AuxioToolbar
6060
@JvmOverloads
@@ -76,6 +76,7 @@ constructor(
7676
private var _binding: ViewToolbarBinding? = null
7777
private val binding: ViewToolbarBinding
7878
get() = checkNotNull(_binding) { "Toolbar binding was not initialized" }
79+
7980
private val actionButtons = mutableMapOf<Int, RippleFixMaterialButton>()
8081
@SuppressLint("RestrictedApi") private var menuBuilder = MenuBuilder(context)
8182

@@ -113,7 +114,10 @@ constructor(
113114
binding.toolbarSubtitle.isVisible = !subtitleText.isNullOrEmpty()
114115

115116
val titleTextAppearance =
116-
toolbarAttrs.getResourceId(androidx.appcompat.R.styleable.Toolbar_titleTextAppearance, 0)
117+
toolbarAttrs.getResourceId(
118+
androidx.appcompat.R.styleable.Toolbar_titleTextAppearance,
119+
0,
120+
)
117121
if (titleTextAppearance != 0) {
118122
setTitleTextAppearance(titleTextAppearance)
119123
}
@@ -134,9 +138,7 @@ constructor(
134138
}
135139

136140
val subtitleTextColor =
137-
toolbarAttrs.getColorStateList(
138-
androidx.appcompat.R.styleable.Toolbar_subtitleTextColor
139-
)
141+
toolbarAttrs.getColorStateList(androidx.appcompat.R.styleable.Toolbar_subtitleTextColor)
140142
if (subtitleTextColor != null) {
141143
setSubtitleTextColor(subtitleTextColor)
142144
}
@@ -147,9 +149,13 @@ constructor(
147149
materialToolbarAttrs.getBoolean(MR.styleable.MaterialToolbar_subtitleCentered, false)
148150
updateTextGravity()
149151

150-
setNavigationIcon(toolbarAttrs.getDrawable(androidx.appcompat.R.styleable.Toolbar_navigationIcon))
152+
setNavigationIcon(
153+
toolbarAttrs.getDrawable(androidx.appcompat.R.styleable.Toolbar_navigationIcon)
154+
)
151155
setNavigationContentDescription(
152-
toolbarAttrs.getText(androidx.appcompat.R.styleable.Toolbar_navigationContentDescription)
156+
toolbarAttrs.getText(
157+
androidx.appcompat.R.styleable.Toolbar_navigationContentDescription
158+
)
153159
)
154160

155161
val menuResId = toolbarAttrs.getResourceId(androidx.appcompat.R.styleable.Toolbar_menu, 0)
@@ -233,9 +239,7 @@ constructor(
233239
}
234240

235241
fun setNavigationIcon(@DrawableRes resId: Int) {
236-
setNavigationIcon(
237-
if (resId != 0) AppCompatResources.getDrawable(context, resId) else null
238-
)
242+
setNavigationIcon(if (resId != 0) AppCompatResources.getDrawable(context, resId) else null)
239243
}
240244

241245
fun setNavigationIcon(icon: Drawable?) {
@@ -310,7 +314,9 @@ constructor(
310314

311315
private fun updateTextGravity() {
312316
binding.toolbarTitle.apply {
313-
gravity = if (titleCentered) android.view.Gravity.CENTER_HORIZONTAL else android.view.Gravity.START
317+
gravity =
318+
if (titleCentered) android.view.Gravity.CENTER_HORIZONTAL
319+
else android.view.Gravity.START
314320
textAlignment =
315321
if (titleCentered) {
316322
View.TEXT_ALIGNMENT_CENTER
@@ -320,7 +326,8 @@ constructor(
320326
}
321327
binding.toolbarSubtitle.apply {
322328
gravity =
323-
if (subtitleCentered) android.view.Gravity.CENTER_HORIZONTAL else android.view.Gravity.START
329+
if (subtitleCentered) android.view.Gravity.CENTER_HORIZONTAL
330+
else android.view.Gravity.START
324331
textAlignment =
325332
if (subtitleCentered) {
326333
View.TEXT_ALIGNMENT_CENTER
@@ -333,7 +340,8 @@ constructor(
333340
private fun updateCenterContentVisibility() {
334341
val hasCustomContent =
335342
binding.toolbarContentFrame.children.any { it !== binding.toolbarTitleContainer }
336-
val showBuiltInTitle = !hasCustomContent && (!titleText.isNullOrEmpty() || !subtitleText.isNullOrEmpty())
343+
val showBuiltInTitle =
344+
!hasCustomContent && (!titleText.isNullOrEmpty() || !subtitleText.isNullOrEmpty())
337345
binding.toolbarTitleContainer.isVisible = showBuiltInTitle
338346
}
339347

@@ -372,24 +380,25 @@ constructor(
372380
private fun createActionButton(item: MenuItemImpl): RippleFixMaterialButton? {
373381
val button =
374382
RippleFixMaterialButton(
375-
createActionButtonContext(item.itemId),
376-
null,
377-
MR.attr.materialIconButtonStyle,
378-
).apply {
379-
configureIconButton(this)
380-
id = item.itemId
381-
icon = item.icon
382-
contentDescription = item.title
383-
isEnabled = item.isEnabled
384-
TooltipCompat.setTooltipText(this, item.title)
385-
setOnClickListener { view ->
386-
if (item.hasSubMenu()) {
387-
showPopupMenu(view, item.subMenu)
388-
} else {
389-
menuItemClickListener?.onMenuItemClick(item)
383+
createActionButtonContext(item.itemId),
384+
null,
385+
MR.attr.materialIconButtonStyle,
386+
)
387+
.apply {
388+
configureIconButton(this)
389+
id = item.itemId
390+
icon = item.icon
391+
contentDescription = item.title
392+
isEnabled = item.isEnabled
393+
TooltipCompat.setTooltipText(this, item.title)
394+
setOnClickListener { view ->
395+
if (item.hasSubMenu()) {
396+
showPopupMenu(view, item.subMenu)
397+
} else {
398+
menuItemClickListener?.onMenuItemClick(item)
399+
}
390400
}
391401
}
392-
}
393402

394403
return button
395404
}
@@ -438,7 +447,8 @@ constructor(
438447
}
439448

440449
popup.setOnMenuItemClickListener { clickedItem ->
441-
val originalItem = originalItems[clickedItem.itemId] ?: return@setOnMenuItemClickListener false
450+
val originalItem =
451+
originalItems[clickedItem.itemId] ?: return@setOnMenuItemClickListener false
442452
if (originalItem.hasSubMenu()) {
443453
showPopupMenu(anchor, originalItem.subMenu)
444454
true

0 commit comments

Comments
 (0)