aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-15 20:54:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded AGP to 2.10

Browse Source
This commit is contained in:
himalia416
2025-10-06 17:17:17 +02:00
parent 25e1de5497
commit b48a504fdc
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
View File

@@ -53,8 +53,9 @@ import no.nordicsemi.android.ui.view.internal.LoadingView
@Composable
internal fun ChannelSoundingScreen(isNotificationPermissionGranted: Boolean?) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA && isNotificationPermissionGranted != null) {
// Channel Sounding is available from Android 16 (API 36) onward, while better accuracy and
// performance are provided from Android 16 (API 36, minor version 1) and later.
if (Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1 && isNotificationPermissionGranted != null) {
RequestRangingPermission {
val channelSoundingViewModel = hiltViewModel<ChannelSoundingViewModel>()
val channelSoundingState by channelSoundingViewModel.channelSoundingState.collectAsStateWithLifecycle()

2
profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/uart/UARTConfigurationPicker.kt
View File

@@ -8,10 +8,10 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowDropDown
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuAnchorType.Companion.PrimaryNotEditable
import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MenuAnchorType.Companion.PrimaryNotEditable
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable

2
settings.gradle.kts
View File

@@ -50,7 +50,7 @@ dependencyResolutionManagement {
}
versionCatalogs {
create("libs") {
from("no.nordicsemi.android.gradle:version-catalog:2.9-6")
from("no.nordicsemi.android.gradle:version-catalog:2.10")
}
}
}