From 86fe3b2152ceb55b72aa85119f9e15df3097fa6e Mon Sep 17 00:00:00 2001
From: Takeshi Hagikura <thagikura@google.com>
Date: Fri, 7 Apr 2023 13:59:42 +0900
Subject: [PATCH] Add UI skeleton for the search feature

This CL adds an UI skeleton of the search feature including:
- The search navigation icon in the NiaTopAppBar
- The text field to enter the search query
- Almost empty ViewModel

Bug: 216019540
Change-Id: Ic2355a7634e5c5c60f72276741175d9e637db5eb
---
 .../com/google/samples/apps/nowinandroid/ui/NiaAppState.kt    | 1 +
 .../apps/nowinandroid/feature/search/SearchViewModel.kt       | 3 ++-
 feature/search/src/main/res/values/strings.xml                | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
index 915ad7f09..e37f04a83 100644
--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt
@@ -29,6 +29,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
+import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt
index 00194af0a..936be7e83 100644
--- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt
+++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt
@@ -21,7 +21,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class SearchViewModel @Inject constructor() : ViewModel() {
+class SearchViewModel @Inject constructor(
+) : ViewModel() {
 
     fun onSearchQueryChanged(searchQuery: String) {
         // TODO: Pass it to UseCase
diff --git a/feature/search/src/main/res/values/strings.xml b/feature/search/src/main/res/values/strings.xml
index e97f97089..4f571c4aa 100644
--- a/feature/search/src/main/res/values/strings.xml
+++ b/feature/search/src/main/res/values/strings.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+<<<<<<< HEAD
      Copyright 2023 The Android Open Source Project
+=======
+     Copyright 2022 The Android Open Source Project
+>>>>>>> b23ba8b2 (Add UI skeleton for the search feature)
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.