-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#200: Major fixes to bluetooth pairing and app behavior:
- Completely rebuilt the bluetooth core - Implemented new pairing behavior - Added error message capabilities for each observation - Added the capability to open the bluetooth device connection view, when a device is not connected, directly from the task view or the error list view - Added a new button to the schedule header which shows the amount of errors and opens a new page, which shows a list of all errors - Fixed Threading issues - General improvements - Version Upgrades
- Loading branch information
1 parent
86237f3
commit 244471c
Showing
58 changed files
with
930 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...java/io/redlink/more/app/android/activities/observationErrors/ObservationErrorListView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package io.redlink.more.app.android.activities.observationErrors | ||
|
|
||
| import android.app.Activity | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.lazy.items | ||
| import androidx.compose.material.Divider | ||
| import androidx.compose.material.Icon | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Warning | ||
| import androidx.compose.material.icons.filled.Watch | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.snapshots.SnapshotStateList | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import io.redlink.more.app.android.R | ||
| import io.redlink.more.app.android.activities.NavigationScreen | ||
| import io.redlink.more.app.android.activities.bluetooth.BLEConnectionActivity | ||
| import io.redlink.more.app.android.extensions.getStringResource | ||
| import io.redlink.more.app.android.extensions.getStringResourceByName | ||
| import io.redlink.more.app.android.extensions.showNewActivity | ||
| import io.redlink.more.app.android.shared_composables.BasicText | ||
| import io.redlink.more.app.android.shared_composables.SmallTextIconButton | ||
| import io.redlink.more.app.android.ui.theme.MoreColors | ||
| import io.redlink.more.more_app_mutliplatform.observations.Observation | ||
|
|
||
| @Composable | ||
| fun ObservationErrorListView( | ||
| errors: SnapshotStateList<String>, | ||
| errorActions: SnapshotStateList<String> | ||
| ) { | ||
| val context = LocalContext.current | ||
| if (errors.isNotEmpty()) { | ||
| LazyColumn( | ||
| verticalArrangement = Arrangement.Bottom, | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| modifier = Modifier.fillMaxWidth() | ||
| ) { | ||
| items(errors.toList()) { error -> | ||
| Row( | ||
| verticalAlignment = Alignment.Bottom, | ||
| horizontalArrangement = Arrangement.Center, | ||
| modifier = Modifier | ||
| .padding(8.dp) | ||
| .fillMaxWidth() | ||
| ) { | ||
| Icon( | ||
| imageVector = Icons.Default.Warning, | ||
| contentDescription = "Error", | ||
| tint = MoreColors.Important, | ||
| modifier = Modifier.padding(end = 4.dp) | ||
| ) | ||
| BasicText( | ||
| text = "${getStringResourceByName(error)}!", | ||
| fontSize = 16.sp, | ||
| color = MoreColors.Important | ||
| ) | ||
| } | ||
| } | ||
| if (errorActions.isNotEmpty()) { | ||
| item { | ||
| if (errorActions.contains(Observation.ERROR_DEVICE_NOT_CONNECTED)) { | ||
| SmallTextIconButton( | ||
| text = NavigationScreen.BLUETOOTH_CONNECTION.stringRes(), | ||
| imageText = getStringResource(id = R.string.more_ble_icon_description), | ||
| image = Icons.Default.Watch, | ||
| imageTint = MoreColors.White | ||
| ) { | ||
| (context as? Activity)?.let { | ||
| showNewActivity(it, BLEConnectionActivity::class.java) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Divider(thickness = 1.dp) | ||
| } | ||
| } |
Oops, something went wrong.