Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix App bar #145

Merged
merged 2 commits into from
Jun 17, 2024
Merged

Fix App bar #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5fed95
Fix app bar
roshanrajaratnam Jun 17, 2024
2a644a8
Bump gradle dependencies
roshanrajaratnam Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ androidGradlePlugin = "8.4.2"
androidxActivity = "1.9.0"
androidxAnnotation = "1.8.0"
androidxAppCompat = "1.7.0"
androidxComposeBom = "2024.05.00" # https://developer.android.com/jetpack/compose/bom/bom-mapping
androidxComposeBom = "2024.06.00" # https://developer.android.com/jetpack/compose/bom/bom-mapping
androidxComposeCompiler = "1.5.12" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin
androidxComposeRuntimeTracing = "1.0.0-beta01"
androidxCore = "1.13.1"
androidxCoreSplashscreen = "1.0.1"
androidxDataStore = "1.1.1"
androidxEspresso = "3.5.1"
androidxHiltNavigationCompose = "1.2.0"
androidxLifecycle = "2.8.1"
androidxLifecycle = "2.8.2"
androidxLocalbroadcastmanager = "1.1.0"
androidxMacroBenchmark = "1.2.4"
androidxNavigation = "2.7.7"
Expand All @@ -34,12 +34,12 @@ hilt = "2.51.1"
hiltExt = "1.2.0"
jacoco = "0.8.7"
junit4 = "4.13.2"
kotlin = "1.9.23"
kotlin = "1.9.24"
kotlinxCoroutines = "1.8.0"
kotlinxDatetime = "0.5.0"
kotlinxSerializationJson = "1.6.3"
ksp = "1.9.23-1.0.20"
lint = "31.4.1"
lint = "31.5.0"
memfault-cloud = "2.0.5"
okhttp = "4.12.0"
protobuf = "4.26.1"
Expand All @@ -65,11 +65,11 @@ moshiAdapters = "1.15.1"
moshiConverter = "2.11.0"
moshi = "1.15.1"
moshiKotlinCodegen = "1.15.1"
material3 = "1.3.0-beta02"
material = "1.6.7"
material3 = "1.3.0-beta03"
material = "1.6.8"

nordic-log = "2.3.0"
nordic-common = "1.9.5"
nordic-common = "1.10.1"
nordicPlugins = "1.11.1"
dokkaPlugin = "1.9.20"
googleServicesPlugins = "4.4.2"
Expand Down
7 changes: 5 additions & 2 deletions uiscanner/src/main/java/no/nordicsemi/android/kotlin/ble/ui/scanner/view/ScannerAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
Expand All @@ -53,13 +54,15 @@ fun ScannerAppBar(
onNavigationButtonClick: (() -> Unit)? = null,
) {
NordicAppBar(
text = text,
title = { Text(text = text) },
backButtonIcon = backButtonIcon,
onNavigationButtonClick = onNavigationButtonClick,
actions = {
if (showProgress) {
CircularProgressIndicator(
modifier = Modifier.padding(horizontal = 16.dp).size(30.dp),
modifier = Modifier
.padding(horizontal = 16.dp)
.size(30.dp),
color = MaterialTheme.colorScheme.onPrimary
)
}
Expand Down