Fix: Handle missing 'color', 'isArchived' and 'value' fields in DTOs and mappers to prevent JsonDataException

app/build.gradle.kts

@@ -45,6 +45,10 @@ android {
     buildFeatures {
         compose = true
         buildConfig = true
+        aidl = false
+        renderScript = false
+        resValues = true
+        shaders = false
     }
     composeOptions {
         kotlinCompilerExtensionVersion = Versions.composeCompiler
@@ -65,6 +69,8 @@ dependencies {
     implementation(project(":data"))
     // [MODULE_DEPENDENCY] Domain module (transitively included via data, but explicit for clarity)
     implementation(project(":domain"))
+    implementation(project(":ui"))
+    implementation(project(":feature:inventory"))
 
     // [DEPENDENCY] AndroidX
     implementation(Libs.coreKtx)

app/src/main/java/com/homebox/lens/navigation/NavGraph.kt

@@ -15,7 +15,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.homebox.lens.ui.screen.dashboard.DashboardScreen
-import com.homebox.lens.ui.screen.inventorylist.InventoryListScreen
+import com.homebox.lens.feature.inventory.ui.InventoryScreen
 import com.homebox.lens.ui.screen.itemdetails.ItemDetailsScreen
 import com.homebox.lens.ui.screen.itemedit.ItemEditScreen
 import com.homebox.lens.ui.screen.labelslist.LabelsListScreen
@@ -26,6 +26,8 @@ import com.homebox.lens.ui.screen.search.SearchScreen
 import com.homebox.lens.ui.screen.setup.SetupScreen
 import com.homebox.lens.ui.screen.settings.SettingsScreen
 import com.homebox.lens.ui.screen.splash.SplashScreen
+import com.homebox.lens.navigation.NavigationActions
+import com.homebox.lens.ui.navigation.Screen
 // [END_IMPORTS]
 
 // [ENTITY: Function('NavGraph')]
@@ -59,7 +61,9 @@ fun NavGraph(
         composable(route = Screen.Setup.route) {
             SetupScreen(onSetupComplete = {
                 navController.navigate(Screen.Dashboard.route) {
-                    popUpTo(Screen.Setup.route) { inclusive = true }
+                    popUpTo(Screen.Setup.route) {
+                        inclusive = true
+                    }
                 }
             })
         }
@@ -69,8 +73,8 @@ fun NavGraph(
                 navigationActions = navigationActions
             )
         }
-        composable(route = Screen.InventoryList.route) {
-            InventoryListScreen(
+        composable(route = Screen.Inventory.route) {
+            InventoryScreen(
                 currentRoute = currentRoute,
                 navigationActions = navigationActions
             )
@@ -105,7 +109,7 @@ fun NavGraph(
                 navigationActions = navigationActions,
                 onLocationClick = { locationId ->
                     // [AI_NOTE]: Navigate to a pre-filtered inventory list screen
-                    navController.navigate(Screen.InventoryList.route)
+                    navController.navigate(Screen.Inventory.route)
                 },
                 onAddNewLocationClick = {
                     navController.navigate(Screen.LocationEdit.createRoute("new"))

app/src/main/java/com/homebox/lens/navigation/NavigationActions.kt

@@ -1,107 +0,0 @@
-// [FILE] NavigationActions.kt
-// [SEMANTICS] app, ui, navigation, actions
-package com.homebox.lens.navigation
-
-// [IMPORTS]
-import androidx.navigation.NavHostController
-import timber.log.Timber
-// [END_IMPORTS]
-
-// [ENTITY: Class('NavigationActions')]
-// [RELATION: Class('NavigationActions')] -> [DEPENDS_ON] -> [Framework('NavHostController')]
-/**
- * @summary Wrapper class over NavHostController to provide typed navigation actions.
- * @param navController The Jetpack Navigation controller.
- * @invariant All navigation actions must use the provided navController.
- */
-class NavigationActions(private val navController: NavHostController) {
-
-    // [ENTITY: Function('navigateToDashboard')]
-    /**
-     * @summary Navigation to the main screen.
-     * @sideeffect Clears the back stack up to the main screen to avoid cycles.
-     */
-    fun navigateToDashboard() {
-        Timber.i("[INFO][ACTION][navigate_to_dashboard] Navigating to Dashboard.")
-        navController.navigate(Screen.Dashboard.route) {
-            popUpTo(navController.graph.startDestinationId)
-            launchSingleTop = true
-        }
-    }
-    // [END_ENTITY: Function('navigateToDashboard')]
-
-    // [ENTITY: Function('navigateToLocations')]
-    fun navigateToLocations() {
-        Timber.i("[INFO][ACTION][navigate_to_locations] Navigating to Locations.")
-        navController.navigate(Screen.LocationsList.route) {
-            launchSingleTop = true
-        }
-    }
-    // [END_ENTITY: Function('navigateToLocations')]
-
-    // [ENTITY: Function('navigateToLabels')]
-    fun navigateToLabels() {
-        Timber.i("[INFO][ACTION][navigate_to_labels] Navigating to Labels.")
-        navController.navigate(Screen.LabelsList.route) {
-            launchSingleTop = true
-        }
-    }
-    // [END_ENTITY: Function('navigateToLabels')]
-
-    // [ENTITY: Function('navigateToLabelEdit')]
-    fun navigateToLabelEdit(labelId: String? = null) {
-        Timber.i("[INFO][ACTION][navigate_to_label_edit] Navigating to Label Edit with ID: %s", labelId)
-        navController.navigate(Screen.LabelEdit.createRoute(labelId))
-    }
-    // [END_ENTITY: Function('navigateToLabelEdit')]
-
-    // [ENTITY: Function('navigateToSearch')]
-    fun navigateToSearch() {
-        Timber.i("[INFO][ACTION][navigate_to_search] Navigating to Search.")
-        navController.navigate(Screen.Search.route) {
-            launchSingleTop = true
-        }
-    }
-    // [END_ENTITY: Function('navigateToSearch')]
-
-    // [ENTITY: Function('navigateToInventoryListWithLabel')]
-    fun navigateToInventoryListWithLabel(labelId: String) {
-        Timber.i("[INFO][ACTION][navigate_to_inventory_with_label] Navigating to Inventory with label: %s", labelId)
-        val route = Screen.InventoryList.withFilter("label", labelId)
-        navController.navigate(route)
-    }
-    // [END_ENTITY: Function('navigateToInventoryListWithLabel')]
-
-    // [ENTITY: Function('navigateToInventoryListWithLocation')]
-    fun navigateToInventoryListWithLocation(locationId: String) {
-        Timber.i("[INFO][ACTION][navigate_to_inventory_with_location] Navigating to Inventory with location: %s", locationId)
-        val route = Screen.InventoryList.withFilter("location", locationId)
-        navController.navigate(route)
-    }
-    // [END_ENTITY: Function('navigateToInventoryListWithLocation')]
-
-    // [ENTITY: Function('navigateToCreateItem')]
-    fun navigateToCreateItem() {
-        Timber.i("[INFO][ACTION][navigate_to_create_item] Navigating to Create Item.")
-        navController.navigate(Screen.ItemEdit.createRoute())
-    }
-    // [END_ENTITY: Function('navigateToCreateItem')]
-
-    // [ENTITY: Function('navigateToLogout')]
-    fun navigateToLogout() {
-        Timber.i("[INFO][ACTION][navigate_to_logout] Navigating to Logout.")
-        navController.navigate(Screen.Setup.route) {
-            popUpTo(Screen.Dashboard.route) { inclusive = true }
-        }
-    }
-    // [END_ENTITY: Function('navigateToLogout')]
-
-    // [ENTITY: Function('navigateBack')]
-    fun navigateBack() {
-        Timber.i("[INFO][ACTION][navigate_back] Navigating back.")
-        navController.popBackStack()
-    }
-    // [END_ENTITY: Function('navigateBack')]
-}
-// [END_ENTITY: Class('NavigationActions')]
-// [END_FILE_NavigationActions.kt]

app/src/main/java/com/homebox/lens/navigation/Screen.kt

@@ -1,130 +0,0 @@
-// [FILE] Screen.kt
-// [SEMANTICS] app, ui, navigation, routes
-package com.homebox.lens.navigation
-
-// [ENTITY: SealedClass('Screen')]
-/**
- * @summary Sealed class for defining navigation routes in the application.
- * @description Provides type safety during navigation.
- * @param route The string identifier of the route.
- */
-sealed class Screen(val route: String) {
-    // [ENTITY: Object('Splash')]
-    data object Splash : Screen("splash_screen")
-    // [END_ENTITY: Object('Splash')]
-
-    // [ENTITY: Object('Setup')]
-    data object Setup : Screen("setup_screen")
-    // [END_ENTITY: Object('Setup')]
-
-    // [ENTITY: Object('Dashboard')]
-    data object Dashboard : Screen("dashboard_screen")
-    // [END_ENTITY: Object('Dashboard')]
-
-    // [ENTITY: Object('InventoryList')]
-    data object InventoryList : Screen("inventory_list_screen") {
-        // [ENTITY: Function('withFilter')]
-        /**
-         * @summary Creates a route for the inventory list screen with a filter parameter.
-         * @param key The filter key (e.g., "label" or "location").
-         * @param value The filter value (e.g., the ID of the label or location).
-         * @return A string of the full route with a query parameter.
-         * @throws IllegalArgumentException if the key or value is blank.
-         */
-        fun withFilter(key: String, value: String): String {
-            require(key.isNotBlank()) { "Filter key cannot be blank." }
-            require(value.isNotBlank()) { "Filter value cannot be blank." }
-            val constructedRoute = "inventory_list_screen?$key=$value"
-            check(constructedRoute.contains("?$key=$value")) { "Route must contain the filter query." }
-            return constructedRoute
-        }
-        // [END_ENTITY: Function('withFilter')]
-    }
-    // [END_ENTITY: Object('InventoryList')]
-
-    // [ENTITY: Object('ItemDetails')]
-    data object ItemDetails : Screen("item_details_screen/{itemId}") {
-        // [ENTITY: Function('createRoute')]
-        /**
-         * @summary Creates a route for the item details screen with the specified ID.
-         * @param itemId The ID of the item to display.
-         * @return A string of the full route.
-         * @throws IllegalArgumentException if itemId is blank.
-         */
-        fun createRoute(itemId: String): String {
-            require(itemId.isNotBlank()) { "itemId не может быть пустым." }
-            val route = "item_details_screen/$itemId"
-            check(route.endsWith(itemId)) { "Маршрут должен заканчиваться на itemId." }
-            return route
-        }
-        // [END_ENTITY: Function('createRoute')]
-    }
-    // [END_ENTITY: Object('ItemDetails')]
-
-    // [ENTITY: Object('ItemEdit')]
-    data object ItemEdit : Screen("item_edit_screen?itemId={itemId}") {
-        // [ENTITY: Function('createRoute')]
-        /**
-         * @summary Creates a route for the item edit screen with the specified ID.
-         * @param itemId The ID of the item to edit. Null if a new item is being created.
-         * @return A string of the full route.
-         */
-        fun createRoute(itemId: String? = null): String {
-            return itemId?.let { "item_edit_screen?itemId=$it" } ?: "item_edit_screen"
-        }
-        // [END_ENTITY: Function('createRoute')]
-    }
-    // [END_ENTITY: Object('ItemEdit')]
-
-    // [ENTITY: Object('LabelsList')]
-    data object LabelsList : Screen("labels_list_screen")
-    // [END_ENTITY: Object('LabelsList')]
-
-    // [ENTITY: Object('LabelEdit')]
-    data object LabelEdit : Screen("label_edit_screen?labelId={labelId}") {
-        // [ENTITY: Function('createRoute')]
-        /**
-         * @summary Creates a route for the label edit screen with the specified ID.
-         * @param labelId The ID of the label to edit. Null if a new label is being created.
-         * @return A string of the full route.
-         */
-        fun createRoute(labelId: String? = null): String {
-            return labelId?.let { "label_edit_screen?labelId=$it" } ?: "label_edit_screen"
-        }
-        // [END_ENTITY: Function('createRoute')]
-    }
-    // [END_ENTITY: Object('LabelEdit')]
-
-    // [ENTITY: Object('LocationsList')]
-    data object LocationsList : Screen("locations_list_screen")
-    // [END_ENTITY: Object('LocationsList')]
-
-    // [ENTITY: Object('LocationEdit')]
-    data object LocationEdit : Screen("location_edit_screen/{locationId}") {
-        // [ENTITY: Function('createRoute')]
-        /**
-         * @summary Creates a route for the location edit screen with the specified ID.
-         * @param locationId The ID of the location to edit.
-         * @return A string of the full route.
-         * @throws IllegalArgumentException if locationId is blank.
-         */
-        fun createRoute(locationId: String): String {
-            require(locationId.isNotBlank()) { "locationId не может быть пустым." }
-            val route = "location_edit_screen/$locationId"
-            check(route.endsWith(locationId)) { "Маршрут должен заканчиваться на locationId." }
-            return route
-        }
-        // [END_ENTITY: Function('createRoute')]
-    }
-    // [END_ENTITY: Object('LocationEdit')]
-
-    // [ENTITY: Object('Search')]
-    data object Search : Screen("search_screen")
-    // [END_ENTITY: Object('Search')]
-
-    // [ENTITY: Object('Settings')]
-    data object Settings : Screen("settings_screen")
-    // [END_ENTITY: Object('Settings')]
-}
-// [END_ENTITY: SealedClass('Screen')]
-// [END_FILE_Screen.kt]

app/src/main/java/com/homebox/lens/ui/common/AppDrawer.kt

@@ -1,105 +0,0 @@
-// [FILE] AppDrawer.kt
-// [SEMANTICS] app, ui, common, navigation
-package com.homebox.lens.ui.common
-
-// [IMPORTS]
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material3.Button
-import androidx.compose.material3.Divider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ModalDrawerSheet
-import androidx.compose.material3.NavigationDrawerItem
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.homebox.lens.R
-import com.homebox.lens.navigation.NavigationActions
-import com.homebox.lens.navigation.Screen
-// [END_IMPORTS]
-
-// [ENTITY: Function('AppDrawerContent')]
-// [RELATION: Function('AppDrawerContent')] -> [DEPENDS_ON] -> [Class('NavigationActions')]
-/**
- * @summary Content for the side navigation menu (Drawer).
- * @param currentRoute The current route to highlight the active item.
- * @param navigationActions The object with navigation actions.
- * @param onCloseDrawer Lambda to close the side menu.
- */
-@Composable
-internal fun AppDrawerContent(
-    currentRoute: String?,
-    navigationActions: NavigationActions,
-    onCloseDrawer: () -> Unit
-) {
-    ModalDrawerSheet {
-        Spacer(Modifier.height(12.dp))
-        Button(
-            onClick = {
-                navigationActions.navigateToCreateItem()
-                onCloseDrawer()
-            },
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp)
-        ) {
-            Icon(Icons.Default.Add, contentDescription = null, modifier = Modifier.size(18.dp))
-            Spacer(Modifier.width(8.dp))
-            Text(stringResource(id = R.string.create))
-        }
-        Spacer(Modifier.height(12.dp))
-        Divider()
-        NavigationDrawerItem(
-            label = { Text(stringResource(id = R.string.dashboard_title)) },
-            selected = currentRoute == Screen.Dashboard.route,
-            onClick = {
-                navigationActions.navigateToDashboard()
-                onCloseDrawer()
-            }
-        )
-        NavigationDrawerItem(
-            label = { Text(stringResource(id = R.string.nav_locations)) },
-            selected = currentRoute == Screen.LocationsList.route,
-            onClick = {
-                navigationActions.navigateToLocations()
-                onCloseDrawer()
-            }
-        )
-        NavigationDrawerItem(
-            label = { Text(stringResource(id = R.string.nav_labels)) },
-            selected = currentRoute == Screen.LabelsList.route,
-            onClick = {
-                navigationActions.navigateToLabels()
-                onCloseDrawer()
-            }
-        )
-        NavigationDrawerItem(
-            label = { Text(stringResource(id = R.string.search)) },
-            selected = currentRoute == Screen.Search.route,
-            onClick = {
-                navigationActions.navigateToSearch()
-                onCloseDrawer()
-            }
-        )
-        // [AI_NOTE]: Add Profile and Tools items
-        Divider()
-        NavigationDrawerItem(
-            label = { Text(stringResource(id = R.string.logout)) },
-            selected = false,
-            onClick = {
-                navigationActions.navigateToLogout()
-                onCloseDrawer()
-            }
-        )
-    }
-}
-// [END_ENTITY: Function('AppDrawerContent')]
-// [END_FILE_AppDrawer.kt]

app/src/main/java/com/homebox/lens/ui/common/MainScaffold.kt

@@ -1,75 +0,0 @@
-// [FILE] MainScaffold.kt
-// [SEMANTICS] app, ui, common, scaffold
-
-package com.homebox.lens.ui.common
-
-// [IMPORTS]
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.res.stringResource
-import com.homebox.lens.R
-import com.homebox.lens.navigation.NavigationActions
-import kotlinx.coroutines.launch
-// [END_IMPORTS]
-
-// [ENTITY: Function('MainScaffold')]
-// [RELATION: Function('MainScaffold')] -> [DEPENDS_ON] -> [Class('NavigationActions')]
-// [RELATION: Function('MainScaffold')] -> [CALLS] -> [Function('AppDrawerContent')]
-/**
- * @summary A common wrapper for screens that includes a Scaffold and Navigation Drawer.
- * @param topBarTitle The title for the TopAppBar.
- * @param currentRoute The current route to highlight the active item in the Drawer.
- * @param navigationActions The object with navigation actions.
- * @param topBarActions A Composable function to display actions (icons) in the TopAppBar.
- * @param content The main content of the screen to be displayed inside the Scaffold.
- * @sideeffect Manages the state (open/closed) of the side menu (ModalNavigationDrawer).
- * @invariant The TopAppBar is always displayed with a menu icon.
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MainScaffold(
-    topBarTitle: String,
-    currentRoute: String?,
-    navigationActions: NavigationActions,
-    topBarActions: @Composable () -> Unit = {},
-    content: @Composable (PaddingValues) -> Unit
-) {
-    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
-    val scope = rememberCoroutineScope()
-
-    ModalNavigationDrawer(
-        drawerState = drawerState,
-        drawerContent = {
-            AppDrawerContent(
-                currentRoute = currentRoute,
-                navigationActions = navigationActions,
-                onCloseDrawer = { scope.launch { drawerState.close() } }
-            )
-        }
-    ) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = { Text(topBarTitle) },
-                    navigationIcon = {
-                        IconButton(onClick = { scope.launch { drawerState.open() } }) {
-                            Icon(
-                                Icons.Default.Menu,
-                                contentDescription = stringResource(id = R.string.cd_open_navigation_drawer)
-                            )
-                        }
-                    },
-                    actions = { topBarActions() }
-                )
-            }
-        ) { paddingValues ->
-            content(paddingValues)
-        }
-    }
-}
-// [END_ENTITY: Function('MainScaffold')]
-// [END_FILE_MainScaffold.kt]

app/src/main/java/com/homebox/lens/ui/screen/inventorylist/InventoryListScreen.kt

@@ -1,38 +0,0 @@
-// [FILE] InventoryListScreen.kt
-// [SEMANTICS] app, ui, screen, list
-
-package com.homebox.lens.ui.screen.inventorylist
-
-// [IMPORTS]
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.homebox.lens.R
-import com.homebox.lens.navigation.NavigationActions
-import com.homebox.lens.ui.common.MainScaffold
-// [END_IMPORTS]
-
-// [ENTITY: Function('InventoryListScreen')]
-// [RELATION: Function('InventoryListScreen')] -> [DEPENDS_ON] -> [Class('NavigationActions')]
-// [RELATION: Function('InventoryListScreen')] -> [CALLS] -> [Function('MainScaffold')]
-/**
- * @summary Composable function for the "Inventory List" screen.
- * @param currentRoute The current route to highlight the active item in the Drawer.
- * @param navigationActions The object with navigation actions.
- */
-@Composable
-fun InventoryListScreen(
-    currentRoute: String?,
-    navigationActions: NavigationActions
-) {
-    MainScaffold(
-        topBarTitle = stringResource(id = R.string.inventory_list_title),
-        currentRoute = currentRoute,
-        navigationActions = navigationActions
-    ) {
-        // [AI_NOTE]: Implement Inventory List Screen UI
-        Text(text = "Inventory List Screen")
-    }
-}
-// [END_ENTITY: Function('InventoryListScreen')]
-// [END_FILE_InventoryListScreen.kt]

app/src/main/java/com/homebox/lens/ui/screen/inventorylist/InventoryListViewModel.kt

@@ -1,20 +0,0 @@
-// [FILE] InventoryListViewModel.kt
-// [SEMANTICS] app, ui, viewmodel, list
-package com.homebox.lens.ui.screen.inventorylist
-
-// [IMPORTS]
-import androidx.lifecycle.ViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-// [END_IMPORTS]
-
-// [ENTITY: ViewModel('InventoryListViewModel')]
-/**
- * @summary ViewModel for the inventory list screen.
- */
-@HiltViewModel
-class InventoryListViewModel @Inject constructor() : ViewModel() {
-    // [AI_NOTE]: Implement UI state
-}
-// [END_ENTITY: ViewModel('InventoryListViewModel')]
-// [END_FILE_InventoryListViewModel.kt]

app/src/main/java/com/homebox/lens/ui/screen/labelslist/LabelsListScreen.kt

@@ -36,7 +36,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.homebox.lens.R
 import com.homebox.lens.domain.model.Label
 import com.homebox.lens.navigation.NavigationActions
-import com.homebox.lens.navigation.Screen
+import com.homebox.lens.ui.navigation.Screen
 import com.homebox.lens.ui.common.MainScaffold
 import timber.log.Timber
 // [END_IMPORTS]

app/src/main/java/com/homebox/lens/ui/screen/splash/SplashScreen.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
-import com.homebox.lens.navigation.Screen
+import com.homebox.lens.ui.navigation.Screen
 import com.homebox.lens.ui.screen.setup.SetupViewModel
 import timber.log.Timber
 // [END_IMPORTS]
@@ -50,7 +50,9 @@ fun SplashScreen(
         }
 
         navController.navigate(destination) {
-            popUpTo(Screen.Splash.route) { inclusive = true }
+            popUpTo(Screen.Splash.route) {
+                inclusive = true
+            }
         }
     }
 }

app/src/main/res/values-en/strings.xml

@@ -1,121 +0,0 @@
-<resources>
-    <string name="app_name">Homebox Lens</string>
-
-    <!-- Common -->
-    <string name="create">Create</string>
-    <string name="edit">Edit</string>
-    <string name="delete">Delete</string>
-    <string name="search">Search</string>
-    <string name="logout">Logout</string>
-    <string name="no_location">No location</string>
-    <string name="items_not_found">Items not found</string>
-    <string name="error_loading_failed">Failed to load data. Please try again.</string>
-
-    <!-- Content Descriptions -->
-    <string name="cd_open_navigation_drawer">Open navigation drawer</string>
-    <string name="cd_scan_qr_code">Scan QR code</string>
-    <string name="cd_navigate_back">Navigate back</string>
-    <string name="cd_add_new_location">Add new location</string>
-    <string name="content_desc_add_label">Add new label</string>
-
-    <!-- Dashboard Screen -->
-    <string name="dashboard_title">Dashboard</string>
-    <string name="dashboard_section_quick_stats">Quick Stats</string>
-    <string name="dashboard_section_recently_added">Recently Added</string>
-    <string name="dashboard_section_locations">Locations</string>
-    <string name="dashboard_section_labels">Labels</string>
-    <string name="location_chip_label">%1$s (%2$d)</string>
-
-    <!-- Dashboard Statistics -->
-    <string name="dashboard_stat_total_items">Total Items</string>
-    <string name="dashboard_stat_total_value">Total Value</string>
-    <string name="dashboard_stat_total_labels">Total Labels</string>
-    <string name="dashboard_stat_total_locations">Total Locations</string>
-
-    <!-- Navigation -->
-    <string name="nav_locations">Locations</string>
-    <string name="nav_labels">Labels</string>
-
-    <!-- Screen Titles -->
-    <string name="inventory_list_title">Inventory</string>
-
-    <!-- Screen Titles -->
-    <string name="item_details_title">Details</string>
-    <string name="item_edit_title">Edit Item</string>
-    <string name="labels_list_title">Labels</string>
-    <string name="locations_list_title">Locations</string>
-    <string name="search_title">Search</string>
-
-    <string name="save_item">Save</string>
-    <string name="item_name">Name</string>
-    <string name="item_description">Description</string>
-    <string name="item_quantity">Quantity</string>
-
-    <!-- Location Edit Screen -->
-    <string name="location_edit_title_create">Create Location</string>
-    <string name="location_edit_title_edit">Edit Location</string>
-
-    <!-- Locations List Screen -->
-    <string name="locations_not_found">Locations not found. Press + to add a new one.</string>
-    <string name="item_count">Items: %1$d</string>
-    <string name="cd_more_options">More options</string>
-
-    <!-- Setup Screen -->
-    <string name="setup_title">Server Setup</string>
-    <string name="setup_server_url_label">Server URL</string>
-    <string name="setup_username_label">Username</string>
-    <string name="setup_password_label">Password</string>
-    <string name="setup_connect_button">Connect</string>
-
-    <!-- Labels List Screen -->
-    <string name="screen_title_labels">Labels</string>
-    <string name="content_desc_navigate_back">Navigate back</string>
-    <string name="content_desc_create_label">Create new label</string>
-    <string name="content_desc_label_icon">Label icon</string>
-    <string name="no_labels_found">No labels found.</string>
-    <string name="dialog_title_create_label">Create Label</string>
-    <string name="dialog_field_label_name">Label Name</string>
-    <string name="dialog_button_create">Create</string>
-    <string name="dialog_button_cancel">Cancel</string>
-
-    
-
-    <!-- Inventory List Screen -->
-    <string name="content_desc_sync_inventory">Sync inventory</string>
-
-    <!-- Item Details Screen -->
-    <string name="content_desc_edit_item">Edit item</string>
-    <string name="content_desc_delete_item">Delete item</string>
-    <string name="section_title_description">Description</string>
-    <string name="placeholder_no_description">No description</string>
-    <string name="section_title_details">Details</string>
-    <string name="label_quantity">Quantity</string>
-    <string name="label_location">Location</string>
-    <string name="section_title_labels">Labels</string>
-
-    <!-- Item Edit Screen -->
-    <string name="item_edit_title_create">Create item</string>
-    <string name="content_desc_save_item">Save item</string>
-    <string name="label_name">Name</string>
-    <string name="label_description">Description</string>
-
-    <!-- Search Screen -->
-    <string name="placeholder_search_items">Search items...</string>
-
-    <!-- Setup Screen -->
-    <string name="screen_title_setup">Setup</string>
-
-    <!-- Label Edit Screen -->
-    <string name="label_edit_title_create">Create label</string>
-    <string name="label_edit_title_edit">Edit label</string>
-    <string name="label_name_edit">Label name</string>
-
-    <!-- Common Actions -->
-    <string name="back">Back</string>
-    <string name="save">Save</string>
-
-    <!-- Color Picker -->
-    <string name="label_color">Color</string>
-    <string name="label_hex_color">HEX color code</string>
-
-</resources>

app/src/main/res/values/strings.xml

@@ -2,86 +2,112 @@
     <string name="app_name">Homebox Lens</string>
 
     <!-- Common -->
-    <string name="create">Создать</string>
-    <string name="edit">Редактировать</string>
-    <string name="delete">Удалить</string>
-    <string name="search">Поиск</string>
-    <string name="logout">Выйти</string>
-    <string name="no_location">Нет локации</string>
-    <string name="items_not_found">Элементы не найдены</string>
-    <string name="error_loading_failed">Не удалось загрузить данные. Пожалуйста, попробуйте еще раз.</string>
+    <string name="create">Create</string>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="search">Search</string>
+    <string name="logout">Logout</string>
+    <string name="no_location">No location</string>
+    <string name="items_not_found">Items not found</string>
+    <string name="error_loading_failed">Failed to load data. Please try again.</string>
 
     <!-- Content Descriptions -->
-    <string name="cd_open_navigation_drawer">Открыть боковое меню</string>
-    <string name="setup_subtitle">Enter your Homebox server details to connect.</string>
-    <string name="cd_scan_qr_code">Сканировать QR-код</string>
-    <string name="cd_navigate_back">Вернуться назад</string>
-    <string name="cd_add_new_location">Добавить новую локацию</string>
-    <string name="content_desc_add_label">Добавить новую метку</string>
-
-    <!-- Inventory List Screen -->
-    <string name="content_desc_sync_inventory">Синхронизировать инвентарь</string>
-
-    <!-- Item Details Screen -->
-    <string name="content_desc_edit_item">Редактировать элемент</string>
-    <string name="content_desc_delete_item">Удалить элемент</string>
-    <string name="section_title_description">Описание</string>
-    <string name="placeholder_no_description">Нет описания</string>
-    <string name="section_title_details">Детали</string>
-    <string name="label_quantity">Количество</string>
-    <string name="label_location">Местоположение</string>
-    <string name="section_title_labels">Метки</string>
-
-    <!-- Item Edit Screen -->
-    <string name="item_edit_title_create">Создать элемент</string>
-    <string name="content_desc_save_item">Сохранить элемент</string>
-    <string name="label_name">Название</string>
-
-    <!-- Search Screen -->
-    <string name="placeholder_search_items">Поиск элементов...</string>
+    <string name="cd_open_navigation_drawer">Open navigation drawer</string>
+    <string name="cd_scan_qr_code">Scan QR code</string>
+    <string name="cd_navigate_back">Navigate back</string>
+    <string name="cd_add_new_location">Add new location</string>
+    <string name="content_desc_add_label">Add new label</string>
 
     <!-- Dashboard Screen -->
-    <string name="dashboard_title">Главная</string>
-    <string name="dashboard_section_quick_stats">Быстрая статистика</string>
-    <string name="dashboard_section_recently_added">Недавно добавлено</string>
-    <string name="dashboard_section_locations">Места хранения</string>
-    <string name="dashboard_section_labels">Метки</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="dashboard_section_quick_stats">Quick Stats</string>
+    <string name="dashboard_section_recently_added">Recently Added</string>
+    <string name="dashboard_section_locations">Locations</string>
+    <string name="dashboard_section_labels">Labels</string>
     <string name="location_chip_label">%1$s (%2$d)</string>
 
     <!-- Dashboard Statistics -->
-    <string name="dashboard_stat_total_items">Всего вещей</string>
-    <string name="dashboard_stat_total_value">Общая стоимость</string>
-    <string name="dashboard_stat_total_labels">Всего меток</string>
-    <string name="dashboard_stat_total_locations">Всего локаций</string>
+    <string name="dashboard_stat_total_items">Total Items</string>
+    <string name="dashboard_stat_total_value">Total Value</string>
+    <string name="dashboard_stat_total_labels">Total Labels</string>
+    <string name="dashboard_stat_total_locations">Total Locations</string>
 
     <!-- Navigation -->
-    <string name="nav_locations">Локации</string>
-    <string name="nav_labels">Метки</string>
+    <string name="nav_locations">Locations</string>
+    <string name="nav_labels">Labels</string>
 
     <!-- Screen Titles -->
-    <string name="inventory_list_title">Инвентарь</string>
-    <string name="item_details_title">Детали</string>
-    <string name="item_edit_title">Редактирование</string>
-    <string name="labels_list_title">Метки</string>
-    <string name="locations_list_title">Места хранения</string>
-    <string name="search_title">Поиск</string>
+    <string name="inventory_list_title">Inventory</string>
+
+    <!-- Screen Titles -->
+    <string name="item_details_title">Details</string>
+    <string name="item_edit_title">Edit Item</string>
+    <string name="labels_list_title">Labels</string>
+    <string name="locations_list_title">Locations</string>
+    <string name="search_title">Search</string>
+
+    <string name="save_item">Save</string>
+    <string name="item_name">Name</string>
+    <string name="item_description">Description</string>
+    <string name="item_quantity">Quantity</string>
+
+    <!-- Location Edit Screen -->
+    <string name="location_edit_title_create">Create Location</string>
+    <string name="location_edit_title_edit">Edit Location</string>
+
+    <!-- Locations List Screen -->
+    <string name="locations_not_found">Locations not found. Press + to add a new one.</string>
+    <string name="item_count">Items: %1$d</string>
+    <string name="cd_more_options">More options</string>
+
+    <!-- Setup Screen -->
+    <string name="setup_title">Server Setup</string>
+    <string name="setup_server_url_label">Server URL</string>
+    <string name="setup_username_label">Username</string>
+    <string name="setup_password_label">Password</string>
+    <string name="setup_connect_button">Connect</string>
+
+    <!-- Labels List Screen -->
+    <string name="screen_title_labels">Labels</string>
+    <string name="content_desc_navigate_back">Navigate back</string>
+    <string name="content_desc_create_label">Create new label</string>
+    <string name="content_desc_label_icon">Label icon</string>
+    <string name="no_labels_found">No labels found.</string>
+    <string name="dialog_title_create_label">Create Label</string>
+    <string name="dialog_field_label_name">Label Name</string>
+    <string name="dialog_button_create">Create</string>
+    <string name="dialog_button_cancel">Cancel</string>
+    
+    <!-- Inventory List Screen -->
+    <string name="content_desc_sync_inventory">Sync inventory</string>
+
+    <!-- Item Details Screen -->
+    <string name="content_desc_edit_item">Edit item</string>
+    <string name="content_desc_delete_item">Delete item</string>
+    <string name="section_title_description">Description</string>
+    <string name="placeholder_no_description">No description</string>
+    <string name="section_title_details">Details</string>
+    <string name="label_quantity">Quantity</string>
+    <string name="label_location">Location</string>
+    <string name="section_title_labels">Labels</string>
+
+    <!-- Item Edit Screen -->
+    <string name="item_edit_title_create">Create item</string>
+    <string name="content_desc_save_item">Save item</string>
+    <string name="label_name">Name</string>
+    <string name="label_description">Description</string>
 
-    <string name="save_item">Сохранить</string>
-    <string name="item_name">Название</string>
-    <string name="item_description">Описание</string>
-    <string name="item_quantity">Количество</string>
     <string name="item_edit_general_information">General Information</string>
     <string name="item_edit_location">Location</string>
-    <string name="item_edit_select_location">Select Location</string>
     <string name="item_edit_labels">Labels</string>
     <string name="item_edit_select_labels">Select Labels</string>
+    <string name="dialog_ok">OK</string>
+    <string name="dialog_cancel">Cancel</string>
     <string name="item_edit_purchase_information">Purchase Information</string>
     <string name="item_edit_purchase_price">Purchase Price</string>
     <string name="item_edit_purchase_from">Purchase From</string>
-    <string name="item_edit_purchase_time">Purchase Date</string>
+    <string name="item_edit_purchase_time">Purchase Time</string>
     <string name="item_edit_select_date">Select Date</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_cancel">Cancel</string>
     <string name="item_edit_warranty_information">Warranty Information</string>
     <string name="item_edit_lifetime_warranty">Lifetime Warranty</string>
     <string name="item_edit_warranty_details">Warranty Details</string>
@@ -99,50 +125,26 @@
     <string name="item_edit_sold_price">Sold Price</string>
     <string name="item_edit_sold_to">Sold To</string>
     <string name="item_edit_sold_notes">Sold Notes</string>
-    <string name="item_edit_sold_time">Sold Date</string>
+    <string name="item_edit_sold_time">Sold Time</string>
 
-    <!-- Location Edit Screen -->
-    <string name="location_edit_title_create">Создать локацию</string>
-    <string name="location_edit_title_edit">Редактировать локацию</string>
-
-    <!-- Locations List Screen -->
-    <string name="locations_not_found">Местоположения не найдены. Нажмите +, чтобы добавить новое.</string>
-    <string name="item_count">Предметов: %1$d</string>
-    <string name="cd_more_options">Больше опций</string>
+    <!-- Search Screen -->
+    <string name="placeholder_search_items">Search items...</string>
 
     <!-- Setup Screen -->
-    <string name="screen_title_setup">Настройка</string>
-    <string name="setup_title">Настройка сервера</string>
-    <string name="setup_server_url_label">URL сервера</string>
-    <string name="setup_username_label">Имя пользователя</string>
-    <string name="setup_password_label">Пароль</string>
-    <string name="setup_connect_button">Подключиться</string>
-
-    <!-- Labels List Screen -->
-    <string name="screen_title_labels">Метки</string>
-    <!-- Settings Screen -->
-    <string name="screen_title_settings">Настройки</string>
-    <string name="content_desc_navigate_back" translatable="false">Вернуться назад</string>
-    <string name="content_desc_create_label">Создать новую метку</string>
-    <string name="content_desc_label_icon">Иконка метки</string>
-    <string name="no_labels_found">Метки не найдены.</string>
-    <string name="dialog_title_create_label">Создать метку</string>
-    <string name="dialog_field_label_name">Название метки</string>
-    <string name="dialog_button_create">Создать</string>
-    <string name="dialog_button_cancel">Отмена</string>
+    <string name="screen_title_setup">Setup</string>
+    <string name="screen_title_settings">Settings</string>
 
     <!-- Label Edit Screen -->
-    <string name="label_edit_title_create">Создать метку</string>
-    <string name="label_edit_title_edit">Редактировать метку</string>
-    <string name="label_name_edit">Название метки</string>
-    <string name="label_description">Описание</string>
+    <string name="label_edit_title_create">Create label</string>
+    <string name="label_edit_title_edit">Edit label</string>
+    <string name="label_name_edit">Label name</string>
 
     <!-- Common Actions -->
-    <string name="back">Назад</string>
-    <string name="save">Сохранить</string>
-    <!-- Common Actions -->
+    <string name="back">Back</string>
+    <string name="save">Save</string>
 
     <!-- Color Picker -->
-    <string name="label_color">Цвет</string>
-    <string name="label_hex_color">HEX-код цвета</string>
-</resources>
+    <string name="label_color">Color</string>
+    <string name="label_hex_color">HEX color code</string>
+
+</resources>