mirror of
https://github.com/Myzel394/Alibi.git
synced 2025-06-19 07:15:25 +02:00
fix: Decreasing version because of https://issuetracker.google.com/issues/299506164
This commit is contained in:
parent
3df34b4ad0
commit
2c5665fa49
@ -42,6 +42,13 @@ android {
|
|||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
useSupportLibrary true
|
useSupportLibrary true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configurations.all {
|
||||||
|
resolutionStrategy {
|
||||||
|
force("androidx.emoji2:emoji2-views-helper:1.3.0")
|
||||||
|
force("androidx.emoji2:emoji2:1.3.0")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
@ -91,10 +98,10 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'androidx.core:core-ktx:1.12.0'
|
implementation 'androidx.core:core-ktx:1.10.0'
|
||||||
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
|
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
|
||||||
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
|
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
|
||||||
implementation 'androidx.activity:activity-compose:1.8.0'
|
implementation 'androidx.activity:activity-compose:1.0.0'
|
||||||
implementation platform('androidx.compose:compose-bom:2022.10.00')
|
implementation platform('androidx.compose:compose-bom:2022.10.00')
|
||||||
implementation 'androidx.compose.ui:ui'
|
implementation 'androidx.compose.ui:ui'
|
||||||
implementation 'androidx.compose.ui:ui-graphics'
|
implementation 'androidx.compose.ui:ui-graphics'
|
||||||
@ -110,7 +117,7 @@ dependencies {
|
|||||||
debugImplementation 'androidx.compose.ui:ui-tooling'
|
debugImplementation 'androidx.compose.ui:ui-tooling'
|
||||||
debugImplementation 'androidx.compose.ui:ui-test-manifest'
|
debugImplementation 'androidx.compose.ui:ui-test-manifest'
|
||||||
|
|
||||||
implementation "androidx.navigation:navigation-compose:2.7.4"
|
implementation "androidx.navigation:navigation-compose:2.5.0"
|
||||||
|
|
||||||
implementation 'com.google.dagger:hilt-android:2.46.1'
|
implementation 'com.google.dagger:hilt-android:2.46.1'
|
||||||
annotationProcessor 'com.google.dagger:hilt-compiler:2.46.1'
|
annotationProcessor 'com.google.dagger:hilt-compiler:2.46.1'
|
||||||
|
@ -146,8 +146,8 @@ abstract class RecorderService : Service() {
|
|||||||
fun startRecording() {
|
fun startRecording() {
|
||||||
recordingStart = LocalDateTime.now()
|
recordingStart = LocalDateTime.now()
|
||||||
|
|
||||||
ServiceCompat.startForeground(
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
this,
|
startForeground(
|
||||||
NotificationHelper.RECORDER_CHANNEL_NOTIFICATION_ID,
|
NotificationHelper.RECORDER_CHANNEL_NOTIFICATION_ID,
|
||||||
getNotificationHelper().buildStartingNotification(),
|
getNotificationHelper().buildStartingNotification(),
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
||||||
@ -156,6 +156,12 @@ abstract class RecorderService : Service() {
|
|||||||
0
|
0
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
startForeground(
|
||||||
|
NotificationHelper.RECORDER_CHANNEL_NOTIFICATION_ID,
|
||||||
|
getNotificationHelper().buildStartingNotification(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// Start
|
// Start
|
||||||
changeState(RecorderState.RECORDING)
|
changeState(RecorderState.RECORDING)
|
||||||
|
@ -60,15 +60,6 @@ fun Navigation(
|
|||||||
}
|
}
|
||||||
composable(
|
composable(
|
||||||
Screen.AudioRecorder.route,
|
Screen.AudioRecorder.route,
|
||||||
enterTransition = {
|
|
||||||
when (initialState.destination.route) {
|
|
||||||
Screen.Welcome.route -> null
|
|
||||||
else -> scaleIn(initialScale = SCALE_IN) + fadeIn()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
exitTransition = {
|
|
||||||
scaleOut(targetScale = SCALE_IN) + fadeOut(tween(durationMillis = 150))
|
|
||||||
}
|
|
||||||
) {
|
) {
|
||||||
AudioRecorderScreen(
|
AudioRecorderScreen(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
@ -77,12 +68,6 @@ fun Navigation(
|
|||||||
}
|
}
|
||||||
composable(
|
composable(
|
||||||
Screen.Settings.route,
|
Screen.Settings.route,
|
||||||
enterTransition = {
|
|
||||||
scaleIn(initialScale = 1 / SCALE_IN) + fadeIn()
|
|
||||||
},
|
|
||||||
exitTransition = {
|
|
||||||
scaleOut(targetScale = 1 / SCALE_IN) + fadeOut(tween(durationMillis = 150))
|
|
||||||
}
|
|
||||||
) {
|
) {
|
||||||
SettingsScreen(
|
SettingsScreen(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
@ -91,16 +76,6 @@ fun Navigation(
|
|||||||
}
|
}
|
||||||
composable(
|
composable(
|
||||||
Screen.CustomRecordingNotifications.route,
|
Screen.CustomRecordingNotifications.route,
|
||||||
enterTransition = {
|
|
||||||
slideInHorizontally(
|
|
||||||
initialOffsetX = { it -> it / 2 }
|
|
||||||
) + fadeIn()
|
|
||||||
},
|
|
||||||
exitTransition = {
|
|
||||||
slideOutHorizontally(
|
|
||||||
targetOffsetX = { it -> it / 2 }
|
|
||||||
) + fadeOut(tween(150))
|
|
||||||
}
|
|
||||||
) {
|
) {
|
||||||
CustomRecordingNotificationsScreen(
|
CustomRecordingNotificationsScreen(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
@ -108,12 +83,6 @@ fun Navigation(
|
|||||||
}
|
}
|
||||||
composable(
|
composable(
|
||||||
Screen.About.route,
|
Screen.About.route,
|
||||||
enterTransition = {
|
|
||||||
scaleIn()
|
|
||||||
},
|
|
||||||
exitTransition = {
|
|
||||||
scaleOut() + fadeOut(tween(150))
|
|
||||||
}
|
|
||||||
) {
|
) {
|
||||||
AboutScreen(
|
AboutScreen(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
|
@ -16,10 +16,13 @@ val ALLOWED_MICROPHONE_TYPES =
|
|||||||
AudioDeviceInfo.TYPE_WIRED_HEADPHONES,
|
AudioDeviceInfo.TYPE_WIRED_HEADPHONES,
|
||||||
AudioDeviceInfo.TYPE_IP,
|
AudioDeviceInfo.TYPE_IP,
|
||||||
AudioDeviceInfo.TYPE_DOCK,
|
AudioDeviceInfo.TYPE_DOCK,
|
||||||
|
/*
|
||||||
|
Currently unavailable due to targetSDK 33
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
AudioDeviceInfo.TYPE_DOCK_ANALOG
|
AudioDeviceInfo.TYPE_DOCK_ANALOG
|
||||||
} else {
|
} else {
|
||||||
},
|
},
|
||||||
|
*/
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
AudioDeviceInfo.TYPE_BLE_HEADSET
|
AudioDeviceInfo.TYPE_BLE_HEADSET
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user