Skip to content

Commit 0257657

Browse files
committed
Remove duplicate strings in grid widget
1 parent 06ae591 commit 0257657

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

app/src/main/java/io/homeassistant/companion/android/widgets/grid/GridWidget.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class GridWidget : BaseWidgetProvider() {
243243
)
244244
setTextViewText(
245245
R.id.widgetState,
246-
state ?: context.getString(commonR.string.widget_grid_entity_state_unknown)
246+
state ?: context.getString(commonR.string.state_unknown)
247247
)
248248

249249
val fillInIntent = Intent().apply {

app/src/main/java/io/homeassistant/companion/android/widgets/grid/config/GridConfigurationScreen.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fun GridConfiguration(
8282
icon = { Icon(Icons.Default.Edit, null) }
8383
)
8484
PreferenceItem(
85-
name = stringResource(R.string.widget_grid_require_authentication),
85+
name = stringResource(R.string.widget_checkbox_require_authentication),
8686
checked = config.requireAuthentication,
8787
onClick = { onRequireAuthenticationChange(!config.requireAuthentication) },
8888
icon = { Icon(Icons.Default.Lock, null) }
@@ -145,7 +145,7 @@ fun GridConfiguration(
145145
modifier = Modifier.align(Alignment.End),
146146
onClick = { onConfigure(config) }
147147
) {
148-
Text(stringResource(R.string.widget_grid_save))
148+
Text(stringResource(R.string.save))
149149
}
150150
}
151151
}
@@ -323,13 +323,13 @@ private fun ActionConfigurationDialog(
323323
modifier = Modifier.fillMaxWidth(),
324324
value = gridItem.icon,
325325
onValueChange = { gridItem = gridItem.copy(icon = it) },
326-
label = { Text(stringResource(R.string.widget_grid_icon)) }
326+
label = { Text(stringResource(R.string.icon)) }
327327
)
328328
OutlinedTextField(
329329
modifier = Modifier.fillMaxWidth(),
330330
value = gridItem.domain,
331331
onValueChange = { gridItem = gridItem.copy(domain = it) },
332-
label = { Text(stringResource(R.string.widget_grid_domain)) }
332+
label = { Text(stringResource(R.string.widget_text_hint_action_domain)) }
333333
)
334334
OutlinedTextField(
335335
modifier = Modifier.fillMaxWidth(),
@@ -341,7 +341,7 @@ private fun ActionConfigurationDialog(
341341
modifier = Modifier.fillMaxWidth(),
342342
value = gridItem.entityId,
343343
onValueChange = { gridItem = gridItem.copy(entityId = it) },
344-
label = { Text(stringResource(R.string.widget_grid_entity)) }
344+
label = { Text(stringResource(R.string.widget_text_hint_action_data)) }
345345
)
346346

347347
Row {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,16 +1011,10 @@
10111011
<string name="grid_widget_actions">Actions</string>
10121012
<string name="widget_grid_add_action">Add action</string>
10131013
<string name="widget_grid_desc">A configurable grid of actions</string>
1014-
<string name="widget_grid_domain">Domain</string>
10151014
<string name="widget_grid_edit_action">Edit action</string>
1016-
<string name="widget_grid_entity">Entity</string>
1017-
<string name="widget_grid_entity_state_unknown">Unknown</string>
1018-
<string name="widget_grid_icon">Icon</string>
10191015
<string name="widget_grid_label">Action grid</string>
10201016
<string name="widget_grid_name">Name</string>
10211017
<string name="widget_grid_preferences">Grid preferences</string>
1022-
<string name="widget_grid_require_authentication">Require authentication</string>
1023-
<string name="widget_grid_save">Save</string>
10241018
<string name="widget_grid_service">Service</string>
10251019
<string name="widget_image_description">Home Assistant widget</string>
10261020
<string name="widget_label_placeholder_text_button">Toggle</string>

0 commit comments

Comments
 (0)