From c3dae2c7041d2fa00139dea926059baf5fbcf495 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Wed, 10 Jan 2024 22:33:50 +0100
Subject: [PATCH] Cleanup settings page on android

---
 .../apps/mobile/app/(app)/settings/index.tsx  | 23 +++++++++++++++++++
 front/packages/ui/src/settings/index.tsx      | 10 ++++----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 front/apps/mobile/app/(app)/settings/index.tsx

diff --git a/front/apps/mobile/app/(app)/settings/index.tsx b/front/apps/mobile/app/(app)/settings/index.tsx
new file mode 100644
index 00000000..7a987194
--- /dev/null
+++ b/front/apps/mobile/app/(app)/settings/index.tsx
@@ -0,0 +1,23 @@
+/*
+ * Kyoo - A portable and vast media library solution.
+ * Copyright (c) Kyoo.
+ *
+ * See AUTHORS.md and LICENSE file in the project root for full license information.
+ *
+ * Kyoo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Kyoo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { SettingsPage } from "@kyoo/ui";
+
+export default SettingsPage;
diff --git a/front/packages/ui/src/settings/index.tsx b/front/packages/ui/src/settings/index.tsx
index 5fba6888..4d3cfb2c 100644
--- a/front/packages/ui/src/settings/index.tsx
+++ b/front/packages/ui/src/settings/index.tsx
@@ -91,9 +91,9 @@ const Preference = ({
 				props,
 			)}
 		>
-			<View {...css({ flexDirection: "row", alignItems: "center" })}>
+			<View {...css({ flexDirection: "row", alignItems: "center", flexShrink: 1 })}>
 				<Icon icon={icon} {...css({ marginX: ts(2) })} />
-				<View>
+				<View {...css({ flexShrink: 1 })}>
 					<P {...css({ marginBottom: 0 })}>{label}</P>
 					<SubP>{description}</SubP>
 				</View>
@@ -291,7 +291,7 @@ const AccountSettings = ({ setPopup }: { setPopup: (e?: ReactElement) => void })
 							licon={<Icon icon={Logout} {...css({ marginX: ts(1) })} />}
 							text={t("login.logout")}
 							onPress={logout}
-							{...css({ flex: 1 })}
+							{...css({ flexGrow: 1, flexShrink: 1, flexBasis: 0 })}
 						/>
 						<Button
 							licon={<Icon icon={Delete} {...css({ marginX: ts(1) })} />}
@@ -315,7 +315,7 @@ const AccountSettings = ({ setPopup }: { setPopup: (e?: ReactElement) => void })
 									},
 								);
 							}}
-							{...css({ flex: 1 })}
+							{...css({ flexGrow: 1, flexShrink: 1, flexBasis: 0 })}
 						/>
 					</View>
 				}
@@ -394,7 +394,7 @@ export const SettingsPage: QueryPage = () => {
 	const theme = useUserTheme("auto");
 	return (
 		<>
-			<ScrollView contentContainerStyle={{ gap: ts(4) }}>
+			<ScrollView contentContainerStyle={{ gap: ts(4), paddingBottom: ts(4) }}>
 				<SettingsContainer title={t("settings.general.label")}>
 					<Preference
 						icon={Theme}