💚 End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refactor(photos):use-preference-rows-and-selection-drawers
Aswin Asokdaad4c76176f
diff --git a/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx b/web/apps/photos/src/components/sidebar/preferences/Preferences.tsxindex 7297e264b1..9027d8dad0 100644--- a/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx+++ b/web/apps/photos/src/components/sidebar/preferences/Preferences.tsx@@ -1,21 +1,25 @@-import ChevronRightIcon from "@mui/icons-material/ChevronRight";+import DarkModeIcon from "@mui/icons-material/DarkMode";+import LightModeIcon from "@mui/icons-material/LightMode";+import SmartphoneIcon from "@mui/icons-material/Smartphone";import { Divider, Link, Stack, TextField, useColorScheme } from "@mui/material";import Typography from "@mui/material/Typography";import { isDesktop } from "ente-base/app";+import { EnteSwitch } from "ente-base/components/EnteSwitch";import {- RowButton,RowButtonEndActivityIndicator,RowButtonGroup,RowButtonGroupHint,RowSwitch,} from "ente-base/components/RowButton";-import { SpacedRow } from "ente-base/components/containers";import { LoadingButton } from "ente-base/components/mui/LoadingButton";import {TitledNestedSidebarDrawer,type NestedSidebarDrawerVisibilityProps,} from "ente-base/components/mui/SidebarDrawer";import { useModalVisibility } from "ente-base/components/utils/modal";+import { MenuComponent } from "ente-base/components/v2/MenuComponent";+import { MenuGroupComponent } from "ente-base/components/v2/MenuGroupComponent";+import { RowCard } from "ente-base/components/v2/RowCard";import { isHTTPErrorWithStatus } from "ente-base/http";import {getLocaleInUse,@@ -46,7 +50,6 @@ import { useFormik } from "formik";import { t } from "i18next";import React, { useCallback, useEffect, useState } from "react";import { Trans } from "react-i18next";-import { DropdownInput } from "../DropdownInput";import { AppLockSettings } from "./AppLockSettings";import { MLSettings } from "./MLSettings";@@ -78,6 +81,12 @@ export const Preferences: React.FC<PreferencesProps> = ({pendingAction,onActionHandled,}) => {+ const {+ show: showLanguageSettings,+ props: languageSettingsVisibilityProps,+ } = useModalVisibility();+ const { show: showThemeSettings, props: themeSettingsVisibilityProps } =+ useModalVisibility();const { show: showDomainSettings, props: domainSettingsVisibilityProps } =useModalVisibility();const {@@ -120,9 +129,13 @@ export const Preferences: React.FC<PreferencesProps> = ({case "preferences.mlSearch":showMLSettings();break;- case "preferences.map":case "preferences.language":+ showLanguageSettings();+ break;case "preferences.theme":+ showThemeSettings();+ break;+ case "preferences.map":case "preferences.streamableVideos":break;}@@ -133,6 +146,8 @@ export const Preferences: React.FC<PreferencesProps> = ({pendingAction,showAdvancedSettings,showDomainSettings,+ showLanguageSettings,+ showThemeSettings,showMLSettings,]);@@ -148,32 +163,30 @@ export const Preferences: React.FC<PreferencesProps> = ({onRootClose={handleRootClose}title={t("preferences")}>- <Stack sx={{ px: 2, py: 1, gap: 3 }}>- <LanguageSelector />- <ThemeSelector />+ <Stack sx={{ px: 2, py: 1, gap: 1 }}>+ <RowCard title={t("language")} onClick={showLanguageSettings} />+ <RowCard title={t("theme")} onClick={showThemeSettings} /><Divider sx={{ my: "2px", opacity: 0.1 }} />{isMLSupported && (- <RowButtonGroup>- <RowButton- endIcon={<ChevronRightIcon />}- label={t("ml_search")}- onClick={showMLSettings}- />- </RowButtonGroup>+ <RowCard title={t("ml_search")} onClick={showMLSettings} />)}- <RowButton- label={t("custom_domains")}- endIcon={<ChevronRightIcon />}+ <RowCard+ title={t("custom_domains")}onClick={showDomainSettings}/><Stack>- <RowButtonGroup>- <RowSwitch- label={t("map")}- checked={mapEnabled}- onClick={handleToggleMap}- />- </RowButtonGroup>+ <RowCard+ title={t("map")}+ endIcon={+ <EnteSwitch+ checked={mapEnabled}+ onChange={handleToggleMap}+ slotProps={{+ input: { "aria-label": t("map") },+ }}+ />+ }+ /><RowButtonGroupHint>{t("maps_privacy_notice")}</RowButtonGroupHint>@@ -186,11 +199,7 @@ export const Preferences: React.FC<PreferencesProps> = ({</Typography>)}</Stack>- <RowButton- endIcon={<ChevronRightIcon />}- label={t("advanced")}- onClick={showAdvancedSettings}- />+ <RowCard title={t("advanced")} onClick={showAdvancedSettings} />{isDesktop && (<AppLockSettingsonAuthenticateUser={onAuthenticateUser}@@ -199,43 +208,67 @@ export const Preferences: React.FC<PreferencesProps> = ({)}{isHLSGenerationSupported && (<Stack>- <RowButtonGroup>- <RowSwitch- label={t("streamable_videos")}- checked={isHLSGenerationEnabled}- onClick={() => void toggleHLSGeneration()}- />- </RowButtonGroup>+ <RowCard+ title={t("streamable_videos")}+ endIcon={+ <EnteSwitch+ checked={isHLSGenerationEnabled}+ onChange={() => void toggleHLSGeneration()}+ slotProps={{+ input: {+ "aria-label":+ t("streamable_videos"),+ },+ }}+ />+ }+ />{isHLSGenerationEnabled && (- <SpacedRow sx={{ gap: 2, px: 2, pt: 2, pb: 1 }}>- <Typography sx={{ color: "text.faint" }}>- {t("processed")}- </Typography>- {hlsProcessedFraction == undefined ? (- <RowButtonEndActivityIndicator />- ) : (- <Typography sx={{ textAlign: "right" }}>- {t("percent_complete", {- percent: hlsProcessedFraction * 100,- formatParams: {- percent: {- minimumFractionDigits:- hlsProcessedFraction ==- 0- ? 0- : 2,- maximumFractionDigits: 2,- roundingMode: "trunc",- },- },- })}+ <RowCard+ title={+ <Typography+ component="span"+ sx={{ color: "text.faint" }}+ >+ {t("processed")}</Typography>- )}- </SpacedRow>+ }+ endIcon={+ hlsProcessedFraction == undefined ? (+ <RowButtonEndActivityIndicator />+ ) : (+ <Typography sx={{ textAlign: "right" }}>+ {t("percent_complete", {+ percent:+ hlsProcessedFraction * 100,+ formatParams: {+ percent: {+ minimumFractionDigits:+ hlsProcessedFraction ==+ 0+ ? 0+ : 2,+ maximumFractionDigits: 2,+ roundingMode: "trunc",+ },+ },+ })}+ </Typography>+ )+ }+ />)}</Stack>)}</Stack>+ <LanguageSelector+ {...languageSettingsVisibilityProps}+ onRootClose={handleRootClose}+ />+ <ThemeSelector+ {...themeSettingsVisibilityProps}+ onRootClose={handleRootClose}+ /><DomainSettings{...domainSettingsVisibilityProps}onRootClose={onRootClose}@@ -252,11 +285,18 @@ export const Preferences: React.FC<PreferencesProps> = ({);};-const LanguageSelector = () => {+const LanguageSelector: React.FC<NestedSidebarDrawerVisibilityProps> = ({+ open,+ onClose,+ onRootClose,+}) => {const locale = getLocaleInUse();const updateCurrentLocale = (newLocale: SupportedLocale) => {- if (newLocale === locale) return;+ if (newLocale === locale) {+ onClose();+ return;+ }void setLocaleInUse(newLocale).then(() => {// Global translations and cached formatters need a full reload.@@ -268,22 +308,31 @@ const LanguageSelector = () => {});};- const options = supportedLocales.map((locale) => ({- label: localeName(locale),- value: locale,- }));+ const handleRootClose = () => {+ onClose();+ onRootClose();+ };return (- <Stack sx={{ gap: 1 }}>- <Typography variant="small" sx={{ px: 1, color: "text.muted" }}>- {t("language")}- </Typography>- <DropdownInput- options={options}- selected={locale}- onSelect={updateCurrentLocale}- />- </Stack>+ <TitledNestedSidebarDrawer+ maxWidth="440px"+ {...{ open, onClose }}+ onRootClose={handleRootClose}+ title={t("select_language")}+ >+ <Stack sx={{ px: 2, py: 1 }}>+ <MenuGroupComponent>+ {supportedLocales.map((option) => (+ <MenuComponent+ key={option}+ title={localeName(option)}+ selected={option === locale}+ onClick={() => updateCurrentLocale(option)}+ />+ ))}+ </MenuGroupComponent>+ </Stack>+ </TitledNestedSidebarDrawer>);};@@ -306,9 +355,9 @@ const localeName = (locale: SupportedLocale) => {case "es-ES":return "Español";case "pt-PT":- return "Português";+ return "Português (Portugal)";case "pt-BR":- return "Português Brasileiro";+ return "Português (Brasil)";case "ru-RU":return "Русский";case "pl-PL":@@ -330,33 +379,57 @@ const localeName = (locale: SupportedLocale) => {case "tr-TR":return "Türkçe";case "cs-CZ":- return "čeština";+ return "Čeština";case "el-GR":return "Ελληνικά";}};-const ThemeSelector = () => {+const ThemeSelector: React.FC<NestedSidebarDrawerVisibilityProps> = ({+ open,+ onClose,+ onRootClose,+}) => {const { mode, setMode } = useColorScheme();+ const handleRootClose = () => {+ onClose();+ onRootClose();+ };+// MUI color mode is undefined during SSR.if (!mode) return null;+ const options = [+ { label: t("system"), value: "system", icon: <SmartphoneIcon /> },+ { label: t("light"), value: "light", icon: <LightModeIcon /> },+ { label: t("dark"), value: "dark", icon: <DarkModeIcon /> },+ ] as const;+return (- <Stack sx={{ gap: 1 }}>- <Typography variant="small" sx={{ px: 1, color: "text.muted" }}>- {t("theme")}- </Typography>- <DropdownInput- options={[- { label: t("system"), value: "system" },- { label: t("light"), value: "light" },- { label: t("dark"), value: "dark" },- ]}- selected={mode}- onSelect={setMode}- />- </Stack>+ <TitledNestedSidebarDrawer+ maxWidth="440px"+ {...{ open, onClose }}+ onRootClose={handleRootClose}+ title={t("theme")}+ >+ <Stack sx={{ px: 2, py: 1 }}>+ <MenuGroupComponent dividerInset={68}>+ {options.map(({ label, value, icon }) => (+ <MenuComponent+ key={value}+ title={label}+ startIcon={icon}+ selected={value === mode}+ onClick={() => {+ setMode(value);+ onClose();+ }}+ />+ ))}+ </MenuGroupComponent>+ </Stack>+ </TitledNestedSidebarDrawer>);};diff --git a/web/packages/base/components/v2/MenuComponent.tsx b/web/packages/base/components/v2/MenuComponent.tsxnew file mode 100644index 0000000000..77b59a64dc--- /dev/null+++ b/web/packages/base/components/v2/MenuComponent.tsx@@ -0,0 +1,92 @@+import CheckIcon from "@mui/icons-material/Check";+import { Box, Typography } from "@mui/material";+import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";+import type { ReactNode } from "react";++interface MenuComponentProps {+ title: string;+ selected: boolean;+ onClick: () => void;+ startIcon?: ReactNode;+}++/** A selectable menu row, matching the mobile MenuComponent. */+export function MenuComponent({+ title,+ selected,+ onClick,+ startIcon,+}: MenuComponentProps) {+ return (+ <FocusVisibleButton+ fullWidth+ onClick={onClick}+ aria-pressed={selected}+ sx={[+ {+ minHeight: 58,+ py: "9px",+ pl: startIcon ? "12px" : "16px",+ pr: "12px",+ gap: "12px",+ borderRadius: "20px",+ color: "text.base",+ bgcolor: "transparent",+ textAlign: "left",+ "&:hover": { bgcolor: "fill.faintHover" },+ "&:active": { bgcolor: "fill.muted" },+ "&.Mui-focusVisible": { outlineOffset: "-2px" },+ },+ (theme) =>+ theme.applyStyles("dark", {+ "&:hover": { bgcolor: "#0a0a0a" },+ "&:active": { bgcolor: "#141414" },+ }),+ ]}+ >+ {startIcon && (+ <Box+ sx={{+ width: 36,+ height: 36,+ flexShrink: 0,+ display: "grid",+ placeItems: "center",+ color: "text.muted",+ "& svg": { fontSize: 20 },+ }}+ >+ {startIcon}+ </Box>+ )}+ <Typography+ sx={{+ flex: 1,+ minWidth: 0,+ fontSize: 14,+ lineHeight: "20px",+ fontWeight: 500,+ display: "-webkit-box",+ WebkitBoxOrient: "vertical",+ WebkitLineClamp: 2,+ overflow: "hidden",+ }}+ >+ {title}+ </Typography>+ <Box+ sx={{+ width: 36,+ height: 36,+ flexShrink: 0,+ display: "grid",+ placeItems: "center",+ }}+ >+ {selected && (+ <CheckIcon sx={{ fontSize: 20, color: "accent.main" }} />+ )}+ </Box>+ </FocusVisibleButton>+ );+}diff --git a/web/packages/base/components/v2/MenuGroupComponent.tsx b/web/packages/base/components/v2/MenuGroupComponent.tsxnew file mode 100644index 0000000000..0fcb759948--- /dev/null+++ b/web/packages/base/components/v2/MenuGroupComponent.tsx@@ -0,0 +1,38 @@+import { Divider, Stack } from "@mui/material";+import type { ReactNode } from "react";++interface MenuGroupComponentProps {+ children: ReactNode;+ dividerInset?: number;+}++/** A shared rounded surface with inset dividers, like mobile menu groups. */+export function MenuGroupComponent({+ children,+ dividerInset = 16,+}: MenuGroupComponentProps) {+ return (+ <Stack+ divider={+ <Divider+ sx={{+ "&&": { ml: `${dividerInset}px` },+ borderColor: "fill.fainter",+ }}+ />+ }+ sx={[+ {+ bgcolor: "background.paper",+ borderRadius: "20px",+ overflow: "hidden",+ "& > button": { borderRadius: 0 },+ },+ // Mobile's fillLight surface contrasts with the drawer background.+ (theme) => theme.applyStyles("dark", { bgcolor: "#212121" }),+ ]}+ >+ {children}+ </Stack>+ );+}diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.jsonindex ac07ac6fd7..0aa8030e09 100644--- a/web/packages/base/locales/en-US/translation.json+++ b/web/packages/base/locales/en-US/translation.json@@ -850,6 +850,7 @@"password_strength_strong": "Password strength: Strong","preferences": "Preferences","language": "Language",+ "select_language": "Select language","advanced": "Advanced","export_directory_does_not_exist": "Invalid export directory","export_directory_does_not_exist_message": "<p>The export directory you have selected does not exist.</p><p>Please select a valid directory.</p>",