LMN-775: Add entity type in place selector (#1808)

* add type for bpk session in app search modal * Updated snapshots for 'dm' * Updated snapshots for 'rtl' * Updated snapshots for 'default' * fix to more standard and simplification * Updated snapshots for 'rtl' * Updated snapshots for 'default' * Updated snapshots for 'dm' * modify color and search modal snapshot test * Updated snapshots for 'dm' * Updated snapshots for 'rtl' * Updated snapshots for 'default' --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Maria Neumayer <[email protected]>
Skyscanner · Nov 29, 2023 · 6a3cc15 · 6a3cc15
1 parent 30b1500
commit 6a3cc15
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 17 deletions.
diff --git a/...et.skyscanner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content.png b/...et.skyscanner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content.png
diff --git a/...ner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content_inputText.png b/...ner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content_inputText.png
diff --git a/...et.skyscanner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content.png b/...et.skyscanner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content.png
diff --git a/...ner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content_inputText.png b/...ner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content_inputText.png
diff --git a/...et.skyscanner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content.png b/...et.skyscanner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content.png
diff --git a/...ner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content_inputText.png b/...ner.backpack.compose.appsearchmodal.BpkAppSearchModalTest_content_inputText.png
diff --git a/app/src/main/java/net/skyscanner/backpack/demo/compose/AppSearchModalStory.kt b/app/src/main/java/net/skyscanner/backpack/demo/compose/AppSearchModalStory.kt
@@ -130,7 +130,8 @@ internal fun contentResult() = BpkAppSearchModalResult.Content(
                     },
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.current_location_subtitle)) },
                     icon = BpkIcon.UseLocation,
-                ) {},
+                    onItemSelected = {},
+                ),
             ),
         ),
         BpkSection(
@@ -144,7 +145,6 @@ internal fun contentResult() = BpkAppSearchModalResult.Content(
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
                     icon = BpkIcon.City,
                     onItemSelected = {},
-
                 ),
                 BpkItem(
                     title = buildAnnotatedString {
@@ -156,14 +156,6 @@ internal fun contentResult() = BpkAppSearchModalResult.Content(
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
                     icon = BpkIcon.Airports,
                     onItemSelected = {},
-
-                ),
-                BpkItem(
-                    title = buildAnnotatedString { append(stringResource(id = R.string.city_rome)) },
-                    subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
-                    icon = BpkIcon.Airports,
-                    onItemSelected = {},
-
                 ),
             ),
         ),
@@ -177,28 +169,28 @@ internal fun contentResult() = BpkAppSearchModalResult.Content(
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
                     icon = BpkIcon.City,
                     onItemSelected = {},
-
+                    tertiaryLabel = stringResource(id = R.string.search_modal_item_tertiary_label),
                 ),
                 BpkItem(
                     title = buildAnnotatedString { append(stringResource(id = R.string.city_paris)) },
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
                     icon = BpkIcon.City,
                     onItemSelected = {},
-
+                    tertiaryLabel = stringResource(id = R.string.search_modal_item_tertiary_label),
                 ),
                 BpkItem(
                     title = buildAnnotatedString { append(stringResource(id = R.string.city_algiers)) },
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
                     icon = BpkIcon.City,
                     onItemSelected = {},
-
+                    tertiaryLabel = stringResource(id = R.string.search_modal_item_tertiary_label),
                 ),
                 BpkItem(
                     title = buildAnnotatedString { append(stringResource(id = R.string.city_madrid)) },
                     subtitle = buildAnnotatedString { append(stringResource(id = R.string.search_modal_item_subtitle)) },
                     icon = BpkIcon.City,
                     onItemSelected = {},
-
+                    tertiaryLabel = stringResource(id = R.string.search_modal_item_tertiary_label),
                 ),
             ),
         ),

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -319,6 +319,7 @@
     <string name="recent_searches">Recent Searches</string>
     <string name="popular_destinations">Popular Destinations</string>
     <string name="search_modal_item_subtitle">City, United Kingdom</string>
+    <string name="search_modal_item_tertiary_label">City</string>
     <string name="view_more">View More</string>
     <string name="try_again">Try Again</string>
     <string name="destination">Destination</string>

diff --git a/...mpose/src/main/kotlin/net/skyscanner/backpack/compose/appsearchmodal/BpkAppSearchModal.kt b/...mpose/src/main/kotlin/net/skyscanner/backpack/compose/appsearchmodal/BpkAppSearchModal.kt
@@ -58,6 +58,7 @@ data class BpkItem(
     val subtitle: AnnotatedString,
     val icon: BpkIcon,
     val onItemSelected: () -> Unit,
+    val tertiaryLabel: String? = null,
 )
 
 data class BpkSectionHeading(val title: String, val action: BpkAction? = null)

diff --git a/...ose/src/main/kotlin/net/skyscanner/backpack/compose/appsearchmodal/internal/BpkSection.kt b/...ose/src/main/kotlin/net/skyscanner/backpack/compose/appsearchmodal/internal/BpkSection.kt
@@ -76,11 +76,22 @@ internal fun BpkSectionItem(item: BpkItem, modifier: Modifier = Modifier) {
             icon = item.icon,
             contentDescription = null,
             size = BpkIconSize.Large,
-
         )
-        Column {
+        Column(
+            modifier = Modifier.weight(1f),
+        ) {
             BpkText(text = item.title)
-            BpkText(text = item.subtitle)
+            BpkText(
+                style = BpkTheme.typography.footnote,
+                text = item.subtitle,
+            )
+        }
+        item.tertiaryLabel?.let {
+            BpkText(
+                style = BpkTheme.typography.footnote,
+                color = BpkTheme.colors.textSecondary,
+                text = it,
+            )
         }
     }
 }
diff --git a/docs/compose/AppSearchModal/screenshots/content.png b/docs/compose/AppSearchModal/screenshots/content.png
diff --git a/docs/compose/AppSearchModal/screenshots/content_dm.png b/docs/compose/AppSearchModal/screenshots/content_dm.png