From 701dacf1fff805f238812cb423941eab6930b167 Mon Sep 17 00:00:00 2001
From: anhChillLe <chieu280200@gmail.com>
Date: Thu, 3 Aug 2023 14:01:09 +0700
Subject: [PATCH 1/2] Fix navigation

---
 package.json                                 |  3 +-
 src/App.tsx                                  | 14 ++++-
 src/actions/link_actions.ts                  |  4 +-
 src/pages/currentUser/edit_profile.tsx       |  6 +--
 src/pages/home/CollectionGroup.tsx           |  2 +-
 src/pages/home/PhotoGroup.tsx                |  2 +-
 src/pages/home/TopicGroup.tsx                |  2 +-
 src/pages/home/UserGroup.tsx                 |  6 +--
 src/pages/landing/landing_page.tsx           | 23 ++++----
 src/pages/search/search_screen.tsx           | 56 +++++++++++---------
 src/service/unsplash/service/current_user.ts |  2 +-
 11 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index a07668c..0b1840b 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,11 @@
     "connect": "adb connect 192.168.200.31",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
+    "ios-release":"npx react-native run-ios --mode Release",
     "lint": "eslint .",
     "start": "react-native start",
     "test": "jest",
-    "release": "cd android && ./gradlew assembleRelease && cd app/build/outputs/apk/release && adb install app-release.apk",
+    "android-release": "cd android && ./gradlew assembleRelease && cd app/build/outputs/apk/release && adb install app-release.apk",
     "build-release": "cd android && ./gradlew assembleRelease",
     "install-release": "cd android/app/build/outputs/apk/release && adb install app-release.apk",
     "setup-permission": "react-native setup-ios-permissions && cd ios && pod install"
diff --git a/src/App.tsx b/src/App.tsx
index 045c9a5..f0f0cd9 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,17 +1,20 @@
 import React, { ReactElement } from "react"
-import { Platform, StatusBar, useColorScheme } from "react-native"
+import { Image, Platform, StatusBar, useColorScheme } from "react-native"
 import { Provider as PaperProvider } from "react-native-paper"
 import { SafeAreaProvider } from "react-native-safe-area-context"
 import { Provider as ReduxProvider } from "react-redux"
 import { darkTheme, lightTheme } from "./assets/themes"
 import RootStack from "./navigations/root_stack"
 import { store } from "./redux/store/store"
+import { Images } from "./assets/images"
+import FastImage from "react-native-fast-image"
 
 export default function App(): ReactElement {
 	const colorScheme = useColorScheme()
 	const isDarkMode = colorScheme === "dark"
 	const theme = isDarkMode ? darkTheme : lightTheme
 
+	preloadImages()
 	Platform.OS === "android" && StatusBar.setBackgroundColor(theme.colors.elevation.level1)
 	StatusBar.setBarStyle(isDarkMode ? "light-content" : "dark-content")
 
@@ -25,3 +28,12 @@ export default function App(): ReactElement {
 		</SafeAreaProvider>
 	)
 }
+
+
+function preloadImages() {
+	const images = [Images.landing, Images.landing2]
+	const uris = images.map(image => ({
+		uri: Image.resolveAssetSource(image).uri,
+	}))
+	FastImage.preload(uris)
+}
diff --git a/src/actions/link_actions.ts b/src/actions/link_actions.ts
index 2b7163d..f8cdf4f 100644
--- a/src/actions/link_actions.ts
+++ b/src/actions/link_actions.ts
@@ -17,7 +17,7 @@ const openPortfolio = (portfolio_url: string) => {
 	Linking.openURL(portfolio_url).catch((err) => console.error("Can not open Portfolio:", err));
 };
 
