From ecac53516e8f05a174b63c800b0dc778ec710a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.lebihan773@gmail.com>
Date: Fri, 24 Nov 2023 00:23:36 +0100
Subject: [PATCH] init branch

---
 front/Dockerfile.buildandroid         | 16 ++++++++++++++++
 front/components/CardGridCustom.tsx   |  1 +
 front/components/SongCardGrid.tsx     |  1 +
 front/components/UI/MusicList.tsx     |  1 +
 front/components/UI/ScaffoldAuth.tsx  |  2 +-
 front/components/UI/TextFieldBase.tsx |  4 ++--
 front/eas.json                        |  8 ++++----
 front/views/PlayView.tsx              | 20 ++++++++++----------
 8 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 front/Dockerfile.buildandroid

diff --git a/front/Dockerfile.buildandroid b/front/Dockerfile.buildandroid
new file mode 100644
index 0000000..49ad57a
--- /dev/null
+++ b/front/Dockerfile.buildandroid
@@ -0,0 +1,16 @@
+FROM ubuntu:22.04 as buildandroid
+
+# Install dependencies (yarn, nodejs, git, etc.)
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    gnupg \
+    unzip \
+    zip \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+
+RUN npm install -g expo-cli
+RUN eas login --non-interactive --username $EAS_USERNAME --password $EAS_PASSWORD
+RUN eas:configure -p android
\ No newline at end of file
diff --git a/front/components/CardGridCustom.tsx b/front/components/CardGridCustom.tsx
index bdb2aa4..5690c1b 100644
--- a/front/components/CardGridCustom.tsx
+++ b/front/components/CardGridCustom.tsx
@@ -17,6 +17,7 @@ const CardGridCustom = <T extends Record<string, unknown>>(props: CardGridCustom
 		<VStack space={5}>
 			{heading && <Heading>{heading}</Heading>}
 			<FlatGrid
+				nestedScrollEnabled
 				maxItemsPerRow={maxItemsPerRow}
 				additionalRowStyle={style ?? { justifyContent: 'flex-start' }}
 				data={content}
diff --git a/front/components/SongCardGrid.tsx b/front/components/SongCardGrid.tsx
index c529d43..8050472 100644
--- a/front/components/SongCardGrid.tsx
+++ b/front/components/SongCardGrid.tsx
@@ -15,6 +15,7 @@ const SongCardGrid = (props: SongCardGrid) => {
 		<VStack space={5}>
 			<Heading>{props.heading}</Heading>
 			<FlatGrid
+				nestedScrollEnabled
 				maxItemsPerRow={props.maxItemsPerRow}
 				additionalRowStyle={props.style ?? { justifyContent: 'flex-start' }}
 				data={props.songs}
diff --git a/front/components/UI/MusicList.tsx b/front/components/UI/MusicList.tsx
index 6dc710f..1c37dc2 100644
--- a/front/components/UI/MusicList.tsx
+++ b/front/components/UI/MusicList.tsx
@@ -195,6 +195,7 @@ function MusicListComponent({
 	// FlatList: Renders list efficiently, only rendering visible items.
 	return (
 		<FlatList
+			nestedScrollEnabled
 			style={styles.container}
 			ListHeaderComponent={headerComponent}
 			data={musicListState.displayedMusics}
diff --git a/front/components/UI/ScaffoldAuth.tsx b/front/components/UI/ScaffoldAuth.tsx
index 77b3b70..279d331 100644
--- a/front/components/UI/ScaffoldAuth.tsx
+++ b/front/components/UI/ScaffoldAuth.tsx
@@ -65,7 +65,7 @@ const ScaffoldAuth: FunctionComponent<ScaffoldAuthProps> = ({
 				<Wrap space={4} direction="row" style={{ padding: 16, paddingBottom: 0 }}>
 					<Row space={2} flex={1}>
 						<Image
-							source={{ uri: logo }}
+							// source={{ uri: logo }}
 							style={{
 								aspectRatio: 1,
 								width: 32,
diff --git a/front/components/UI/TextFieldBase.tsx b/front/components/UI/TextFieldBase.tsx
index 92a1243..4364742 100644
--- a/front/components/UI/TextFieldBase.tsx
+++ b/front/components/UI/TextFieldBase.tsx
@@ -164,7 +164,7 @@ const styles = StyleSheet.create({
 		flex: 1,
 		paddingHorizontal: 12 + 20 + 12,
 		paddingVertical: 12,
-		outlineStyle: 'none',
+		// outlineStyle: 'none',
 	},
 	iconContainerLeft: {
 		position: 'absolute',
@@ -173,7 +173,7 @@ const styles = StyleSheet.create({
 	},
 	iconContainerRight: {
 		position: 'absolute',
-		outlineStyle: 'none',
+		// outlineStyle: 'none',
 		right: 12,
 		zIndex: 1,
 	},
diff --git a/front/eas.json b/front/eas.json
index 4cb7427..751ee55 100644
--- a/front/eas.json
+++ b/front/eas.json
@@ -8,8 +8,8 @@
 				"distribution": "internal"
 			},
 			"env": {
-				"EXPO_PUBLIC_API_URL": "https://chroma.octohub.app/api",
-				"EXPO_PUBLIC_SCORO_URL": "wss://chroma.octohub.app/ws"
+				"EXPO_PUBLIC_API_URL": "https://nightly.chroma.octohub.app/api",
+				"EXPO_PUBLIC_SCORO_URL": "wss://nightly.chroma.octohub.app/ws"
 			}
 		},
 		"production": {
@@ -20,8 +20,8 @@
 				"distribution": "internal"
 			},
 			"env": {
-				"EXPO_PUBLIC_API_URL": "https://chroma.octohub.app/api",
-				"EXPO_PUBLIC_SCORO_URL": "wss://chroma.octohub.app/ws"
+				"EXPO_PUBLIC_API_URL": "https://nightly.chroma.octohub.app/api",
+				"EXPO_PUBLIC_SCORO_URL": "wss://nightly.chroma.octohub.app/ws"
 			}
 		}
 	}
diff --git a/front/views/PlayView.tsx b/front/views/PlayView.tsx
index aeb72e9..ebfb9aa 100644
--- a/front/views/PlayView.tsx
+++ b/front/views/PlayView.tsx
@@ -23,7 +23,7 @@ import { RootState } from '../state/Store';
 import { Translate, translate } from '../i18n/i18n';
 import { ColorSchemeType } from 'native-base/lib/typescript/components/types';
 import { useStopwatch } from 'react-use-precision-timer';
-import { MIDIAccess, MIDIMessageEvent, requestMIDIAccess } from '@arthi-chaud/react-native-midi';
+// import { MIDIAccess, MIDIMessageEvent, requestMIDIAccess } from '@arthi-chaud/react-native-midi';
 import * as Linking from 'expo-linking';
 import url from 'url';
 import { PianoCanvasContext } from '../models/PianoGame';
@@ -62,14 +62,14 @@ if (process.env.NODE_ENV != 'development' && Platform.OS === 'web') {
 	});
 }
 
-function parseMidiMessage(message: MIDIMessageEvent) {
-	return {
-		command: message.data.at(0)! >> 4,
-		channel: message.data.at(0)! & 0xf,
-		note: message.data.at(1)!,
-		velocity: message.data.at(2)! / 127,
-	};
-}
+// function parseMidiMessage(message: MIDIMessageEvent) {
+// 	return {
+// 		command: message.data.at(0)! >> 4,
+// 		channel: message.data.at(0)! & 0xf,
+// 		note: message.data.at(1)!,
+// 		velocity: message.data.at(2)! / 127,
+// 	};
+// }
 
 //create a context with an array of number
 export const PianoCC = createContext<PianoCanvasContext>({
@@ -300,7 +300,7 @@ const PlayView = ({ songId, route }: RouteProps<PlayViewProps>) => {
 			return;
 		}
 		if (song.data && !webSocket.current && partitionRendered) {
-			requestMIDIAccess().then(onMIDISuccess).catch(onMIDIFailure);
+			// requestMIDIAccess().then(onMIDISuccess).catch(onMIDIFailure);
 		}
 	}, [song.data, partitionRendered]);