Skip to content

Commit c843973

Browse files
t-regbst-regbs
committed
chore: bump dependencies
1 parent 1055704 commit c843973

File tree

6 files changed

+64
-59
lines changed

6 files changed

+64
-59
lines changed

‎.idea/deploymentTargetDropDown.xml

+18-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/timilehinaregbesola/mathalarm/navigation/NavGraph.kt

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.timilehinaregbesola.mathalarm.navigation
22

3-
import androidx.compose.animation.AnimatedContentScope
3+
import androidx.compose.animation.AnimatedContentTransitionScope
44
import androidx.compose.animation.ExperimentalAnimationApi
55
import androidx.compose.animation.core.tween
66
import androidx.compose.foundation.ExperimentalFoundationApi
@@ -51,16 +51,16 @@ fun NavGraph(preferences: AlarmPreferencesImpl) {
5151
route = Navigation.NAV_ALARM_LIST,
5252
enterTransition = {
5353
slideIntoContainer(
54-
AnimatedContentScope.SlideDirection.Right,
55-
animationSpec = tween(700)
54+
AnimatedContentTransitionScope.SlideDirection.Right,
55+
animationSpec = tween(700),
5656
)
5757
},
5858
exitTransition = {
5959
slideOutOfContainer(
60-
AnimatedContentScope.SlideDirection.Left,
61-
animationSpec = tween(700)
60+
AnimatedContentTransitionScope.SlideDirection.Left,
61+
animationSpec = tween(700),
6262
)
63-
}
63+
},
6464
) {
6565
ListDisplayScreen(
6666
navController = navController,
@@ -72,16 +72,16 @@ fun NavGraph(preferences: AlarmPreferencesImpl) {
7272
deepLinks = listOf(navDeepLink { uriPattern = Navigation.NAV_ALARM_MATH_URI }),
7373
enterTransition = {
7474
slideIntoContainer(
75-
AnimatedContentScope.SlideDirection.Right,
76-
animationSpec = tween(700)
75+
AnimatedContentTransitionScope.SlideDirection.Right,
76+
animationSpec = tween(700),
7777
)
7878
},
7979
exitTransition = {
8080
slideOutOfContainer(
81-
AnimatedContentScope.SlideDirection.Left,
82-
animationSpec = tween(700)
81+
AnimatedContentTransitionScope.SlideDirection.Left,
82+
animationSpec = tween(700),
8383
)
84-
}
84+
},
8585
) {
8686
val alarmJson = it.arguments?.getString(Navigation.NAV_ALARM_MATH_ARGUMENT)
8787
val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
@@ -90,31 +90,31 @@ fun NavGraph(preferences: AlarmPreferencesImpl) {
9090
MathScreen(
9191
navController = navController,
9292
alarm = alarmObject!!,
93-
darkTheme = preferences.shouldUseDarkColors()
93+
darkTheme = preferences.shouldUseDarkColors(),
9494
)
9595
}
9696
composable(
9797
route = Navigation.NAV_APP_SETTINGS,
9898
enterTransition = {
9999
slideIntoContainer(
100-
AnimatedContentScope.SlideDirection.Right,
101-
animationSpec = tween(700)
100+
AnimatedContentTransitionScope.SlideDirection.Right,
101+
animationSpec = tween(700),
102102
)
103103
},
104104
exitTransition = {
105105
slideOutOfContainer(
106-
AnimatedContentScope.SlideDirection.Left,
107-
animationSpec = tween(700)
106+
AnimatedContentTransitionScope.SlideDirection.Left,
107+
animationSpec = tween(700),
108108
)
109-
}
109+
},
110110
) {
111111
AppSettingsScreen(
112112
onBackPress = { navController.popBackStack() },
113-
pref = preferences
113+
pref = preferences,
114114
)
115115
}
116116
bottomSheet(
117-
route = Navigation.NAV_SETTINGS_SHEET
117+
route = Navigation.NAV_SETTINGS_SHEET,
118118
) { backStackEntry ->
119119
val alarmJson = backStackEntry.arguments?.getString(Navigation.NAV_SETTINGS_SHEET_ARGUMENT)
120120
val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
@@ -123,7 +123,7 @@ fun NavGraph(preferences: AlarmPreferencesImpl) {
123123
AlarmBottomSheet(
124124
navController = navController,
125125
darkTheme = preferences.shouldUseDarkColors(),
126-
alarm = alarmObject!!
126+
alarm = alarmObject!!,
127127
)
128128
}
129129
}

‎app/src/main/java/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotification.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import java.net.URLEncoder
4141
class MathAlarmNotification(
4242
private val context: Context,
4343
private val channel: MathAlarmNotificationChannel,
44-
private val player: AudioPlayer
44+
private val player: AudioPlayer,
4545
) {
4646
/**
4747
* Shows the [MathAlarmNotification] based on the given Alarm.
@@ -99,12 +99,11 @@ class MathAlarmNotification(
9999
val vibratePattern = longArrayOf(0, 100, 200, 300)
100100
val bigPicStyle = NotificationCompat.BigPictureStyle()
101101
.bigPicture(alarmImage)
102-
.bigLargeIcon(null)
103-
// setContentIntent(buildPendingIntent(task))
102+
// .bigLargeIcon(null)
103+
setContentIntent(buildPendingIntent(alarm))
104104
setSmallIcon(R.drawable.icon)
105105
setContentTitle(context.getString(R.string.notification_title))
106106
setContentText(alarm.title)
107-
setFullScreenIntent(buildPendingIntent(alarm), true)
108107
setStyle(bigPicStyle)
109108
setSound(null)
110109
setLargeIcon(alarmImage)
@@ -114,6 +113,7 @@ class MathAlarmNotification(
114113
setPriority(NotificationCompat.PRIORITY_HIGH)
115114
setAutoCancel(true)
116115
addAction(getSnoozeAction(alarm))
116+
setFullScreenIntent(buildPendingIntent(alarm), true)
117117
}
118118

119119
private fun buildPendingIntent(alarm: Alarm): PendingIntent {
@@ -125,7 +125,7 @@ class MathAlarmNotification(
125125
Intent.ACTION_VIEW,
126126
"https://timilehinaregbesola.com/alarmId=$alarmJson".toUri(),
127127
context,
128-
MainActivity::class.java
128+
MainActivity::class.java,
129129
)
130130
return TaskStackBuilder.create(context).run {
131131
addNextIntentWithParentStack(notificationIntent)
@@ -152,7 +152,7 @@ class MathAlarmNotification(
152152
private fun getIntent(
153153
alarm: Alarm,
154154
intentAction: String,
155-
requestCode: Int
155+
requestCode: Int,
156156
): PendingIntent {
157157
val receiverIntent = Intent(context, AlarmReceiver::class.java).apply {
158158
action = intentAction
@@ -164,7 +164,7 @@ class MathAlarmNotification(
164164
context,
165165
requestCode,
166166
receiverIntent,
167-
PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
167+
PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE,
168168
)
169169
}
170170

‎gradle/libs.versions.toml

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
[versions]
2-
accompanist = "0.26.1-alpha"
2+
accompanist = "0.31.0-alpha"
33
# @keep
44
android_compile_sdk = "33"
5-
android_gradle_plugin = "7.2.0"
5+
android_gradle_plugin = "7.2.2"
66
# @keep
77
android_min_sdk = "21"
88
# @keep
99
android_target_sdk = "33"
10-
androidx_activity_compose = "1.6.0-beta01"
10+
androidx_activity_compose = "1.7.2"
1111
androidx_compose = "1.2.1"
12-
androidx_compose_compiler = "1.3.0"
12+
androidx_compose_compiler = "1.4.7"
1313
androidx_datastore = "1.0.0"
14-
androidx_ktx = "1.9.0-beta01"
15-
androidx_room = "2.5.0-alpha02"
16-
androidx_test_core = "1.4.0"
17-
compose = "2022.10.00"
14+
androidx_ktx = "1.10.1"
15+
androidx_room = "2.5.2"
16+
androidx_test_core = "1.5.0"
17+
compose = "2023.06.01"
1818
coroutines = "1.6.4"
19-
crashlytics_plugin = "2.9.1"
20-
firebase = "30.3.2"
21-
google_services = "4.3.13"
19+
crashlytics_plugin = "2.9.6"
20+
firebase = "32.1.1"
21+
google_services = "4.3.15"
2222
hilt_android = "2.43.2"
2323
hilt_android_compiler = "2.43.2"
2424
hilt_nav_compose = "1.0.0"
2525
# @pin
26-
kotlin_gradle_plugin = "1.7.10"
27-
material = "1.7.0-beta01"
26+
kotlin_gradle_plugin = "1.8.21"
27+
material = "1.9.0"
2828
material_dialogs = "0.5.1"
2929
moshi = "1.13.0"
30-
splashscreen = "1.0.0-beta01"
30+
splashscreen = "1.0.1"
3131
test_coroutines = "1.6.4"
32-
test_espresso_core = "3.5.0-alpha07"
32+
test_espresso_core = "3.5.1"
3333
test_junit = "4.13.2"
34-
test_junit_ext = "1.1.4-alpha07"
34+
test_junit_ext = "1.1.5"
3535
test_mockk = "1.12.5"
3636
timber = "4.7.1"
3737
lottie = "5.2.0"
@@ -59,7 +59,7 @@ androidx_room_compiler = { module = "androidx.room:room-compiler", version.ref =
5959
androidx_room_ktx = { module = "androidx.room:room-ktx", version.ref = "androidx_room" }
6060
androidx_room_runtime = { module = "androidx.room:room-runtime", version.ref = "androidx_room" }
6161
androidx_test_core = { module = "androidx.test:core", version.ref = "androidx_test_core" }
62-
androidx_test_core_ktx = "androidx.test:core-ktx:1.5.0-alpha01"
62+
androidx_test_core_ktx = "androidx.test:core-ktx:1.5.0"
6363
androidx_test_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "test_espresso_core" }
6464
androidx_test_ext_junit = { module = "androidx.test.ext:junit", version.ref = "test_junit_ext" }
6565
coroutines_android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }

0 commit comments

Comments
 (0)