-function LoginWidthUnsplash() {
+function LoginWithUnsplash() {
 	const baseUrl = "https://unsplash.com/oauth/authorize";
 	const clientId = `client_id=${ACCESS_KEY}`;
 	const redirect = `redirect_uri=unsplash://app/login_success`;
@@ -41,4 +41,4 @@ function LoginWidthUnsplash() {
 	Linking.openURL(url);
 }
 
-export { openInstagramProfile, openTwitterProfile, LoginWidthUnsplash, openPortfolio };
+export { openInstagramProfile, openTwitterProfile, LoginWithUnsplash, openPortfolio };
diff --git a/src/pages/currentUser/edit_profile.tsx b/src/pages/currentUser/edit_profile.tsx
index d68337d..0a313a0 100644
--- a/src/pages/currentUser/edit_profile.tsx
+++ b/src/pages/currentUser/edit_profile.tsx
@@ -5,8 +5,8 @@ import { Avatar, Button, IconButton, Surface, Text } from "react-native-paper"
 import { useSafeAreaInsets } from "react-native-safe-area-context"
 import * as yup from "yup"
 import { BackAppBar, LoadingScreen, TextField } from "../../components"
-import { useAppDispatch, useUserState } from "../../redux/store/store"
 import { updateCurrentUser } from "../../redux/features/user/action"
+import { useAppDispatch, useUserState } from "../../redux/store/store"
 
 export default function EditUserProfile() {
 	const state = useUserState()
@@ -135,7 +135,7 @@ export default function EditUserProfile() {
 						title="About"
 						control={control}
 						name="bio"
-						initValue={bio}
+						initValue={bio ?? ""}
 						placeholder="Description about you"
 						errors={errors}
 						style={styles.field}
@@ -144,7 +144,7 @@ export default function EditUserProfile() {
 						title="Instagram"
 						control={control}
 						name="instagram_username"
-						initValue={instagram_username}
+						initValue={instagram_username ?? ""}
 						placeholder="Instagram username"
 						errors={errors}
 						style={styles.field}
diff --git a/src/pages/home/CollectionGroup.tsx b/src/pages/home/CollectionGroup.tsx
index 911b2c5..a09618f 100644
--- a/src/pages/home/CollectionGroup.tsx
+++ b/src/pages/home/CollectionGroup.tsx
@@ -21,7 +21,7 @@ export default function CollectionGroup({ width }: { width: number }) {
 	return (
 		<>
 			<GroupHeading containerStyle={styles.collectionHeading} onMorePress={handleMorePress}>
-				Hot collections
+				Collections
 			</GroupHeading>
 			<ListAlbums
 				data={collectionsState.collections}
diff --git a/src/pages/home/PhotoGroup.tsx b/src/pages/home/PhotoGroup.tsx
index 8444db1..5ddd73a 100644
--- a/src/pages/home/PhotoGroup.tsx
+++ b/src/pages/home/PhotoGroup.tsx
@@ -21,7 +21,7 @@ export default function PhotoGroup({ style }: { style?: StyleProp<ViewStyle> })
 	return (
 		<>
 			<GroupHeading containerStyle={[styles.photoHeading, style]} onMorePress={handleMorePress}>
-				Top of the week
+				Photos
 			</GroupHeading>
 			<HorizontalImageList
 				data={photosState.photos}
diff --git a/src/pages/home/TopicGroup.tsx b/src/pages/home/TopicGroup.tsx
index bf6e5fc..d2f6097 100644
--- a/src/pages/home/TopicGroup.tsx
+++ b/src/pages/home/TopicGroup.tsx
@@ -22,7 +22,7 @@ export default function TopicGroup({ width }: { width: number }) {
 	return (
 		<>
 			<GroupHeading containerStyle={styles.heading} onMorePress={handleMorePress}>
-				Hot topics
+				Topics
 			</GroupHeading>
 			<ListAlbums
 				data={topicsState.topics}
diff --git a/src/pages/home/UserGroup.tsx b/src/pages/home/UserGroup.tsx
index 0570345..a853d7a 100644
--- a/src/pages/home/UserGroup.tsx
+++ b/src/pages/home/UserGroup.tsx
@@ -2,7 +2,7 @@ import { PropsWithChildren, useState } from "react"
 import { Pressable, StyleSheet, View } from "react-native"
 import { Avatar, Divider, IconButton, Menu, Text } from "react-native-paper"
 import { useDispatch, useSelector } from "react-redux"
-import { LoginWidthUnsplash as Login } from "../../actions/link_actions"
+import { LoginWithUnsplash as Login } from "../../actions/link_actions"
 import { Icons } from "../../assets/images/icons"
 import { useAppNavigation } from "../../navigations/hooks"
 import { Screens } from "../../navigations/screen_name"
@@ -30,12 +30,12 @@ export default function UserGroup() {
 	}
 
 	const openEdit = () => {
-		navigation.navigate(Screens.editUserProfile)
+		// navigation.navigate(Screens.editUserProfile)
 		closeMenu()
 	}
 
 	const openCreateCollection = () => {
-		navigation.navigate(Screens.createCollection)
+		// navigation.navigate(Screens.createCollection)
 		closeMenu()
 	}
 
diff --git a/src/pages/landing/landing_page.tsx b/src/pages/landing/landing_page.tsx
index 1401ed2..469e2e3 100644
--- a/src/pages/landing/landing_page.tsx
+++ b/src/pages/landing/landing_page.tsx
@@ -1,15 +1,18 @@
-import { ImageBackground, StyleSheet, View } from "react-native"
+import { ImageBackground, Platform, StatusBar, StyleSheet, View } from "react-native"
 import { Button, Text } from "react-native-paper"
-import { LoginWidthUnsplash } from "../../actions/link_actions"
+import { LoginWithUnsplash } from "../../actions/link_actions"
 import { Images } from "../../assets/images"
 import { Icons } from "../../assets/images/icons"
-import { useAppNavigation } from "../../navigations/hooks"
+import { useEffect } from "react"
 
 export default function LandingPage() {
-	const navigation = useAppNavigation()
-	const openApp = () => {
-		// navigation.navigate(ScreenName.main)
-	}
+	Platform.OS === "android" &&
+		useEffect(() => {
+			StatusBar.setTranslucent(true)
+			return () => {
+				StatusBar.setTranslucent(false)
+			}
+		}, [])
 
 	return (
 		<ImageBackground source={Images.landing2} style={styles.container}>
@@ -22,7 +25,7 @@ export default function LandingPage() {
 				</Text>
 			</View>
 			<View style={styles.buttonGroup}>
-				<Button
+				{/* <Button
 					mode="contained"
 					rippleColor="transparent"
 					onPress={openApp}
@@ -30,10 +33,10 @@ export default function LandingPage() {
 					labelStyle={styles.buttonLabel}
 				>
 					Maybe laster
-				</Button>
+				</Button> */}
 				<Button
 					mode="contained"
-					onPress={LoginWidthUnsplash}
+					onPress={LoginWithUnsplash}
 					icon={Icons.unsplash}
 					rippleColor="transparent"
 					style={[styles.button, styles.buttonLogin]}
diff --git a/src/pages/search/search_screen.tsx b/src/pages/search/search_screen.tsx
index e16cc67..2d9d5b9 100644
--- a/src/pages/search/search_screen.tsx
+++ b/src/pages/search/search_screen.tsx
@@ -16,12 +16,13 @@ import { Fillter } from "../../service/unsplash/params/search_params"
 export default function SearchScreen() {
 	const { top } = useSafeAreaInsets()
 	const navigation = useAppNavigation()
-	const [searchValue, setSearchValue] = useState<string>("")
+	const [searchValue, setSearchValue] = useState("")
 	const filter = useRef<Fillter>({})
 	const searchRef = useRef<TextInput>(null)
 	const [flag, setFlag] = useState(false)
 
 	const handleSearchSubmit = async (query: string) => {
+		if (searchValue === "") return
 		navigation.navigate({
 			name: Screens.searchResult,
 			params: {
@@ -44,7 +45,7 @@ export default function SearchScreen() {
 					placeholder="Search for image"
 					ref={searchRef}
 					value={searchValue}
-					onLayout={() => searchRef.current?.focus()}
+					onLayout={searchRef.current?.focus}
 					autoCapitalize="none"
 					onChangeText={setSearchValue}
 					onSubmitEditing={() => handleSearchSubmit(searchValue)}
@@ -52,10 +53,6 @@ export default function SearchScreen() {
 				/>
 			</View>
 
-			<Text variant="headlineLarge" style={styles.cardHeader}>
-				Histories
-			</Text>
-
 			<Histories onItemPress={handleSearchSubmit} flag={flag} />
 
 			<Text variant="headlineLarge" style={styles.cardHeader}>
@@ -90,37 +87,46 @@ export default function SearchScreen() {
 	)
 }
 
-function Histories({ onItemPress, flag }: { flag: boolean; onItemPress: (query: string) => void }) {
+type HistoriesProps = {
+	flag: boolean
+	onItemPress: (query: string) => void
+}
+function Histories({ onItemPress, flag }: HistoriesProps) {
 	const [histories, setHistories] = useState<string[]>([])
 	const nonDuplicateHistories = Array.from(new Set(histories))
 
-	function getHistories() {
-		History.get().then(data => {
-			setHistories(data)
-		})
+	const getHistories = () => {
+		History.get().then(data => setHistories(data))
 	}
 
-	function removeHistory(query: string) {
+	const removeHistory = (query: string) => {
 		History.remove(query)
 		setHistories(histories.filter(history => history != query))
 	}
 
 	useEffect(getHistories, [flag])
 
+	if (histories.length === 0) return null
+
 	return (
-		<View style={styles.historiesContainer}>
-			{nonDuplicateHistories.map((query, index) => (
-				<Chip
-					key={index}
-					style={styles.history}
-					mode="outlined"
-					onClose={() => removeHistory(query)}
-					onPress={() => onItemPress(query)}
-				>
-					{query}
-				</Chip>
-			))}
-		</View>
+		<>
+			<Text variant="headlineLarge" style={styles.cardHeader}>
+				Histories
+			</Text>
+			<View style={styles.historiesContainer}>
+				{nonDuplicateHistories.map((query, index) => (
+					<Chip
+						key={index}
+						style={styles.history}
+						mode="outlined"
+						onClose={() => removeHistory(query)}
+						onPress={() => onItemPress(query)}
+					>
+						{query}
+					</Chip>
+				))}
+			</View>
+		</>
 	)
 }
 
diff --git a/src/service/unsplash/service/current_user.ts b/src/service/unsplash/service/current_user.ts
index fa045fe..ca4a323 100644
--- a/src/service/unsplash/service/current_user.ts
+++ b/src/service/unsplash/service/current_user.ts
@@ -7,7 +7,7 @@ const CurrentUserService = {
 		return response.data
 	},
 	update: async (params: UpdateUserProfieParams) => {
-		const response = await API.put<FullUser>("/me", { params })
+		const response = await API.put<FullUser>("/me", undefined, { params })
 		return response.data
 	},
 }

From bd4b1c86733c951b8cbb9bc9966fbb26ff409822 Mon Sep 17 00:00:00 2001
From: anhChillLe <chieu280200@gmail.com>
Date: Thu, 3 Aug 2023 15:46:41 +0700
Subject: [PATCH 2/2] Fix navigation collection photo

---
 android/app/src/main/AndroidManifest.xml    |  3 ---
 src/hooks/user_collections.ts               |  3 +--
 src/pages/collections/collection_photos.tsx |  7 ++-----
 src/pages/landing/landing_page.tsx          | 11 +----------
 src/pages/user/user_collection.tsx          |  7 ++++---
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 32362d9..eae6430 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -60,9 +60,6 @@
                     android:host="app"
                     android:scheme="unsplash" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-            </intent-filter>
         </activity>
     </application>
 
diff --git a/src/hooks/user_collections.ts b/src/hooks/user_collections.ts
index 4d36805..61f87bf 100644
--- a/src/hooks/user_collections.ts
+++ b/src/hooks/user_collections.ts
@@ -10,7 +10,6 @@ export default function useUserCollections(username: string) {
 
 	const getCollections = useCallback(() => {
 		if(isLoading) return
-
 		setLoading(true)
 		unsplash.user
 			.listCollection({ username, page: page.current + 1, per_page: 10 })
@@ -19,7 +18,7 @@ export default function useUserCollections(username: string) {
 				setCollections([...collections, ...data])
 				page.current += 1
 			})
-			.catch(error => console.error("Get current user collections: ", error))
+			.catch(error => console.error("Get user collections: ", error))
 			.finally(() => isMounted.current && setLoading(false))
 	}, [username])
 
diff --git a/src/pages/collections/collection_photos.tsx b/src/pages/collections/collection_photos.tsx
index c3255a5..3ed8eb9 100644
--- a/src/pages/collections/collection_photos.tsx
+++ b/src/pages/collections/collection_photos.tsx
@@ -18,12 +18,9 @@ export default function CollectionPhotos() {
 
 	const handleItemPress = (photo: Photo, index: number) =>
 		navigation.navigate({
-			name: Screens.detailPager,
+			name: Screens.detail,
 			key: photo.id,
-			params: {
-				photos: [photo],
-				initPosition: index,
-			},
+			params: { photo },
 			merge: false,
 		})
 
diff --git a/src/pages/landing/landing_page.tsx b/src/pages/landing/landing_page.tsx
index 469e2e3..6ffabff 100644
--- a/src/pages/landing/landing_page.tsx
+++ b/src/pages/landing/landing_page.tsx
@@ -1,19 +1,10 @@
-import { ImageBackground, Platform, StatusBar, StyleSheet, View } from "react-native"
+import { ImageBackground, StyleSheet, View } from "react-native"
 import { Button, Text } from "react-native-paper"
 import { LoginWithUnsplash } from "../../actions/link_actions"
 import { Images } from "../../assets/images"
 import { Icons } from "../../assets/images/icons"
-import { useEffect } from "react"
 
 export default function LandingPage() {
-	Platform.OS === "android" &&
-		useEffect(() => {
-			StatusBar.setTranslucent(true)
-			return () => {
-				StatusBar.setTranslucent(false)
-			}
-		}, [])
-
 	return (
 		<ImageBackground source={Images.landing2} style={styles.container}>
 			<View style={{ alignItems: "flex-start" }}>
diff --git a/src/pages/user/user_collection.tsx b/src/pages/user/user_collection.tsx
index 4f6b74b..5ac42eb 100644
--- a/src/pages/user/user_collection.tsx
+++ b/src/pages/user/user_collection.tsx
@@ -8,11 +8,12 @@ import { Screens } from "../../navigations/screen_name"
 import { BaseGroup } from "../../service/unsplash/models"
 
 export default function UserCollection() {
-	const route = useUserCollectionsRoute()
-	const user = route.params.user
 	const { width } = Dimensions.get("window")
-	const navigation = useAppNavigation()
 	const { top, bottom } = useSafeAreaInsets()
+
+	const route = useUserCollectionsRoute()
+	const navigation = useAppNavigation()
+	const user = route.params.user
 	const { isLoading, collections, loadMore } = useUserCollections(user.username)
 
 	const handleItemPress = (collection: BaseGroup) =>