Skip to content

Commit dc2e2a5

Browse files
committed
chore: update line separator
1 parent c2deb2a commit dc2e2a5

File tree

10 files changed

+47
-31
lines changed

10 files changed

+47
-31
lines changed

.idea/compiler.xml

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

.idea/gradle.xml

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

.idea/misc.xml

+1-1
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/framework/app/di/AppModule.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ object AppModule {
150150

151151
@OptIn(
152152
ExperimentalMaterialNavigationApi::class,
153-
androidx.compose.animation.ExperimentalAnimationApi::class,
154-
kotlinx.coroutines.InternalCoroutinesApi::class,
155-
androidx.compose.ui.ExperimentalComposeUiApi::class,
156-
androidx.compose.material.ExperimentalMaterialApi::class,
157-
androidx.compose.foundation.ExperimentalFoundationApi::class
153+
ExperimentalAnimationApi::class,
154+
InternalCoroutinesApi::class,
155+
ExperimentalComposeUiApi::class,
156+
ExperimentalMaterialApi::class,
157+
ExperimentalFoundationApi::class
158158
)
159159
@Provides
160160
@Singleton

app/src/main/java/com/timilehinaregbesola/mathalarm/interactors/AudioPlayer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ interface AudioPlayer {
2424

2525
class PlayerWrapper(
2626
// val resources: Resources,
27-
val context: Context
27+
val context: Context,
2828
) : AudioPlayer {
2929
override fun setDataSource(alarmtone: Uri) {
3030
// Fall back on the default alarm if the database does not have an
@@ -53,7 +53,7 @@ class PlayerWrapper(
5353
AudioAttributes.Builder()
5454
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
5555
.setUsage(AudioAttributes.USAGE_ALARM)
56-
.build()
56+
.build(),
5757
)
5858
prepare()
5959
isLooping = true

app/src/main/java/com/timilehinaregbesola/mathalarm/interactors/NotificationInteractorImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import timber.log.Timber
1616
@InternalCoroutinesApi
1717
@ExperimentalAnimationApi
1818
@ExperimentalMaterialNavigationApi
19-
internal class NotificationInteractorImpl constructor(
19+
internal class NotificationInteractorImpl(
2020
private val alarmNotification: MathAlarmNotification,
2121
) : NotificationInteractor {
2222

app/src/main/java/com/timilehinaregbesola/mathalarm/notification/AlarmNotificationScheduler.kt

+24-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.timilehinaregbesola.mathalarm.notification
22

33
import android.app.PendingIntent
4+
import android.app.PendingIntent.FLAG_MUTABLE
5+
import android.app.PendingIntent.FLAG_UPDATE_CURRENT
46
import android.content.Context
57
import android.content.Intent
68
import android.os.Build
@@ -50,7 +52,7 @@ class AlarmNotificationScheduler(private val context: Context) {
5052
passedAlarm.repeatDays = sb.toString()
5153
}
5254
}
53-
(SUN..SAT).forEach { i ->
55+
for (i in SUN..SAT) {
5456
if (passedAlarm.repeatDays[i] == 'T') {
5557
val daysUntilAlarm: Int
5658
val cal = passedAlarm.initCalendar()
@@ -71,8 +73,6 @@ class AlarmNotificationScheduler(private val context: Context) {
7173
cal.add(Calendar.DAY_OF_YEAR, daysUntilAlarm)
7274
Timber.d("days until alarm: $daysUntilAlarm")
7375
}
74-
// val stringId: StringBuilder = StringBuilder().append(i)
75-
// .append(passedAlarm.hour).append(passedAlarm.minute)
7676
val stringId: StringBuilder = StringBuilder().append(passedAlarm.alarmId).append(i)
7777
.append(passedAlarm.hour).append(passedAlarm.minute)
7878
val id = stringId.toString().split("-").joinToString("")
@@ -81,24 +81,33 @@ class AlarmNotificationScheduler(private val context: Context) {
8181
// check if a previous alarm has been set
8282
val isSet = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
8383
PendingIntent.getBroadcast(
84-
context, intentId, alarmIntent, PendingIntent.FLAG_NO_CREATE or PendingIntent.FLAG_MUTABLE
84+
context,
85+
intentId,
86+
alarmIntent,
87+
PendingIntent.FLAG_NO_CREATE or FLAG_MUTABLE,
8588
)
8689
} else {
8790
PendingIntent.getBroadcast(context, intentId, alarmIntent, PendingIntent.FLAG_NO_CREATE)
8891
}
8992
if (isSet != null) {
9093
if (!reschedule) {
91-
// context.showToast(R.string.alarm_duplicate_toast_text)
94+
// context.showToast(R.string.alarm_duplicate_toast_text)
9295
}
9396
return false
9497
}
9598
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
9699
PendingIntent.getBroadcast(
97-
context, intentId, alarmIntent, PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_MUTABLE
100+
context,
101+
intentId,
102+
alarmIntent,
103+
PendingIntent.FLAG_CANCEL_CURRENT or FLAG_MUTABLE,
98104
)
99105
} else {
100106
PendingIntent.getBroadcast(
101-
context, intentId, alarmIntent, PendingIntent.FLAG_CANCEL_CURRENT
107+
context,
108+
intentId,
109+
alarmIntent,
110+
PendingIntent.FLAG_CANCEL_CURRENT,
102111
)
103112
}
104113
alarmIntentList.add(pendingIntent)
@@ -131,13 +140,17 @@ class AlarmNotificationScheduler(private val context: Context) {
131140
val intentId = id.toInt()
132141
val cancelPendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
133142
PendingIntent.getBroadcast(
134-
context, intentId, receiverIntent,
135-
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
143+
context,
144+
intentId,
145+
receiverIntent,
146+
FLAG_UPDATE_CURRENT or FLAG_MUTABLE,
136147
)
137148
} else {
138149
PendingIntent.getBroadcast(
139-
context, intentId, receiverIntent,
140-
PendingIntent.FLAG_UPDATE_CURRENT
150+
context,
151+
intentId,
152+
receiverIntent,
153+
FLAG_UPDATE_CURRENT,
141154
)
142155
}
143156
context.cancelAlarm(cancelPendingIntent)

app/src/main/java/com/timilehinaregbesola/mathalarm/utils/ContextExtensions.kt

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@file:JvmName("extension-context")
2+
23
package com.timilehinaregbesola.mathalarm.utils
34

45
import android.app.AlarmManager
@@ -23,7 +24,7 @@ import java.util.*
2324
fun Context.setExactAlarm(
2425
triggerAtMillis: Long,
2526
operation: PendingIntent?,
26-
type: Int = AlarmManager.RTC_WAKEUP
27+
type: Int = AlarmManager.RTC_WAKEUP,
2728
) {
2829
val currentTime = Calendar.getInstance().timeInMillis
2930
if (triggerAtMillis <= currentTime) {
@@ -71,19 +72,22 @@ fun Context.email(
7172
chooserTitle: String,
7273
email: String = "",
7374
subject: String = "",
74-
text: String = ""
75+
text: String = "",
7576
) {
7677
val intent = Intent(Intent.ACTION_SENDTO)
7778
intent.data = Uri.parse("mailto:")
7879

79-
if (email.isNotEmpty())
80+
if (email.isNotEmpty()) {
8081
intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
82+
}
8183

82-
if (subject.isNotEmpty())
84+
if (subject.isNotEmpty()) {
8385
intent.putExtra(Intent.EXTRA_SUBJECT, subject)
86+
}
8487

85-
if (text.isNotEmpty())
88+
if (text.isNotEmpty()) {
8689
intent.putExtra(Intent.EXTRA_TEXT, text)
90+
}
8791

8892
startActivity(Intent.createChooser(intent, chooserTitle))
8993
}

core/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ java {
99
}
1010

1111
dependencies {
12-
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
12+
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
1313
implementation(libs.coroutines.android)
1414
implementation(libs.timber)
1515
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1717
android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
19-
android.enableJetifier=true
19+
android.enableJetifier=false
2020
# Kotlin code style for this project: "official" or "obsolete":
2121
kotlin.code.style=official

0 commit comments

Comments
 (0)