Skip to content

Commit c0c8620

Browse files
nift4nift4
committed
some edits
1 parent c4b4840 commit c0c8620

File tree

17 files changed

+70
-11
lines changed

17 files changed

+70
-11
lines changed

‎app/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@ aboutLibraries {
241241
dependencies {
242242
implementation(project(":libphonograph:libPhonograph"))
243243
val media3Version = "1.4.1"
244-
implementation("androidx.activity:activity-ktx:1.9.2")
244+
implementation("androidx.activity:activity-ktx:1.9.3")
245245
implementation("androidx.appcompat:appcompat:1.7.0")
246-
implementation("androidx.collection:collection-ktx:1.4.4")
246+
implementation("androidx.collection:collection-ktx:1.4.5")
247247
implementation("androidx.concurrent:concurrent-futures-ktx:1.2.0")
248-
implementation("androidx.constraintlayout:constraintlayout:2.2.0-beta01")
248+
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
249249
implementation("androidx.core:core-ktx:1.13.1")
250250
implementation("androidx.core:core-splashscreen:1.0.1")
251251
//implementation("androidx.datastore:datastore-preferences:1.1.0-rc01") TODO don't abuse shared prefs
252-
implementation("androidx.fragment:fragment-ktx:1.8.4")
252+
implementation("androidx.fragment:fragment-ktx:1.8.5")
253253
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6")
254254
implementation("androidx.media3:media3-exoplayer:$media3Version")
255255
implementation("androidx.media3:media3-exoplayer-midi:$media3Version")
@@ -262,7 +262,7 @@ dependencies {
262262
implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
263263
implementation("com.google.android.material:material:1.12.0")
264264
implementation("me.zhanghai.android.fastscroll:library:1.3.0")
265-
implementation("io.coil-kt.coil3:coil:3.0.0-alpha10")
265+
implementation("io.coil-kt.coil3:coil:3.0.4")
266266
//noinspection GradleDependency newer versions need java.nio which is api 26+
267267
//implementation("com.github.albfernandez:juniversalchardet:2.0.3") TODO
268268
implementation("androidx.profileinstaller:profileinstaller:1.4.1")

‎app/src/debug/AndroidManifest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<application tools:ignore="MissingApplicationIcon"
77
android:memtagMode="sync"
88
android:gwpAsanMode="always"
9-
android:requestLegacyExternalStorage="true"
10-
tools:targetApi="s">
9+
android:icon="@mipmap/ic_launcher_xmas"
10+
tools:targetApi="s"
11+
tools:replace="android:icon">
1112
<activity
1213
android:name="com.android.development.MediaScannerActivity"
1314
android:label="SD Exploder"

‎app/src/main/ic_launcher_xmas-playstore.png‎

18.7 KB
Loading

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@
1717

1818
package org.akanework.gramophone.ui
1919

20+
import android.annotation.SuppressLint
2021
import android.app.NotificationManager
2122
import android.content.Intent
2223
import android.content.pm.PackageManager
24+
import android.graphics.Color
2325
import android.net.Uri
2426
import android.os.Bundle
2527
import android.os.Handler
2628
import android.os.Looper
2729
import android.provider.Settings
2830
import android.view.Choreographer
31+
import android.view.ViewGroup
32+
import android.widget.TextView
2933
import android.widget.Toast
3034
import androidx.activity.result.ActivityResultLauncher
3135
import androidx.activity.result.IntentSenderRequest
@@ -49,6 +53,7 @@ import kotlinx.coroutines.CoroutineScope
4953
import kotlinx.coroutines.Dispatchers
5054
import kotlinx.coroutines.launch
5155
import kotlinx.coroutines.withContext
56+
import org.akanework.gramophone.BuildConfig
5257
import org.akanework.gramophone.R
5358
import org.akanework.gramophone.logic.enableEdgeToEdgeProperly
5459
import org.akanework.gramophone.logic.gramophoneApplication
@@ -126,6 +131,15 @@ class MainActivity : AppCompatActivity() {
126131

127132
// Set content Views.
128133
setContentView(R.layout.activity_main)
134+
if (BuildConfig.DEBUG) {
135+
@SuppressLint("SetTextI18n")
136+
findViewById<ViewGroup>(R.id.rootView).addView(TextView(this).apply {
137+
text = "DEBUG"
138+
setTextColor(Color.RED)
139+
translationZ = 9999999f
140+
translationX = 50f
141+
})
142+
}
129143
playerBottomSheet = findViewById(R.id.player_layout)
130144
val container = findViewById<FragmentContainerView>(R.id.container)
131145
// Modifies FragmentContainerView's insets to account for bottom sheet size.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ class MediaControllerViewModel(application: Application) : AndroidViewModel(appl
176176
if (lifecycleOne.currentState == Lifecycle.State.DESTROYED ||
177177
lifecycleTwo.currentState == Lifecycle.State.DESTROYED
178178
) {
179-
180179
// you cannot set DESTROYED before setting CREATED
181180
if (lifecycle.currentState == Lifecycle.State.INITIALIZED)
182181
lifecycleRegistry.currentState = Lifecycle.State.CREATED

‎app/src/main/res/drawable/ic_launcher_xmas_foreground.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="1080"
5+
android:viewportHeight="1080">
6+
<group android:scaleX="0.66"
7+
android:scaleY="0.66"
8+
android:translateX="183.6"
9+
android:translateY="183.6">
10+
<path
11+
android:pathData="M459.1,412.8a58.8,32 0,1 0,117.7 0a58.8,32 0,1 0,-117.7 0z"
12+
android:strokeWidth="0"
13+
android:fillColor="#3d5646"/>
14+
<path
15+
android:pathData="m867,410.6l-295.3,-161.1c-19.6,-10.7 -43.3,-10.7 -62.9,0l-295.3,161.1c-21.1,11.5 -34.2,33.6 -34.2,57.6l0,151.7c0,24 13.1,46.1 34.2,57.6l295.3,161.1c19.6,10.7 43.3,10.7 62.9,0l295.3,-161.1c21.1,-11.5 34.2,-33.6 34.2,-57.6l0,-151.7c0,-24 -13.1,-46.1 -34.2,-57.6zM518,505.2c-93.9,0 -170,-41.3 -170,-92.3s76.1,-92.3 170,-92.3s170,41.3 170,92.3s-76.1,92.3 -170,92.3zM794.2,465.9l-179.2,97.8c-2.4,1.3 -5.1,2 -7.8,2l-45.1,0c-9.1,0 -16.4,-7.3 -16.4,-16.4s7.3,-16.4 16.4,-16.4l40.9,0l150.5,-82.1c-4.1,-5 -4.9,-12.2 -1.6,-18.2c4.4,-7.9 14.3,-10.8 22.3,-6.5l20.1,11.1c5.3,2.9 8.5,8.4 8.5,14.4s-3.3,11.5 -8.6,14.4l0,0z"
16+
android:strokeWidth="0"
17+
android:fillColor="#3d5646"/>
18+
<path
19+
android:pathData="m794.6,349.2c72.3,2.3 121.9,5.3 135.5,10.2c16.7,6.2 66.1,45 66.8,72.2c1,41.1 -2.5,86.1 -27.2,135c-4.2,8.3 -24.7,-0.4 -25.5,-9.7c-2.2,-25.3 -3.9,-34 -12.9,-46.8c0,0 -7.7,32.1 -20.8,63.1c-9,21.3 -105.9,-13.4 -125.3,-38s-48,-71.6 -32.8,-103.7s42.1,-82.4 42.1,-82.4l0,0z"
20+
android:strokeWidth="0"
21+
android:fillColor="#ba4242"/>
22+
<path
23+
android:pathData="m786.7,338c-7.8,-0.7 -27.7,-2.9 -34.8,1.8c-18.1,12 -45.7,126.4 -14.3,180.6c25.6,44.3 98.9,91 163.6,85.2c4.1,-0.4 7.1,-6 9.9,-12c4.5,-9.5 7.4,-17.8 8.2,-19.8c4.2,-9.7 -3.4,-11.8 -13.8,-12.6c-44.8,-3.3 -107.7,-31.7 -125.1,-68.9c-19.9,-42.6 7.6,-121.7 19.1,-142.9c3.5,-6.6 -7.7,-10.9 -12.9,-11.4l0,0z"
24+
android:strokeWidth="0"
25+
android:fillColor="#fffefa"/>
26+
<path
27+
android:pathData="M958.9,576m-23.4,0a23.4,23.4 0,1 1,46.8 0a23.4,23.4 0,1 1,-46.8 0"
28+
android:strokeWidth="0"
29+
android:fillColor="#fffefa"/>
30+
</group>
31+
</vector>

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
android:id="@+id/rootView"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
78
android:animateLayoutChanges="true"

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_xmas.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_xmas_background"/>
4+
<foreground android:drawable="@drawable/ic_launcher_xmas_foreground"/>
5+
</adaptive-icon>

‎app/src/main/res/mipmap-hdpi/ic_launcher_xmas.webp‎

2.89 KB
Loading

‎app/src/main/res/mipmap-mdpi/ic_launcher_xmas.webp‎

1.84 KB
Loading

0 commit comments

Comments
 (0)