From 92e165ea01e20ebc5d24ebcebf6e8b9ece401c90 Mon Sep 17 00:00:00 2001 From: Pronay sarker Date: Fri, 29 Nov 2024 23:21:23 +0600 Subject: [PATCH] MIFOSAC-287 applied spotless and detekt to pathTracking module MIFOSAC-287 applied spotless and detekt to pathTracking module --- feature/path-tracking/build.gradle.kts | 9 ++ .../ExampleInstrumentedTest.kt | 21 +++-- .../src/main/AndroidManifest.xml | 9 ++ .../PathTrackingScreen.kt | 89 ++++++++++--------- .../pathTracking/PathTrackingUiState.kt | 25 ++++++ .../PathTrackingViewModel.kt | 33 ++++--- .../navigation/PathTrackingNavigation.kt | 41 +++++++++ .../navigation/PathTrackingScreens.kt | 17 ++++ .../path_tracking/PathTrackingUiState.kt | 17 ---- .../navigation/PathTrackingNavigation.kt | 32 ------- .../navigation/PathTrackingScreens.kt | 9 -- .../src/main/res/values/strings.xml | 9 ++ .../feature/pathTracking/ExampleUnitTest.kt | 25 ++++++ .../feature/path_tracking/ExampleUnitTest.kt | 17 ---- .../mifosxdroid/HomeDestinationsScreen.kt | 2 +- .../mifosxdroid/components/Navigation.kt | 2 +- 16 files changed, 222 insertions(+), 135 deletions(-) rename feature/path-tracking/src/androidTest/java/com/mifos/feature/{path_tracking => pathTracking}/ExampleInstrumentedTest.kt (52%) rename feature/path-tracking/src/main/java/com/mifos/feature/{path_tracking => pathTracking}/PathTrackingScreen.kt (84%) create mode 100644 feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt rename feature/path-tracking/src/main/java/com/mifos/feature/{path_tracking => pathTracking}/PathTrackingViewModel.kt (65%) create mode 100644 feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingNavigation.kt create mode 100644 feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingScreens.kt delete mode 100644 feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingUiState.kt delete mode 100644 feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingNavigation.kt delete mode 100644 feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingScreens.kt create mode 100644 feature/path-tracking/src/test/java/com/mifos/feature/pathTracking/ExampleUnitTest.kt delete mode 100644 feature/path-tracking/src/test/java/com/mifos/feature/path_tracking/ExampleUnitTest.kt diff --git a/feature/path-tracking/build.gradle.kts b/feature/path-tracking/build.gradle.kts index fd89808bcc2..fa8b7c10281 100644 --- a/feature/path-tracking/build.gradle.kts +++ b/feature/path-tracking/build.gradle.kts @@ -1,3 +1,12 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ plugins { alias(libs.plugins.mifos.android.feature) alias(libs.plugins.mifos.android.library.compose) diff --git a/feature/path-tracking/src/androidTest/java/com/mifos/feature/path_tracking/ExampleInstrumentedTest.kt b/feature/path-tracking/src/androidTest/java/com/mifos/feature/pathTracking/ExampleInstrumentedTest.kt similarity index 52% rename from feature/path-tracking/src/androidTest/java/com/mifos/feature/path_tracking/ExampleInstrumentedTest.kt rename to feature/path-tracking/src/androidTest/java/com/mifos/feature/pathTracking/ExampleInstrumentedTest.kt index 4bee60f120f..542eb9c4971 100644 --- a/feature/path-tracking/src/androidTest/java/com/mifos/feature/path_tracking/ExampleInstrumentedTest.kt +++ b/feature/path-tracking/src/androidTest/java/com/mifos/feature/pathTracking/ExampleInstrumentedTest.kt @@ -1,13 +1,20 @@ -package com.mifos.feature.path_tracking +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ +package com.mifos.feature.pathTracking -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import junit.framework.TestCase.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -19,6 +26,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.mifos.feature.path_tracking.test", appContext.packageName) + assertEquals("com.mifos.feature.pathTracking.test", appContext.packageName) } -} \ No newline at end of file +} diff --git a/feature/path-tracking/src/main/AndroidManifest.xml b/feature/path-tracking/src/main/AndroidManifest.xml index a5918e68abc..1dc76da0f7e 100644 --- a/feature/path-tracking/src/main/AndroidManifest.xml +++ b/feature/path-tracking/src/main/AndroidManifest.xml @@ -1,4 +1,13 @@ + \ No newline at end of file diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingScreen.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt similarity index 84% rename from feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingScreen.kt rename to feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt index a7b8f7a2321..e5fbde1320d 100644 --- a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingScreen.kt +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt @@ -1,8 +1,17 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ @file:OptIn( - ExperimentalMaterialApi::class + ExperimentalMaterialApi::class, ) -package com.mifos.feature.path_tracking +package com.mifos.feature.pathTracking import android.Manifest import android.content.BroadcastReceiver @@ -75,17 +84,15 @@ import com.mifos.feature.path.tracking.R @Composable fun PathTrackingScreen( - onBackPressed: () -> Unit + onBackPressed: () -> Unit, + viewModel: PathTrackingViewModel = hiltViewModel(), ) { - val context = LocalContext.current - val viewModel: PathTrackingViewModel = hiltViewModel() val state by viewModel.pathTrackingUiState.collectAsStateWithLifecycle() val refreshState by viewModel.isRefreshing.collectAsStateWithLifecycle() val userStatus by viewModel.userStatus.collectAsStateWithLifecycle() DisposableEffect(Unit) { - val notificationReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { val action = intent.action @@ -98,7 +105,7 @@ fun PathTrackingScreen( context, notificationReceiver, IntentFilter(Constants.STOP_TRACKING), - ContextCompat.RECEIVER_NOT_EXPORTED + ContextCompat.RECEIVER_NOT_EXPORTED, ) onDispose { @@ -120,7 +127,8 @@ fun PathTrackingScreen( val uri = if (userLatLngs.isNotEmpty()) { val originLatLng = userLatLngs[0] val destinationLatLng = userLatLngs[userLatLngs.size - 1] - "http://maps.google.com/maps?f=d&hl=en&saddr=${originLatLng.lat},${originLatLng.lng}&daddr=${destinationLatLng.lat},${destinationLatLng.lng}" + "http://maps.google.com/maps?f=d&hl=en&saddr=${originLatLng.lat},${originLatLng.lng}" + + "&daddr=${destinationLatLng.lat},${destinationLatLng.lng}" } else { // Handle the case when userLatLngs is empty "" @@ -128,7 +136,8 @@ fun PathTrackingScreen( val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri)) intent.setClassName( - "com.google.android.apps.maps", "com.google.android.maps.MapsActivity" + "com.google.android.apps.maps", + "com.google.android.maps.MapsActivity", ) startActivity(context, Intent.createChooser(intent, "Start Tracking"), null) }, @@ -137,13 +146,13 @@ fun PathTrackingScreen( }, refreshState = refreshState, userStatus = userStatus, - updateUserStatus = { viewModel.updateUserStatus(it) } + updateUserStatus = { viewModel.updateUserStatus(it) }, ) } @OptIn(ExperimentalMaterialApi::class) @Composable -fun PathTrackingScreen( +internal fun PathTrackingScreen( state: PathTrackingUiState, onBackPressed: () -> Unit, onRetry: () -> Unit, @@ -151,22 +160,21 @@ fun PathTrackingScreen( onRefresh: () -> Unit, refreshState: Boolean, userStatus: Boolean, - updateUserStatus: (Boolean) -> Unit + modifier: Modifier = Modifier, + updateUserStatus: (Boolean) -> Unit, ) { - val snackbarHostState = remember { SnackbarHostState() } val pullRefreshState = rememberPullRefreshState( refreshing = refreshState, - onRefresh = onRefresh + onRefresh = onRefresh, ) var checkPermission by remember { mutableStateOf(false) } - if (checkPermission) { PermissionBox( requiredPermissions = listOf( Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_COARSE_LOCATION + Manifest.permission.ACCESS_COARSE_LOCATION, ), title = R.string.feature_path_tracking_permission_required, description = R.string.feature_path_tracking_approve_permission_description_location, @@ -174,11 +182,12 @@ fun PathTrackingScreen( dismissButtonText = R.string.feature_path_tracking_dismiss, onGranted = { updateUserStatus(true) - } + }, ) } MifosScaffold( + modifier = modifier, icon = MifosIcons.arrowBack, title = stringResource(id = R.string.feature_path_tracking_track_my_path), onBackPressed = onBackPressed, @@ -191,7 +200,7 @@ fun PathTrackingScreen( } else { checkPermission = true } - } + }, ) { Icon( imageVector = if (userStatus) Icons.Rounded.Stop else Icons.Rounded.MyLocation, @@ -199,7 +208,7 @@ fun PathTrackingScreen( ) } }, - snackbarHostState = snackbarHostState + snackbarHostState = snackbarHostState, ) { paddingValues -> Column(modifier = Modifier.padding(paddingValues)) { Box(modifier = Modifier.pullRefresh(pullRefreshState)) { @@ -215,40 +224,41 @@ fun PathTrackingScreen( is PathTrackingUiState.PathTracking -> { PathTrackingContent( pathTrackingList = state.userLocations, - onPathTrackingClick = onPathTrackingClick + onPathTrackingClick = onPathTrackingClick, ) } } PullRefreshIndicator( refreshing = refreshState, state = pullRefreshState, - modifier = Modifier.align(Alignment.TopCenter) + modifier = Modifier.align(Alignment.TopCenter), ) } } } } - @Composable -fun PathTrackingContent( +private fun PathTrackingContent( pathTrackingList: List, - onPathTrackingClick: (List) -> Unit + modifier: Modifier = Modifier, + onPathTrackingClick: (List) -> Unit, ) { - LazyColumn { + LazyColumn(modifier = modifier) { items(pathTrackingList) { pathTracking -> PathTrackingItem( pathTracking = pathTracking, - onPathTrackingClick = onPathTrackingClick + onPathTrackingClick = onPathTrackingClick, ) } } } @Composable -fun PathTrackingItem( +private fun PathTrackingItem( pathTracking: UserLocation, - onPathTrackingClick: (List) -> Unit + modifier: Modifier = Modifier, + onPathTrackingClick: (List) -> Unit, ) { val latLngList = getLatLngList(pathTracking.latlng) val latLng = latLngList[0] @@ -260,19 +270,19 @@ fun PathTrackingItem( } OutlinedCard( - modifier = Modifier + modifier = modifier .padding(8.dp), onClick = { onPathTrackingClick(latLngList) }, - colors = CardDefaults.outlinedCardColors(White) + colors = CardDefaults.outlinedCardColors(White), ) { GoogleMap( modifier = Modifier .fillMaxWidth() .height(150.dp), cameraPositionState = cameraPositionState, - uiSettings = uiSettings + uiSettings = uiSettings, ) Text( modifier = Modifier.padding(8.dp), @@ -281,8 +291,8 @@ fun PathTrackingItem( fontSize = 16.sp, fontWeight = FontWeight.Normal, fontStyle = FontStyle.Normal, - color = Black - ) + color = Black, + ), ) } } @@ -291,26 +301,25 @@ private fun getLatLngList(latLngString: String?): List { val gson = Gson() return gson.fromJson( latLngString, - object : TypeToken>() {}.type + object : TypeToken>() {}.type, ) } - -class PathTrackingUiStateProvider : PreviewParameterProvider { +private class PathTrackingUiStateProvider : PreviewParameterProvider { override val values: Sequence get() = sequenceOf( PathTrackingUiState.Loading, PathTrackingUiState.Error(R.string.feature_path_tracking_no_path_tracking_found), PathTrackingUiState.Error(R.string.feature_path_tracking_failed_to_load_path_tracking), - PathTrackingUiState.PathTracking(samplePathTrackingList) + PathTrackingUiState.PathTracking(samplePathTrackingList), ) } @Preview(showBackground = true) @Composable private fun PathTrackingScreenPreview( - @PreviewParameter(PathTrackingUiStateProvider::class) state: PathTrackingUiState + @PreviewParameter(PathTrackingUiStateProvider::class) state: PathTrackingUiState, ) { PathTrackingScreen( state = state, @@ -320,7 +329,7 @@ private fun PathTrackingScreenPreview( onRefresh = {}, refreshState = false, userStatus = false, - updateUserStatus = {} + updateUserStatus = {}, ) } @@ -332,4 +341,4 @@ val samplePathTrackingList = List(10) { start_time = "start time $it", stop_time = "stop time $it", ) -} \ No newline at end of file +} diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt new file mode 100644 index 00000000000..a085b68f1d6 --- /dev/null +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ +package com.mifos.feature.pathTracking + +import com.mifos.core.objects.user.UserLocation + +/** + * Created by Aditya Gupta on 06/08/23. + */ + +sealed class PathTrackingUiState { + + data object Loading : PathTrackingUiState() + + data class Error(val message: Int) : PathTrackingUiState() + + data class PathTracking(val userLocations: List) : PathTrackingUiState() +} diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingViewModel.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingViewModel.kt similarity index 65% rename from feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingViewModel.kt rename to feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingViewModel.kt index 3c21473650b..56e1dad97c7 100644 --- a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingViewModel.kt +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingViewModel.kt @@ -1,4 +1,13 @@ -package com.mifos.feature.path_tracking +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ +package com.mifos.feature.pathTracking import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -16,7 +25,7 @@ import javax.inject.Inject @HiltViewModel class PathTrackingViewModel @Inject constructor( private val getUserPathTrackingUseCase: GetUserPathTrackingUseCase, - private val prefManager: PrefManager + private val prefManager: PrefManager, ) : ViewModel() { private val _pathTrackingUiState = @@ -35,24 +44,27 @@ class PathTrackingViewModel @Inject constructor( _isRefreshing.value = false } - fun loadPathTracking() = viewModelScope.launch(Dispatchers.IO) { getUserPathTrackingUseCase(prefManager.getUserId()).collect { result -> when (result) { - is Resource.Error -> _pathTrackingUiState.value = - PathTrackingUiState.Error(R.string.feature_path_tracking_failed_to_load_path_tracking) + is Resource.Error -> + _pathTrackingUiState.value = + PathTrackingUiState.Error(R.string.feature_path_tracking_failed_to_load_path_tracking) is Resource.Loading -> _pathTrackingUiState.value = PathTrackingUiState.Loading is Resource.Success -> result.data?.let { pathTracking -> _pathTrackingUiState.value = - if (pathTracking.isEmpty()) PathTrackingUiState.Error(R.string.feature_path_tracking_no_path_tracking_found) else PathTrackingUiState.PathTracking( - pathTracking - ) + if (pathTracking.isEmpty()) { + PathTrackingUiState.Error(R.string.feature_path_tracking_no_path_tracking_found) + } else { + PathTrackingUiState.PathTracking( + pathTracking, + ) + } } } - } } @@ -60,5 +72,4 @@ class PathTrackingViewModel @Inject constructor( prefManager.userStatus = status _userStatus.value = status } - -} \ No newline at end of file +} diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingNavigation.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingNavigation.kt new file mode 100644 index 00000000000..1f7e8cf395b --- /dev/null +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingNavigation.kt @@ -0,0 +1,41 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ +package com.mifos.feature.pathTracking.navigation + +import androidx.navigation.NavController +import androidx.navigation.NavGraphBuilder +import androidx.navigation.compose.composable +import androidx.navigation.navigation +import com.mifos.feature.pathTracking.PathTrackingScreen + +fun NavGraphBuilder.pathTrackingNavGraph( + navController: NavController, +) { + navigation( + startDestination = PathTrackingScreens.PathTrackingScreen.route, + route = PathTrackingScreens.PathTrackingScreenRoute.route, + ) { + pathTrackingRoute( + onBackPressed = navController::popBackStack, + ) + } +} + +fun NavGraphBuilder.pathTrackingRoute( + onBackPressed: () -> Unit, +) { + composable( + route = PathTrackingScreens.PathTrackingScreen.route, + ) { + PathTrackingScreen( + onBackPressed = onBackPressed, + ) + } +} diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingScreens.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingScreens.kt new file mode 100644 index 00000000000..58d7c17aaeb --- /dev/null +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/navigation/PathTrackingScreens.kt @@ -0,0 +1,17 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ +package com.mifos.feature.pathTracking.navigation + +sealed class PathTrackingScreens(val route: String) { + + data object PathTrackingScreenRoute : PathTrackingScreens("path_tracking_screen_route") + + data object PathTrackingScreen : PathTrackingScreens("path_tracking_screen") +} diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingUiState.kt b/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingUiState.kt deleted file mode 100644 index 68256cb2311..00000000000 --- a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/PathTrackingUiState.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.mifos.feature.path_tracking - -import com.mifos.core.objects.user.UserLocation - -/** - * Created by Aditya Gupta on 06/08/23. - */ - -sealed class PathTrackingUiState { - - data object Loading : PathTrackingUiState() - - data class Error(val message: Int) : PathTrackingUiState() - - data class PathTracking(val userLocations: List) : PathTrackingUiState() - -} \ No newline at end of file diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingNavigation.kt b/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingNavigation.kt deleted file mode 100644 index 4229a0c78d7..00000000000 --- a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingNavigation.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.mifos.feature.path_tracking.navigation - -import androidx.navigation.NavController -import androidx.navigation.NavGraphBuilder -import androidx.navigation.compose.composable -import androidx.navigation.navigation -import com.mifos.feature.path_tracking.PathTrackingScreen - -fun NavGraphBuilder.pathTrackingNavGraph( - navController: NavController -) { - navigation( - startDestination = PathTrackingScreens.PathTrackingScreen.route, - route = PathTrackingScreens.PathTrackingScreenRoute.route - ) { - pathTrackingRoute( - onBackPressed = navController::popBackStack - ) - } -} - -fun NavGraphBuilder.pathTrackingRoute( - onBackPressed: () -> Unit -) { - composable( - route = PathTrackingScreens.PathTrackingScreen.route - ) { - PathTrackingScreen( - onBackPressed = onBackPressed - ) - } -} \ No newline at end of file diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingScreens.kt b/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingScreens.kt deleted file mode 100644 index 6e564a8da4c..00000000000 --- a/feature/path-tracking/src/main/java/com/mifos/feature/path_tracking/navigation/PathTrackingScreens.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.mifos.feature.path_tracking.navigation - -sealed class PathTrackingScreens(val route: String) { - - data object PathTrackingScreenRoute : PathTrackingScreens("path_tracking_screen_route") - - data object PathTrackingScreen : PathTrackingScreens("path_tracking_screen") - -} \ No newline at end of file diff --git a/feature/path-tracking/src/main/res/values/strings.xml b/feature/path-tracking/src/main/res/values/strings.xml index b2e2ddaeeac..cc9ce990621 100644 --- a/feature/path-tracking/src/main/res/values/strings.xml +++ b/feature/path-tracking/src/main/res/values/strings.xml @@ -1,4 +1,13 @@ + Track my path diff --git a/feature/path-tracking/src/test/java/com/mifos/feature/pathTracking/ExampleUnitTest.kt b/feature/path-tracking/src/test/java/com/mifos/feature/pathTracking/ExampleUnitTest.kt new file mode 100644 index 00000000000..bce07027b05 --- /dev/null +++ b/feature/path-tracking/src/test/java/com/mifos/feature/pathTracking/ExampleUnitTest.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2024 Mifos Initiative + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * See https://github.com/openMF/android-client/blob/master/LICENSE.md + */ +package com.mifos.feature.pathTracking + +import junit.framework.TestCase.assertEquals +import org.junit.Test + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/feature/path-tracking/src/test/java/com/mifos/feature/path_tracking/ExampleUnitTest.kt b/feature/path-tracking/src/test/java/com/mifos/feature/path_tracking/ExampleUnitTest.kt deleted file mode 100644 index a560fdfad3c..00000000000 --- a/feature/path-tracking/src/test/java/com/mifos/feature/path_tracking/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.mifos.feature.path_tracking - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeDestinationsScreen.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeDestinationsScreen.kt index a7325642b0d..ff365ee185a 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeDestinationsScreen.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeDestinationsScreen.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import com.mifos.feature.checkerInboxTask.navigation.CheckerInboxTaskScreens import com.mifos.feature.groups.navigation.GroupScreen import com.mifos.feature.offline.navigation.OfflineScreens -import com.mifos.feature.path_tracking.navigation.PathTrackingScreens +import com.mifos.feature.pathTracking.navigation.PathTrackingScreens import com.mifos.feature.search.navigation.SearchScreens import com.mifos.feature.settings.navigation.SettingsScreens diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt index 4617330f711..7d5bcc52bd4 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt @@ -42,7 +42,7 @@ import com.mifos.feature.loan.navigation.navigateToLoanAccountSummaryScreen import com.mifos.feature.note.navigation.navigateToNoteScreen import com.mifos.feature.note.navigation.noteScreen import com.mifos.feature.offline.navigation.offlineNavGraph -import com.mifos.feature.path_tracking.navigation.pathTrackingNavGraph +import com.mifos.feature.pathTracking.navigation.pathTrackingNavGraph import com.mifos.feature.report.navigation.reportNavGraph import com.mifos.feature.savings.navigation.addSavingsAccountScreen import com.mifos.feature.savings.navigation.navigateToAddSavingsAccount