From 806ceb1fa8edef272f46a6718a0b3ddd35c44be1 Mon Sep 17 00:00:00 2001 From: Vineyro Date: Fri, 31 Mar 2023 16:54:33 +0700 Subject: [PATCH] Checkout --- app/build.gradle | 19 +- app/src/main/AndroidManifest.xml | 7 +- .../java/llc/arma/ble/app/ui/MainActivity.kt | 154 ++++- .../arma/ble/app/ui/common/BottomDialog.kt | 51 ++ .../app/ui/screen/beacon/BeaconContract.kt | 50 +- .../ble/app/ui/screen/beacon/BeaconScreen.kt | 450 +++++++++---- .../app/ui/screen/beacon/BeaconViewModel.kt | 138 +++- .../app/ui/screen/beacon/view/DisplayState.kt | 158 +++++ .../app/ui/screen/beacon/view/PowerEdit.kt | 97 +++ .../screen/connection/ConnectionContract.kt | 7 + .../ui/screen/connection/ConnectionScreen.kt | 60 +- .../screen/connection/ConnectionViewModel.kt | 131 ++-- .../arma/ble/app/ui/screen/main/MainScreen.kt | 17 + .../screen/password/ChangePasswordContract.kt | 62 ++ .../screen/password/ChangePasswordScreen.kt | 270 ++++++++ .../password/ChangePasswordViewModel.kt | 125 ++++ .../app/ui/screen/password/view/Display.kt | 205 ++++++ .../app/ui/screen/password/view/Loading.kt | 67 ++ .../ble/app/ui/screen/password/view/Result.kt | 115 ++++ .../screen/thermometer/ThermometerContract.kt | 10 + .../screen/thermometer/ThermometerScreen.kt | 550 ++++------------ .../thermometer/ThermometerViewModel.kt | 47 +- .../screen/thermometer/view/DisplayState.kt | 36 ++ .../thermometer/view/TemperatureHistory.kt | 181 +++--- .../app/ui/screen/thermometer/view/Write.kt | 381 +++++++++++ .../llc/arma/ble/data/BleRepositoryImpl.kt | 590 +++++++++--------- .../llc/arma/ble/data/ReadHistoryCallback.kt | 292 +++++++++ .../ble/domain/repository/BleRepository.kt | 6 +- .../ble/domain/usecase/ChangeBlePassword.kt | 18 + .../llc/arma/ble/domain/usecase/WriteBle.kt | 14 +- .../drawable-v24/ic_launcher_foreground.xml | 30 - app/src/main/res/drawable/ic_done.xml | 22 + app/src/main/res/drawable/ic_error.xml | 25 + .../res/drawable/ic_launcher_foreground.xml | 84 +++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- .../res/mipmap-anydpi-v33/ic_launcher.xml | 6 - app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2104 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4017 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1228 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2385 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2624 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 5511 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 4230 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 8936 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 5613 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 12683 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes app/src/main/res/values-night/themes.xml | 18 + .../res/values/ic_launcher_background.xml | 4 + app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 11 +- 61 files changed, 3414 insertions(+), 1104 deletions(-) create mode 100644 app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/DisplayState.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/PowerEdit.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordContract.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Display.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Loading.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Result.kt create mode 100644 app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/Write.kt create mode 100644 app/src/main/java/llc/arma/ble/data/ReadHistoryCallback.kt create mode 100644 app/src/main/java/llc/arma/ble/domain/usecase/ChangeBlePassword.kt delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_done.xml create mode 100644 app/src/main/res/drawable/ic_error.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values-night/themes.xml create mode 100644 app/src/main/res/values/ic_launcher_background.xml diff --git a/app/build.gradle b/app/build.gradle index a2facca..1ae6330 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,20 +50,21 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' - implementation 'androidx.activity:activity-compose:1.3.1' - implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.activity:activity-compose:1.7.0' + implementation "androidx.compose.ui:ui:1.5.0-alpha01" + implementation "androidx.compose.ui:ui-tooling-preview:1.5.0-alpha01" implementation 'androidx.compose.material3:material3:1.1.0-beta01' + implementation 'androidx.compose.material:material:1.5.0-alpha01' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" - debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" - debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" + androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.0-alpha01" + debugImplementation "androidx.compose.ui:ui-tooling:1.5.0-alpha01" + debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.0-alpha01" - implementation "androidx.compose.material:material-icons-extended:1.4.0-rc01" + implementation "androidx.compose.material:material-icons-extended:1.5.0-alpha01" implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.navigation:navigation-compose:2.5.3' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e3fed92..8d50d78 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,6 +7,9 @@ + + + + android:theme="@style/Theme.App.Starting"> diff --git a/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt b/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt index 6a979c1..c2969e7 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/MainActivity.kt @@ -1,66 +1,162 @@ package llc.arma.ble.app.ui +import android.Manifest import android.os.Build import android.os.Bundle import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.ExperimentalMaterialApi +import androidx.compose.material.ModalBottomSheetLayout +import androidx.compose.material.ModalBottomSheetValue +import androidx.compose.material.rememberModalBottomSheetState import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface -import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.Saver +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.WindowCompat import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberMultiplePermissionsState import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.launch +import llc.arma.ble.app.ui.common.BottomState +import llc.arma.ble.app.ui.common.LocalBottomDialogState import llc.arma.ble.app.ui.screen.main.MainScreen import llc.arma.ble.app.ui.theme.BleTheme @AndroidEntryPoint class MainActivity : ComponentActivity() { - @OptIn(ExperimentalPermissionsApi::class) + @OptIn(ExperimentalPermissionsApi::class, ExperimentalMaterialApi::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) WindowCompat.setDecorFitsSystemWindows(window, false) + installSplashScreen() + setContent { BleTheme { - Surface( - modifier = Modifier - .fillMaxSize() - .navigationBarsPadding(), - color = MaterialTheme.colorScheme.background + val modalState = + rememberModalBottomSheetState( + skipHalfExpanded = true, + initialValue = ModalBottomSheetValue.Hidden + ) + + var sheetContent by remember() { + mutableStateOf<@Composable () -> Unit>({}) + } + + CompositionLocalProvider( + LocalBottomDialogState provides BottomState( + sheetState = modalState, + setContent = { + sheetContent = it + } + ) ) { - val multiplePermissionsState = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - rememberMultiplePermissionsState( - listOf( - android.Manifest.permission.BLUETOOTH_SCAN, - android.Manifest.permission.BLUETOOTH_CONNECT - ) - ) - } else { - rememberMultiplePermissionsState( - listOf() - ) - } + ModalBottomSheetLayout( + sheetShape = RoundedCornerShape( + topStart = 25.dp, + topEnd = 25.dp + ), + sheetElevation = 0.dp, + sheetState = modalState, + sheetContent = { - if(multiplePermissionsState.allPermissionsGranted) { + val scope = rememberCoroutineScope() - MainScreen() + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { - } else { + Surface( + modifier = Modifier.fillMaxWidth() + ) { + + Column() { + + Spacer(modifier = Modifier.height(14.dp)) + + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.primary.copy(alpha = 0.7f), + modifier = Modifier + .align(Alignment.CenterHorizontally) + .size( + width = 54.dp, + height = 5.dp + ) + + ) {} + + Spacer(modifier = Modifier.height(12.dp)) + + sheetContent() + + Spacer(modifier = Modifier.navigationBarsPadding()) + } + + } + } + + BackHandler(modalState.isVisible) { + scope.launch { modalState.hide() } + } + + }, + content = { + + Surface( + modifier = Modifier + .fillMaxSize() + .navigationBarsPadding(), + color = MaterialTheme.colorScheme.background + ) { + + val multiplePermissionsState = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + rememberMultiplePermissionsState( + listOf( + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_CONNECT + ) + ) + } else { + rememberMultiplePermissionsState( + listOf( + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION + ) + ) + } + + if (multiplePermissionsState.allPermissionsGranted) { + + MainScreen() + + } else { + + LaunchedEffect(multiplePermissionsState) { + multiplePermissionsState.launchMultiplePermissionRequest() + } + + } + + } - LaunchedEffect(multiplePermissionsState){ - multiplePermissionsState.launchMultiplePermissionRequest() } - - } - + ) } } diff --git a/app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt b/app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt new file mode 100644 index 0000000..06706b3 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/common/BottomDialog.kt @@ -0,0 +1,51 @@ +package llc.arma.ble.app.ui.common + +import androidx.compose.material.ExperimentalMaterialApi +import androidx.compose.material.ModalBottomSheetState +import androidx.compose.material.ModalBottomSheetValue +import androidx.compose.runtime.Composable +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.runtime.remember + +val LocalBottomDialogState = compositionLocalOf { null } + +@OptIn(ExperimentalMaterialApi::class) +@Composable +fun rememberBottomDialogState(): BottomDialogState { + + val state = LocalBottomDialogState.current + + return remember { + BottomDialogState( + sheetState = state?.sheetState, + setContent = state?.setContent ?: { } + ) + } +} + +class BottomState @OptIn(ExperimentalMaterialApi::class) constructor( + val sheetState: ModalBottomSheetState?, + val setContent: (@Composable () -> Unit) -> Unit, +) + +class BottomDialogState @OptIn(ExperimentalMaterialApi::class) constructor( + private val sheetState: ModalBottomSheetState?, + val setContent: (@Composable () -> Unit) -> Unit, +) { + + @OptIn(ExperimentalMaterialApi::class) + suspend fun show( + content: @Composable () -> Unit + ){ + setContent(content) + if(sheetState?.currentValue != ModalBottomSheetValue.Expanded) + sheetState?.show() + } + + @OptIn(ExperimentalMaterialApi::class) + suspend fun hide(){ + sheetState?.hide() + setContent { } + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconContract.kt index c541f3f..111e144 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconContract.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconContract.kt @@ -3,20 +3,36 @@ package llc.arma.ble.app.ui.screen.beacon import llc.arma.ble.app.ui.common.ViewEvent import llc.arma.ble.app.ui.common.ViewSideEffect import llc.arma.ble.app.ui.common.ViewState +import llc.arma.ble.app.ui.model.BleView +import llc.arma.ble.app.ui.screen.thermometer.ThermometerContract import llc.arma.ble.domain.model.Ble class BeaconContract { sealed class Event : ViewEvent { + object OnWriteBle : Event() + + object OnHideWriteBlePreview : Event() + + object OnShowWriteBlePreview : Event() + + object OnPowerEdit : Event() + data class OnBleChanged( val ble: Ble.Beacon ) : Event() + data class OnPowerChanged( + val tx: BleView.BleState.TX + ) : Event() + data class OnTxChanged(val tx: Int) : Event() object OnNavigateUpClicked : Event() + object OnChangePassword : Event() + } sealed class State : ViewState { @@ -24,15 +40,45 @@ class BeaconContract { object Loading : State() data class Display( - val beacon: Ble.Beacon - ) : State() + val origin: Ble.Beacon, + val beacon: BleView.Beacon, + val writeState: WriteState? + ) : State() { + + sealed class WriteState { + + data class DisplayPreview( + val writeRequest: Ble.Beacon.WriteRequest + ) : WriteState() + + data class Writing( + val writeRequest: Ble.Beacon.WriteRequest + ) : WriteState() + + object Success : WriteState() + + object Failure : WriteState() + + } + + } } sealed class Effect : ViewSideEffect { + object ShowPowerPicker : Effect() + + object HidePowerPicker : Effect() + + object HideWriteBlePreview : Effect() + + object ShowWriteBlePreview : Effect() + sealed class Navigation : Effect() { + object NavigateToChangePassword : Navigation() + object NavigateUp : Navigation() } diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconScreen.kt index 708c882..3a51bdb 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconScreen.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconScreen.kt @@ -1,30 +1,33 @@ package llc.arma.ble.app.ui.screen.beacon -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.ArrowBack -import androidx.compose.material.icons.rounded.KeyboardArrowDown -import androidx.compose.material.icons.rounded.KeyboardArrowRight -import androidx.compose.material.icons.rounded.Refresh -import androidx.compose.material3.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import llc.arma.ble.app.ui.screen.BleInfoView +import kotlinx.coroutines.launch +import llc.arma.ble.app.ui.common.rememberBottomDialogState +import llc.arma.ble.app.ui.screen.beacon.view.DisplayState +import llc.arma.ble.app.ui.screen.beacon.view.PowerEdit +import llc.arma.ble.app.ui.screen.thermometer.localizedName import llc.arma.ble.domain.model.Ble -import llc.arma.ble.domain.model.BleInfo -@OptIn(ExperimentalMaterial3Api::class) +enum class SheetPage { + WRITE, POWER_EDIT +} + @Composable fun BeaconScreen( ble: Ble.Beacon, @@ -34,10 +37,32 @@ fun BeaconScreen( val viewModel = hiltViewModel() val state = viewModel.viewState.value + var sheetPage by rememberSaveable { + mutableStateOf(null) + } + + val bottomDialog = rememberBottomDialogState() + LaunchedEffect("effect"){ viewModel.effect.onEach { when(it){ is BeaconContract.Effect.Navigation -> onNavigationEvent(it) + BeaconContract.Effect.HideWriteBlePreview -> launch { + sheetPage = null + } + BeaconContract.Effect.ShowWriteBlePreview -> launch { + sheetPage = null + delay(100) + sheetPage = SheetPage.WRITE + } + BeaconContract.Effect.HidePowerPicker -> launch { + sheetPage = null + } + BeaconContract.Effect.ShowPowerPicker -> launch { + sheetPage = null + delay(100) + sheetPage = SheetPage.POWER_EDIT + } } }.launchIn(this) } @@ -46,29 +71,291 @@ fun BeaconScreen( viewModel.setEvent(BeaconContract.Event.OnBleChanged(ble)) } - Column { - - CenterAlignedTopAppBar( - navigationIcon = { - IconButton( - onClick = { - viewModel.setEvent(BeaconContract.Event.OnNavigateUpClicked) - }, - content = { - Icon( - imageVector = Icons.Rounded.ArrowBack, - contentDescription = null - ) + LaunchedEffect(sheetPage){ + when(sheetPage){ + SheetPage.WRITE -> bottomDialog.show { + + val scope = rememberCoroutineScope() + + val currentState = viewModel.viewState.value + + if(currentState is BeaconContract.State.Display) { + + Column() { + + when (currentState.writeState) { + is BeaconContract.State.Display.WriteState.DisplayPreview -> { + + Text( + modifier = Modifier.padding(horizontal = 12.dp), + text = "Записать изменения?", + style = MaterialTheme.typography.titleLarge + ) + + currentState.writeState.writeRequest.tx?.let { + Box( + modifier = Modifier.padding( + vertical = 8.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Мощность" + ) + Text( + color = MaterialTheme.colorScheme.secondary, + style = MaterialTheme.typography.bodyMedium, + text = "${currentState.origin.state.tx.localizedName} db -> ${it.localizedName} db" + ) + + } + + } + + } + } + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + viewModel.setEvent(BeaconContract.Event.OnWriteBle) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.background, + style = MaterialTheme.typography.labelLarge, + text = "Записать" + ) + + } + + } + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + scope.launch { + viewModel.setEvent(BeaconContract.Event.OnHideWriteBlePreview) + } + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + + } + is BeaconContract.State.Display.WriteState.Writing -> { + + Box { + + Column() { + + Text( + modifier = Modifier.padding(horizontal = 12.dp), + text = "Запись", + style = MaterialTheme.typography.titleLarge + ) + + CircularProgressIndicator( + modifier = Modifier + .align(Alignment.CenterHorizontally) + .padding(bottom = 48.dp) + ) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + scope.launch { + viewModel.setEvent(BeaconContract.Event.OnHideWriteBlePreview) + } + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + } + + } + + } + BeaconContract.State.Display.WriteState.Success -> { + + Box { + + Column { + + Text( + modifier = Modifier.padding(horizontal = 12.dp), + text = "Запись завершена", + style = MaterialTheme.typography.titleLarge + ) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primary, + onClick = { + scope.launch { + viewModel.setEvent(BeaconContract.Event.OnHideWriteBlePreview) + } + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.labelLarge, + text = "Ок" + ) + + } + + } + + } + + } + + } + BeaconContract.State.Display.WriteState.Failure -> { + + Box { + + Column { + + Text( + modifier = Modifier.padding(horizontal = 12.dp), + text = "Ошибка записи", + style = MaterialTheme.typography.titleLarge + ) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primary, + onClick = { + scope.launch { + viewModel.setEvent(BeaconContract.Event.OnHideWriteBlePreview) + } + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.labelLarge, + text = "Ок" + ) + + } + + } + + } + + } + + } + else -> {} + } + + Spacer(modifier = Modifier.height(48.dp)) + } - ) - }, - title = { - if (state is BeaconContract.State.Display) Text(text = state.beacon.info.name) + + } + } - ) + SheetPage.POWER_EDIT -> bottomDialog.show { + val currentState = viewModel.viewState.value + + if(currentState is BeaconContract.State.Display) { + PowerEdit( + state = currentState.beacon, + onEvent = { + viewModel.setEvent(it) + } + ) + } + } + else -> { + bottomDialog.hide() + } + } + } + + Column { when(state){ - is BeaconContract.State.Display -> DisplayState(state.beacon) + is BeaconContract.State.Display -> DisplayState( + onEvent = { + viewModel.setEvent(it) + }, + ble = state.beacon + ) is BeaconContract.State.Loading -> LoadingState() } @@ -85,103 +372,4 @@ private fun LoadingState(){ } -} - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -private fun DisplayState(ble: Ble.Beacon){ - - Column { - - LazyColumn( - modifier = Modifier.weight(1f), - content = { - - item { - - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ) { - BleInfoView(bleInfo = ble.info) - } - - } - - item { - - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ){ - - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .clickable { } - .padding(8.dp) - ) { - - Column( - modifier = Modifier.weight(1f) - ) { - - Text( - text = "Мощность" - ) - Text( - color = MaterialTheme.colorScheme.secondary, - style = MaterialTheme.typography.bodyMedium, - text = "-40 db" - ) - - } - - Icon( - imageVector = Icons.Rounded.KeyboardArrowDown, - contentDescription = null - ) - - } - - } - - } - - } - - ) - - Surface( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .height(50.dp), - shape = CircleShape, - color = MaterialTheme.colorScheme.primaryContainer, - onClick = { - - } - ) { - - Box(modifier = Modifier.fillMaxSize()) { - - Text( - modifier = Modifier.align(Alignment.Center), - color = MaterialTheme.colorScheme.background, - style = MaterialTheme.typography.labelLarge, - text = "Сохранить" - ) - - } - - } - - } - } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconViewModel.kt index d3a4b99..bccebca 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconViewModel.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/BeaconViewModel.kt @@ -1,18 +1,27 @@ package llc.arma.ble.app.ui.screen.beacon import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch import llc.arma.ble.app.ui.common.BaseViewModel +import llc.arma.ble.app.ui.mapper.BleMapper +import llc.arma.ble.app.ui.mapper.BleViewMapper +import llc.arma.ble.app.ui.model.BleView +import llc.arma.ble.app.ui.screen.thermometer.ThermometerContract import llc.arma.ble.domain.model.Ble import llc.arma.ble.domain.model.BleInfo +import llc.arma.ble.domain.usecase.WriteBle import javax.inject.Inject @HiltViewModel class BeaconViewModel @Inject constructor( + private val bleMapper: BleMapper, + private val writeBle: WriteBle, + private val bleViewMapper: BleViewMapper ) : BaseViewModel() { override fun setInitialState() = BeaconContract.State.Loading @@ -22,9 +31,41 @@ class BeaconViewModel @Inject constructor( is BeaconContract.Event.OnNavigateUpClicked -> reduce(viewState.value, event) is BeaconContract.Event.OnTxChanged -> reduce(viewState.value, event) is BeaconContract.Event.OnBleChanged -> reduce(viewState.value, event) + is BeaconContract.Event.OnChangePassword -> reduce(viewState.value, event) + is BeaconContract.Event.OnHideWriteBlePreview -> reduce(viewState.value, event) + is BeaconContract.Event.OnShowWriteBlePreview -> reduce(viewState.value, event) + is BeaconContract.Event.OnWriteBle -> reduce(viewState.value, event) + is BeaconContract.Event.OnPowerChanged -> reduce(viewState.value, event) + is BeaconContract.Event.OnPowerEdit -> reduce(viewState.value, event) } } + private fun reduce( + state: BeaconContract.State, + event: BeaconContract.Event.OnPowerChanged + ) { + + if(state is BeaconContract.State.Display) { + + state.beacon.state.tx = event.tx + + } + + setEffect { + BeaconContract.Effect.HidePowerPicker + } + + } + + + private fun reduce( + state: BeaconContract.State, + event: BeaconContract.Event.OnPowerEdit + ) { + setEffect { BeaconContract.Effect.ShowPowerPicker } + } + + private fun reduce( state: BeaconContract.State, event: BeaconContract.Event.OnNavigateUpClicked @@ -45,9 +86,104 @@ class BeaconViewModel @Inject constructor( ) { setState { BeaconContract.State.Display( - event.ble + origin = event.ble, + beacon = bleMapper.map(event.ble) as BleView.Beacon, + writeState = null ) } } + private fun reduce( + state: BeaconContract.State, + event: BeaconContract.Event.OnChangePassword + ) { + setEffect { + BeaconContract.Effect.Navigation.NavigateToChangePassword + } + } + + private fun reduce( + state: BeaconContract.State, + event: BeaconContract.Event.OnHideWriteBlePreview + ) { + setEffect { + BeaconContract.Effect.HideWriteBlePreview + } + } + + private fun reduce( + state: BeaconContract.State, + event: BeaconContract.Event.OnShowWriteBlePreview + ) { + + if(state is BeaconContract.State.Display){ + + val newBle = bleViewMapper.map(state.beacon) as Ble.Beacon + + val writeRequest = Ble.Beacon.WriteRequest( + tx = if(newBle.state.tx == state.origin.state.tx) null else newBle.state.tx + ) + + setState { + state.copy( + writeState = BeaconContract.State.Display.WriteState.DisplayPreview( + writeRequest + ) + ) + } + + setEffect { + BeaconContract.Effect.ShowWriteBlePreview + } + + } + + } + + private fun reduce( + state: BeaconContract.State, + event: BeaconContract.Event.OnWriteBle + ) { + + if(state is BeaconContract.State.Display){ + + state.writeState?.let { + + if(it is BeaconContract.State.Display.WriteState.DisplayPreview) { + + viewModelScope.launch { + + setState { + state.copy( + writeState = BeaconContract.State.Display.WriteState.Writing(it.writeRequest) + ) + } + + writeBle(state.beacon.info.serial, it.writeRequest).fold( + onSuccess = { + setState { + state.copy( + writeState = BeaconContract.State.Display.WriteState.Success + ) + } + }, + onFailure = { + setState { + state.copy( + writeState = BeaconContract.State.Display.WriteState.Failure + ) + } + } + ) + + } + + } + + } + + } + + } + } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/DisplayState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/DisplayState.kt new file mode 100644 index 0000000..b39bab8 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/DisplayState.kt @@ -0,0 +1,158 @@ +package llc.arma.ble.app.ui.screen.beacon.view + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.KeyboardArrowDown +import androidx.compose.material.icons.rounded.KeyboardArrowRight +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.dp +import llc.arma.ble.app.ui.model.BleView +import llc.arma.ble.app.ui.screen.BleInfoView +import llc.arma.ble.app.ui.screen.beacon.BeaconContract + +@Composable +fun DisplayState( + onEvent: (BeaconContract.Event) -> Unit, + ble: BleView.Beacon +) { + + Column() { + + Column( + modifier = Modifier + .verticalScroll(rememberScrollState()) + .weight(1f) + ) { + + Box( + modifier = Modifier.padding( + vertical = 8.dp, + horizontal = 8.dp + ) + ) { + BleInfoView(bleInfo = ble.info) + } + + Column( + modifier = Modifier, + content = { + + Box( + modifier = Modifier.padding( + vertical = 8.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .clickable { + onEvent(BeaconContract.Event.OnPowerEdit) + } + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Мощность" + ) + Text( + color = MaterialTheme.colorScheme.secondary, + style = MaterialTheme.typography.bodyMedium, + text = "${ble.state.tx.value} db" + ) + + } + + Icon( + imageVector = Icons.Rounded.KeyboardArrowDown, + contentDescription = null + ) + + } + + } + + Box( + modifier = Modifier.padding( + vertical = 8.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .clickable { + onEvent(BeaconContract.Event.OnChangePassword) + } + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Изменить пароль" + ) + + } + + Icon( + imageVector = Icons.Rounded.KeyboardArrowRight, + contentDescription = null + ) + + } + + } + + } + ) + + } + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + onEvent(BeaconContract.Event.OnShowWriteBlePreview) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.background, + style = MaterialTheme.typography.labelLarge, + text = "Сохранить" + ) + + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/PowerEdit.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/PowerEdit.kt new file mode 100644 index 0000000..cc8d363 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/beacon/view/PowerEdit.kt @@ -0,0 +1,97 @@ +package llc.arma.ble.app.ui.screen.beacon.view + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.dp +import llc.arma.ble.app.ui.model.BleView +import llc.arma.ble.app.ui.screen.beacon.BeaconContract +import llc.arma.ble.app.ui.screen.thermometer.ThermometerContract + +@Composable +fun PowerEdit( + state: BleView.Beacon, + onEvent: (BeaconContract.Event) -> Unit, +){ + + var value by remember(state.state.tx) { + mutableStateOf(state.state.tx) + } + + Column( + modifier = Modifier + ) { + + Text( + modifier = Modifier.padding(horizontal = 12.dp), + text = "Мощность", + style = MaterialTheme.typography.titleLarge + ) + + Spacer(modifier = Modifier.height(16.dp)) + + BleView.BleState.TX.values().forEach { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable { value = it } + .padding(4.dp) + ) { + + RadioButton( + selected = it == value, + onClick = { value = it } + ) + + Text(text = it.value.toString() + " db") + + } + + } + + Spacer(modifier = Modifier.height(16.dp)) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + onEvent( + BeaconContract.Event.OnPowerChanged( + value + ) + ) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.background, + style = MaterialTheme.typography.labelLarge, + text = "Применить" + ) + + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt index 6fa7094..f972f34 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionContract.kt @@ -13,6 +13,8 @@ class ConnectionContract { sealed class Event : ViewEvent { + object RefreshBle : Event() + object OnNavigateUp : Event() data class OnBeaconNavigationEvent( @@ -44,6 +46,11 @@ class ConnectionContract { sealed class Navigation : Effect() { object NavigateUp : Navigation() + + data class NavigateToChangePassword( + val serial: String + ) : Navigation() + } } diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt index 3f294fd..8b18f39 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.coroutines.flow.launchIn @@ -20,6 +21,7 @@ import kotlinx.coroutines.flow.onEach import llc.arma.ble.app.ui.model.BleView import llc.arma.ble.app.ui.screen.BleInfoView import llc.arma.ble.app.ui.screen.beacon.BeaconScreen +import llc.arma.ble.app.ui.screen.password.ChangePasswordContract import llc.arma.ble.app.ui.screen.thermometer.ThermometerContract import llc.arma.ble.app.ui.screen.thermometer.ThermometerScreen import llc.arma.ble.domain.model.Ble @@ -82,16 +84,20 @@ fun ConnectionScreen( ) when (state) { - is ConnectionContract.State.DisplayException -> DisplayException(state.exception) + is ConnectionContract.State.DisplayException -> DisplayException( + onEvent = { + viewModel.setEvent(it) + } + ) is ConnectionContract.State.Loading -> LoadingState() is ConnectionContract.State.Display -> { when(state.ble){ - is Ble.Beacon -> {}/*BeaconScreen( + is Ble.Beacon -> BeaconScreen( ble = state.ble, onNavigationEvent = { viewModel.setEvent(ConnectionContract.Event.OnBeaconNavigationEvent(it)) } - )*/ + ) is Ble.Thermometer -> { Column(modifier = Modifier.weight(1f)) { @@ -100,9 +106,7 @@ fun ConnectionScreen( ble = state.ble, onNavigationEvent = { viewModel.setEvent( - ConnectionContract.Event.OnThermometerNavigationEvent( - it - ) + ConnectionContract.Event.OnThermometerNavigationEvent(it) ) } ) @@ -135,10 +139,50 @@ private fun LoadingState(){ @Composable private fun DisplayException( - exception: GetBleBySerial.GetBleException + onEvent: (ConnectionContract.Event) -> Unit ){ - Column { + Box( + modifier = Modifier.fillMaxSize() + ) { + + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.align(Alignment.Center) + ) { + + Text( + textAlign = TextAlign.Center, + style = MaterialTheme.typography.titleMedium, + text = "Неудалось соединится с устройством" + ) + + Spacer(modifier = Modifier.height(18.dp)) + + Surface( + modifier = Modifier + .height(42.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + onEvent(ConnectionContract.Event.RefreshBle) + } + ) { + + Box(modifier = Modifier.padding(horizontal = 16.dp)) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimaryContainer, + style = MaterialTheme.typography.labelLarge, + text = "Повторить" + ) + + } + + } + + } } diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt index cf135ea..35638b0 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/connection/ConnectionViewModel.kt @@ -17,19 +17,92 @@ import javax.inject.Inject @HiltViewModel class ConnectionViewModel @Inject constructor( - savedStateHandle: SavedStateHandle, - getBleBySerial: GetBleBySerial, - private val writeBle: WriteBle, - private val bleMapper: BleMapper, - private val bleViewMapper: BleViewMapper + private val savedStateHandle: SavedStateHandle, + private val getBleBySerial: GetBleBySerial, ) : BaseViewModel() { init { + refreshBle() + } + override fun setInitialState() = ConnectionContract.State.Loading + + override fun handleEvents(event: ConnectionContract.Event) { + when(event){ + is ConnectionContract.Event.OnBeaconNavigationEvent -> reduce(viewState.value, event) + is ConnectionContract.Event.OnNavigateUp -> reduce(viewState.value, event) + is ConnectionContract.Event.OnThermometerNavigationEvent -> reduce(viewState.value, event) + is ConnectionContract.Event.RefreshBle -> reduce(viewState.value, event) + } + } + + private fun reduce( + state: ConnectionContract.State, + event: ConnectionContract.Event.OnBeaconNavigationEvent + ) { + when(event.event){ + BeaconContract.Effect.Navigation.NavigateUp -> { + setEffect { + ConnectionContract.Effect.Navigation.NavigateUp + } + } + BeaconContract.Effect.Navigation.NavigateToChangePassword -> { + setEffect { + ConnectionContract.Effect.Navigation.NavigateToChangePassword(savedStateHandle.get("serial")!!) + } + } + } + } + + private fun reduce( + state: ConnectionContract.State, + event: ConnectionContract.Event.OnThermometerNavigationEvent + ) { + when(event.event){ + ThermometerContract.Effect.Navigation.NavigateUp -> { + setEffect { + ConnectionContract.Effect.Navigation.NavigateUp + } + } + ThermometerContract.Effect.Navigation.NavigateToChangePassword -> { + setEffect { + ConnectionContract.Effect.Navigation.NavigateToChangePassword(savedStateHandle.get("serial")!!) + } + } + } + } + + private fun reduce( + state: ConnectionContract.State, + event: ConnectionContract.Event.OnNavigateUp + ) { + + setEffect { + ConnectionContract.Effect.Navigation.NavigateUp + } + + } + + private fun reduce( + state: ConnectionContract.State, + event: ConnectionContract.Event.RefreshBle + ) { + + refreshBle() + + } + + private fun refreshBle(){ val serial = savedStateHandle.get("serial") if(serial != null){ + viewModelScope.launch { + + setState { + ConnectionContract.State.Loading + } + getBleBySerial(serial).fold( onSuccess = { @@ -50,54 +123,6 @@ class ConnectionViewModel @Inject constructor( } else { throw IllegalArgumentException("serial arg must not be null") } - - } - - override fun setInitialState() = ConnectionContract.State.Loading - - override fun handleEvents(event: ConnectionContract.Event) { - when(event){ - is ConnectionContract.Event.OnBeaconNavigationEvent -> reduce(viewState.value, event) - is ConnectionContract.Event.OnNavigateUp -> reduce(viewState.value, event) - is ConnectionContract.Event.OnThermometerNavigationEvent -> reduce(viewState.value, event) - } - } - - private fun reduce( - state: ConnectionContract.State, - event: ConnectionContract.Event.OnBeaconNavigationEvent - ) { - when(event.event){ - BeaconContract.Effect.Navigation.NavigateUp -> { - setEffect { - ConnectionContract.Effect.Navigation.NavigateUp - } - } - } - } - - private fun reduce( - state: ConnectionContract.State, - event: ConnectionContract.Event.OnThermometerNavigationEvent - ) { - when(event.event){ - ThermometerContract.Effect.Navigation.NavigateUp -> { - setEffect { - ConnectionContract.Effect.Navigation.NavigateUp - } - } - } - } - - private fun reduce( - state: ConnectionContract.State, - event: ConnectionContract.Event.OnNavigateUp - ) { - - setEffect { - ConnectionContract.Effect.Navigation.NavigateUp - } - } } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt index a0c45b4..eedfd3b 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/main/MainScreen.kt @@ -1,8 +1,10 @@ package llc.arma.ble.app.ui.screen.main import androidx.compose.runtime.Composable +import androidx.compose.ui.window.DialogProperties import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable +import androidx.navigation.compose.dialog import androidx.navigation.compose.rememberNavController import llc.arma.ble.app.ui.screen.beacon.BeaconContract import llc.arma.ble.app.ui.screen.thermometer.ThermometerScreen @@ -11,6 +13,8 @@ import llc.arma.ble.app.ui.screen.ble.BleListContract import llc.arma.ble.app.ui.screen.ble.BleListScreen import llc.arma.ble.app.ui.screen.connection.ConnectionContract import llc.arma.ble.app.ui.screen.connection.ConnectionScreen +import llc.arma.ble.app.ui.screen.password.ChangePasswordContract +import llc.arma.ble.app.ui.screen.password.ChangePasswordScreen @Composable fun MainScreen() { @@ -45,6 +49,7 @@ fun MainScreen() { onNavigationEvent = { when(it){ ConnectionContract.Effect.Navigation.NavigateUp -> controller.navigateUp() + is ConnectionContract.Effect.Navigation.NavigateToChangePassword -> controller.navigate("change_password/${it.serial}") } } ) @@ -52,6 +57,18 @@ fun MainScreen() { } ) + dialog( + route = "change_password/{serial}", + dialogProperties = DialogProperties(usePlatformDefaultWidth = false), + content = { + ChangePasswordScreen { + when(it){ + is ChangePasswordContract.Effect.Navigation.NavigateUp -> controller.navigateUp() + } + } + } + ) + } ) diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordContract.kt new file mode 100644 index 0000000..01f94a2 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordContract.kt @@ -0,0 +1,62 @@ +package llc.arma.ble.app.ui.screen.password + +import llc.arma.ble.app.ui.common.ViewEvent +import llc.arma.ble.app.ui.common.ViewSideEffect +import llc.arma.ble.app.ui.common.ViewState + +class ChangePasswordContract { + + sealed class Event : ViewEvent { + + data class OnPasswordChanged( + val password: String + ) : Event() + + data class OnRePasswordChanged( + val password: String + ) : Event() + + object OnChange : Event() + + object OnNavigateUp : Event() + + } + + data class State( + val password: String, + val rePassword: String, + val exception: ValidationException?, + val loading: LoadingState? + ) : ViewState { + + sealed class LoadingState { + + object Loading : LoadingState() + + object Success : LoadingState() + + object Failure : LoadingState() + + } + + sealed class ValidationException { + + object PasswordsNotMatch : ValidationException() + + object WrongLength : ValidationException() + + } + + } + + sealed class Effect : ViewSideEffect { + + sealed class Navigation : Effect() { + + object NavigateUp : Navigation() + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt new file mode 100644 index 0000000..1a1041e --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordScreen.kt @@ -0,0 +1,270 @@ +package llc.arma.ble.app.ui.screen.password + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Visibility +import androidx.compose.material.icons.rounded.VisibilityOff +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import llc.arma.ble.app.ui.screen.password.view.Loading +import llc.arma.ble.app.ui.screen.password.view.Result +import llc.arma.ble.app.ui.screen.thermometer.view.LoadingState + +@Composable +fun ChangePasswordScreen( + onNavigationEvent: (ChangePasswordContract.Effect.Navigation) -> Unit +) { + + val viewModel = hiltViewModel() + val state = viewModel.viewState.value + + LaunchedEffect("effect"){ + viewModel.effect.onEach { + when(it){ + is ChangePasswordContract.Effect.Navigation -> onNavigationEvent(it) + } + }.launchIn(this) + } + + Surface( + shape = RoundedCornerShape(16.dp), + modifier = Modifier + .fillMaxWidth() + .wrapContentHeight() + .padding(24.dp), + ) { + + Column { + + Spacer(modifier = Modifier.height(20.dp)) + + Text( + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.titleLarge, + text = "Изменение пароля", + textAlign = TextAlign.Center + ) + + if(state.loading != null){ + + when(state.loading){ + + ChangePasswordContract.State.LoadingState.Loading -> { + Loading { + viewModel.setEvent(it) + } + } + ChangePasswordContract.State.LoadingState.Failure, + ChangePasswordContract.State.LoadingState.Success -> { + Result( + onEvent = { + viewModel.setEvent(it) + }, + state = state.loading + ) + } + } + + } else { + + Column( + modifier = Modifier.padding(20.dp) + ) { + + + var passwordVisibility by remember { + mutableStateOf(false) + } + var rePasswordVisibility by remember { + mutableStateOf(false) + } + + @Composable + fun TrailingPasswordIcon( + visible: Boolean, + onClick: () -> Unit + ) { + IconButton(onClick = onClick) { + Icon( + contentDescription = null, + imageVector = if (visible) { + Icons.Rounded.Visibility + } else { + Icons.Rounded.VisibilityOff + } + ) + } + } + + val isError = state.exception != null + + TextField( + modifier = Modifier.fillMaxWidth(), + singleLine = true, + visualTransformation = if (passwordVisibility.not()) PasswordVisualTransformation() else VisualTransformation.None, + value = state.password, + onValueChange = { + viewModel.setEvent(ChangePasswordContract.Event.OnPasswordChanged(it)) + }, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.NumberPassword, + imeAction = ImeAction.Next), + trailingIcon = { + TrailingPasswordIcon(visible = passwordVisibility) { + passwordVisibility = passwordVisibility.not() + } + }, + isError = isError, + label = { + Text(text = "Пароль") + }, + supportingText = { + Row() { + Spacer(modifier = Modifier.weight(1f)) + + Text( + style = MaterialTheme.typography.bodyMedium, + text = "${state.password.length}/6" + ) + } + } + ) + + Spacer(modifier = Modifier.height(12.dp)) + + TextField( + modifier = Modifier.fillMaxWidth(), + singleLine = true, + visualTransformation = if (rePasswordVisibility.not()) PasswordVisualTransformation() else VisualTransformation.None, + value = state.rePassword, + onValueChange = { + viewModel.setEvent(ChangePasswordContract.Event.OnRePasswordChanged(it)) + }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword), + trailingIcon = { + TrailingPasswordIcon(visible = rePasswordVisibility) { + rePasswordVisibility = rePasswordVisibility.not() + } + }, + label = { + Text(text = "Повторите пароль") + }, + isError = isError, + supportingText = { + + Row() { + + if (isError) { + val text = when (state.exception) { + is ChangePasswordContract.State.ValidationException.WrongLength -> "Неверная длинна" + is ChangePasswordContract.State.ValidationException.PasswordsNotMatch -> "Пароли не совпадают" + null -> "" + } + + Text( + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, + text = text + ) + } + + Spacer(modifier = Modifier.weight(1f)) + + Text( + style = MaterialTheme.typography.bodyMedium, + text = "${state.rePassword.length}/6" + ) + + } + + } + ) + + Spacer(modifier = Modifier.height(20.dp)) + + Box( + modifier = Modifier + ) { + + Surface( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + viewModel.setEvent(ChangePasswordContract.Event.OnChange) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimaryContainer, + style = MaterialTheme.typography.labelLarge, + text = "Применить" + ) + + } + + } + + } + + Spacer(modifier = Modifier.height(12.dp)) + + Box( + modifier = Modifier + ) { + + Surface( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + viewModel.setEvent(ChangePasswordContract.Event.OnNavigateUp) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + } + + } + + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt new file mode 100644 index 0000000..1dd9b55 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/ChangePasswordViewModel.kt @@ -0,0 +1,125 @@ +package llc.arma.ble.app.ui.screen.password + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.launch +import llc.arma.ble.app.ui.common.BaseViewModel +import llc.arma.ble.domain.usecase.ChangeBlePassword +import javax.inject.Inject + +@HiltViewModel +class ChangePasswordViewModel @Inject constructor( + private val savedStateHandle: SavedStateHandle, + private val changeBlePassword: ChangeBlePassword +) : BaseViewModel() { + + override fun setInitialState() = ChangePasswordContract.State("", "", null, null) + + override fun handleEvents(event: ChangePasswordContract.Event) { + when(event){ + is ChangePasswordContract.Event.OnPasswordChanged -> reduce(viewState.value, event) + is ChangePasswordContract.Event.OnRePasswordChanged -> reduce(viewState.value, event) + is ChangePasswordContract.Event.OnChange -> reduce(viewState.value, event) + is ChangePasswordContract.Event.OnNavigateUp -> reduce(viewState.value, event) + } + } + + private fun reduce( + state: ChangePasswordContract.State, + event: ChangePasswordContract.Event.OnPasswordChanged + ) { + + setState { + copy( + password = event.password + ) + } + + } + + private fun reduce( + state: ChangePasswordContract.State, + event: ChangePasswordContract.Event.OnRePasswordChanged + ) { + + setState { + copy( + rePassword = event.password + ) + } + + } + + private fun reduce( + state: ChangePasswordContract.State, + event: ChangePasswordContract.Event.OnChange + ) { + + if(state.password.length != 6 || state.rePassword.length != 6){ + setState { + state.copy( + exception = ChangePasswordContract.State.ValidationException.WrongLength + ) + } + } else { + + if(state.password != state.rePassword){ + setState { + state.copy( + exception = ChangePasswordContract.State.ValidationException.PasswordsNotMatch + ) + } + } else { + + viewModelScope.launch { + + setState { + state.copy( + loading = ChangePasswordContract.State.LoadingState.Loading, + exception = null + ) + } + + changeBlePassword.invoke( + state.password, + savedStateHandle.get("serial")!! + ).fold( + onSuccess = { + setState { + state.copy( + loading = ChangePasswordContract.State.LoadingState.Success, + exception = null + ) + } + }, + onFailure = { + setState { + state.copy( + loading = ChangePasswordContract.State.LoadingState.Failure, + exception = null + ) + } + } + ) + + } + + } + + } + + } + + private fun reduce( + state: ChangePasswordContract.State, + event: ChangePasswordContract.Event.OnNavigateUp + ) { + + setEffect { + ChangePasswordContract.Effect.Navigation.NavigateUp + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Display.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Display.kt new file mode 100644 index 0000000..d8d4daf --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Display.kt @@ -0,0 +1,205 @@ +package llc.arma.ble.app.ui.screen.password.view + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Visibility +import androidx.compose.material.icons.rounded.VisibilityOff +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import llc.arma.ble.app.ui.screen.password.ChangePasswordContract + +@Composable +fun Display( + onEvent: (ChangePasswordContract.Event) -> Unit, + state: ChangePasswordContract.State +){ + + Column( + modifier = Modifier.padding(20.dp) + ) { + + + var passwordVisibility by remember { + mutableStateOf(false) + } + var rePasswordVisibility by remember { + mutableStateOf(false) + } + + @Composable + fun TrailingPasswordIcon( + visible: Boolean, + onClick: () -> Unit + ) { + IconButton(onClick = onClick) { + Icon( + contentDescription = null, + imageVector = if (visible) { + Icons.Rounded.Visibility + } else { + Icons.Rounded.VisibilityOff + } + ) + } + } + + val isError = state.exception != null + + TextField( + modifier = Modifier.fillMaxWidth(), + singleLine = true, + visualTransformation = if (passwordVisibility.not()) PasswordVisualTransformation() else VisualTransformation.None, + value = state.password, + onValueChange = { + onEvent(ChangePasswordContract.Event.OnPasswordChanged(it)) + }, + keyboardOptions = KeyboardOptions( + keyboardType = KeyboardType.NumberPassword, + imeAction = ImeAction.Next), + trailingIcon = { + TrailingPasswordIcon(visible = passwordVisibility) { + passwordVisibility = passwordVisibility.not() + } + }, + isError = isError, + label = { + Text(text = "Пароль") + }, + supportingText = { + Row() { + Spacer(modifier = Modifier.weight(1f)) + + Text( + style = MaterialTheme.typography.bodyMedium, + text = "${state.password.length}/6" + ) + } + } + ) + + Spacer(modifier = Modifier.height(12.dp)) + + TextField( + modifier = Modifier.fillMaxWidth(), + singleLine = true, + visualTransformation = if (rePasswordVisibility.not()) PasswordVisualTransformation() else VisualTransformation.None, + value = state.rePassword, + onValueChange = { + onEvent(ChangePasswordContract.Event.OnRePasswordChanged(it)) + }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword), + trailingIcon = { + TrailingPasswordIcon(visible = rePasswordVisibility) { + rePasswordVisibility = rePasswordVisibility.not() + } + }, + label = { + Text(text = "Повторите пароль") + }, + isError = isError, + supportingText = { + + Row() { + + if (isError) { + val text = when (state.exception) { + is ChangePasswordContract.State.ValidationException.WrongLength -> "Неверная длинна" + is ChangePasswordContract.State.ValidationException.PasswordsNotMatch -> "Пароли не совпадают" + null -> "" + } + + Text( + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, + text = text + ) + } + + Spacer(modifier = Modifier.weight(1f)) + + Text( + style = MaterialTheme.typography.bodyMedium, + text = "${state.rePassword.length}/6" + ) + + } + + } + ) + + Spacer(modifier = Modifier.height(20.dp)) + + Box( + modifier = Modifier + ) { + + Surface( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + onEvent(ChangePasswordContract.Event.OnChange) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimaryContainer, + style = MaterialTheme.typography.labelLarge, + text = "Применить" + ) + + } + + } + + } + + Spacer(modifier = Modifier.height(12.dp)) + + Box( + modifier = Modifier + ) { + + Surface( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + onEvent(ChangePasswordContract.Event.OnNavigateUp) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Loading.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Loading.kt new file mode 100644 index 0000000..4e1556f --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Loading.kt @@ -0,0 +1,67 @@ +package llc.arma.ble.app.ui.screen.password.view + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Visibility +import androidx.compose.material.icons.rounded.VisibilityOff +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import llc.arma.ble.app.ui.screen.password.ChangePasswordContract + +@Composable +fun Loading( + onEvent: (ChangePasswordContract.Event) -> Unit +) { + + Column( + modifier = Modifier.padding(20.dp) + ) { + + CircularProgressIndicator( + modifier = Modifier.align(Alignment.CenterHorizontally) + ) + + Spacer(modifier = Modifier.height(20.dp)) + + Box( + modifier = Modifier + ) { + + Surface( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + onEvent(ChangePasswordContract.Event.OnNavigateUp) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Result.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Result.kt new file mode 100644 index 0000000..332816a --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/password/view/Result.kt @@ -0,0 +1,115 @@ +package llc.arma.ble.app.ui.screen.password.view + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import llc.arma.ble.app.ui.screen.password.ChangePasswordContract + +@Composable +fun Result( + onEvent: (ChangePasswordContract.Event) -> Unit, + state: ChangePasswordContract.State.LoadingState +) { + + Column( + modifier = Modifier.padding(20.dp) + ) { + + when(state){ + ChangePasswordContract.State.LoadingState.Failure -> { + + Box( + modifier = Modifier + .padding(8.dp) + .fillMaxWidth() + ) { + + Image( + modifier = Modifier + .size(125.dp) + .align(Alignment.Center), + painter = painterResource(llc.arma.ble.R.drawable.ic_error), + contentDescription = null + ) + + } + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + modifier = Modifier.align(Alignment.CenterHorizontally), + text = "Ошибка записи" + ) + } + ChangePasswordContract.State.LoadingState.Success -> { + + Box( + modifier = Modifier + .padding(8.dp) + .fillMaxWidth() + ) { + + Image( + modifier = Modifier + .size(125.dp) + .align(Alignment.Center), + painter = painterResource(llc.arma.ble.R.drawable.ic_done), + contentDescription = null + ) + + } + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + modifier = Modifier.align(Alignment.CenterHorizontally), + text = "Успешно завершено" + ) + } + else -> {} + } + + Spacer(modifier = Modifier.height(20.dp)) + + Box( + modifier = Modifier + ) { + + Surface( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primary, + onClick = { + onEvent(ChangePasswordContract.Event.OnNavigateUp) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.labelLarge, + text = "Ок" + ) + + } + + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerContract.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerContract.kt index 8f78d73..c772b8b 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerContract.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerContract.kt @@ -20,6 +20,8 @@ class ThermometerContract { object OnHideTemperatureHistory : Event() + object OnChangePassword : Event() + data class OnSaveHistoryChanged( val saveHistory: Boolean ) : Event() @@ -68,6 +70,8 @@ class ThermometerContract { object Success : WriteState() + object Failure : WriteState() + } } @@ -88,10 +92,16 @@ class ThermometerContract { object HidePowerPicker : Effect() + object ShowWriteBle : Effect() + + object HideWriteBle : Effect() + sealed class Navigation : Effect() { object NavigateUp : Navigation() + object NavigateToChangePassword : Navigation() + } } diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerScreen.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerScreen.kt index b4e53fc..9389907 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerScreen.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerScreen.kt @@ -1,32 +1,41 @@ package llc.arma.ble.app.ui.screen.thermometer +import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.ExperimentalMaterialApi +import androidx.compose.material.ModalBottomSheetLayout +import androidx.compose.material.ModalBottomSheetValue import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.KeyboardArrowDown import androidx.compose.material3.* import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import llc.arma.ble.R +import llc.arma.ble.app.ui.common.rememberBottomDialogState import llc.arma.ble.app.ui.screen.thermometer.view.* import llc.arma.ble.domain.model.Ble enum class SheetPage { - INTERVAL, POWER, TEMPERATURE_HISTORY + INTERVAL, POWER, TEMPERATURE_HISTORY, WRITE } -private val Boolean.localizedName: String +val Boolean.localizedName: String get() { return if(this){ "Включено" @@ -35,7 +44,7 @@ private val Boolean.localizedName: String } } -private val Ble.BleState.TX.localizedName: String +val Ble.BleState.TX.localizedName: String get() { return when(this){ Ble.BleState.TX.MINUS_40 -> -40 @@ -51,48 +60,133 @@ private val Ble.BleState.TX.localizedName: String } -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class) @Composable fun ThermometerScreen( ble: Ble.Thermometer, onNavigationEvent: (ThermometerContract.Effect.Navigation) -> Unit ) { - var sheetPage by remember { + var sheetPage by rememberSaveable { mutableStateOf(null) } val viewModel = hiltViewModel() val state = viewModel.viewState.value - val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + + val bottomDialog = rememberBottomDialogState() + + LaunchedEffect(sheetPage){ + when(sheetPage){ + SheetPage.INTERVAL -> bottomDialog.show { + + val currentState = viewModel.viewState.value + + if(currentState is ThermometerContract.State.Display) { + IntervalEdit( + state = currentState.thermometer, + onEvent = { + viewModel.setEvent(it) + } + ) + } + + } + SheetPage.POWER -> bottomDialog.show { + + val currentState = viewModel.viewState.value + + if(currentState is ThermometerContract.State.Display) { + PowerEdit( + state = currentState.thermometer, + onEvent = { + viewModel.setEvent(it) + } + ) + } + + } + SheetPage.TEMPERATURE_HISTORY -> bottomDialog.show { + + val currentState = viewModel.viewState.value + + if (currentState is ThermometerContract.State.Display) { + TemperatureHistory( + ble = currentState.thermometer.info + ) + } + } + SheetPage.WRITE -> bottomDialog.show { + + val currentState = viewModel.viewState.value + + if (currentState is ThermometerContract.State.Display) { + + currentState.writeState?.let { + + Write( + state = it, + onEvent = { + viewModel.setEvent(it) + } + ) + + } + + } + } + else -> { + bottomDialog.hide() + } + } + } + val writeSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) LaunchedEffect("effect"){ viewModel.effect.onEach { when(it){ - is ThermometerContract.Effect.Navigation -> onNavigationEvent(it) - is ThermometerContract.Effect.HideIntervalPicker -> launch { - bottomSheetState.hide() + is ThermometerContract.Effect.Navigation -> { sheetPage = null + onNavigationEvent(it) + } + is ThermometerContract.Effect.HideIntervalPicker -> launch { + sheetPage = null + delay(100) } is ThermometerContract.Effect.ShowIntervalPicker -> launch { + sheetPage = null + delay(100) sheetPage = SheetPage.INTERVAL } is ThermometerContract.Effect.HidePowerPicker -> launch { - bottomSheetState.hide() sheetPage = null + delay(100) } is ThermometerContract.Effect.ShowPowerPicker -> launch { + sheetPage = null + delay(100) sheetPage = SheetPage.POWER } is ThermometerContract.Effect.HideTemperatureHistory -> launch { - bottomSheetState.hide() sheetPage = null + delay(100) } is ThermometerContract.Effect.ShowTemperatureHistory -> launch { + sheetPage = null + delay(100) sheetPage = SheetPage.TEMPERATURE_HISTORY } + is ThermometerContract.Effect.HideWriteBle -> { + sheetPage = null + delay(100) + } + is ThermometerContract.Effect.ShowWriteBle -> { + sheetPage = null + delay(100) + sheetPage = SheetPage.WRITE + } } }.launchIn(this) @@ -118,438 +212,4 @@ fun ThermometerScreen( } - sheetPage?.let { - - Column() { - - ModalBottomSheet( - modifier = Modifier, - sheetState = bottomSheetState, - onDismissRequest = { - sheetPage = null - }, - content = { - - Column() { - - if (state is ThermometerContract.State.Display) { - - when (sheetPage) { - SheetPage.INTERVAL -> { - IntervalEdit( - state = state.thermometer, - onEvent = { - viewModel.setEvent(it) - } - ) - } - SheetPage.POWER -> { - PowerEdit( - state = state.thermometer, - onEvent = { - viewModel.setEvent(it) - } - ) - } - SheetPage.TEMPERATURE_HISTORY -> TemperatureHistory(state.thermometer.info) - null -> {} - } - - } - - Spacer(modifier = Modifier.height(48.dp)) - - } - - } - - ) - - } - - } - - if(state is ThermometerContract.State.Display){ - - state.writeState?.let { - - val scope = rememberCoroutineScope() - - ModalBottomSheet( - modifier = Modifier, - containerColor = MaterialTheme.colorScheme.surface, - sheetState = writeSheetState, - onDismissRequest = { - viewModel.setEvent(ThermometerContract.Event.OnHideWriteBlePreview) - }, - content = { - - Column() { - - when (it) { - is ThermometerContract.State.Display.WriteState.DisplayPreview -> { - - Text( - modifier = Modifier.padding(horizontal = 12.dp), - text = "Записать изменения?", - style = MaterialTheme.typography.titleLarge - ) - - it.writeRequest.tx?.let { - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ) { - - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .padding(8.dp) - ) { - - Column( - modifier = Modifier.weight(1f) - ) { - - Text( - text = "Мощность" - ) - Text( - color = MaterialTheme.colorScheme.secondary, - style = MaterialTheme.typography.bodyMedium, - text = "${state.origin.state.tx.localizedName} db -> ${it.localizedName} db" - ) - - } - - } - - } - } - - it.writeRequest.saveHistory?.let { - - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ) { - - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .padding(8.dp) - ) { - - Column( - modifier = Modifier.weight(1f) - ) { - - Text( - text = "Сохранять историю измерений" - ) - Text( - color = MaterialTheme.colorScheme.secondary, - style = MaterialTheme.typography.bodyMedium, - text = "${state.origin.thermometerState.saveHistory.localizedName} -> ${it.localizedName}" - ) - - } - - } - - } - - } - - it.writeRequest.historyInterval?.let { - - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ) { - - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .padding(8.dp) - ) { - - Column( - modifier = Modifier.weight(1f) - ) { - - Text( - text = "Интервал измерний" - ) - Text( - color = MaterialTheme.colorScheme.secondary, - style = MaterialTheme.typography.bodyMedium, - text = "${ state.origin.thermometerState.historyInterval / 1000 / 60 / 60 } ч. -> ${it / 1000 / 60 / 60} ч." - ) - - } - - } - - } - - } - - Surface( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .height(50.dp), - shape = CircleShape, - color = MaterialTheme.colorScheme.primaryContainer, - onClick = { - viewModel.setEvent(ThermometerContract.Event.OnWriteBle) - } - ) { - - Box(modifier = Modifier.fillMaxSize()) { - - Text( - modifier = Modifier.align(Alignment.Center), - color = MaterialTheme.colorScheme.background, - style = MaterialTheme.typography.labelLarge, - text = "Записать" - ) - - } - - } - - Surface( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .height(50.dp), - shape = CircleShape, - color = MaterialTheme.colorScheme.surfaceVariant, - onClick = { - scope.launch { - writeSheetState.hide() - viewModel.setEvent(ThermometerContract.Event.OnHideWriteBlePreview) - } - } - ) { - - Box(modifier = Modifier.fillMaxSize()) { - - Text( - modifier = Modifier.align(Alignment.Center), - color = MaterialTheme.colorScheme.onSurfaceVariant, - style = MaterialTheme.typography.labelLarge, - text = "Отменить" - ) - - } - - } - - - } - is ThermometerContract.State.Display.WriteState.Writing -> { - - Box { - - Column() { - - Text( - modifier = Modifier.padding(horizontal = 12.dp), - text = "Запись", - style = MaterialTheme.typography.titleLarge - ) - - Column( - modifier = Modifier.alpha(0.6f) - ) { - - it.writeRequest.tx?.let { - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ) { - - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .padding(8.dp) - ) { - - Column( - modifier = Modifier.weight(1f) - ) { - - Text( - text = "Мощность" - ) - Text( - color = MaterialTheme.colorScheme.secondary, - style = MaterialTheme.typography.bodyMedium, - text = "${it} db" - ) - - } - - } - - } - } - - it.writeRequest.saveHistory?.let { - - } - - it.writeRequest.historyInterval?.let { - - Box( - modifier = Modifier.padding( - vertical = 8.dp, - horizontal = 8.dp - ) - ) { - - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .padding(8.dp) - ) { - - Column( - modifier = Modifier.weight(1f) - ) { - - Text( - text = "Интервал измерний" - ) - Text( - color = MaterialTheme.colorScheme.secondary, - style = MaterialTheme.typography.bodyMedium, - text = "${state.origin.thermometerState.historyInterval / 1000 / 60 / 60} ч. -> ${it / 1000 / 60 / 60} ч." - ) - - } - - } - - } - - } - - } - - Surface( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .height(50.dp), - shape = CircleShape, - color = MaterialTheme.colorScheme.surfaceVariant, - onClick = { - scope.launch { - writeSheetState.hide() - viewModel.setEvent(ThermometerContract.Event.OnHideWriteBlePreview) - } - } - ) { - - Box(modifier = Modifier.fillMaxSize()) { - - Text( - modifier = Modifier.align(Alignment.Center), - color = MaterialTheme.colorScheme.onSurfaceVariant, - style = MaterialTheme.typography.labelLarge, - text = "Отменить" - ) - - } - - } - - } - - CircularProgressIndicator( - modifier = Modifier - .align(Alignment.Center) - .padding(bottom = 48.dp) - ) - - } - - } - ThermometerContract.State.Display.WriteState.Success -> { - - Box { - - Column { - - Text( - modifier = Modifier.padding(horizontal = 12.dp), - text = "Запись завершена", - style = MaterialTheme.typography.titleLarge - ) - - Surface( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .height(50.dp), - shape = CircleShape, - color = MaterialTheme.colorScheme.primary, - onClick = { - scope.launch { - writeSheetState.hide() - viewModel.setEvent(ThermometerContract.Event.OnHideWriteBlePreview) - } - } - ) { - - Box(modifier = Modifier.fillMaxSize()) { - - Text( - modifier = Modifier.align(Alignment.Center), - color = MaterialTheme.colorScheme.onPrimary, - style = MaterialTheme.typography.labelLarge, - text = "Ок" - ) - - } - - } - - } - - } - - } - - } - - Spacer(modifier = Modifier.height(48.dp)) - - } - - } - ) - - } - - } - - } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerViewModel.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerViewModel.kt index dd404cb..1ed2411 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerViewModel.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/ThermometerViewModel.kt @@ -35,6 +35,7 @@ class ThermometerViewModel @Inject constructor( is ThermometerContract.Event.OnShowWriteBlePreview -> reduce(viewState.value, event) is ThermometerContract.Event.OnHideWriteBlePreview -> reduce(viewState.value, event) is ThermometerContract.Event.OnWriteBle -> reduce(viewState.value, event) + is ThermometerContract.Event.OnChangePassword -> reduce(viewState.value, event) } } @@ -172,6 +173,10 @@ class ThermometerViewModel @Inject constructor( ) } + setEffect { + ThermometerContract.Effect.ShowWriteBle + } + } } @@ -195,13 +200,22 @@ class ThermometerViewModel @Inject constructor( ) } - writeBle(state.thermometer.info.serial, it.writeRequest) - - setState { - state.copy( - writeState = ThermometerContract.State.Display.WriteState.Success - ) - } + writeBle(state.thermometer.info.serial, it.writeRequest).fold( + onSuccess = { + setState { + state.copy( + writeState = ThermometerContract.State.Display.WriteState.Success + ) + } + }, + onFailure = { + setState { + state.copy( + writeState = ThermometerContract.State.Display.WriteState.Failure + ) + } + } + ) } @@ -228,6 +242,25 @@ class ThermometerViewModel @Inject constructor( } + setEffect { + ThermometerContract.Effect.HideWriteBle + } + + } + + private fun reduce( + state: ThermometerContract.State, + event: ThermometerContract.Event.OnChangePassword + ) { + + if(state is ThermometerContract.State.Display){ + + setEffect { + ThermometerContract.Effect.Navigation.NavigateToChangePassword + } + + } + } } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/DisplayState.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/DisplayState.kt index 96f3502..08df045 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/DisplayState.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/DisplayState.kt @@ -236,6 +236,42 @@ fun DisplayState( } + Box( + modifier = Modifier.padding( + vertical = 8.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .clickable { + onEvent(ThermometerContract.Event.OnChangePassword) + } + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Изменить пароль" + ) + + } + + Icon( + imageVector = Icons.Rounded.KeyboardArrowRight, + contentDescription = null + ) + + } + + } + } ) diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/TemperatureHistory.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/TemperatureHistory.kt index 7abe4cd..263e297 100644 --- a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/TemperatureHistory.kt +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/TemperatureHistory.kt @@ -11,18 +11,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.patrykandpatrick.vico.compose.axis.horizontal.bottomAxis import com.patrykandpatrick.vico.compose.axis.vertical.startAxis import com.patrykandpatrick.vico.compose.chart.Chart -import com.patrykandpatrick.vico.compose.chart.column.columnChart import com.patrykandpatrick.vico.compose.chart.line.lineChart -import com.patrykandpatrick.vico.core.chart.composed.plus import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer -import com.patrykandpatrick.vico.core.entry.FloatEntry -import com.patrykandpatrick.vico.core.entry.composed.plus -import com.patrykandpatrick.vico.core.entry.entriesOf import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import llc.arma.ble.app.ui.common.BaseViewModel @@ -32,8 +26,6 @@ import llc.arma.ble.app.ui.common.ViewState import llc.arma.ble.domain.model.BleInfo import llc.arma.ble.domain.usecase.GetTemperatureHistoryBySerial import javax.inject.Inject -import kotlin.random.Random -import kotlin.random.nextInt import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Refresh import androidx.compose.ui.graphics.StrokeCap @@ -41,7 +33,6 @@ import androidx.compose.ui.text.style.TextAlign import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollState import com.patrykandpatrick.vico.core.axis.AxisPosition import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter -import com.patrykandpatrick.vico.core.chart.scale.AutoScaleUp import com.patrykandpatrick.vico.core.entry.ChartEntry import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -70,26 +61,39 @@ fun TemperatureHistory( val viewModel = hiltViewModel() val state = viewModel.viewState.value - LaunchedEffect(ble.serial) { - viewModel.setEvent(TemperatureHistoryContract.Event.LoadHistory(ble.serial)) + LaunchedEffect("ble.serial") { + viewModel.setEvent(TemperatureHistoryContract.Event.OnStart(ble.serial)) } - Column { + Column( + modifier = Modifier.fillMaxHeight(0.9f) + ) { Row( modifier = Modifier.padding(horizontal = 12.dp), verticalAlignment = Alignment.CenterVertically ) { + val title = when(state){ + is TemperatureHistoryContract.State.Display -> { + when (state.loadingHistoryState) { + is ProgressState.Finished -> "История измерений (${state.loadingHistoryState.data.size})" + is ProgressState.Indeterminate -> "История измерений" + is ProgressState.Progress -> "История измерений" + } + } + TemperatureHistoryContract.State.Exception -> "История измерений" + } + Text( modifier = Modifier.weight(1f), - text = "История измерений", + text = title, style = MaterialTheme.typography.titleLarge ) IconButton( onClick = { - viewModel.setEvent(TemperatureHistoryContract.Event.LoadHistory(ble.serial)) + viewModel.setEvent(TemperatureHistoryContract.Event.OnRefreshHistory(ble.serial)) }, enabled = when(state){ is TemperatureHistoryContract.State.Display -> state.loadingHistoryState is ProgressState.Finished @@ -106,95 +110,90 @@ fun TemperatureHistory( Spacer(modifier = Modifier.height(16.dp)) - when(state){ - is TemperatureHistoryContract.State.Display -> Display(state = state) - TemperatureHistoryContract.State.Exception -> Exception() + Box(modifier = Modifier) { + + when (state) { + is TemperatureHistoryContract.State.Display -> Display(state = state) + TemperatureHistoryContract.State.Exception -> Exception() + } + } } } + @Composable fun Display( state: TemperatureHistoryContract.State.Display ) { - when (state.loadingHistoryState) { - is ProgressState.Finished -> { - Text(text = "${state.loadingHistoryState.data.size}") + Box(modifier = Modifier + .padding(8.dp) + .fillMaxSize() + ) { - val producer = state.loadingHistoryState.data.mapIndexed { index, measurePoint -> - TemperatureEntry(measurePoint.date, index.toFloat(), measurePoint.value) }.let { - ChartEntryModelProducer(it) - } + when (state.loadingHistoryState) { - val axisValueFormatter = AxisValueFormatter { value, chartValues -> - (chartValues.chartEntryModel.entries.first().getOrNull(value.toInt()) as? TemperatureEntry) - ?.localDate - ?.let { formatter.format(Date(it)) } - .orEmpty() - } + is ProgressState.Finished -> { - val lineChart = lineChart( - spacing = 110.dp - ) + val producer = remember(state.loadingHistoryState.data) { + state.loadingHistoryState.data.mapIndexed { index, measurePoint -> + TemperatureEntry(measurePoint.date, index.toFloat(), measurePoint.value) + }.let { + ChartEntryModelProducer(it) + } + } - Box(modifier = Modifier.padding(8.dp)) { + val axisValueFormatter = + AxisValueFormatter { value, chartValues -> + (chartValues.chartEntryModel.entries.first() + .getOrNull(value.toInt()) as? TemperatureEntry) + ?.localDate + ?.let { formatter.format(Date(it)) } + .orEmpty() + } + + val lineChart = lineChart() val scrollState = rememberChartScrollState() - LaunchedEffect(scrollState.maxValue){ - scrollState.scrollBy(scrollState.maxValue) - } - Chart( chartScrollState = scrollState, chart = lineChart, chartModelProducer = producer, startAxis = startAxis(), bottomAxis = bottomAxis( + tickLength = 0.dp, valueFormatter = axisValueFormatter, - labelRotationDegrees = 0f, + labelRotationDegrees = -90f, ), - modifier = Modifier - .fillMaxWidth() - .aspectRatio(1.5f), + modifier = Modifier.fillMaxSize(), ) - } - } - is ProgressState.Indeterminate -> { - - Box(modifier = Modifier.padding(8.dp)) { - - Box( - modifier = Modifier - .fillMaxWidth() - .aspectRatio(2f), - ){ - - CircularProgressIndicator( - strokeCap = StrokeCap.Round, - modifier = Modifier.align(Alignment.Center) - ) - + LaunchedEffect(scrollState.maxValue) { + scrollState.scrollBy(scrollState.maxValue) } } - } - is ProgressState.Progress -> Box(modifier = Modifier.padding(8.dp)) { + is ProgressState.Indeterminate -> { - Box( - modifier = Modifier - .fillMaxWidth() - .aspectRatio(2f), - ){ + CircularProgressIndicator( + strokeCap = StrokeCap.Round, + modifier = Modifier.align(Alignment.Center) + ) + + } + is ProgressState.Progress -> { val progressAnimDuration = 1500 val progressAnimation by animateFloatAsState( targetValue = state.loadingHistoryState.value, - animationSpec = tween(durationMillis = progressAnimDuration, easing = FastOutSlowInEasing) + animationSpec = tween( + durationMillis = progressAnimDuration, + easing = FastOutSlowInEasing + ) ) CircularProgressIndicator( @@ -206,6 +205,7 @@ fun Display( } } + } } @@ -234,7 +234,11 @@ class TemperatureHistoryContract { sealed class Event : ViewEvent { - data class LoadHistory( + data class OnStart( + val serial: String + ) : Event() + + data class OnRefreshHistory( val serial: String ) : Event() @@ -269,13 +273,50 @@ class TemperatureHistoryViewModel @Inject constructor( override fun handleEvents(event: TemperatureHistoryContract.Event) { when(event){ - is TemperatureHistoryContract.Event.LoadHistory -> reduce(viewState.value, event) + is TemperatureHistoryContract.Event.OnStart -> reduce(viewState.value, event) + is TemperatureHistoryContract.Event.OnRefreshHistory -> reduce(viewState.value, event) } } private fun reduce( state: TemperatureHistoryContract.State, - event: TemperatureHistoryContract.Event.LoadHistory + event: TemperatureHistoryContract.Event.OnStart + ) { + viewModelScope.launch { + + if(state is TemperatureHistoryContract.State.Display) { + + if(state.loadingHistoryState is ProgressState.Indeterminate) { + + setState { + TemperatureHistoryContract.State.Display(ProgressState.Indeterminate) + } + + getTemperatureHistoryBySerial(event.serial).onEach { + it.fold( + onSuccess = { + setState { + TemperatureHistoryContract.State.Display(it) + } + }, + onFailure = { + setState { + TemperatureHistoryContract.State.Exception + } + } + ) + }.launchIn(this) + + } + + } + + } + } + + private fun reduce( + state: TemperatureHistoryContract.State, + event: TemperatureHistoryContract.Event.OnRefreshHistory ) { viewModelScope.launch { diff --git a/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/Write.kt b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/Write.kt new file mode 100644 index 0000000..d23b38b --- /dev/null +++ b/app/src/main/java/llc/arma/ble/app/ui/screen/thermometer/view/Write.kt @@ -0,0 +1,381 @@ +package llc.arma.ble.app.ui.screen.thermometer.view + +import androidx.compose.animation.animateContentSize +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch +import llc.arma.ble.R +import llc.arma.ble.app.ui.screen.thermometer.ThermometerContract +import llc.arma.ble.app.ui.screen.thermometer.localizedName + +@Composable +fun Write( + state: ThermometerContract.State.Display.WriteState, + onEvent: (ThermometerContract.Event) -> Unit +) { + + val scope = rememberCoroutineScope() + + Column( + modifier = Modifier.animateContentSize { initialValue, targetValue -> } + ) { + + Text( + modifier = Modifier.padding(horizontal = 12.dp), + text = "Запись изменений", + style = MaterialTheme.typography.titleLarge + ) + + Spacer(modifier = Modifier.height(20.dp)) + + when (state) { + is ThermometerContract.State.Display.WriteState.DisplayPreview -> { + + state.writeRequest.tx?.let { + Box( + modifier = Modifier.padding( + vertical = 0.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Мощность" + ) + Text( + color = MaterialTheme.colorScheme.secondary, + style = MaterialTheme.typography.bodyMedium, + text = "${it.localizedName} db" + ) + + } + + } + + } + } + + state.writeRequest.saveHistory?.let { + + Box( + modifier = Modifier.padding( + vertical = 0.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Сохранять историю измерений" + ) + Text( + color = MaterialTheme.colorScheme.secondary, + style = MaterialTheme.typography.bodyMedium, + text = "${it.localizedName}" + ) + + } + + } + + } + + } + + state.writeRequest.historyInterval?.let { + + Box( + modifier = Modifier.padding( + vertical = 0.dp, + horizontal = 8.dp + ) + ) { + + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .clip(RoundedCornerShape(16.dp)) + .padding(8.dp) + ) { + + Column( + modifier = Modifier.weight(1f) + ) { + + Text( + text = "Интервал измерний" + ) + Text( + color = MaterialTheme.colorScheme.secondary, + style = MaterialTheme.typography.bodyMedium, + text = "${it / 1000 / 60 / 60} ч." + ) + + } + + } + + } + + } + + Spacer(modifier = Modifier.height(20.dp)) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + onClick = { + onEvent(ThermometerContract.Event.OnWriteBle) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.background, + style = MaterialTheme.typography.labelLarge, + text = "Записать" + ) + + } + + } + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + onEvent(ThermometerContract.Event.OnHideWriteBlePreview) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + + } + is ThermometerContract.State.Display.WriteState.Writing -> { + + Box { + + Column() { + + Spacer(modifier = Modifier.height(28.dp)) + + CircularProgressIndicator( + modifier = Modifier + .align(Alignment.CenterHorizontally) + ) + + Spacer(modifier = Modifier.height(48.dp)) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceVariant, + onClick = { + onEvent(ThermometerContract.Event.OnHideWriteBlePreview) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.labelLarge, + text = "Отменить" + ) + + } + + } + + } + + } + + } + ThermometerContract.State.Display.WriteState.Success -> { + + Box { + + Column { + + Box( + modifier = Modifier + .padding(8.dp) + .fillMaxWidth() + ) { + + Image( + modifier = Modifier + .size(125.dp) + .align(Alignment.Center), + painter = painterResource(llc.arma.ble.R.drawable.ic_done), + contentDescription = null + ) + + } + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + modifier = Modifier.align(Alignment.CenterHorizontally), + text = "Успешно завершено" + ) + + Spacer(modifier = Modifier.height(20.dp)) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primary, + onClick = { + onEvent(ThermometerContract.Event.OnHideWriteBlePreview) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.labelLarge, + text = "Ок" + ) + + } + + } + + } + + } + + } + ThermometerContract.State.Display.WriteState.Failure -> { + + Box { + + Column { + + Box( + modifier = Modifier + .padding(8.dp) + .fillMaxWidth() + ) { + + Image( + modifier = Modifier + .size(125.dp) + .align(Alignment.Center), + painter = painterResource(R.drawable.ic_error), + contentDescription = null + ) + + } + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + modifier = Modifier.align(Alignment.CenterHorizontally), + text = "Ошибка записи" + ) + + Spacer(modifier = Modifier.height(20.dp)) + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + .height(50.dp), + shape = CircleShape, + color = MaterialTheme.colorScheme.primary, + onClick = { + onEvent(ThermometerContract.Event.OnHideWriteBlePreview) + } + ) { + + Box(modifier = Modifier.fillMaxSize()) { + + Text( + modifier = Modifier.align(Alignment.Center), + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.labelLarge, + text = "Ок" + ) + + } + + } + + } + + } + + } + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/data/BleRepositoryImpl.kt b/app/src/main/java/llc/arma/ble/data/BleRepositoryImpl.kt index c0a5a86..71340fd 100644 --- a/app/src/main/java/llc/arma/ble/data/BleRepositoryImpl.kt +++ b/app/src/main/java/llc/arma/ble/data/BleRepositoryImpl.kt @@ -23,12 +23,24 @@ import llc.arma.ble.domain.model.Ble import llc.arma.ble.domain.model.BleInfo import llc.arma.ble.domain.repository.BleRepository import llc.arma.ble.domain.usecase.GetBleBySerial +import java.nio.charset.Charset import java.util.* import javax.inject.Inject import javax.inject.Singleton import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine +val serviceUUID: UUID = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002") + +val temperatureHistoryReadUUID: UUID = UUID.fromString("a77db2d8-9bc4-11ed-a8fc-0242ac120002") +val temperatureReadUUID: UUID = UUID.fromString("00002a6e-0000-1000-8000-00805f9b34fb") +val intervalReadUUID: UUID = UUID.fromString("a77db2d8-9bc4-11ed-a8fc-0242ac120002") +val intervalWriteUUID: UUID = UUID.fromString("a77db6f2-9bc4-11ed-a8fc-0242ac120002") +val saveEnabledWriteUUID: UUID = UUID.fromString("a77db6f2-9bc4-11ed-a8fc-0242ac120002") +val passwordWriteUUID: UUID = UUID.fromString("a77db6f2-9bc4-11ed-a8fc-0242ac120002") +val txWriteUUID: UUID = UUID.fromString("00002a07-0000-1000-8000-00805f9b34fb") +val flashWriteUUID: UUID = UUID.fromString("a77db6f2-9bc4-11ed-a8fc-0242ac120002") + @Singleton class BleRepositoryImpl @Inject constructor( private val app: Application @@ -75,15 +87,12 @@ class BleRepositoryImpl @Inject constructor( override fun getBleAroundFlow(): Flow, BleException>> { - return if (ActivityCompat.checkSelfPermission( + return if( + Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_SCAN - ) != PackageManager.PERMISSION_GRANTED - ) { - - flow { emit(Result.failure(BleException.PermissionDenied)) } - - } else { + ) == PackageManager.PERMISSION_GRANTED + ){ callbackFlow { @@ -96,7 +105,7 @@ class BleRepositoryImpl @Inject constructor( super.onScanResult(callbackType, result) - if (ActivityCompat.checkSelfPermission( + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_CONNECT ) == PackageManager.PERMISSION_GRANTED @@ -143,7 +152,7 @@ class BleRepositoryImpl @Inject constructor( send(Result.success(resultList.values.toList())) } } - }, 100, 500) + }, 500, 500) } awaitClose { @@ -153,6 +162,10 @@ class BleRepositoryImpl @Inject constructor( } + } else { + + flow { emit(Result.failure(BleException.PermissionDenied)) } + } } @@ -164,7 +177,7 @@ class BleRepositoryImpl @Inject constructor( deviceCache[serial]?.let { result -> - if (ActivityCompat.checkSelfPermission( + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_CONNECT ) == PackageManager.PERMISSION_GRANTED @@ -264,8 +277,8 @@ class BleRepositoryImpl @Inject constructor( val dataResult = readCharacteristic( device = record.device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("00002a6e-0000-1000-8000-00805f9b34fb") + serviceId = serviceUUID, + characteristicId = temperatureReadUUID ).fold( onFailure = { return Result.failure(it) @@ -283,15 +296,17 @@ class BleRepositoryImpl @Inject constructor( writeCharacteristic( device = record.device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb"), + serviceId = serviceUUID, + characteristicId = intervalReadUUID, writeData = byteArrayOf(3, 0, 0, 0, 0) - ) + ).onFailure { + return Result.failure(it) + } val dataResult = readCharacteristic( device = record.device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb") + serviceId = serviceUUID, + characteristicId = intervalReadUUID ).fold( onFailure = { return Result.failure(it) @@ -311,221 +326,153 @@ class BleRepositoryImpl @Inject constructor( override suspend fun getTemperatureHistoryBySerial( serial: String - ): Flow>, BleException>> = flow { + ): Flow>, BleException>> { - fun ByteArray.getUIntAt(idx: Int) = - ((this[idx + 3].toUInt() and 0xFFu) shl 24) or - ((this[idx + 2].toUInt() and 0xFFu) shl 16) or - ((this[idx + 1].toUInt() and 0xFFu) shl 8) or - (this[idx].toUInt() and 0xFFu) + var gatt: BluetoothGatt? = null - findDeviceBySerial(serial).fold( - onSuccess = { - return@fold it - }, - onFailure = { - emit(Result.failure(it)) - return@flow - } - ).let { device -> + return callbackFlow { - emit(Result.success(ProgressState.Indeterminate)) + deviceCache[serial]?.device?.let { - writeCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb"), - writeData = byteArrayOf(2) - ) + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { - val countDataArray = readCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb") - ).fold( - onFailure = { - emit(Result.failure(it)) - return@flow - }, - onSuccess = { return@fold it } - ) + gatt = it.connectGatt(app, false, ReadHistoryCallback(app) { + CoroutineScope(Dispatchers.IO).launch { + send(it) + } + }) - writeCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb"), - writeData = mutableListOf( - 1.toByte(), - 0.toByte(), - 0.toByte() - ).apply { - addAll(countDataArray.toList()) - }.toByteArray() - ) - - val firstPackageResponse = readCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb") - ).fold( - onFailure = { - emit(Result.failure(it)) - return@flow - }, - onSuccess = { return@fold it } - ) - - if(firstPackageResponse[0] == 250.toByte()){ - - val interval = firstPackageResponse.getUIntAt(2).toLong() - val lastMeasureTime = firstPackageResponse.getUIntAt(6).toLong() - val realTime = firstPackageResponse.getUIntAt(10).toLong() - - val lastMeasureSystemTime = System.currentTimeMillis() - ((realTime - lastMeasureTime) / 10_000) - - var temperatureDataArray = firstPackageResponse.asList().subList(14, firstPackageResponse.size) - - val temperaturePackage = temperatureDataArray.chunked(2).map { - (it[0] + it[1] * 256).toFloat() / 100f - }.toMutableList() - - var dataCount = firstPackageResponse[1].toUByte() - val totalDataSize = dataCount.toInt() + temperaturePackage.size - - emit(Result.success(ProgressState.Progress(0f / totalDataSize.toFloat()))) - delay(100) - emit(Result.success(ProgressState.Progress(dataCount.toFloat() / totalDataSize.toFloat()))) - - while(dataCount != 0.toUByte()){ - - writeCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb"), - writeData = byteArrayOf(5) - ) - - val readResponse = readCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb") - ).fold( - onFailure = { - emit(Result.failure(it)) - return@flow - }, - onSuccess = { return@fold it } - ) - - if(readResponse[0] == 251.toByte()) { - - dataCount = readResponse[1].toUByte() - - temperatureDataArray = readResponse.toList().subList(2, readResponse.size) - - temperaturePackage.addAll( - temperatureDataArray.chunked(2).map { - (it[0] + it[1] * 256).toFloat() / 100f - } - ) - - emit(Result.success(ProgressState.Progress(totalDataSize.toFloat() / temperaturePackage.size.toFloat()))) - - } else { - - emit(Result.failure(BleException.UnexpectedResponse)) + } else { + CoroutineScope(Dispatchers.IO).launch { + send(Result.failure(BleException.PermissionDenied)) } + return@callbackFlow + } - readCharacteristic( - device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b2d8-0000-1000-8000-00805f9b34fb") - ) - - emit( - Result.success( - ProgressState.Finished( - temperaturePackage.withIndex().map { - Ble.Thermometer.MeasurePoint( - date = lastMeasureSystemTime - (((temperaturePackage.size - 1) - it.index) * interval), - value = it.value - ) - } - ) - ) - ) - - } else { - - emit(Result.failure(BleException.UnexpectedResponse)) - } - } + awaitClose { + gatt?.close() + } - } - - override suspend fun writeBle(ble: Ble) { - when(ble){ - is Ble.Beacon -> writeBeacon(ble) - is Ble.Thermometer -> writeThermometer(ble) } } override suspend fun writeBle( serial: String, request: Ble.Thermometer.WriteRequest - ) { + ): Result { deviceCache[serial]?.let { result -> - request.tx?.let { writeTx(result.device, it) } + request.tx?.let { writeTx(result.device, it) }?.onFailure { + return Result.failure(it) + } - request.historyInterval?.let { writeSaveInterval(result.device, it) } + request.historyInterval?.let { writeSaveInterval(result.device, it) }?.onFailure { + return Result.failure(it) + } - request.saveHistory?.let { writeSaveEnabled(result.device, it) } + request.saveHistory?.let { writeSaveEnabled(result.device, it) }?.onFailure { + return Result.failure(it) + } + + writeToFlash(serial).onFailure { + return Result.failure(it) + } deviceCache.remove(serial) resultList.remove(serial) } - } - - private suspend fun writeBeacon(ble: Ble.Beacon){ - - deviceCache[ble.info.serial]?.device?.let { - - writeTx(it, ble.state.tx) - - } + return Result.success(Unit) } - private suspend fun writeThermometer(ble: Ble.Thermometer){ + override suspend fun writeBle( + serial: String, + request: Ble.Beacon.WriteRequest + ): Result { - deviceCache[ble.info.serial]?.device?.let { + deviceCache[serial]?.let { result -> - writeTx(it, ble.state.tx) + request.tx?.let { writeTx(result.device, it) }?.onFailure { + return Result.failure(it) + } - writeSaveInterval(it, ble.thermometerState.historyInterval) + writeToFlash(serial).onFailure { + return Result.failure(it) + } + + deviceCache.remove(serial) + resultList.remove(serial) } + return Result.success(Unit) + + } + + private suspend fun writeToFlash( + serial: String + ): Result{ + + deviceCache[serial]?.device?.let { result -> + + return writeCharacteristic( + device = result, + serviceId = serviceUUID, + characteristicId = flashWriteUUID, + writeData = byteArrayOf(9, 1) + ) + + } + + return Result.success(Unit) + + } + + override suspend fun changeBlePassword( + password: String, + serial: String + ): Result { + deviceCache[serial]?.device?.let { + return writeCharacteristic( + device = it, + serviceId = serviceUUID, + characteristicId = passwordWriteUUID, + writeData = mutableListOf(8.toByte()).apply { + addAll(password.toByteArray(Charsets.US_ASCII).toList()) + }.toByteArray() + ).fold( + onFailure = { + Result.failure(it) + }, + onSuccess = { + Result.success(Unit) + } + ) + } + return Result.success(Unit) } private suspend fun writeTx( device: BluetoothDevice, tx: Ble.BleState.TX - ) { + ): Result { - writeCharacteristic( + return writeCharacteristic( device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("00002a07-0000-1000-8000-00805f9b34fb"), + serviceId = serviceUUID, + characteristicId = txWriteUUID, writeData = byteArrayOf( when(tx) { Ble.BleState.TX.MINUS_40 -> -40 @@ -546,17 +493,17 @@ class BleRepositoryImpl @Inject constructor( private suspend fun writeSaveInterval( device: BluetoothDevice, interval: Long - ) { + ): Result { fun UInt.to4ByteArrayInBigEndian(): ByteArray = (3 downTo 0).map { (this shr (it * Byte.SIZE_BITS)).toByte() }.reversed().toByteArray() - writeCharacteristic( + return writeCharacteristic( device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b6f2-0000-1000-8000-00805f9b34fb"), + serviceId = serviceUUID, + characteristicId = intervalWriteUUID, writeData = mutableListOf(3).apply { addAll(interval.toUInt().to4ByteArrayInBigEndian().toList()) }.toByteArray() @@ -569,17 +516,15 @@ class BleRepositoryImpl @Inject constructor( enabled: Boolean ): Result { - writeCharacteristic( + return writeCharacteristic( device = device, - serviceId = UUID.fromString("a77db03a-9bc4-11ed-a8fc-0242ac120002"), - characteristicId = UUID.fromString("0000b6f2-0000-1000-8000-00805f9b34fb"), + serviceId = serviceUUID, + characteristicId = saveEnabledWriteUUID, writeData = mutableListOf(4).apply { add(if(enabled) 1 else 0) }.toByteArray() ) - return Result.success(Unit) - } private suspend fun readCharacteristic( @@ -601,18 +546,30 @@ class BleRepositoryImpl @Inject constructor( Log.d("read", "onConnectionStateChange $newState $status") - if (newState == BluetoothProfile.STATE_CONNECTED) { + if(status == BluetoothGatt.GATT_SUCCESS) { + + if (newState == BluetoothProfile.STATE_CONNECTED) { + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + + gatt.discoverServices() + + } else { + + it.resume(Result.failure(BleException.PermissionDenied)) + + } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission( - app, - Manifest.permission.BLUETOOTH_CONNECT - ) == PackageManager.PERMISSION_GRANTED - ) { - gatt.discoverServices() - } else { - it.resume(Result.failure(BleException.PermissionDenied)) } + } else { + + it.resume(Result.failure(BleException.PermissionDenied)) + } } @@ -633,22 +590,52 @@ class BleRepositoryImpl @Inject constructor( characteristic.uuid == characteristicId }?.let { char -> - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission( + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_CONNECT ) == PackageManager.PERMISSION_GRANTED ) { + gatt.readCharacteristic(char) + } else { + it.resume(Result.failure(BleException.PermissionDenied)) + } + return + } + it.resume(Result.failure(BleException.UnexpectedResponse)) + + }else{ + it.resume(Result.failure(BleException.UnexpectedResponse)) } } + @Deprecated("Deprecated in Java") + override fun onCharacteristicRead( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + status: Int + ) { + super.onCharacteristicRead(gatt, characteristic, status) + + result = characteristic.value + if (result != null) { + it.resume(Result.success(result!!)) + } else { + bleGatt?.close() + it.resume(Result.failure(BleException.UnexpectedResponse)) + } + + gatt.close() + + } + override fun onCharacteristicRead( gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, @@ -659,36 +646,40 @@ class BleRepositoryImpl @Inject constructor( Log.d("read", "onCharacteristicRead $status") - if (ActivityCompat.checkSelfPermission( - app, - Manifest.permission.BLUETOOTH_CONNECT - ) != PackageManager.PERMISSION_GRANTED - ) { - it.resume(Result.failure(BleException.PermissionDenied)) - }else { - gatt.close() - result = value - if(result != null){ + if(status == BluetoothGatt.GATT_SUCCESS) { + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + + gatt.close() + result = value it.resume(Result.success(result!!)) + } else { - bleGatt?.close() - it.resume(Result.failure(BleException.UnexpectedResponse)) + it.resume(Result.failure(BleException.PermissionDenied)) + } + } else { + + it.resume(Result.failure(BleException.UnexpectedResponse)) + } } } - if (ActivityCompat.checkSelfPermission( + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_CONNECT - ) != PackageManager.PERMISSION_GRANTED - ) { - it.resume(Result.failure(BleException.PermissionDenied)) + ) == PackageManager.PERMISSION_GRANTED) { + bleGatt = device.connectGatt(app, false, callback) } else { - bleGatt = device.connectGatt(app, true, callback) + it.resume(Result.failure(BleException.PermissionDenied)) } } @@ -698,7 +689,7 @@ class BleRepositoryImpl @Inject constructor( serviceId: UUID, characteristicId: UUID, writeData: ByteArray - ) = suspendCancellableCoroutine { + ): Result = suspendCancellableCoroutine { var bleGatt: BluetoothGatt? = null @@ -710,23 +701,35 @@ class BleRepositoryImpl @Inject constructor( newState: Int ) { - Log.d("write", "onConnectionStateChange $newState") + Log.d("write", "onConnectionStateChange $status $newState") - if (newState == BluetoothProfile.STATE_CONNECTED) { + if (status == BluetoothGatt.GATT_SUCCESS) { + + if (newState == BluetoothProfile.STATE_CONNECTED) { + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + gatt.discoverServices() + } else { + + it.resume(Result.failure(BleException.PermissionDenied)) + + } + + } else { + + it.resume(Result.failure(BleException.UnexpectedResponse)) + bleGatt?.close() - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission( - app, - Manifest.permission.BLUETOOTH_CONNECT - ) == PackageManager.PERMISSION_GRANTED - ) { - gatt.discoverServices() } } else { - if(newState == BluetoothProfile.STATE_DISCONNECTED && status == BluetoothGatt.GATT_FAILURE){ - bleGatt?.close() - } + it.resume(Result.failure(BleException.UnexpectedResponse)) + bleGatt?.close() } @@ -737,7 +740,9 @@ class BleRepositoryImpl @Inject constructor( status: Int ) { super.onServicesDiscovered(gatt, status) + Log.d("write", "onServicesDiscovered $status") + if (status == BluetoothGatt.GATT_SUCCESS) { gatt.services?.firstOrNull { service -> @@ -746,23 +751,30 @@ class BleRepositoryImpl @Inject constructor( characteristic.uuid == characteristicId }?.let { char -> - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission( + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_CONNECT ) == PackageManager.PERMISSION_GRANTED ) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - gatt.writeCharacteristic(char, writeData, BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT) - }else{ - char.value = writeData - gatt.writeCharacteristic(char) - } + gatt.writeCharacteristic(char, writeData) + + } else { + + it.resume(Result.failure(BleException.PermissionDenied)) } + return + } + it.resume(Result.failure(BleException.UnexpectedResponse)) + + } else { + + it.resume(Result.failure(BleException.UnexpectedResponse)) + } } @@ -776,79 +788,61 @@ class BleRepositoryImpl @Inject constructor( Log.d("write", "onCharacteristicWrite $status") - if (ActivityCompat.checkSelfPermission( + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( app, Manifest.permission.BLUETOOTH_CONNECT - ) != PackageManager.PERMISSION_GRANTED + ) == PackageManager.PERMISSION_GRANTED ) { - return - } else { + gatt.close() - it.resume(Unit) + + if(status == BluetoothGatt.GATT_SUCCESS) { + + it.resume(Result.success(Unit)) + + }else{ + + it.resume(Result.failure(BleException.UnexpectedResponse)) + + } + + } else { + + it.resume(Result.failure(BleException.PermissionDenied)) + } } } - bleGatt = device.connectGatt(app, true, callback) + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED) { + + bleGatt = device.connectGatt(app, false, callback) + + } else { + + it.resume(Result.failure(BleException.PermissionDenied)) + + } } - private suspend fun findDeviceBySerial(serial: String): Result = suspendCancellableCoroutine { +} - val bleCallback = object : ScanCallback() { - - override fun onScanResult( - callbackType: Int, - result: ScanResult - ) { - - super.onScanResult(callbackType, result) - - if(it.isActive) { - - if (ActivityCompat.checkSelfPermission( - app, - Manifest.permission.BLUETOOTH_CONNECT - ) == PackageManager.PERMISSION_GRANTED - ) { - - - it.resume(Result.success(result.device)) - - } else { - CoroutineScope(Dispatchers.IO).launch { - it.resume( - Result.failure(BleException.PermissionDenied) - ) - } - } - - } - - } - - } - - val bleScanner = - app.getSystemService(BluetoothManager::class.java).adapter.bluetoothLeScanner - - bleScanner.startScan( - listOf(ScanFilter.Builder().setDeviceAddress(serial).build()), - ScanSettings.Builder() - .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) - .setCallbackType(ScanSettings.CALLBACK_TYPE_FIRST_MATCH) - .setMatchMode(ScanSettings.MATCH_MODE_AGGRESSIVE) - .setNumOfMatches(ScanSettings.MATCH_NUM_ONE_ADVERTISEMENT) - .setReportDelay(400L) - .build(), - bleCallback) - - it.invokeOnCancellation { - bleScanner.stopScan(bleCallback) - } +fun BluetoothGatt.writeCharacteristic( + characteristic: BluetoothGattCharacteristic, + data: ByteArray +){ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + writeCharacteristic(characteristic, data, BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT) + }else{ + characteristic.value = data + writeCharacteristic(characteristic) } } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/data/ReadHistoryCallback.kt b/app/src/main/java/llc/arma/ble/data/ReadHistoryCallback.kt new file mode 100644 index 0000000..ed10025 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/data/ReadHistoryCallback.kt @@ -0,0 +1,292 @@ +package llc.arma.ble.data + +import android.Manifest +import android.annotation.SuppressLint +import android.app.Application +import android.bluetooth.BluetoothGatt +import android.bluetooth.BluetoothGattCallback +import android.bluetooth.BluetoothGattCharacteristic +import android.content.pm.PackageManager +import android.os.Build +import androidx.core.app.ActivityCompat +import llc.arma.ble.domain.Result +import llc.arma.ble.domain.common.BleException +import llc.arma.ble.domain.common.ProgressState +import llc.arma.ble.domain.model.Ble +import java.util.* + +enum class Property { + DATA_SIZE, PACKAGE +} + +class ReadHistoryCallback( + private val app: Application, + private val onResult: (Result>, BleException>) -> Unit +) : BluetoothGattCallback() { + + private fun ByteArray.getUIntAt(idx: Int) = + ((this[idx + 3].toUInt() and 0xFFu) shl 24) or + ((this[idx + 2].toUInt() and 0xFFu) shl 16) or + ((this[idx + 1].toUInt() and 0xFFu) shl 8) or + (this[idx].toUInt() and 0xFFu) + + private var readProperty: Property? = null + + init { + onResult(Result.success(ProgressState.Indeterminate)) + } + + override fun onConnectionStateChange( + gatt: BluetoothGatt, + status: Int, + newState: Int + ) { + super.onConnectionStateChange(gatt, status, newState) + + if(status == BluetoothGatt.GATT_SUCCESS){ + + if(newState == BluetoothGatt.STATE_CONNECTED){ + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + gatt.discoverServices() + + } else { + onResult(Result.failure(BleException.UnexpectedResponse)) + gatt.close() + } + } + + } else { + + onResult(Result.failure(BleException.UnexpectedResponse)) + gatt.close() + + } + + } + + override fun onServicesDiscovered( + gatt: BluetoothGatt, + status: Int + ) { + super.onServicesDiscovered(gatt, status) + if(status == BluetoothGatt.GATT_SUCCESS){ + gatt.getService(serviceUUID)?.getCharacteristic(temperatureHistoryReadUUID)?.let { + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + + readProperty = Property.DATA_SIZE + gatt.writeCharacteristic(it, byteArrayOf(2)) + + } else { + + onResult(Result.failure(BleException.PermissionDenied)) + gatt.close() + + } + + } + + } + + } + + private var lastMeasureSystemTime: Long? = null + + private var bleMeasureInterval: Long? = null + private var bleRealTime: Long? = null + private var bleLastMeasureTime: Long? = null + + private val resultTemperaturePackage: MutableList = mutableListOf() + + var expectedDataSize: Int? = null + + override fun onCharacteristicRead( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + status: Int + ) { + super.onCharacteristicRead(gatt, characteristic, status) + onCommonCharacteristicRead(gatt, characteristic, characteristic.value, status) + } + + override fun onCharacteristicRead( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + value: ByteArray, + status: Int + ) { + super.onCharacteristicRead(gatt, characteristic, value, status) + //onCommonCharacteristicRead(gatt, characteristic, value, status) + } + + private fun onCommonCharacteristicRead( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + value: ByteArray, + status: Int + ){ + if(status == BluetoothGatt.GATT_SUCCESS){ + when(readProperty){ + Property.DATA_SIZE -> { + val writeData = mutableListOf( + 1.toByte(), + 0.toByte(), + 0.toByte() + ).apply { + addAll(value.toList()) + }.toByteArray() + + readProperty = Property.PACKAGE + gatt.writeCharacteristic(characteristic, writeData) + } + Property.PACKAGE -> { + + if(value[0] == 250.toByte()){ + + bleMeasureInterval = value.getUIntAt(2).toLong() + bleLastMeasureTime = value.getUIntAt(6).toLong() + bleRealTime = value.getUIntAt(10).toLong() + + lastMeasureSystemTime = System.currentTimeMillis() - ((bleRealTime!! - bleLastMeasureTime!!) / 10_000) + + val temperatureDataArray = value.asList().subList(14, value.size) + + resultTemperaturePackage.addAll( + temperatureDataArray.chunked(2).map { + (it[0] + it[1] * 256).toFloat() / 100f + }.toMutableList() + ) + + val totalDataSize = value[1].toUByte().toInt() + temperatureDataArray.size / 2 + + val nextPackageDataCount = value[1].toUByte() + expectedDataSize = nextPackageDataCount.toInt() + resultTemperaturePackage.size + + onResult(Result.success(ProgressState.Progress(0f / totalDataSize.toFloat()))) + onResult(Result.success(ProgressState.Progress(nextPackageDataCount.toFloat() / totalDataSize.toFloat()))) + + if(nextPackageDataCount != 0.toUByte()){ + + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + + gatt.writeCharacteristic(characteristic, byteArrayOf(5)) + gatt.readCharacteristic(characteristic) + + } else { + + onResult(Result.failure(BleException.PermissionDenied)) + gatt.close() + + } + + } else { + onResult( + Result.success( + ProgressState.Finished( + resultTemperaturePackage.withIndex().map { + Ble.Thermometer.MeasurePoint( + date = lastMeasureSystemTime!! - (((resultTemperaturePackage.size - 1) - it.index) * bleMeasureInterval!!), + value = it.value + ) + } + ) + ) + ) + gatt.close() + } + + } + + if(value[0] == 251.toByte()) { + + val nextPackageDataCount = value[1].toUByte() + val temperatureDataArray = value.toList().subList(2, value.size) + + resultTemperaturePackage.addAll( + temperatureDataArray.chunked(2).map { + (it[0] + it[1] * 256).toFloat() / 100f + } + ) + + onResult(Result.success(ProgressState.Progress(expectedDataSize!!.toFloat() / resultTemperaturePackage.size.toFloat()))) + + if(nextPackageDataCount != 0.toUByte()){ + + val writeData = byteArrayOf(5) + + gatt.writeCharacteristic(characteristic, writeData) + gatt.readCharacteristic(characteristic) + + } else { + onResult( + Result.success( + ProgressState.Finished( + resultTemperaturePackage.withIndex().map { + Ble.Thermometer.MeasurePoint( + date = lastMeasureSystemTime!! - (((resultTemperaturePackage.size - 1) - it.index) * bleMeasureInterval!!), + value = it.value + ) + } + ) + ) + ) + gatt.close() + } + } + } + else -> { + onResult(Result.failure(BleException.UnexpectedResponse)) + gatt.close() + + } + + } + + } + } + + override fun onCharacteristicWrite( + gatt: BluetoothGatt, + characteristic: BluetoothGattCharacteristic, + status: Int + ) { + super.onCharacteristicWrite(gatt, characteristic, status) + if(status == BluetoothGatt.GATT_SUCCESS){ + + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P || ActivityCompat.checkSelfPermission( + app, + Manifest.permission.BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED + ) { + + gatt.readCharacteristic(characteristic) + + } else { + + onResult(Result.failure(BleException.PermissionDenied)) + gatt.close() + + } + + } else { + onResult(Result.failure(BleException.UnexpectedResponse)) + gatt.close() + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt b/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt index eb24680..38b5ffc 100644 --- a/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt +++ b/app/src/main/java/llc/arma/ble/domain/repository/BleRepository.kt @@ -16,8 +16,10 @@ interface BleRepository { suspend fun getTemperatureHistoryBySerial(serial: String): Flow>, BleException>> - suspend fun writeBle(ble: Ble) + suspend fun writeBle(serial: String, request: Ble.Thermometer.WriteRequest): Result - suspend fun writeBle(serial: String, request: Ble.Thermometer.WriteRequest) + suspend fun writeBle(serial: String, request: Ble.Beacon.WriteRequest): Result + + suspend fun changeBlePassword(password: String, serial: String): Result } \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/domain/usecase/ChangeBlePassword.kt b/app/src/main/java/llc/arma/ble/domain/usecase/ChangeBlePassword.kt new file mode 100644 index 0000000..3667fd6 --- /dev/null +++ b/app/src/main/java/llc/arma/ble/domain/usecase/ChangeBlePassword.kt @@ -0,0 +1,18 @@ +package llc.arma.ble.domain.usecase + +import llc.arma.ble.domain.common.BleException +import llc.arma.ble.domain.repository.BleRepository +import javax.inject.Inject + +class ChangeBlePassword @Inject constructor( + private val bleRepository: BleRepository +) { + + suspend operator fun invoke( + password: String, + serial: String + ): llc.arma.ble.domain.Result { + return bleRepository.changeBlePassword(password, serial) + } + +} \ No newline at end of file diff --git a/app/src/main/java/llc/arma/ble/domain/usecase/WriteBle.kt b/app/src/main/java/llc/arma/ble/domain/usecase/WriteBle.kt index 8e876f3..1bab00b 100644 --- a/app/src/main/java/llc/arma/ble/domain/usecase/WriteBle.kt +++ b/app/src/main/java/llc/arma/ble/domain/usecase/WriteBle.kt @@ -1,6 +1,7 @@ package llc.arma.ble.domain.usecase import android.app.appsearch.SetSchemaRequest +import llc.arma.ble.domain.common.BleException import llc.arma.ble.domain.model.Ble import llc.arma.ble.domain.repository.BleRepository import javax.inject.Inject @@ -9,15 +10,18 @@ class WriteBle @Inject constructor( private val bleRepository: BleRepository ) { - suspend operator fun invoke(ble: Ble){ - bleRepository.writeBle(ble) + suspend operator fun invoke( + serial: String, + request: Ble.Thermometer.WriteRequest + ): llc.arma.ble.domain.Result{ + return bleRepository.writeBle(serial, request) } suspend operator fun invoke( serial: String, - request: Ble.Thermometer.WriteRequest - ){ - bleRepository.writeBle(serial, request) + request: Ble.Beacon.WriteRequest + ): llc.arma.ble.domain.Result{ + return bleRepository.writeBle(serial, request) } } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml new file mode 100644 index 0000000..da4babe --- /dev/null +++ b/app/src/main/res/drawable/ic_done.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml new file mode 100644 index 0000000..731c48b --- /dev/null +++ b/app/src/main/res/drawable/ic_error.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..bb853a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cf..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cf..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..f650714b46fc250d05b8f4c091b368c936948685 GIT binary patch literal 2104 zcmV-82*>w{P)e6YM`@Qt2a&KWdv0H9-??fFIf_ z_((%gsHL@N5z0cewY(n-hKLBY@qs)F5-SMe>3nw?T<-3=yO(yoyWUB@++lX+oH-wJ zX3m+t`^qayQHoNOq7>IIMC8G+(9Pf>wo_7Jf)ed)&C{n(37DRqc6rR$QZqI-w#3v{y9=54Clgc)flr=1nQ|w< zCPvU@W+Gn*_U}oo^Fll)CMHriIpY6g?=HGqu^SGSk`P;lqaq-IXAQ zsmaMn>gwvsgRN2sS}-~~dKALkks#Q_3J5v@Tcr@RaBy(&8!k+&zzrY}WH1;`!d9sS zeG6f3PS7dXDv6-`_wOHrFn1=Xy}kW3Y*h#{heD7ICLZP5|m?!)NG&z8HhCkRg^U5eh*zATNTD7#_&UA)QV~-QC@kpO+`Nk6y1A z2nY@irmD(H0jQ%5pP>)>VhqMY24solOMpBG!sdFRyqrGH%A&-C1d3w&$hM3ON={0m zNM`WX)Kp4IP9_~&9jRNk2tXZe_zZo}7h^CMG9U{wAzQ4^0my?O7!ng5P0?#3Dd8QR zfVfy4tzQ=@8Ee->2{IvDtj__wc!J;x_-})p?+(62_o~$bu2*WPT^}eJx%-z3BtiB( z+|Bs}Ax6P5jExk?Vf#fwd_1j<($bwuFPg6RG@^l_hyDGRw&>ClOUh#gKo@0JTEJ7K0(+t z5zygC2D-0br}xs*EE5EDvbJ011lR&6C?h>x(82XVw*wou^9e#qfT$NoG=L=!7qdzb zT&>%2SK|cXbb}7A@8rpo)Z5!@HZLo1K0(Np5Vs(>142VWC}Pzr>jVj|#@hSLNq8PO zK?nh$gX;?m3!~D~QnPtkf%6GMa*6y25io#2Z}X;2W(3`>P|?kwyr}PI6%FfIdxwff zu6ff$?=uqqx#3MczpJVD4`(lt_6MI?5-ykdP{fKr+ORHw64nRM_6&a-@0m*w zf=TG$`k)(g5YNjBoKFz0DUe5TAZ1v!a-|tTTjTxd+#xmHx}c)WO&U77$A@-gXsE2v zcb1?lKl)JGy8+aFMNM~G)b#f?^A&^>3_478VhoP%L-l$L5+=#R9{~&psK3sxdi28`O@Y%fBO7GKO;eh)w8FXy#zrA*9YCQCdghF zOWj~}u{&(D&fV=xA8gbJ1fAaNL-(q@=w6eNAi>3cW9bQVv7rt(a526~<1Pm%IDXvX zCY`xiLoqX(bV{s0ozGR%XWRWKI>Oi%9}_@deyX9U2;(Ll9~(fK=~gyrri1H~{U(hg zwymv=T3T8JSUcwXS^egDFX}z7qI;KAG*#zG1HT%NezXC@4c@ayytQK<*CEis^+C6+ zk9h=&2-ZSa@CG1gv>7N`LleVI%Te~6K#}R-`eYv{ic^ieyu9b98n)18IalKZ!F{2F z>w|7try4w2<*=Eo+Ji2YRf2HK2py(6Wu2_@>kix<&%)YuhrMX@G;_5%*BvIhpj*~1 zX6eFgLtNba2m)F?=eQat$mK4~#K3iE)~;O?q79}aU-=3oNyUw7Z)*C*hng?>Qttj` zu6gBZ3FYPGv}W~cfh4RXsR$1ZqEKxRMMi`$aw3IG`-+MRGkp#~9t2_21W8y)a5wBp z*tl`JAp}62gwqHSH|hZDXhR)+&=+Gc7Imx~kmJCHYzguphy$*G{Q^efC}q0V2RLLc;fDPEwG85DwSKq1Hm6oPC(A;<>)6N23Sw;GI~Q?OMM zL4$*XZo7hD6A0?)=#ajG`uqEH-Teo3EOI{vTO|>6_3G73E{u^RR^YOLE%-_1*w`2q z6&3A-txZi$i^M!wEoA(G>#GdvzP`Q|EJX-p!rcO}1varecS&F&C2G|0dV4F^-dws6ejunsa z@bEX-)0-iPVHv}67YA&BEnZr!_D%M5%(W~PM$#g-nijL?5++pT%76_sw%ETZJ5a#3 iJ3uK)QHoMrqWlY003uepXMiaH0000e5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..50622ec3894d205809af99363d43782dcc0bb406 GIT binary patch literal 4017 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..60a494a7b7715a714cb9c57956e096acdd3e258d GIT binary patch literal 1228 zcmV;-1T*`IP)YD0O`A5%z(zz>jLkZuO5~+#>~uRIUf0Y16(40qKHkQtVK{UG+TK=*TS=2E zaCtZ5_{z#kBAd<5=!ras zCD#IzFNQ*)2U$Q$b`}Fx8cG3ueSP&xt_3CtFk}z(_Vzxkwtc2ieZ7d^UrHwDj} zkxHE7I_{$$>cdZrB|>unAaSs@m0o%ANosldF?y-taoX>FLKVJ!F3C?#geC%JXJ@4$ z0N_bBGU<5GPB+e5=+BUi{)pLC5&LNeHN5Z?`ThQzu@F~mOA`U%a9A40Km!klhP`!^ zIA@}4_&&-;8CR<*d)>SyAmRY`1pMV#h%2_Gi2$TZOhy1>+WTDXssP{;A73jbT}lA_ zHx|9IPpW`4N)(^2QO$1<3LS9E|M0Sw{B!4#1 zr|(+n^AD|b`KxLgIBlhct2x4_PuQsYBRd5?wo&r3<)#4mBM#yruGp3)0tN>MrQ8l6 zMalwxJ8Po1583I5Pt5dYi=7T1w9~b)MH2ANTMqjEl#QZ4TIugAt33dJITqrIZD}Gv z3FLWMz^}n-a_-qqkJN9cmi>;LfQz{vXm72dMqdrR@tT9lul4}^#h6NHB4Di^IKn+} z;iQ>fZFF!iIHcZ)erKVhuX7IsY@9v~&;#Y>z{~{`^}KJT&pxoykl##aJ1unbJuCV7 zytgwq2TmDb4j@~oW+4&r!qlp37DB#Wa~&v!2;<7?0;lUbAg;u>Bmnq@>-=6QK$n$R z+zWZ0si#X{R7)b%@K?x8*CQ5Ar}yXfLOnf|-wP>$-6WnKMEKmbs(Aj{T6)^GllFO> z`t3$V{FnCuJb5+pKt%)q>-vohSoiP5@>dC@LVSH#cV8v6!v9vl`u(`e`;nbS?SVib zuuI9cz$pLIAQ%kV7Z(?&;k0a!9~{h$QmNETM@Pp4;5aZaP%HpOx!*T;O-)UG$s*uK z5TcjKZD%qWibkVfGq){N?iUj*f3wQva@BLH`zD!8rg(oc$LiB4D+#&H>FMdz=;-LT zPNx&Y2mh_h3xMS-Y+>y1cs%a*_Vxp9ZEd;$ZSQ3R7jRM~FB>X0H8tJIhg%u<=!~u4 qa?9kEhRMQX?+!gtcEWC$LF^y0s^uJ0NO&>;0000B%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!T@F~vX{kTb#A^JAaU7dwnkl0&tZXW0%5f~6RK{uwwTwY4lZrqh zr3BHz%rFe6VF3*{r9@2}FeOAm#1RxfKv_=bdAWD@?%jobR~9=nkNfVs_nz}S_nv$1 zeP8U?ua`zdA&i?D1MsQ;uAABxef8gOm~rr%82$D8Fup&CVPOmv!1W-#9SlC;OTXV| z=8HIgAHjHyk=EJSS?qK=k1`thx*5PV?%_AI5p73kKKfn=2NWQVD8)WxXjDG&@G z1>xKHe)a0rG+$gy87b9(on;I1GJo~JL4|uVoYdalp2HO6x-cg~T|DgU8<1C>-XORJ ztF^T?y`Niz|AmbTfKTo`Uyi&mJxE`}$?=`nu3e+%=H_=)ZrvJ*8qE3kh+ME{(x#-O zgbE7_>Ey|il%AeWZEbC|Y11Y;bm)))T;pCwMh4Z_*BfooNB5%xu`!68N*$+8otmI> z^fEQ?S+zqra4o8ykeHZA3l}aVhr>aWCr_r@+FF`6Z5rj~<{H2??%_AIL0k0E{rH09 z(9+Vfm#G;XRjw|R)5D|xrjk0Qs*NgO(xgdr{P=M%0l0_X0u|siGO5$ayohIEp2}4v zFO}WSqhE!NX6igQp@xPATD)ix&7C`!wr$&Hkla;TN>is!rPQy#Hh^o~!*6JVw&;Vt z@S*$F0WKI+o`vdyf`YqL&QgG(=;FnTINP8T%*&DHl!}Uq=!F?GDCY6UY0|`r0Rer` z7e360z%1}uz)a3oIeU~QUTB4aoZsBX=z+kzS0ARlHN$BOBV*M_O8<0}DSWeX6utUl zG|h~Ur_=09_pd{8YHV!$t)F`>gy0`zgE({M%y4ehDmuWtoD>%q8@UTCUc8tlPMAPB zD*S&>70MvF>K+)PT zdM!4b(m$}$oEIV}bD5PsTN-WcFv!Gg9i_~c2{grs(_uTVHEpB1ik-;jb3>sg1&m!N-Gw1324}F zp_$J`(w8g3Df6>%s&RM^l@wUyVN>V_|$KmvCkOZt>zuqXNhUMqyM{@4r)klv4dPiljfM7a9746*Ln&{Sh4T6Pjx-DXnr$@}@h`p>G5ZQ+5%X?*Y}TwGF$3~AJ%~@FMWV5(<8*9nEWP-26#bB7<5Q{C z6gI51(HF}jX!Y`;uH!U(>Hc*{PE}P^CCv41k^WuWlu~Z^yKmNhSGW3ootk@+w#_ zwm1_yPoiLEec0wA<~u-~vwIrt|e_Vm)B0hVI+9?`JU+ z#+2&8f(@BAh*?%vww*cL2QJ;_eRoD(JM=)tFg`8j@M+Z$fklO?rU&jV;1j+P18Kw6 z5F>v-IM}h{UXO{65D|quPRD+N-s1U@u1x#sgqzimyXJ>!JzDFSjVj-p{iy)Y&!APmF!Gi~n z&CJYv@4$frB~49DEf_)U;2<@9r)4cej)_r;q9__z%|mo8oE z{fCRbGIIZ)35dZvdk~3YjI>xRhk(O7-j^O z;_%_aSaet?a(3|lAMO;uHSVFFBfkfr5Bj=2U7!62A>(m?tv~!k00000NkvXXu0mjf DXIhV3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1772 zcmVQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..56f1fee510c46290623eb68da88823ea15ccbb42 GIT binary patch literal 2624 zcmZ8jWmppm7v9`uBQ_}|rMWmH1Q`rL1|q2#gdoj`xp5g%I@-Z#DKAK<OtbpXZAo=bS(1$9dl8jT8Rpfi{ehhY6! zxa5pvJ&5Wzh%EaiqEKt06HDR9tz3mW2pZ21=YL2TZ!;*DuNJ!-6vi%eEsRK9pW2(Q z=aha*n0QWWk>2on>R;xQ==0g<(CaYO2PIu=m=ne#q#i`iDy$L4BI_C$mUAPAK{RLg zB+?YFdprhGp=fd@%<7Nqb#S30w`6;Pj9-)yp1rTN-h#XSRoaouMV8~?+KiOe%01=M zfp2m1s4-!8N0Z!`1X68t!FEjEB3dXGS$IaOe+Lgz6iCSz5mf%i(c zztgs61ngsIbfe!&IlfavxVI-h80H2JPkLRxD?}oZp3TO6{vB3q&s=a3MF+fy;I1ZY z@yjETjoG993xc0~9-EjTQ!am@4@Fmz7B7Tk_8qK`otYRI>;{?LiBWf@+Lk1lHe2`T z7Wmo*z_29ac}f&7lKG0F%)P=4Z6SeE9Y4SCP6_Gex-C~Z#vegfR#vKO30q%0vAMxO z!x%ng4*X?swT5hZeSLjxW~MN35{GUoZw+PccoGbh*5`I1eC~Mzp}jD?1m-ZZ%UlyTjgb zxxE38%juD846Lc7g&3;AmClH6Y88UAfITTG%7nc9{D|)E?v?Cc@4>}oU*8xU!X1}7 z48CwPV9UYc&_k0;;H}lrQxm z#Z$ufE$((#6D`auonE``9qfcK;F<=QQL(5D7R=6`u2B*)&0l!W&H2{SS1~MQFp&+5 z#+1f0-HhQ^aWoNlmJ|!NVaX0Vo7?IeCWs}SoH;BUPCTmdYEI|g{Mwp#LSVfkcIq}H zR(s+}vgRe~WAXSxK5W%M$k`F3EUyZcR3HF>xhJ@4YLAYx^kG$>#rFTgMV$8aBj$== z8s!0aJQ|%b%szK}%fZUxN_{Lkt0Bf{UIKB$uxOHLRa}vs(G3q4L|O|FYrNh3w#`A* z%LN4m@inAd$=uwRICG%XN{D$19d{hBUN^V=^0&6=mj$iH12F|M9ev8m_1Tl^$1(2E7!fJL8 z2$1swH*vbU;RvNAT|FI_&j6R^Z#g=6z&Vh>y!EUauuXvdR3(1!5|A0J>C8*aS&`d% zD_jBW>>Gom7p>6=5_Zf%fJx)tq3uhBR-41bo(d(${K41RX4+EPfgfmT8wVkRJaug9 z$o}BT@Tom7ddpMoydceGH$OPccW#_`E`Zt-z(eV#CNix0`FaAvlv3unbT=2ACB`L= zsSKZAPJ*j+>8zWC>UYeLR$IO)b(=b6MW00@<~*WOZSC~fT;1_mqRA^majoAzz|@=@ zP~AcN)-MU?_?(=aWQ8m2*Lum&yJOVsgTnodWk~ridG9KZ@?iPdD{bRa`;FGH#_`Dw zx0DBojrC7$$nRD*`<&WpKMU^oX9p-l6!ntuK820V|Z&-;@UfVF(9MFMA| zybU5kn;W9hUoNjAVFk_A#A$hlq_94I7CZ^{q-a>Da!p7C0$JrIbQDzITluw9ep7`B zxaQ=+;L_5SA7hYuW}pN)P=fTu#3Bf}DE2de>rn@^8Zj+lz`MO?;#6lW38iK+tl6og z&z!cX;lj0)O6Baw0ea(pXt~>n+Yg%PV4Mm+Y-uu_bE;=|A6~}<8-8J$+n=iy8k{I0 zTU`HM=$)AAIMH6YX6efMBBC_4N6rkne{3Yut~FJY!B8S*MtPh0@CS=J?B%e&?R$N1 zOQGQBrnFO~NVczKc#k^{266WXtD9Z}fkQC5RA?Ku?a7bKxT88P?Ubwdbvn?~z%2aI zv)OLz=N?t!8a$rjBpK?dJ{(r5=p1+fBbYN`6eQ6vM>4Wi78cAEM!bu34}JB=!*RMr z`zzbtN|Tlrl6K%lk8~_2x=7}CY?^38QNxB?YC6wciX)FlKFM^O3tNN6 z4?@Yz=aR4Z_-{q^d)C*zpa1$f_tOAI>GT2optNlE3-{*A&D^+ASd+=u@lG!R=Uy{G z?rq9)-;2M!XmuzThc@Qu^FK80`sF>xAN6*b8{Eh=3Fyeng=f5H-54tisOcc?M?yX=1S!AL> zFE%INKsOPxv$M^lvL|!MH=;j7v7K01S!r%w<(vZ9tdj?*Hp)uL%gg7H$yVi z3e-;95{roNa9K6w!?}ZLKwGMc&$fue%z5@qM%}!eU<2?vS`4^2v;wm~0f9Bws`BlIGl_jM^LJS)OBK)`Ki zIdOlH7&jy$B66^?gQHxjw@Pbyn?3zT!i3`z2gfo**mH|Y#O+)`1Sphh4LS57VEbYG z$aj589GF92F_DOXnI1;_^kzNm1^oD4NA7qzPaN@MHT>m}jf`)H{f%I*C<>KZ4zmJc zts`IoQt9CZQOjw*+5w^~GnpxO2GzhkYOh>bt^Rqsglyf~&Vbi47%uce((=zgLx8U4 L1C1heo4~&SdDiA` literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..d1141ecd16d71222c4664f79df33fad957b8a005 GIT binary patch literal 5511 zcmV;26?p22P)0TE$_?0bL!S%856fv`Cb1SBAg3!8wBZAiMkG;uJh8Db6=bkN#KJLb@k_+6=@JvP96RE`yvIsRgzV& zBEtDx1BN#vgb~SzlE7yi!?_0f`;=(wp!*}lqK8_L!QUTZv}O!tOkpf$q%!t1@);Kx zR~XkM@EONW%4={f?!mn%17$s=s{=-NX@u2SvDI+??$3CRF^{pEahXAP?%XMZ$z*aG z+WTZ#yJXp@!(Ugo=m^?lwNhk5%ZTUCjTpaTe8DKv60RZhHltJnd~4re4WvTcyACHRh(z$yY|KvcQnxW*XJ0lI|S)3?S7Nk6Ok9>MrK z`NX}H{XCFqghIr*> z^bPkkK%gsBhoB8UvQ1*9ZP{uM5k7RzT@|GWdIc-HRFQxC_U)S3>uo}{1?{?Z>(*y! zX=$p>ch?9cgDwAU#LE2(cfv)^bqoqUrgMu~He5{JWi2x*H;G zg%NJvyqTGwpWjr=MYV~l@a);M==td&zc#rXM?hO)glpHXWu&F0J*MTv?Ly^gW?fcd zSkP|GQJlhMX{OB%?i(-w))=JRhQ0>RyA$j5r=pZf@=%EmwvK z$pCZZ$`v23?4&#Ld<^9iCr(gycDDG8W9V6j4jrPryu7mO(9pem_tLp@=gN-ZGmhb$ zI);02FUnBmqiocn$~OvJ-feKgt|&hvBO_4Dnae`v#WnahFRo`fdcV=+1Dsb=*REYD zEG&%n?AarZZP~JgA|oTk@$=`;i(?${#5H5aj48VppK%Q5@EzCU9^8vEa13SQ8XQMm z`uYt3JBL!ZqE*b5cq&8k=9(x=a^8!rJXM+Dem^TKi#l}ZAV}J@X_Gj%bm>xR-n_Xu zu13N8@4qju88T!@*}eFTV>pNJxEA-|UX+1jC==J71mbh#Hl!0T_V1P1L#3L|g{rdGk*K$}TkvDsB?|)mm z9=DJW)CL0pY=GN0Zrq?_$Bw-R?y776bz@0MNjMjJLH2%=zCxo=TMPh>&{=sDT>S34 z?^=VyG`VOCF z5AH=7IEFHD4UR8dxR7>nov2%{j}ZV@;EdDb^BfCWfy*5`b~rybP`>~A_3L7D#bg$% zid+FwwzRY~`t^%1QvZJas7Lqil+dkPwE%Su=-*$|y_I!0?Dsbptv;7rlP2LUC45P;fXYDM>9`J6st zOHaw(4;Y&Fb6QK|#*Hf@A+cW<`s3L4^rsih_`}#=&`YB`(o4^~2V+Ncq&~llFRT9# ztP9U#t@LyS$VkB-^GKPQnIpid!&pG&v$s0zem-}{k^_KQ>A)wSEF=Hh`QdbZn>XFe zFymUfH(l7{Pv;K=xCKRf0%^r3k!41JE?COY>uCT=u@rLT$dQ%Isdyq=@@rev5MjUN z%Qv5LCHV4vV#?3K#|oc)_8Il=)r-2u$J4KewV|v3_9jziGfV7YobV;nN%sIoz({}r zda*9hNv|h>HlQu~_BjKUk`@&e70jJGHx%4*f?z)uka-o)i*wkgU3EWdZKq?$j#lUt z7f0RrT-(@K8a^nPd%uo+U_0ZGw-s?l0V4tK2nK*IajcVGPr#M6Bdr_y@y8#>fLrd| z7LUnW2$>^wovT-`e&kB;2e=}UciTeiR;@(ukBW+-;fZz(0Aw+8e5}Yb0(t|qVx9DQ zDxfX;_EiF=n>TNwjD_G4s#4_Bwp{a3tSwQG2t|_~C~i zs24ZdDFXlpjdw*_10WtjC%v9VK*fRL;^LBJ%a*kR$2KQr$^e|V4$=63h*hD^0MQ?7 z@d$2M4$$JAx8D|%A*T%hS9Hu+S7b2)cr?EA&O26mLU*)5ZR%7J!T>-0^b_%n{CRLJ zxwaJL|2aqhKe!*NnH04;VgjvHqLeGI@dg2l?7GG003N3o;8_OfrSAW z$b$5G0%!x;qHkYifF)`KVm9P5=2$%DF8MAqfSMvd#2L^gBMbmwYY;1wdaO-J5rMDL z27oI%V$3Me8UXQV?b@|gdID-I)J1?!;`q9iITnFf!+F^kuVQ5K9c+>42%_wb!Kh2*JNY`_$iJkXeAPpH1Oe20( zj?vEsQ}WyZy9RJ)5C#;NoCzI>kB`T?ke5X!Bz=Z9*x!bttuJ8Ak6-2%xJ!G@~iM3#2~1La1=JpOpcg zXR;&0!zen6?~OL2ZA>WrWm1q`13;Hatdm|(;FC{2v3S~|DiGbDB|kquZ~XZ2!Qk2= z4k!bxS+gdBuPu@{ne+u!2AIa{Co~Fk>-GGyLeM|M-^SMy`DWBqSsVo%DJFXam}!Z(n7g3~=VmnG&Ax{Q_LuG{86C zd=twzTv9jb3o;6hV!(2CL2x6zyN1w^KEc$ddkD2?9!f7g9VFs_FaRGb{LXrU1{c)2 zRTzzWI+$Jl7EcQD1Z3#G1c zA++lYIRapSf3X3wEwdtw02pAThZBqb$TEJb+n0St*pI8ZDy!T?yn!XlS`i%+{H zX}AFZC$}+eEyn5f1aQuk#W)bJ7UME9GLo6&M&Md@`f`z*1PyqYyd{^Tu@vn&%hArl z$!$!15O&vc^lkIL@SQ7Ht`N_&@W5^Zn;SCn;KS?-hf4zh5UWC+f!dJ4^ZELXj<+kj zAyZlGZsyPxX$^o48R(?f6S^CaBOn~NS}lg%`RQKl%;Og7w9bD`|z-nev`Y> zoAOnKgKbQU5m3RVJlcS^=-cNk6o>ow@88SZ27qIW0IU_BCjS@zX_A+h_pz%_MHuo} zimSjjrkx!$eGI5*BIe3tDa@nk`t|FSnwpB;uqKjY+p=N92Aq84+i$-eqlp7m3dA|` z!7Tk2pG#YkRRLU)4I}6cU~fwjSrFQyZ=W-e0a&E6JfZs|xaBzTu%7oak&}b^BS(&G z!?VAWvJjKLU}u0~3&rs=gdPZPDh53JWH4R%(FSow0j}t%wJR#v6-c9p#hGJ3@804G z2)&+wE3dUG|9|Ajk<(8+@dTEk>&tZCzVz?kAEUsVD_$-OG5q1&0|yS!;6a1Lqlq2b zhSKT}{ps4jo6(JQ_uzV#H(l88OK11_2^8)Quy{E4slkKkkPB|c7G(Zk3irdAR0?zI zBe|_u*g{B=9!p6{8LhE=mE4d$T)upn{&(_Zito~eTDE9G9ovP{a|45E#31(oZf?kc z5E|4!ga-EyrC~#(Egnyw%(@^?*X!vDl>5O->dcul$AQxd{l60Fh8hF~1x2v$Iw%Ws zX;y3tc#C~7_dFN@BLVKHI)J*604VZB?`K`~`WXPh8D~-1etv#+*T)EGf^YGlL4$gL z%U51`#j*R*hH6H)Cvxv{;i- zqegY*p>)QbqX4Ky1`xeJJ3IR<_x|4CaO~Kz_H+LV#ET~(_-XgR@4x?k23|ZinZ>G7 zBTyR*pn5+R-j*+4{ts{`IjmgoSHeRFv7jkuMA7;A`G;jChR+Lt+F$^a+<0NPeKaH_ z1QV~OPUZd;h!+ndSTJDz{Q2XMze7xB(O2#gY#E>?{alT5Jp}~?G=2K?N#Kmhe-s?* zIIXli7#J9cZL|nZOIO1cVTVVrfU8hzMC>vsjx_1s1WUC#opBxla$ z{SL${F)WWaNy`L;Qb?Q{vb)NQ@-L-4iiI|v}cyQIL zSFg%vJ{3rvgoFhALxbRH)25B(>9zRbQg>!WH3iD`4MtTCs0U#$*FF zU_}gFrl<)(o6&Z}n^mh;tp+FHM!t$_nCsC?9nLHe*|D`2lb)Ww39E<*K=+an&{nh= zOBowCZrs9L#DWvajqUA51Enqp8W9ib)vMQzQ@U;Uk`Wa782zcKshP|{2XG-dG2HLl z67e==`}Xad@!!w}4H|UF$jC@n?nsK2;6hTFko=3$zkTW#bkL4^-RM@Qp74B@}f zwcW5`!-_L!&Zz82h&_V;TI5Z&6_t5sb&n?D%*Tl$yXxWQ9wYz&l)#w3?oFn z{`%`L@vJZxzOp8c25qlL8!|I9k58O95tFPav=MDZn`PTQLWB{TG-=W}l!ZUHZrQSB z!dG8?m2&#@X|WuDWm0w`A-)12pAqdcsjM&bdJNM;YHj9V(LBt3-lUBwsL1ga~u1XSTMW{Wf>v6BPEahS# z_?>^GmC#|qf(5hV;^O*2H|Pjmp)+)sZK!eNYX!<`2CHGB8&%>yCW)KDWs35b&^Ejq7OR6Hp^z}MhfE!hx0B@B&u3fFZ4b)s(80dKCO z$45dp=m=e<&NZ5Ny}*BBC^v*pmDv(pQxucXHZn4@_nU9NIguwipKsf?Z6}^8C@Lxv z8{Fuvc*hDPs*z$#a1PfX>%!&?e0p(lvFYg1qs8gz={r$2>Oftn6Lmue=py|*h=-0f z#@AOxlpz`*pJoJdZmmW|G>Bou_3hg?k>?ZR=g*%%W9{0t|4d`a%F5c!zWUhV!-r4j zTSG|u6gty{OIty{M)nO)0_H{N*TPbdpzO49LbC6TBTb<3O{OUSjJ zc)h3?A>K)V&qdI~GpYO?FEit3-$7O^R$Z~`2zSBfdvxsBvCrd=Kc2`k7{F&7<8$3{ zjl34i1@P%817$Tw*{DPMcWfD=?i%moT@^GQJr6z?gf!&d*#s{%Blm`TkRt?!fy=^3 z0iggMdR4%8oWnH{xCi&jGJH`c%9eGYF4TEX6K_wn2EkfOeMUpfvhk#WzrX*_WeoAv z0>^L;*Wg;*Bkx5S_X&4FK$;C3fBY6Q8_YSjb2%a=fc}4E zrSzssacq<^nmW|Rs93PJni30R<8w<(bK_$LO4L?!_OxLl$}K$MUEllnMK|rg=f3;y z*?;3j|Nh>)p0JQ3A~rf(MibH2r+)3cyV1qF&;8m{w-S*y+0mM){KTK^M5}ksc`qX3 zy>rf^b>~l>SSHds8(I@hz3&PD@LmEs4&prkT=BjsBCXTMhN$_)+kvnl0bLKW5rEsj z*d#KXGDB4P&>etx0X+`R19yC=LS)j!mgs5M0L~+o-T~Jl!p!AJxnGAhV%~rhYUL4hlWhgES3Kb5oA&X z{}?3OBSS-{!v$nCIGj->(-TAG)8LR{htr41^gxsT8yqt2@DEG6Yl`Uma3Nd4;YUoW zTbkYl3CMU5ypMF3EIkYmWL|*BknM`0+Kq6CpvO(y$#j94e+q{vI{Zp8cV_6RK!`&C zob$*5Q|$IZ09dW=L!V zw@#2wviu|<#3lgGE8GEhcx+zBt`} zOwP8j9X%^f7i_bth4PiJ$LYtFJSCN$3xwDN;8mr*B;CJwBP2G0TMq0uNt7S^DO_wE zepk!Wrn#Z#03j{`c*Rf~y3o7?J}w?tEELRUR2cgxB*Y{LzA#pxHgf}q?u5idu>077 zd^=p)`nA}6e`|@`p?u}YU66PP_MA}Zqqe!c{nK&z%Jwq1N4e_q<#4g^xaz=ao;u|6 zwpRcW2Lax=ZGbx=Q*HhlJ`Ns#Y*r0*%!T?P*TTiX;rb)$CGLz=rSUum$)3Qyv{BL2 zO*=OI2|%(Yz~`pNEOnLp>+?T@glq-DujlIp?hdJeZ7ctP4_OKx|5@EOps3rr(pWzg zK4d3&oN-X2qN(d_MkfwB4I)_)!I_6nj2iA9u^pQ{;GckGLxBGrJUM2Wdda!k)Y>lq zmjws>dVQ*vW9lvEMkiN3wE-__6OWD0txS&Qn0n22cyj4Q*8(nG4!G{6OOwNvsrPIL zCl-$W9UwkEUVuLwyD%|inbOF*xMODZ4VMEVAq_zUxZ+K#Gdqf!DW$5f)?7UNOFMz! zrB~tuu=6X2FE(p^iqgxr+?ZK;=yz`e;C$#_@D9Lj-+TDVOrva>(#*PVbaHO>A)mhl z07OJWCqYC60518$!&c`eNBcBW%GnfaQ*$eazV^2_AW?j)h;J1nUjN(I9=0+!RVx~% z3@Tf!P0TE+98jA?WceK-}A1% zW!K)lyKcGqy#M~})315-A#2NXQ`?6NR#Apo=S!oF=JfpX>iR*49ec{7AN$xxpK{D$ z2d%Fz&rdfSqourN$~Y^NFIMV1CZ?J*bMx~H3k&meGtH@q9ra2vZxmA$S(#jaaj-g4 ztJmxG+DLV<*q<|sDXPp$X>E)#S}Vm&sRaO5P&goh2><}FEdZSXDqsL$06sAkh(e+v zAsBhKSRexgwg6tIy~GFJzaTxXD(}|+0eOwFDA%rn`X;MVwDHT9=4=g%OaJ9s%3b9>9EUTnnp0t;2Zpa{*>mk~hZqItE_!dQ zOtC>8`$l|mV43Jbudf0N6&&X;{=z}Zi}d1`2qmJ}i|0*GsulD3>GgQXHN)pkR6sf1 z?5ZU%&xtL}oH;YiAA)d*^Ndw2T$+Mjuzyzz@-SM`9df7LqTxLuIwC~S0092~+=qYv z@*ja;?Wt!T!{U?c*Z0YtGe)XbI&y-?B&G2$`JDM)(dIV9G`Sc#6?sI60de6kv+)Qb zUW~2|WjvJq3TA8`0+sWA3zRhY9a~ow)O~&StBkG2{*{TGiY~S8ep{V&Vo2l<6LWsu z^#p0-v*t2?3&aA1)ozu|%efSR=XnpX$lvTeRdKlvM!@|pM5p2w3u-6 zU>}t2xiYLS+{|%C65AzX+23Mtlq?BS&YdYcYsVjoiE&rT>;Necn6l^K)T^lmE`5u{ zm1i+-a-gc;Z&v-{;8r)z6NYfBUv+=_L}ef}qa9FX01)+Aaf+;xj(mL6|JUzGJR1|fnanb%?BPPIp>SCjP|8qE5qJ{=n5ZGw?81z3(k;pzH%1CtlX50{E7h)$h{qGKfzC`e2o`*IqA#tjA z`Fz&^%$b9F*N`)U-#6>a)Z`55`$Dd0cfcs0$d13^ONrdCu9xcv_=n#WQo8stcz3jP9|2EvdI-RhJM3%Q%oM&!OlShM|0 z?gz?wHZSnm45njLtsz8PVT1S&jAlbKg5kVam$p16=EK@Sj4EP0OtH zmJDmdc^v)x>56Qg_wmYHz6h)>kl_h$>0@J!ypv%APmjZTAQVLy6Fu50RGY&JAVNhx zrF_qG6`x9MkT;1SFWo$)l{M$;3qUDn9JwE}z zRl#E_bDRJFii61kPgBybIgp8dNW!Cc1b*^YYk-#oWLJvtM_v^hQx~9?8LD4VFFxBF z3MlrsSC%f9Oupn*ctPL0U1fwfX?`tRhPD{PSLFPQOmIt$mDy0SgpNVvHS+f#Do>h1Gn?LZU9(KaN>Q_=Y*_T zvtD7%_u^^+{g`0VGzg(VZrpVQ6Ub5M=tI_p7T93R8@3Zulu3|#{iNcu!oiHxZ4Rf*( zfmiN$$ru(*_Zqn=`Gq#OuHRTSwp7uH_SokR&|)RuW5yo=Z|_4?qU-JU+tpt>!B&Is z@N(=SG;bpVc;AO@zbmMM zScqq1)b-ZQIrs={oD}|?6y{$HNB1U0^LsBh8JI&3!GBZxOXI<}&5-$lgkAaYqhOTb z?2vEnZ$-kk;*M_17(upJF3%+iH*s0-r{vttXVB2OUwI1s^+G(Ft(U8gYFXC}#P&E^ z>T@C^tS`Z7{6HT4_nF~n>JlZtk5&qDBl6r|^kzQYe`wq!C)n@$c>WOPA61NDFj<<6 zGW71NMMhwAl!U-yqrq2xrSFqRCI8acw7?}3j;ynxo*-b7Co;g5r%^j=H@9({PXXBf z@r>U>>N;E)81wx`B4f%{PB~MHka_);%kBCb(d|Jy5!MqJ%2p`t&@L)4$T2j&-WHvG zv3(uyA_gwqNu(k?jQTtv3dgPKRZoH8prxe7>pQBW5L&dpumS&5Ld2?(sCpJjvc4L5 zEnh&?91WVm)ZdTj=fjJ$pPDdgAttLXuke+?KdKxufk*_RU8N}@0bBV`>@ z6ftENGK@lg)BAqke}3=zeb4#b=UmToo^xOKbwAhhe6H*Md~VrTnXxhnGEq@cv6{n; z?I`yl`vl8!3*HEm}N=Oe)YC8FP%d9;x_YMv{#sP zwGHrsps2(ho5|dK&u``ETyzJgOeOU!cQO~_^F+HEhdF+xN=cB{rLg;+*LpmA&ZIz? zB*f_Uls#5(^WY<&1&rF!{P$<`WOIXt`KavRgQHlV$Vi_yb1wD&bF|S3aH#P>xFEi+ zK(JrkptJ((Z6=o<)PC@_??s9d{ZhIEv@5v_4M4^uZ$nNZQ#%=J7$B*x-xB&c88)(i zo?GAKj*_NiyHvYuEy9(WEDVM!fVlcix!BjhVV|qTkq;zgq%ohn;~p?_u{eI;k9n5W z5;jsz^CIYTkwh2QXiPvr0QIIi7jI8%yQnGB!l}_UdXyiA&mvWV{ME55QpH|8PBX+^A)Vwi**SqFOMgW^BGIR)>+k zJCSQ=ARBWrs!DIp$-%*)$>n*S267!P+ZwiF)tcbK&CMNd1|9$dHLrj-oFYw;vd%(V zBP-kO`7T*4t^4_kZWlCy=cgu>+&kgc`adP~j(1)|5Ph_N1vbkTZrDnLurRtcdnQJf zPEFZwb%rLmvd;|czX)Ck`Y{sd4CQrhL8kD!-pR?iRMs7_@%|U7#S1?<_G)faF_(J_BNZYl`aUkE(;>%@0+~b8{uhsgd z?#W3ZIZ=xL2_wTy&e{%a|F8W#sezQNsCjKXDVzWMA)If#BTfH)^xiTm4(vJGiVENS z0M269KP=aeo2s=f6ltu1QK3*MmtR%c`Yt$wp5SWY_6K&9CL8{3*y5k`tRKE+KcvCg zdwfm;R-@;?J@Xx#d>OIfx1K8t@geyM7MEDksHi}mK7G2ndskd7l}*5|tW?VnlywGd zWFew|ji2?5GSmX^_?c)lobRhSDc6wi+b3p31lAXS)ZUsdQ|q-H*`bj&bB*-M#|H+s-MIrcfe!RehsW1-yR^lp&7fme zMaE^!r_;Jx)Xeae!(Ae&pO`&Ee--YSP&ZFB)AcO-QXMPy^7?pHp6R61A?qJcLt_R8 zqMxz^P4G0OAifuLgsu2n>oUMy{N?tya<1{-zKbz(^?lbHk#xmZ2P^$NGlsf1_^@f& zJn5$RX$8MEHwR$$MR1vVscGcUPnr{jDEraXg)%!kJDCQj%F7VBnu&*BvGo|A(}zWSO)6Li+(6sRw3=y zMF7C8xM?^OkhDO7yV|!mjLuN)HrlU74ugPD8)%eAa>1RbXaQ_zr|y;;A&!xuTux`J z82iV6$73Xi`bY2OiwM1f<37 zrBG7J6g@rWjx4jcxAzO12H(*G@mFOc9+El7wa%4qQs0{DxWqY9v{^BL%bbZ?Tccf{ z)w(|!D?Kq`fFDnIVM5q>XB<;~MP+MF(3g`+^Mz9WQ`P-2OY8E1u$$4_f$VN_yGr_1 z|3=cQ8{6-BAvUM4vYg|XbZ}}#sVo<(OS2_V4*3_!>2|(9vN>D53|u(_%%Lk}{Nx>l zkVfGp*SV8zE^MlP%DK~a_Vun73rZna)Ok9vTzt$(>to?8n+RZJ2&`HOr#=ZWFE)gl zw<;|p$Z{(D4gWU`KbjQPxL7D4acrK&rlRRK96r4Brp(iK#dlJG;Jx^m^7)Pu&$ zjt$<=I3X(6AN(Yw`7LhJio93Y9bYN?$tR*wDfAdUY>-|tRhlT&EmLB33gZ|TNk$L9 zQ*xDOLax!TC5{2ryH>zw@c{qHC}8*_+6xD=iOZ*-V6Rm+N=MxvELAX{+S4Wz^AOEs zg+$&A&Q;|CX#9vdwble3;ML5H@yT<=;+3;1jH{lxW6I7!G#{0vfnWPC@ykRlh?bAU z)6y!lIBwUl<)aT}75V{8CI&WqwkZ`NesA7sj|=HtvvK1&_+_6h)mpK1<58}6%(ss^ zN9UtWcI4Slq-J0PSC))<@{Qe$dDJ&*XkAoh3dr+}?gpUu-jK#Feg(?6>D|25EiOhSB3J=kcm$G zLSm?IKjDhf!s6EDUDAuZ7SaH2efb^&m(ZlTEqz%_qjYpLt7c1xC`-!ZqscUq5Q`wKnyQ&UsWHhE`N$#x4FsZ3bB@f?-4 z2)Q_~CBCccvOwf`YHyKAs75AW>9W8%-a9;$I4PO;Qduz$LKDZ_ylVi!xA*lbymv5w zrz#rpvnQij>{8A*hL$qf{)6TIFe1iy$Z>@MC~2Et_cT?#GCG1y2;vFtu)oU6 z1NwnWIE^R#jZ*orMX$iad0xj@GQL%Ekm$TBkMjYx;tQWuQBvg0+wOsjGJso-KXusUpQ zQnE-Bk)#f(3@A`EGJew<<=FX3?1w7LK|MhQ#qY?dWEn*+0kh=;3qWVyEv-@eTB-9eE86 zr#*t@E)}m0l`>U*UEPJ)m$o>*RLGa@SOgsZ)`Cdx`}!Mt;?6&L9H(@VvPy{swexms zOxK*kO1>!Z()~A%@(+9IA-8#hz?v2hg@DPzh<7-n7#J{_c)e4XuX{_9jNkXxp0BI# z?qFpe0x-x763Uh6#E-nS-Omku6fV3WDZPyl1TQZU;{+WCluMa$cW-yB|IIgux|$wW zuU3#DPLMbmLV!ufr{tP*Yx!nm6^xF@v&;1J~jpR zy}{M>&m^wvj$-x%2qAi|d?i^G{9|5xydW>;|F6veTTz6EkaNOH%(Wp%ZkwQ>ASvWJ z7Ts^+g0T+IHumFBsrn{O%HpI>|_l9}ea{?D&D zNRGGk`-SS4kY_mq)T4iVRY%Ts*Vg*A={pnvr?8;Y?IN`Dv*Mvo_mz#)>9c$@r{niVG{QhIy?j5Yj+7{*ZFUfkkL_=J zCPT;P)zG)T?%&`?+qdY_N)jL&DtNmp_lR(@IySm?oN39($gqGa?Eldo{OcFEqqnN6 zs&vu=$rPEjOp!9KJyX2z;80@G`I{`P%Y;YPUg;A96zJtHDx_j^XDN5kC1Q;BG#hPm)G5l*S=`&tw{Ms(R;27j{s{yHq+x^e|r{yH2 zq#l|*P!Ei`wa^s~1}kEmMWwK;$Ykd=Fl-Y9!&``;OgZA5K$6hc+LtwFYbb(-LZAa? zFd^*y(EdtQWF?*sZ1lvHFB>8&)`>le%+X#MSI!8sbHWd=#HKd_M12)u ognThn>a5SFl&t?fM)FTYEN8^WBnbzfsVKwT#LBqQ$TR7G08_xnzyJUM literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9f036a47549d47db79c16788749dca10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2884 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeN%Kb_T&L^xJ6O?qK)g+;`XHT(iJIu%P^t`oLpa7TmhRFi8vm~LdU_Y z%~gx}RfF-u*0qq;ix1H`|Xe6?WBjG&CZY9`)R;wf=uCuR>_d={h%J(XqFZ zierdyaeQ^AEa{`_?X`i-j|iIYfmE41iIv`iohVj~hXt&Q9=I4;)l-^t4Qh%e3a0am z8XQHZNvB+FK7M-aS`v5XJSNuO5yg*7PN+Pkv*hYF(>+ykFf+Q;684L4(M-fbMDJj^ zwB~Vb*T;_^gW5mq$Z2)^KR93}RG;ZsAS*Vny3uj|T-;Pp^e6jIr)S?hQ$29TV`ewA zY*EG%%H!wJJ70UQI`jJ8z^;h$YFDv2TGZ(W59e@vR^YMs6X^ax_?A$v+M!ja%rsvN zRfZEq8tuQ3;`%g}$H&0HaPP~vgsD>_&9QhbwbN}pHf7{?K2Ef;@58gp*^PjD6zO7s@4ba@y2>^OE)R&$e$!nJ8ycAvs-cP3coTWD zA05+YU|>Lv-(X>Hp9E$dZETLvpD&bmo#F7d`_7}7$din2mmaa|m)r+@BuX8_6%`fx zO`pyYfRB?CsGaT7u_@juw?MADZ_ms&2YpoFvRHRK*_v&ZHn%wRFTdTeHdXafl6+Cz zI{P7mFq=Z)(t1}MS!v`8~@@+mH5bGIR{<+(Hq_cvyU<=RC#LnB&!%I=4ag z*iVkpXM30GsC*}SlUdEPzeOBuZkSfBDXsKUZ1CjIQpfMGB1!USVdb>m=ei3GrG}Yv zGz+R4w;FSrgoFC399jt2Vki%?%mog3#R8Vvm;$Hv~8l6n2%o|Y(bdI^Ik>Q3&)1O76UPVMs zi@nLrkWQnA#OlJKAZ?0h6mRq)WIP@vSoDwwNyQLvN<1D`p5W<{3-t}TJz^9`4-FaR$ojIpPzdUMg+SlE zI6L@}$e&m6{5isC%h{H2Zg5~=T=m|_fKIRf*T&kU#`!2aJ9KSZQBf=@DXGU)jkB$T zxqBG%0x1#pR)&bp)s2~k;-w{5uX&7$?{rBL}b@S0A<{`w9ihb1${jb+fB-$h|n zM4a0mIs+p=zpBh;33927PYkFRN})I?@n5$tqubgLsmmql!j@*{<}}Ighf3I0!jVjwFO1{j;@Htk%VFtM z9I`{N?oPh8`A}xcVS040YrQuRb+8-wmlBI|$%9y_>~ z!DTp=+xgmLrOfRvd;<=d2ZXAJPQ{$uDlY>0O-g(}zs(j~A|ryxaO0(hyIo}BqXjW| z#)MuX1-{~!=tq|aGmST_m?_mCcjiRrNp$#R^$wgK{p$8I#KMTBa%KH|K6pnlzxe}G zV&^6gG?t*RP)3!%&y`l*_36*vObqq3`<9>ndTS80;31OkV}ee!i8R{K%r(^h zynJp(L#a+}Q-3SDACXGFS)JVx?q71{1pkK4^}Uy}1NW$1OL80WJz8fugt}nFTumL5 z9uHw>C)f8^EQIFSeP!E+U>e!Sm*qp{GjvjrSbFfrVUvns0UW~o2>Z@zns}+*HP_&B z*=zADpBlx3*QcK7P#G3HQYspXKj@+9l)E+Y^4$@4?e5x>Z=hf!F!~T4nW)+TMGhs3 zW9j?%2tW2}DtYe;RxVy%?Fj!}mneLoS-9xsPw*O!dOLXLOmKYX&*uv0b4mgPDx53h zrLhCo#g11u6UyY~M(V*SDG;E!>noclgwF+l9eMMJCX5J66=0sFs-hQ3tOu|Q0&WRc zV~D}AMIHsWMF2Pj?((;v5=D#LFBGe*ug9YUQrV{eyl{bRm-qNXRec`<#aVZl zEC;6pH8-{!!cXulVOXD#!02*fBF+c+GN8bsy^xxSv*{~%kGSqF@D4^?l|~Bql6x%f zH@Q@(E~)%7!r>K6nY|YRVPRqD^BQ=hkm-9?A$bsmYRFMF_l+c;GUv?Jd@?{D_Zp5H zG3VTU>ENEC0QR&*t}9uJLRNBnz`#TDI5-VJVYE30&)9t+W{Kd{4}|$7lt>^!f2?-$ zw{i3%{EttR=zp6>^%QG=oTXi;ii@GuAOrF|QQu3Z(+b}Sf!|KH6tS*BVb1pLu16=p zp}-&+fOII{r-W3%>c+sibqR4lFLcJoK91e-(xiVeZP7hFY;MtPcdYy;Z8U?i9Hz6h zU-Hh5by9x`rkvI;g)aZy=%?13D?>2vb4S~gt=k}07?ROXvy(Q%o7hsuW1ec^f4pZ< z@*>&JI`^$;obd3u{s@|QEn=}@T8;M8$I6LymyK02--fqbdmCn8VOI{5C+9kbb=>V zn6U7>aJK1NYyz+TJF>Os2hP|?fBU#EX~4U0#$(0VOa)Mp)#uMy{F-Ks;A$uwd0$9k z8HoMgVSP!>-WOjHD3YOj!ZT`vJXtwl zHI6Q8<(I&2t_Td5SokcAcKJ{1Y%l1!CvhSChUgIl`<(hQj2> zT`h0G${&T?6t3Uy_-Zu&9o*MJplq3T)wv?;JNqsH7}o!zRPp_2*aNx9d^~Cv1x4Wb zGVvy{h4iUl7Oi3R`CHLsHkxW?y8P@bf+-atcKCpC$i}G34FMm{W!BXu8}iUBxJW4# z<{$b?xB&rB@+#IzmfCn{LzDEv$;=U<9XW2FA9hy{epVwo5DKtm=Bit4W}f^^kpoJd zm{KF~PD)T%cu+>GJlTnjkl>i4b{CU4(+nE~DDfe?7$+hW)jdL;0emnO$wh8I&!B&j z(O8%!RyBe%+9}-###hg^A5_AxAV8VkKgzfU!~Qrwzu0L-+5D81#q)imwR;Wm|{sOjn+5L*FxawK7MvvhL_JHec)_sVE0n`BqQBis7!{vE}BL8B~I}C{#$(4qV$pXpJ!REG5B) zMG1sFOlq8-thheH=4DaC3SW?j!O?c$O91UD#ss}an=ely@! zP@3#{=FxdIrsI+GXmjdNe&$h?d``u{Op{;1kxaZv<_F4oY8QwaRq!h;t^Ykm93Hj3 zAOko0vxVBgr6|QnYsSACx+TuD^E=gP79F zv}-e@U|4g~QodeN{QNJ+W&+eOpe&i;FGvSaKTguJSR~Dw+|wQ#Z%{#5-Za@mv=mTbCeH|&_ARtYW2Zd0%p`&0W{hhcd z)yqfYubwBM{!$qA@FD5U8_(-298VdAQnZfRLJMS}EJ@W*mXt=SuAvd5lB!R^Fmtc@ z>@!CVDN0Q@=1}tG;1*>KZrqKAYPE_VCDzWr-EH-EvBrM_VI?H_ScA8fC~#2ZpBTGx zWgWbM-E>Oz-tf%Sh<>Mq7f{y1a&~yJ5tVQwmUvR}k{xO?mkP9oJi4?#98rZtmBe zoeL8L!@?Ywo5tp>RSn4%w$&Be5t3p~y@7wh-QrDQEmnz_ zzF}d_FJCOcA@m*~`=RMxqA*YLa+Aw|wU{Z_qv?+lJq3;_(;3TdIF)upeotu9^3VDa z2%jsgx{B!j2b)6(nGE8W2m4*H8fHpVdjRl>$8!>gVEeypb&AI51ohW*zlUMnh1l+oAtn);E6wBS+c$}FTOT>OyG!;*URdN zg?hm(FXZY}t;?rxBl&7j=PBb!YuVz3&&kjKopNX9T8VT+Ma3%l_yEMO*Raiy_v7?n zc6K(Z%ezu1l|4DViWb%+%FA2YjO^hP{JHw^71THw6;P{k)$Uhg0+&gB=P_qN3$@nB zO3egHQJji6{|t{sk>@-nGFr@$dn8Zggvh6=!a?fF1Lso>D)3F)wl!oU967YnfcD#( z783=U@#M{RZ934vBT9tNGti&FZ-C+^lUj2kgO{hLpr~~XClxy@6u&Cl&p$`JC0ndP zkByBn!5c2|q(hf|YY0VpwN`AT%tPnZckTPt%AuQxM20olI9Sxd3CX$a>Q@224=z7Mi-bmC91B{u)tJBbYNVHcpQJG@Ex_2!zf? z9(=h7*lIuMeH1<4;oKeXcGFP32qs4ZpQDx7)0XQP9mXS~997zCt0&EiZNy0;hc^^> z;lNoWo?AoB|4U1--Oh~3<74;2#lBQ;Q~o|QImOjQdGe&BPDZ9*RyWmXzeOK>3B7=e zcV359juhZb#N>GIJCvB~i9Z#NPTq_Luoa$_^SOwvGa6F|wTS)KvOHJof;kT+V{Qwy zkYftAFefRh=Z7xJKcbSi&8U$58-nXDT`t=>v`W|(T;rLunh zf^w&0ZnLDb{0~~!s#+BreWvSJS-1}Srt95D>@jzbZfG%?_Vj*ULO)2C#;=h~%L2I5${Z9-*uHCB3?Qh8~g zR++$GuzCMe=?l6C0lw%r(%m#wgm*mV+QJMV|L1_qdK2APiD7%k(KZ;40ol93h9q{3 zElX3__vf`RQIbZO)4|u9aPQ5Y;-WO%$FP0}vq7dgOrQ52CMNz6UFnv8I=7A5zDk9J z&jm!_JI1)<*ou$R6@R+$x)9g&ciAW*T6^@R5WNQUJi1M^DZMwP`{Wss;P>#40{J&R zQov`Z+K>v?>pjeE@4hJ!uUY)qOGbjPD?Lyq>$cc7XalBL)@|Z8_y|^M+srz9USM$& zB#&*fJ_z7t&6Pz=cEuShdMHmEN}dldz>u&!lpKx*$-6#zY&u0#> z49ioUZBhL`qWIg%9Q)to2AJ^KWHOwS@;vVJRvU-AFuQmE+f1}2_)IMx7v@$#H}?!0 P;{ttc6RoPNPO<+5r6NMz literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3844 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..f7d8445 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d71696a..ea4ad9d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Ble + Arma BLE \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 04e3c67..d75ad32 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,9 +1,18 @@ + + + \ No newline at end of file