Skip to content

Commit 9bbf794

Browse files
nift4nift4
committed
1.0.7
1 parent b2f30d5 commit 9bbf794

File tree

13 files changed

+78
-83
lines changed

13 files changed

+78
-83
lines changed

‎app/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ android {
8787
// keep support for it for a while.
8888
minSdk = 21
8989
targetSdk = 34
90-
versionCode = 8
91-
versionName = "1.0.6"
90+
versionCode = 9
91+
versionName = "1.0.7"
9292
if (releaseType != "Release") {
9393
versionNameSuffix = myVersionName
9494
}
@@ -182,15 +182,15 @@ aboutLibraries {
182182
dependencies {
183183
val media3Version = "1.4.0-alpha01"
184184
implementation("androidx.activity:activity-ktx:1.9.0")
185-
implementation("androidx.appcompat:appcompat:1.7.0-rc01")
185+
implementation("androidx.appcompat:appcompat:1.7.0")
186186
implementation("androidx.collection:collection-ktx:1.4.0")
187187
implementation("androidx.concurrent:concurrent-futures-ktx:1.1.0")
188188
implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha13")
189189
implementation("androidx.core:core-ktx:1.13.1")
190190
implementation("androidx.core:core-splashscreen:1.0.1")
191191
//implementation("androidx.datastore:datastore-preferences:1.1.0-rc01") TODO don't abuse shared prefs
192-
implementation("androidx.fragment:fragment-ktx:1.8.0-beta01")
193-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0")
192+
implementation("androidx.fragment:fragment-ktx:1.8.0-rc01")
193+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1")
194194
implementation("androidx.media3:media3-exoplayer:$media3Version")
195195
implementation("androidx.media3:media3-exoplayer-midi:$media3Version")
196196
implementation("androidx.media3:media3-session:$media3Version")

‎app/src/main/kotlin/org/akanework/gramophone/logic/utils/CalculationUtils.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ object CalculationUtils {
7474
return if (amount < low) low else amount.coerceAtMost(high)
7575
}
7676

77-
78-
fun lerp(start: Float, stop: Float, amount: Float): Float {
77+
@Suppress("NOTHING_TO_INLINE")
78+
inline fun lerp(start: Float, stop: Float, amount: Float): Float {
7979
return start + (stop - start) * amount
8080
}
8181

@@ -85,7 +85,8 @@ object CalculationUtils {
8585
*
8686
* If `a == b`, then this function will return 0.
8787
*/
88-
fun lerpInv(a: Float, b: Float, value: Float): Float {
88+
@Suppress("NOTHING_TO_INLINE")
89+
inline fun lerpInv(a: Float, b: Float, value: Float): Float {
8990
return if (a != b) (value - a) / (b - a) else 0.0f
9091
}
9192

‎app/src/main/kotlin/org/akanework/gramophone/logic/utils/ColorUtils.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.akanework.gramophone.logic.utils
1919

2020
import android.content.Context
21+
import android.content.res.Configuration
2122
import androidx.core.graphics.ColorUtils
2223
import kotlin.math.min
2324

@@ -29,10 +30,8 @@ object ColorUtils {
2930
var lighting: Float = 0f,
3031
var lightingDark: Float = 0f
3132
) {
32-
COLOR_BACKGROUND_TINTED(1.5f, 1.0f, 1.02f, 0.9f),
3333
COLOR_BACKGROUND_ELEVATED(1.2f, 1.2f, 0.99f, 0.99f),
3434
COLOR_BACKGROUND(1.0f, 0.9f, 1.015f, 1.015f),
35-
TOOLBAR_ELEVATED(0.6f, 0.6f, 0.97f, 1.5f),
3635
COLOR_CONTRAST_FAINTED(0.7f, 0.8f, 0.97f, 0.5f)
3736
}
3837

@@ -44,7 +43,8 @@ object ColorUtils {
4443
val hsl = FloatArray(3)
4544
ColorUtils.colorToHSL(color, hsl)
4645

47-
if (EnvUtils.isDarkMode(context)) {
46+
if ((context.resources.configuration.uiMode and
47+
Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES) {
4848
hsl[2] *= colorType.lightingDark
4949
hsl[2] = min(hsl[2], 1f)
5050
hsl[1] *= colorType.chromaDark

‎app/src/main/kotlin/org/akanework/gramophone/logic/utils/EnvUtils.kt‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/src/main/kotlin/org/akanework/gramophone/logic/utils/FileOpUtils.kt‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎app/src/main/kotlin/org/akanework/gramophone/ui/FileOpUtils.kt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package org.akanework.gramophone.ui
2+
3+
import org.akanework.gramophone.ui.adapters.AlbumAdapter
4+
import org.akanework.gramophone.ui.adapters.ArtistAdapter
5+
import org.akanework.gramophone.ui.adapters.BaseAdapter
6+
import org.akanework.gramophone.ui.adapters.DateAdapter
7+
import org.akanework.gramophone.ui.adapters.GenreAdapter
8+
import org.akanework.gramophone.ui.adapters.PlaylistAdapter
9+
import org.akanework.gramophone.ui.adapters.SongAdapter
10+
11+
fun getAdapterType(adapter: BaseAdapter<*>) =
12+
when (adapter) {
13+
is AlbumAdapter -> {
14+
0
15+
}
16+
17+
is ArtistAdapter -> {
18+
1
19+
}
20+
21+
is DateAdapter -> {
22+
2
23+
}
24+
25+
is GenreAdapter -> {
26+
3
27+
}
28+
29+
is PlaylistAdapter -> {
30+
4
31+
}
32+
33+
is SongAdapter -> {
34+
5
35+
}
36+
37+
else -> {
38+
throw IllegalArgumentException()
39+
}
40+
}

‎app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ import org.akanework.gramophone.logic.ui.DefaultItemHeightHelper
5353
import org.akanework.gramophone.logic.ui.ItemHeightHelper
5454
import org.akanework.gramophone.logic.ui.MyRecyclerView
5555
import org.akanework.gramophone.logic.ui.placeholderScaleToFit
56-
import org.akanework.gramophone.logic.utils.FileOpUtils
5756
import org.akanework.gramophone.logic.utils.MediaStoreUtils
5857
import org.akanework.gramophone.ui.MainActivity
5958
import org.akanework.gramophone.ui.components.CustomGridLayoutManager
6059
import org.akanework.gramophone.ui.components.GridPaddingDecoration
6160
import org.akanework.gramophone.ui.components.NowPlayingDrawable
6261
import org.akanework.gramophone.ui.fragments.AdapterFragment
62+
import org.akanework.gramophone.ui.getAdapterType
6363
import java.util.Collections
6464

6565
abstract class BaseAdapter<T>(
@@ -113,7 +113,7 @@ abstract class BaseAdapter<T>(
113113
@Suppress("LeakingThis")
114114
private var prefSortType: Sorter.Type = Sorter.Type.valueOf(
115115
prefs.getStringStrict(
116-
"S" + FileOpUtils.getAdapterType(this).toString(),
116+
"S" + getAdapterType(this).toString(),
117117
Sorter.Type.None.toString()
118118
)!!
119119
)
@@ -123,7 +123,7 @@ abstract class BaseAdapter<T>(
123123
@Suppress("LeakingThis")
124124
private var prefLayoutType: LayoutType = LayoutType.valueOf(
125125
prefs.getStringStrict(
126-
"L" + FileOpUtils.getAdapterType(this).toString(),
126+
"L" + getAdapterType(this).toString(),
127127
LayoutType.NONE.toString()
128128
)!!
129129
)

‎app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.google.android.material.button.MaterialButton
3333
import org.akanework.gramophone.R
3434
import org.akanework.gramophone.logic.ui.ItemHeightHelper
3535
import org.akanework.gramophone.logic.ui.MyRecyclerView
36-
import org.akanework.gramophone.logic.utils.FileOpUtils
36+
import org.akanework.gramophone.ui.getAdapterType
3737
import kotlin.random.Random
3838

3939
open class BaseDecorAdapter<T : BaseAdapter<*>>(
@@ -125,7 +125,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
125125
if (!isSubFragment) {
126126
prefs.edit {
127127
putString(
128-
"S" + FileOpUtils.getAdapterType(adapter).toString(),
128+
"S" + getAdapterType(adapter).toString(),
129129
buttonMap[menuItem.itemId].toString()
130130
)
131131
}
@@ -141,7 +141,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
141141
if (!isSubFragment) {
142142
prefs.edit {
143143
putString(
144-
"L" + FileOpUtils.getAdapterType(adapter).toString(),
144+
"L" + getAdapterType(adapter).toString(),
145145
layoutMap[menuItem.itemId].toString()
146146
)
147147
}

‎app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,8 @@ class FullBottomSheet(context: Context, attrs: AttributeSet?, defStyleAttr: Int,
297297
.getDimensionPixelSize(R.dimen.media_seekbar_progress_stroke_width)
298298
.toFloat()
299299

300-
progressDrawable = SquigglyProgress()
301-
bottomSheetFullSeekBar.progressDrawable = progressDrawable
302-
progressDrawable.let {
300+
bottomSheetFullSeekBar.progressDrawable = SquigglyProgress().also {
301+
progressDrawable = it
303302
it.waveLength = seekBarProgressWavelength
304303
it.lineAmplitude = seekBarProgressAmplitude
305304
it.phaseSpeed = seekBarProgressPhase
@@ -775,8 +774,8 @@ class FullBottomSheet(context: Context, attrs: AttributeSet?, defStyleAttr: Int,
775774
colorSurface
776775
)
777776
bottomSheetFullLyricAdapter.updateTextColor(
778-
colorOnSurfaceVariant,
779-
colorContrastFainted,
777+
androidx.core.graphics.ColorUtils.setAlphaComponent(colorOnSurfaceVariant, 170),
778+
androidx.core.graphics.ColorUtils.setAlphaComponent(colorPrimary, 77),
780779
colorPrimary
781780
)
782781

‎app/src/main/kotlin/org/akanework/gramophone/ui/components/NowPlayingDrawable.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import android.graphics.Rect
1212
import android.graphics.Region
1313
import android.graphics.drawable.Drawable
1414
import androidx.annotation.ColorInt
15-
import com.google.android.material.math.MathUtils
15+
import org.akanework.gramophone.logic.utils.CalculationUtils.lerp
1616
import kotlin.random.Random
1717

1818
private inline val padding
@@ -60,15 +60,15 @@ class NowPlayingDrawable : Drawable() {
6060
val scale = ((System.currentTimeMillis() - ts) / animDuration).coerceAtMost(1f)
6161

6262
// Left bar
63-
lc = MathUtils.lerp(li, lt, scale)
63+
lc = lerp(li, lt, scale)
6464
canvas.drawBar(0f, lc)
6565

6666
// Middle bar
67-
mc = MathUtils.lerp(mi, mt, scale)
67+
mc = lerp(mi, mt, scale)
6868
canvas.drawBar(240f, mc)
6969

7070
// Right bar
71-
rc = MathUtils.lerp(ri, rt, scale)
71+
rc = lerp(ri, rt, scale)
7272
canvas.drawBar(480f, rc)
7373

7474
if (level != 1 && lc == lt && mc == mt && rc == rt) ts = 0L

0 commit comments

Comments
 (0)