From 24a226b2834f817b74da2b472969c4dadfdbdb02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.lebihan773@gmail.com>
Date: Wed, 6 Dec 2023 15:42:15 +0100
Subject: [PATCH] Adapted the layout and changed TextInput to Input from native
 base to support the theme

---
 front/components/V2/SearchBar.tsx | 87 ++++++++++++++++++++-----------
 front/views/V2/SearchView.tsx     | 14 +++--
 2 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/front/components/V2/SearchBar.tsx b/front/components/V2/SearchBar.tsx
index 1f0198d..97368b6 100644
--- a/front/components/V2/SearchBar.tsx
+++ b/front/components/V2/SearchBar.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Button, Text, Select } from 'native-base';
 import { ScrollView, TextInput, View } from 'react-native';
+import { Input } from 'native-base';
 import ButtonBase from '../UI/ButtonBase';
 import { AddSquare, CloseCircle, SearchNormal1 } from 'iconsax-react-native';
 import { useQuery } from '../../Queries';
 import API from '../../API';
-import { LoadingView } from '../Loading';
 import Genre from '../../models/Genre';
 
 type ArtistChipProps = {
@@ -17,7 +17,7 @@ type ArtistChipProps = {
 const ArtistChipComponent = (props: ArtistChipProps) => {
 	return (
 		<View>
-			<Button marginX={props.selected ? 0 : 26} variant={'ghost'} onPress={props.onPress}>
+			<Button variant={'ghost'} onPress={props.onPress}>
 				<View
 					style={{
 						display: 'flex',
@@ -46,10 +46,6 @@ const SearchBarComponent = () => {
 	const artistsQuery = useQuery(API.getAllArtists());
 	const genresQuery = useQuery(API.getAllGenres());
 
-	if (artistsQuery.isLoading || genresQuery.isLoading) {
-		return <LoadingView />;
-	}
-
 	return (
 		<View>
 			<View
@@ -59,44 +55,77 @@ const SearchBarComponent = () => {
 					display: 'flex',
 					flexDirection: 'row',
 					alignItems: 'center',
+					width: '100%',
 					margin: 5,
 					padding: 16,
 				}}
 			>
-				{artist ? (
-					<ArtistChipComponent
-						onPress={() => setArtist('')}
-						name={artist}
-						selected={true}
-					/>
-				) : null}
-				<TextInput
+				<View
+					style={{
+						flexGrow: 0,
+						flexShrink: 1,
+						flexDirection: 'row',
+						flexWrap: 'wrap',
+					}}
+				>
+					{artist && (
+						<ArtistChipComponent
+							onPress={() => setArtist('')}
+							name={artist}
+							selected={true}
+						/>
+					)}
+				</View>
+				<Input
+					type="text"
 					value={query}
 					placeholder="What are you looking for ?"
-					style={{ width: '100%', height: 30 }}
+					style={{ height: 30, flexGrow: 1, flexShrink: 1 }}
 					onChangeText={(value) => setQuery(value)}
 				/>
 
-				<ButtonBase type="menu" icon={SearchNormal1} />
+				<ButtonBase
+					type="menu"
+					icon={SearchNormal1}
+					style={{
+						flexShrink: 0,
+						flexGrow: 0,
+					}}
+				/>
 			</View>
 			<View
-				style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}
+				style={{
+					display: 'flex',
+					flexDirection: 'row',
+					justifyContent: 'space-between',
+					alignItems: 'center',
+					gap: 10,
+				}}
 			>
 				<ScrollView
 					horizontal={true}
-					style={{ display: 'flex', flexDirection: 'row', paddingVertical: 10 }}
+					style={{
+						paddingBottom: 10,
+					}}
 				>
-					{!artist
-						? artistsQuery.data?.map((artist, index) => (
-								<ArtistChipComponent
-									key={index}
-									name={artist.name}
-									onPress={() => {
-										setArtist(artist.name);
-									}}
-								/>
-						  ))
-						: null}
+					<View
+						style={{
+							display: 'flex',
+							flexDirection: 'row',
+							alignItems: 'center',
+							gap: 10,
+						}}
+					>
+						{artistsQuery.data?.map((artist, index) => (
+							<ArtistChipComponent
+								key={index}
+								name={artist.name}
+								onPress={() => {
+									setArtist(artist.name);
+								}}
+							/>
+						))}
+					</View>
 				</ScrollView>
 				<View>
 					<Select
diff --git a/front/views/V2/SearchView.tsx b/front/views/V2/SearchView.tsx
index 812ce65..ca52594 100644
--- a/front/views/V2/SearchView.tsx
+++ b/front/views/V2/SearchView.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
-import { View } from 'react-native';
+import ScaffoldCC from '../../components/UI/ScaffoldCC';
 import SearchBarComponent from '../../components/V2/SearchBar';
+import { RouteProps } from '../../Navigation';
 
-// search with all parameters from search bar function
-
-// return to search bar auto completion thing
-
-const SearchView = () => {
+// eslint-disable-next-line @typescript-eslint/ban-types
+const SearchView = (props: RouteProps<{}>) => {
 	return (
-		<View style={{ display: 'flex', flexDirection: 'column', padding: 3 }}>
+		<ScaffoldCC routeName={props.route.name}>
 			<SearchBarComponent />
-		</View>
+		</ScaffoldCC>
 	);
 };