mirror of
https://github.com/arkorty/Expensso.git
synced 2026-03-17 16:41:43 +00:00
feat: black theme and other UI fixes
This commit is contained in:
@@ -92,7 +92,7 @@ android {
|
|||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "0.1.2"
|
versionName "0.1.4"
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
debug {
|
debug {
|
||||||
|
|||||||
2
app.json
2
app.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "Expensso",
|
"name": "Expensso",
|
||||||
"displayName": "Expensso",
|
"displayName": "Expensso",
|
||||||
"version": "0.1.2",
|
"version": "0.1.4",
|
||||||
"android": {
|
"android": {
|
||||||
"versionCode": 1
|
"versionCode": 1
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -265,7 +265,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.1.2;
|
MARKETING_VERSION = 0.1.4;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"-ObjC",
|
"-ObjC",
|
||||||
@@ -294,7 +294,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.1.2;
|
MARKETING_VERSION = 0.1.4;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"-ObjC",
|
"-ObjC",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "expensso",
|
"name": "expensso",
|
||||||
"version": "0.1.2",
|
"version": "0.1.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"android": "react-native run-android",
|
"android": "react-native run-android",
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ const packagePath = path.join(rootDir, 'package.json');
|
|||||||
const appJsonPath = path.join(rootDir, 'app.json');
|
const appJsonPath = path.join(rootDir, 'app.json');
|
||||||
const androidGradlePath = path.join(rootDir, 'android', 'app', 'build.gradle');
|
const androidGradlePath = path.join(rootDir, 'android', 'app', 'build.gradle');
|
||||||
const iosPbxprojPath = path.join(rootDir, 'ios', 'Expensso.xcodeproj', 'project.pbxproj');
|
const iosPbxprojPath = path.join(rootDir, 'ios', 'Expensso.xcodeproj', 'project.pbxproj');
|
||||||
|
const appVersionTsPath = path.join(rootDir, 'src', 'constants', 'appVersion.ts');
|
||||||
|
|
||||||
function readJson(filePath) {
|
function readJson(filePath) {
|
||||||
return JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
return JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
||||||
@@ -69,6 +70,18 @@ function replaceOrThrow(content, regex, replacement, targetName) {
|
|||||||
return updated;
|
return updated;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function writeAppVersionTs({version, buildNumber}) {
|
||||||
|
const content = [
|
||||||
|
`export const APP_VERSION = '${version}';`,
|
||||||
|
`export const APP_BUILD_NUMBER = ${buildNumber};`,
|
||||||
|
'export const APP_VERSION_LABEL = `${APP_VERSION} (${APP_BUILD_NUMBER})`;',
|
||||||
|
'',
|
||||||
|
].join('\n');
|
||||||
|
|
||||||
|
fs.mkdirSync(path.dirname(appVersionTsPath), {recursive: true});
|
||||||
|
fs.writeFileSync(appVersionTsPath, content, 'utf8');
|
||||||
|
}
|
||||||
|
|
||||||
function syncToTargets({version, buildNumber}) {
|
function syncToTargets({version, buildNumber}) {
|
||||||
const packageJson = readJson(packagePath);
|
const packageJson = readJson(packagePath);
|
||||||
packageJson.version = version;
|
packageJson.version = version;
|
||||||
@@ -109,6 +122,8 @@ function syncToTargets({version, buildNumber}) {
|
|||||||
'iOS CURRENT_PROJECT_VERSION',
|
'iOS CURRENT_PROJECT_VERSION',
|
||||||
);
|
);
|
||||||
fs.writeFileSync(iosPbxprojPath, pbxproj, 'utf8');
|
fs.writeFileSync(iosPbxprojPath, pbxproj, 'utf8');
|
||||||
|
|
||||||
|
writeAppVersionTs({version, buildNumber});
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveConfig(config) {
|
function saveConfig(config) {
|
||||||
|
|||||||
@@ -91,8 +91,14 @@ const CustomBottomSheetInner = forwardRef<CustomBottomSheetHandle, CustomBottomS
|
|||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const s = makeStyles(theme);
|
const s = makeStyles(theme);
|
||||||
const sheetRef = useRef<BottomSheet>(null);
|
const sheetRef = useRef<BottomSheet>(null);
|
||||||
|
const [sheetIndex, setSheetIndex] = React.useState(-1);
|
||||||
const snapPoints = useMemo(() => snapPointsProp ?? ['60%'], [snapPointsProp]);
|
const snapPoints = useMemo(() => snapPointsProp ?? ['60%'], [snapPointsProp]);
|
||||||
|
|
||||||
|
const handleClose = useCallback(() => {
|
||||||
|
setSheetIndex(-1);
|
||||||
|
onDismiss?.();
|
||||||
|
}, [onDismiss]);
|
||||||
|
|
||||||
// Imperative handle
|
// Imperative handle
|
||||||
useImperativeHandle(ref, () => ({
|
useImperativeHandle(ref, () => ({
|
||||||
present: () => {
|
present: () => {
|
||||||
@@ -138,7 +144,8 @@ const CustomBottomSheetInner = forwardRef<CustomBottomSheetHandle, CustomBottomS
|
|||||||
snapPoints={enableDynamicSizing ? undefined : snapPoints}
|
snapPoints={enableDynamicSizing ? undefined : snapPoints}
|
||||||
enableDynamicSizing={enableDynamicSizing}
|
enableDynamicSizing={enableDynamicSizing}
|
||||||
enablePanDownToClose
|
enablePanDownToClose
|
||||||
onClose={onDismiss}
|
onClose={handleClose}
|
||||||
|
onChange={setSheetIndex}
|
||||||
backdropComponent={renderBackdrop}
|
backdropComponent={renderBackdrop}
|
||||||
handleComponent={renderHandle}
|
handleComponent={renderHandle}
|
||||||
backgroundStyle={s.background}
|
backgroundStyle={s.background}
|
||||||
@@ -174,12 +181,14 @@ const CustomBottomSheetInner = forwardRef<CustomBottomSheetHandle, CustomBottomS
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Sheet Body */}
|
{/* Sheet Body */}
|
||||||
<Wrapper
|
{sheetIndex >= 0 && (
|
||||||
style={s.body}
|
<Wrapper
|
||||||
contentContainerStyle={s.bodyContent}
|
style={s.body}
|
||||||
showsVerticalScrollIndicator={false}>
|
contentContainerStyle={s.bodyContent}
|
||||||
{children}
|
showsVerticalScrollIndicator={false}>
|
||||||
</Wrapper>
|
{children}
|
||||||
|
</Wrapper>
|
||||||
|
)}
|
||||||
</BottomSheet>
|
</BottomSheet>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
89
src/components/FloatingModal.tsx
Normal file
89
src/components/FloatingModal.tsx
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import {
|
||||||
|
Modal,
|
||||||
|
View,
|
||||||
|
Text,
|
||||||
|
Pressable,
|
||||||
|
StyleSheet,
|
||||||
|
} from 'react-native';
|
||||||
|
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
|
||||||
|
import {useTheme} from '../theme';
|
||||||
|
|
||||||
|
export interface FloatingModalProps {
|
||||||
|
visible: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
title?: string;
|
||||||
|
children: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const FloatingModal: React.FC<FloatingModalProps> = ({
|
||||||
|
visible,
|
||||||
|
onClose,
|
||||||
|
title,
|
||||||
|
children,
|
||||||
|
}) => {
|
||||||
|
const theme = useTheme();
|
||||||
|
const {colors, typography, spacing, shape, elevation} = theme;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Modal
|
||||||
|
visible={visible}
|
||||||
|
transparent
|
||||||
|
animationType="fade"
|
||||||
|
statusBarTranslucent
|
||||||
|
onRequestClose={onClose}>
|
||||||
|
<View style={[styles.backdrop, {backgroundColor: colors.scrim + '66'}]}>
|
||||||
|
<Pressable style={StyleSheet.absoluteFillObject} onPress={onClose} />
|
||||||
|
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.card,
|
||||||
|
{
|
||||||
|
backgroundColor: colors.surfaceContainer,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
|
borderRadius: shape.large,
|
||||||
|
marginHorizontal: spacing.xl,
|
||||||
|
...elevation.level3,
|
||||||
|
},
|
||||||
|
]}>
|
||||||
|
{(title || onClose) && (
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.header,
|
||||||
|
{
|
||||||
|
borderBottomColor: colors.outlineVariant,
|
||||||
|
paddingHorizontal: spacing.lg,
|
||||||
|
paddingVertical: spacing.md,
|
||||||
|
},
|
||||||
|
]}>
|
||||||
|
<Text style={[typography.titleMedium, {color: colors.onSurface}]}> {title ?? ''}</Text>
|
||||||
|
<Pressable onPress={onClose} hitSlop={8}>
|
||||||
|
<Icon name="close" size={20} color={colors.onSurfaceVariant} />
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<View style={{padding: spacing.lg}}>{children}</View>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
backdrop: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
},
|
||||||
|
card: {
|
||||||
|
maxHeight: '72%',
|
||||||
|
borderWidth: 1,
|
||||||
|
overflow: 'hidden',
|
||||||
|
},
|
||||||
|
header: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
borderBottomWidth: 1,
|
||||||
|
},
|
||||||
|
});
|
||||||
137
src/components/SettingsSelectionSheet.tsx
Normal file
137
src/components/SettingsSelectionSheet.tsx
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
import React, {forwardRef, useImperativeHandle, useMemo, useState} from 'react';
|
||||||
|
import {Pressable, ScrollView, StyleSheet, Text, View} from 'react-native';
|
||||||
|
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
|
||||||
|
import type {CustomBottomSheetHandle} from './CustomBottomSheet';
|
||||||
|
import {triggerHaptic} from './CustomBottomSheet';
|
||||||
|
import {FloatingModal} from './FloatingModal';
|
||||||
|
import {useTheme} from '../theme';
|
||||||
|
|
||||||
|
export interface SettingsSelectionOption<T extends string> {
|
||||||
|
label: string;
|
||||||
|
value: T;
|
||||||
|
icon?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SettingsSelectionSheetProps<T extends string> {
|
||||||
|
title: string;
|
||||||
|
options: SettingsSelectionOption<T>[];
|
||||||
|
selectedValue: T;
|
||||||
|
onSelect: (value: T) => void;
|
||||||
|
enableDynamicSizing?: boolean;
|
||||||
|
snapPoints?: (string | number)[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const SettingsSelectionSheetInner = <T extends string>(
|
||||||
|
{
|
||||||
|
title,
|
||||||
|
options,
|
||||||
|
selectedValue,
|
||||||
|
onSelect,
|
||||||
|
}: SettingsSelectionSheetProps<T>,
|
||||||
|
ref: React.ForwardedRef<CustomBottomSheetHandle>,
|
||||||
|
) => {
|
||||||
|
const theme = useTheme();
|
||||||
|
const {colors, typography, spacing, shape} = theme;
|
||||||
|
const [visible, setVisible] = useState(false);
|
||||||
|
|
||||||
|
useImperativeHandle(ref, () => ({
|
||||||
|
present: () => {
|
||||||
|
triggerHaptic('impactLight');
|
||||||
|
setVisible(true);
|
||||||
|
},
|
||||||
|
dismiss: () => {
|
||||||
|
triggerHaptic('impactLight');
|
||||||
|
setVisible(false);
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
const selectedOption = useMemo(
|
||||||
|
() => options.find(option => option.value === selectedValue),
|
||||||
|
[options, selectedValue],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FloatingModal
|
||||||
|
visible={visible}
|
||||||
|
onClose={() => setVisible(false)}
|
||||||
|
title={title}>
|
||||||
|
<ScrollView showsVerticalScrollIndicator={false}>
|
||||||
|
{options.map(option => {
|
||||||
|
const selected = option.value === selectedValue;
|
||||||
|
return (
|
||||||
|
<Pressable
|
||||||
|
key={option.value}
|
||||||
|
onPress={() => {
|
||||||
|
triggerHaptic('selection');
|
||||||
|
onSelect(option.value);
|
||||||
|
setVisible(false);
|
||||||
|
}}
|
||||||
|
style={{
|
||||||
|
...styles.optionRow,
|
||||||
|
paddingHorizontal: spacing.md,
|
||||||
|
paddingVertical: spacing.md,
|
||||||
|
borderRadius: shape.medium,
|
||||||
|
borderColor: selected ? colors.primary : colors.outlineVariant,
|
||||||
|
backgroundColor: selected
|
||||||
|
? colors.primaryContainer
|
||||||
|
: colors.surfaceContainerLowest,
|
||||||
|
marginBottom: spacing.sm,
|
||||||
|
}}>
|
||||||
|
{option.icon ? (
|
||||||
|
<Icon
|
||||||
|
name={option.icon}
|
||||||
|
size={18}
|
||||||
|
color={selected ? colors.primary : colors.onSurfaceVariant}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
<Text
|
||||||
|
style={[
|
||||||
|
{
|
||||||
|
...typography.bodyLarge,
|
||||||
|
color: selected ? colors.onPrimaryContainer : colors.onSurface,
|
||||||
|
},
|
||||||
|
styles.optionLabel,
|
||||||
|
option.icon ? styles.optionLabelWithIcon : null,
|
||||||
|
]}>
|
||||||
|
{option.label}
|
||||||
|
</Text>
|
||||||
|
{selected ? (
|
||||||
|
<Icon name="check" size={18} color={colors.primary} />
|
||||||
|
) : null}
|
||||||
|
</Pressable>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
|
||||||
|
{!selectedOption && options.length > 0 ? (
|
||||||
|
<View style={{...styles.hintContainer, marginTop: spacing.xs, paddingHorizontal: spacing.xs}}>
|
||||||
|
<Text style={{...typography.bodySmall, color: colors.onSurfaceVariant}}>
|
||||||
|
Current selection is unavailable. Pick a new value.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
) : null}
|
||||||
|
</ScrollView>
|
||||||
|
</FloatingModal>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const SettingsSelectionSheet = forwardRef(SettingsSelectionSheetInner) as <T extends string>(
|
||||||
|
props: SettingsSelectionSheetProps<T> & React.RefAttributes<CustomBottomSheetHandle>,
|
||||||
|
) => React.ReactElement;
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
optionRow: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
borderWidth: 1,
|
||||||
|
},
|
||||||
|
optionLabel: {
|
||||||
|
flex: 1,
|
||||||
|
},
|
||||||
|
optionLabelWithIcon: {
|
||||||
|
marginLeft: 8,
|
||||||
|
},
|
||||||
|
hintContainer: {
|
||||||
|
marginTop: 0,
|
||||||
|
paddingHorizontal: 0,
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -2,6 +2,8 @@ export {SummaryCard} from './SummaryCard';
|
|||||||
export {TransactionItem} from './TransactionItem';
|
export {TransactionItem} from './TransactionItem';
|
||||||
export {EmptyState} from './EmptyState';
|
export {EmptyState} from './EmptyState';
|
||||||
export {SectionHeader} from './SectionHeader';
|
export {SectionHeader} from './SectionHeader';
|
||||||
|
export {FloatingModal} from './FloatingModal';
|
||||||
|
export {SettingsSelectionSheet} from './SettingsSelectionSheet';
|
||||||
export {
|
export {
|
||||||
CustomBottomSheet,
|
CustomBottomSheet,
|
||||||
BottomSheetInput,
|
BottomSheetInput,
|
||||||
@@ -9,3 +11,4 @@ export {
|
|||||||
triggerHaptic,
|
triggerHaptic,
|
||||||
} from './CustomBottomSheet';
|
} from './CustomBottomSheet';
|
||||||
export type {CustomBottomSheetHandle} from './CustomBottomSheet';
|
export type {CustomBottomSheetHandle} from './CustomBottomSheet';
|
||||||
|
export type {SettingsSelectionOption} from './SettingsSelectionSheet';
|
||||||
|
|||||||
3
src/constants/appVersion.ts
Normal file
3
src/constants/appVersion.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export const APP_VERSION = '0.1.4';
|
||||||
|
export const APP_BUILD_NUMBER = 1;
|
||||||
|
export const APP_VERSION_LABEL = `${APP_VERSION} (${APP_BUILD_NUMBER})`;
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
import {Category, ExchangeRates, PaymentMethod} from '../types';
|
import {Category, ExchangeRates, PaymentMethod} from '../types';
|
||||||
|
|
||||||
|
export * from './appVersion';
|
||||||
|
|
||||||
// ─── Default Expense Categories (Indian Context) ────────────────────
|
// ─── Default Expense Categories (Indian Context) ────────────────────
|
||||||
|
|
||||||
export const DEFAULT_EXPENSE_CATEGORIES: Omit<Category, 'id' | 'createdAt'>[] = [
|
export const DEFAULT_EXPENSE_CATEGORIES: Omit<Category, 'id' | 'createdAt'>[] = [
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
gap: spacing.md,
|
gap: spacing.md,
|
||||||
marginTop: spacing.sm,
|
marginTop: spacing.sm,
|
||||||
marginBottom: spacing.lg,
|
marginBottom: spacing.xs,
|
||||||
},
|
},
|
||||||
summaryItem: {
|
summaryItem: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
@@ -504,7 +504,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
flex: 1,
|
flex: 1,
|
||||||
backgroundColor: colors.surface,
|
backgroundColor: colors.surface,
|
||||||
marginHorizontal: spacing.xl,
|
marginHorizontal: spacing.xl,
|
||||||
marginTop: spacing.md,
|
marginTop: spacing.xs,
|
||||||
|
marginBottom: spacing.md,
|
||||||
borderRadius: shape.large,
|
borderRadius: shape.large,
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
borderColor: colors.outlineVariant,
|
borderColor: colors.outlineVariant,
|
||||||
|
|||||||
@@ -19,25 +19,27 @@ import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
|
|||||||
import Animated, {FadeIn, FadeInDown} from 'react-native-reanimated';
|
import Animated, {FadeIn, FadeInDown} from 'react-native-reanimated';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CustomBottomSheet,
|
SettingsSelectionSheet,
|
||||||
triggerHaptic,
|
triggerHaptic,
|
||||||
} from '../components';
|
} from '../components';
|
||||||
import type {CustomBottomSheetHandle} from '../components';
|
import type {CustomBottomSheetHandle, SettingsSelectionOption} from '../components';
|
||||||
|
import {APP_VERSION_LABEL} from '../constants';
|
||||||
import {useSettingsStore} from '../store';
|
import {useSettingsStore} from '../store';
|
||||||
import {useTheme} from '../theme';
|
import {useTheme} from '../theme';
|
||||||
import type {MD3Theme} from '../theme';
|
import type {MD3Theme} from '../theme';
|
||||||
import {Currency} from '../types';
|
import {Currency} from '../types';
|
||||||
|
|
||||||
const CURRENCIES: {label: string; value: Currency; icon: string}[] = [
|
const CURRENCIES: SettingsSelectionOption<Currency>[] = [
|
||||||
{label: 'Indian Rupee (\u20B9)', value: 'INR', icon: 'currency-inr'},
|
{label: 'Indian Rupee (\u20B9)', value: 'INR', icon: 'currency-inr'},
|
||||||
{label: 'US Dollar ($)', value: 'USD', icon: 'currency-usd'},
|
{label: 'US Dollar ($)', value: 'USD', icon: 'currency-usd'},
|
||||||
{label: 'Euro (\u20AC)', value: 'EUR', icon: 'currency-eur'},
|
{label: 'Euro (\u20AC)', value: 'EUR', icon: 'currency-eur'},
|
||||||
{label: 'British Pound (\u00A3)', value: 'GBP', icon: 'currency-gbp'},
|
{label: 'British Pound (\u00A3)', value: 'GBP', icon: 'currency-gbp'},
|
||||||
];
|
];
|
||||||
|
|
||||||
const THEMES: {label: string; value: 'light' | 'dark' | 'system'; icon: string}[] = [
|
const THEMES: SettingsSelectionOption<'light' | 'dark' | 'black' | 'system'>[] = [
|
||||||
{label: 'Light', value: 'light', icon: 'white-balance-sunny'},
|
{label: 'Light', value: 'light', icon: 'white-balance-sunny'},
|
||||||
{label: 'Dark', value: 'dark', icon: 'moon-waning-crescent'},
|
{label: 'Dark', value: 'dark', icon: 'moon-waning-crescent'},
|
||||||
|
{label: 'Black', value: 'black', icon: 'theme-light-dark'},
|
||||||
{label: 'System', value: 'system', icon: 'theme-light-dark'},
|
{label: 'System', value: 'system', icon: 'theme-light-dark'},
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -228,7 +230,7 @@ const SettingsScreen: React.FC = () => {
|
|||||||
icon="information"
|
icon="information"
|
||||||
iconColor="#7E57C2"
|
iconColor="#7E57C2"
|
||||||
label={t('settings.version')}
|
label={t('settings.version')}
|
||||||
value="0.1.1-alpha"
|
value={APP_VERSION_LABEL}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
@@ -238,79 +240,25 @@ const SettingsScreen: React.FC = () => {
|
|||||||
</Text>
|
</Text>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
{/* Currency Selection Bottom Sheet */}
|
<SettingsSelectionSheet
|
||||||
<CustomBottomSheet
|
|
||||||
ref={currencySheetRef}
|
ref={currencySheetRef}
|
||||||
title={t('settings.baseCurrency')}
|
title={t('settings.baseCurrency')}
|
||||||
|
options={CURRENCIES}
|
||||||
|
selectedValue={baseCurrency}
|
||||||
|
onSelect={setBaseCurrency}
|
||||||
enableDynamicSizing
|
enableDynamicSizing
|
||||||
snapPoints={['40%']}>
|
snapPoints={['40%']}
|
||||||
{CURRENCIES.map(c => (
|
/>
|
||||||
<Pressable
|
|
||||||
key={c.value}
|
|
||||||
style={[
|
|
||||||
s.selectionRow,
|
|
||||||
c.value === baseCurrency && {backgroundColor: colors.primaryContainer},
|
|
||||||
]}
|
|
||||||
onPress={() => {
|
|
||||||
triggerHaptic('selection');
|
|
||||||
setBaseCurrency(c.value);
|
|
||||||
currencySheetRef.current?.dismiss();
|
|
||||||
}}>
|
|
||||||
<Icon
|
|
||||||
name={c.icon}
|
|
||||||
size={20}
|
|
||||||
color={c.value === baseCurrency ? colors.primary : colors.onSurfaceVariant}
|
|
||||||
/>
|
|
||||||
<Text
|
|
||||||
style={[
|
|
||||||
s.selectionLabel,
|
|
||||||
c.value === baseCurrency && {color: colors.onPrimaryContainer, fontWeight: '600'},
|
|
||||||
]}>
|
|
||||||
{c.label}
|
|
||||||
</Text>
|
|
||||||
{c.value === baseCurrency && (
|
|
||||||
<Icon name="check" size={20} color={colors.primary} />
|
|
||||||
)}
|
|
||||||
</Pressable>
|
|
||||||
))}
|
|
||||||
</CustomBottomSheet>
|
|
||||||
|
|
||||||
{/* Theme Selection Bottom Sheet */}
|
<SettingsSelectionSheet
|
||||||
<CustomBottomSheet
|
|
||||||
ref={themeSheetRef}
|
ref={themeSheetRef}
|
||||||
title={t('settings.theme')}
|
title={t('settings.theme')}
|
||||||
|
options={THEMES}
|
||||||
|
selectedValue={themeSetting}
|
||||||
|
onSelect={setTheme}
|
||||||
enableDynamicSizing
|
enableDynamicSizing
|
||||||
snapPoints={['35%']}>
|
snapPoints={['35%']}
|
||||||
{THEMES.map(th => (
|
/>
|
||||||
<Pressable
|
|
||||||
key={th.value}
|
|
||||||
style={[
|
|
||||||
s.selectionRow,
|
|
||||||
th.value === themeSetting && {backgroundColor: colors.primaryContainer},
|
|
||||||
]}
|
|
||||||
onPress={() => {
|
|
||||||
triggerHaptic('selection');
|
|
||||||
setTheme(th.value);
|
|
||||||
themeSheetRef.current?.dismiss();
|
|
||||||
}}>
|
|
||||||
<Icon
|
|
||||||
name={th.icon}
|
|
||||||
size={20}
|
|
||||||
color={th.value === themeSetting ? colors.primary : colors.onSurfaceVariant}
|
|
||||||
/>
|
|
||||||
<Text
|
|
||||||
style={[
|
|
||||||
s.selectionLabel,
|
|
||||||
th.value === themeSetting && {color: colors.onPrimaryContainer, fontWeight: '600'},
|
|
||||||
]}>
|
|
||||||
{th.label}
|
|
||||||
</Text>
|
|
||||||
{th.value === themeSetting && (
|
|
||||||
<Icon name="check" size={20} color={colors.primary} />
|
|
||||||
)}
|
|
||||||
</Pressable>
|
|
||||||
))}
|
|
||||||
</CustomBottomSheet>
|
|
||||||
</SafeAreaView>
|
</SafeAreaView>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -363,19 +311,5 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
marginTop: spacing.xxxl,
|
marginTop: spacing.xxxl,
|
||||||
marginBottom: spacing.xxxl + 8,
|
marginBottom: spacing.xxxl + 8,
|
||||||
},
|
},
|
||||||
selectionRow: {
|
|
||||||
flexDirection: 'row',
|
|
||||||
alignItems: 'center',
|
|
||||||
gap: spacing.md,
|
|
||||||
paddingVertical: spacing.lg,
|
|
||||||
paddingHorizontal: spacing.lg,
|
|
||||||
borderRadius: shape.medium,
|
|
||||||
marginBottom: spacing.xs,
|
|
||||||
},
|
|
||||||
selectionLabel: {
|
|
||||||
flex: 1,
|
|
||||||
...typography.bodyLarge,
|
|
||||||
color: colors.onSurface,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export const mmkvStorage = {
|
|||||||
getStorage().set(KEYS.LOCALE, locale);
|
getStorage().set(KEYS.LOCALE, locale);
|
||||||
},
|
},
|
||||||
|
|
||||||
getTheme: (): 'light' | 'dark' | 'system' => {
|
getTheme: (): 'light' | 'dark' | 'black' | 'system' => {
|
||||||
return (getStorage().getString(KEYS.THEME) as AppSettings['theme']) || 'light';
|
return (getStorage().getString(KEYS.THEME) as AppSettings['theme']) || 'light';
|
||||||
},
|
},
|
||||||
setTheme: (theme: AppSettings['theme']) => {
|
setTheme: (theme: AppSettings['theme']) => {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
import React, {createContext, useContext, useMemo} from 'react';
|
import React, {createContext, useContext, useMemo} from 'react';
|
||||||
import {useColorScheme} from 'react-native';
|
import {useColorScheme} from 'react-native';
|
||||||
import {useSettingsStore} from '../store/settingsStore';
|
import {useSettingsStore} from '../store/settingsStore';
|
||||||
import {LightTheme, DarkTheme} from './md3';
|
import {LightTheme, DarkTheme, BlackTheme} from './md3';
|
||||||
import type {MD3Theme} from './md3';
|
import type {MD3Theme} from './md3';
|
||||||
|
|
||||||
const ThemeContext = createContext<MD3Theme>(LightTheme);
|
const ThemeContext = createContext<MD3Theme>(LightTheme);
|
||||||
@@ -18,6 +18,7 @@ export const ThemeProvider: React.FC<{children: React.ReactNode}> = ({children})
|
|||||||
const systemScheme = useColorScheme();
|
const systemScheme = useColorScheme();
|
||||||
|
|
||||||
const resolvedTheme = useMemo<MD3Theme>(() => {
|
const resolvedTheme = useMemo<MD3Theme>(() => {
|
||||||
|
if (themeSetting === 'black') return BlackTheme;
|
||||||
if (themeSetting === 'dark') return DarkTheme;
|
if (themeSetting === 'dark') return DarkTheme;
|
||||||
if (themeSetting === 'light') return LightTheme;
|
if (themeSetting === 'light') return LightTheme;
|
||||||
return systemScheme === 'dark' ? DarkTheme : LightTheme;
|
return systemScheme === 'dark' ? DarkTheme : LightTheme;
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
export {
|
export {
|
||||||
MD3LightColors,
|
MD3LightColors,
|
||||||
MD3DarkColors,
|
MD3DarkColors,
|
||||||
|
MD3BlackColors,
|
||||||
MD3Typography,
|
MD3Typography,
|
||||||
MD3Elevation,
|
MD3Elevation,
|
||||||
MD3Shape,
|
MD3Shape,
|
||||||
Spacing,
|
Spacing,
|
||||||
LightTheme,
|
LightTheme,
|
||||||
DarkTheme,
|
DarkTheme,
|
||||||
|
BlackTheme,
|
||||||
} from './md3';
|
} from './md3';
|
||||||
export type {MD3Theme, MD3ColorScheme} from './md3';
|
export type {MD3Theme, MD3ColorScheme} from './md3';
|
||||||
export {ThemeProvider, useTheme} from './ThemeProvider';
|
export {ThemeProvider, useTheme} from './ThemeProvider';
|
||||||
|
|||||||
208
src/theme/md3.ts
208
src/theme/md3.ts
@@ -9,64 +9,64 @@
|
|||||||
|
|
||||||
export const MD3LightColors = {
|
export const MD3LightColors = {
|
||||||
// Primary
|
// Primary
|
||||||
primary: '#6750A4',
|
primary: '#4078F2',
|
||||||
onPrimary: '#FFFFFF',
|
onPrimary: '#FFFFFF',
|
||||||
primaryContainer: '#EADDFF',
|
primaryContainer: '#DCE6FF',
|
||||||
onPrimaryContainer: '#21005D',
|
onPrimaryContainer: '#1E3E8A',
|
||||||
|
|
||||||
// Secondary
|
// Secondary
|
||||||
secondary: '#625B71',
|
secondary: '#A626A4',
|
||||||
onSecondary: '#FFFFFF',
|
onSecondary: '#FFFFFF',
|
||||||
secondaryContainer: '#E8DEF8',
|
secondaryContainer: '#F3E5F5',
|
||||||
onSecondaryContainer: '#1D192B',
|
onSecondaryContainer: '#4E1A4C',
|
||||||
|
|
||||||
// Tertiary (Fintech Teal)
|
// Tertiary (Fintech Teal)
|
||||||
tertiary: '#00897B',
|
tertiary: '#0184BC',
|
||||||
onTertiary: '#FFFFFF',
|
onTertiary: '#FFFFFF',
|
||||||
tertiaryContainer: '#A7F3D0',
|
tertiaryContainer: '#D8F1FC',
|
||||||
onTertiaryContainer: '#00382E',
|
onTertiaryContainer: '#004B6C',
|
||||||
|
|
||||||
// Error
|
// Error
|
||||||
error: '#B3261E',
|
error: '#E45649',
|
||||||
onError: '#FFFFFF',
|
onError: '#FFFFFF',
|
||||||
errorContainer: '#F9DEDC',
|
errorContainer: '#FCE3E1',
|
||||||
onErrorContainer: '#410E0B',
|
onErrorContainer: '#7A211C',
|
||||||
|
|
||||||
// Success (custom MD3 extension)
|
// Success (custom MD3 extension)
|
||||||
success: '#1B873B',
|
success: '#50A14F',
|
||||||
onSuccess: '#FFFFFF',
|
onSuccess: '#FFFFFF',
|
||||||
successContainer: '#D4EDDA',
|
successContainer: '#DDF3D1',
|
||||||
onSuccessContainer: '#0A3D1B',
|
onSuccessContainer: '#1F4D1E',
|
||||||
|
|
||||||
// Warning (custom MD3 extension)
|
// Warning (custom MD3 extension)
|
||||||
warning: '#E65100',
|
warning: '#C18401',
|
||||||
onWarning: '#FFFFFF',
|
onWarning: '#FFFFFF',
|
||||||
warningContainer: '#FFE0B2',
|
warningContainer: '#F8EACB',
|
||||||
onWarningContainer: '#3E2723',
|
onWarningContainer: '#5C4300',
|
||||||
|
|
||||||
// Surface
|
// Surface
|
||||||
background: '#FFFBFE',
|
background: '#FAFAFA',
|
||||||
onBackground: '#1C1B1F',
|
onBackground: '#383A42',
|
||||||
surface: '#FFFBFE',
|
surface: '#FAFAFA',
|
||||||
onSurface: '#1C1B1F',
|
onSurface: '#383A42',
|
||||||
surfaceVariant: '#E7E0EC',
|
surfaceVariant: '#E9ECF3',
|
||||||
onSurfaceVariant: '#49454F',
|
onSurfaceVariant: '#4B5260',
|
||||||
surfaceDim: '#DED8E1',
|
surfaceDim: '#EDEFF2',
|
||||||
surfaceBright: '#FFF8FF',
|
surfaceBright: '#FFFFFF',
|
||||||
surfaceContainerLowest: '#FFFFFF',
|
surfaceContainerLowest: '#FFFFFF',
|
||||||
surfaceContainerLow: '#F7F2FA',
|
surfaceContainerLow: '#F4F5F7',
|
||||||
surfaceContainer: '#F3EDF7',
|
surfaceContainer: '#EEF0F4',
|
||||||
surfaceContainerHigh: '#ECE6F0',
|
surfaceContainerHigh: '#E8EBF0',
|
||||||
surfaceContainerHighest: '#E6E0E9',
|
surfaceContainerHighest: '#E2E6EC',
|
||||||
|
|
||||||
// Outline
|
// Outline
|
||||||
outline: '#79747E',
|
outline: '#7F8693',
|
||||||
outlineVariant: '#CAC4D0',
|
outlineVariant: '#BCC3CF',
|
||||||
|
|
||||||
// Inverse
|
// Inverse
|
||||||
inverseSurface: '#313033',
|
inverseSurface: '#383A42',
|
||||||
inverseOnSurface: '#F4EFF4',
|
inverseOnSurface: '#FAFAFA',
|
||||||
inversePrimary: '#D0BCFF',
|
inversePrimary: '#8FB1FF',
|
||||||
|
|
||||||
// Scrim & Shadow
|
// Scrim & Shadow
|
||||||
scrim: '#000000',
|
scrim: '#000000',
|
||||||
@@ -74,97 +74,114 @@ export const MD3LightColors = {
|
|||||||
|
|
||||||
// ─── App-Specific Semantic Colors ─────────────────────────────
|
// ─── App-Specific Semantic Colors ─────────────────────────────
|
||||||
|
|
||||||
income: '#1B873B',
|
income: '#50A14F',
|
||||||
expense: '#B3261E',
|
expense: '#E45649',
|
||||||
asset: '#6750A4',
|
asset: '#4078F2',
|
||||||
liability: '#E65100',
|
liability: '#C18401',
|
||||||
|
|
||||||
// Chart palette (MD3 tonal)
|
// Chart palette (MD3 tonal)
|
||||||
chartColors: [
|
chartColors: [
|
||||||
'#6750A4', '#00897B', '#1E88E5', '#E65100',
|
'#4078F2', '#A626A4', '#0184BC', '#50A14F',
|
||||||
'#8E24AA', '#00ACC1', '#43A047', '#F4511E',
|
'#E45649', '#C18401', '#56B6C2', '#C678DD',
|
||||||
'#5C6BC0', '#FFB300',
|
'#61AFEF', '#D19A66',
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
export const MD3DarkColors: typeof MD3LightColors = {
|
export const MD3DarkColors: typeof MD3LightColors = {
|
||||||
// Primary
|
// Primary
|
||||||
primary: '#D0BCFF',
|
primary: '#61AFEF',
|
||||||
onPrimary: '#381E72',
|
onPrimary: '#1B2838',
|
||||||
primaryContainer: '#4F378B',
|
primaryContainer: '#2C3E55',
|
||||||
onPrimaryContainer: '#EADDFF',
|
onPrimaryContainer: '#D6E9FF',
|
||||||
|
|
||||||
// Secondary
|
// Secondary
|
||||||
secondary: '#CCC2DC',
|
secondary: '#C678DD',
|
||||||
onSecondary: '#332D41',
|
onSecondary: '#2F1B36',
|
||||||
secondaryContainer: '#4A4458',
|
secondaryContainer: '#4B2F55',
|
||||||
onSecondaryContainer: '#E8DEF8',
|
onSecondaryContainer: '#F0D7F6',
|
||||||
|
|
||||||
// Tertiary
|
// Tertiary
|
||||||
tertiary: '#4DB6AC',
|
tertiary: '#56B6C2',
|
||||||
onTertiary: '#003730',
|
onTertiary: '#102D31',
|
||||||
tertiaryContainer: '#005048',
|
tertiaryContainer: '#1F4A50',
|
||||||
onTertiaryContainer: '#A7F3D0',
|
onTertiaryContainer: '#CDEFF3',
|
||||||
|
|
||||||
// Error
|
// Error
|
||||||
error: '#F2B8B5',
|
error: '#E06C75',
|
||||||
onError: '#601410',
|
onError: '#3A1519',
|
||||||
errorContainer: '#8C1D18',
|
errorContainer: '#5A232A',
|
||||||
onErrorContainer: '#F9DEDC',
|
onErrorContainer: '#FFD9DC',
|
||||||
|
|
||||||
// Success
|
// Success
|
||||||
success: '#81C784',
|
success: '#98C379',
|
||||||
onSuccess: '#0A3D1B',
|
onSuccess: '#1B2A17',
|
||||||
successContainer: '#1B5E20',
|
successContainer: '#2D4524',
|
||||||
onSuccessContainer: '#D4EDDA',
|
onSuccessContainer: '#DDF3D1',
|
||||||
|
|
||||||
// Warning
|
// Warning
|
||||||
warning: '#FFB74D',
|
warning: '#E5C07B',
|
||||||
onWarning: '#3E2723',
|
onWarning: '#342915',
|
||||||
warningContainer: '#BF360C',
|
warningContainer: '#5A4728',
|
||||||
onWarningContainer: '#FFE0B2',
|
onWarningContainer: '#FFE8C1',
|
||||||
|
|
||||||
// Surface
|
// Surface
|
||||||
background: '#141218',
|
background: '#282C34',
|
||||||
onBackground: '#E6E0E9',
|
onBackground: '#E6EAF0',
|
||||||
surface: '#141218',
|
surface: '#282C34',
|
||||||
onSurface: '#E6E0E9',
|
onSurface: '#E6EAF0',
|
||||||
surfaceVariant: '#49454F',
|
surfaceVariant: '#3A404B',
|
||||||
onSurfaceVariant: '#CAC4D0',
|
onSurfaceVariant: '#BCC3CF',
|
||||||
surfaceDim: '#141218',
|
surfaceDim: '#21252B',
|
||||||
surfaceBright: '#3B383E',
|
surfaceBright: '#353B45',
|
||||||
surfaceContainerLowest: '#0F0D13',
|
surfaceContainerLowest: '#1E2228',
|
||||||
surfaceContainerLow: '#1D1B20',
|
surfaceContainerLow: '#2B3038',
|
||||||
surfaceContainer: '#211F26',
|
surfaceContainer: '#313741',
|
||||||
surfaceContainerHigh: '#2B2930',
|
surfaceContainerHigh: '#393F4A',
|
||||||
surfaceContainerHighest: '#36343B',
|
surfaceContainerHighest: '#424955',
|
||||||
|
|
||||||
// Outline
|
// Outline
|
||||||
outline: '#938F99',
|
outline: '#8E97A8',
|
||||||
outlineVariant: '#49454F',
|
outlineVariant: '#5A6271',
|
||||||
|
|
||||||
// Inverse
|
// Inverse
|
||||||
inverseSurface: '#E6E0E9',
|
inverseSurface: '#ABB2BF',
|
||||||
inverseOnSurface: '#313033',
|
inverseOnSurface: '#282C34',
|
||||||
inversePrimary: '#6750A4',
|
inversePrimary: '#4078F2',
|
||||||
|
|
||||||
// Scrim & Shadow
|
// Scrim & Shadow
|
||||||
scrim: '#000000',
|
scrim: '#000000',
|
||||||
shadow: '#000000',
|
shadow: '#000000',
|
||||||
|
|
||||||
// App-Specific
|
// App-Specific
|
||||||
income: '#81C784',
|
income: '#98C379',
|
||||||
expense: '#F2B8B5',
|
expense: '#E06C75',
|
||||||
asset: '#D0BCFF',
|
asset: '#61AFEF',
|
||||||
liability: '#FFB74D',
|
liability: '#E5C07B',
|
||||||
|
|
||||||
chartColors: [
|
chartColors: [
|
||||||
'#D0BCFF', '#4DB6AC', '#64B5F6', '#FFB74D',
|
'#61AFEF', '#C678DD', '#56B6C2', '#98C379',
|
||||||
'#CE93D8', '#4DD0E1', '#81C784', '#FF8A65',
|
'#E06C75', '#E5C07B', '#D19A66', '#ABB2BF',
|
||||||
'#9FA8DA', '#FFD54F',
|
'#7F848E', '#8BE9FD',
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const MD3BlackColors: typeof MD3LightColors = {
|
||||||
|
...MD3DarkColors,
|
||||||
|
background: '#000000',
|
||||||
|
surface: '#000000',
|
||||||
|
surfaceDim: '#000000',
|
||||||
|
surfaceBright: '#0D0D0D',
|
||||||
|
surfaceContainerLowest: '#000000',
|
||||||
|
surfaceContainerLow: '#070707',
|
||||||
|
surfaceContainer: '#0E0E0E',
|
||||||
|
surfaceContainerHigh: '#141414',
|
||||||
|
surfaceContainerHighest: '#1B1B1B',
|
||||||
|
inverseSurface: '#F1F1F1',
|
||||||
|
inverseOnSurface: '#000000',
|
||||||
|
outline: '#767676',
|
||||||
|
outlineVariant: '#333333',
|
||||||
|
};
|
||||||
|
|
||||||
// ─── MD3 Typography Scale ────────────────────────────────────────────
|
// ─── MD3 Typography Scale ────────────────────────────────────────────
|
||||||
|
|
||||||
const fontFamily = 'JetBrainsMono-Regular';
|
const fontFamily = 'JetBrainsMono-Regular';
|
||||||
@@ -381,3 +398,12 @@ export const DarkTheme: MD3Theme = {
|
|||||||
spacing: Spacing,
|
spacing: Spacing,
|
||||||
isDark: true,
|
isDark: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const BlackTheme: MD3Theme = {
|
||||||
|
colors: MD3BlackColors,
|
||||||
|
typography: MD3Typography,
|
||||||
|
elevation: MD3Elevation,
|
||||||
|
shape: MD3Shape,
|
||||||
|
spacing: Spacing,
|
||||||
|
isDark: true,
|
||||||
|
};
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ export interface NetWorthSnapshot {
|
|||||||
export interface AppSettings {
|
export interface AppSettings {
|
||||||
baseCurrency: Currency;
|
baseCurrency: Currency;
|
||||||
locale: string;
|
locale: string;
|
||||||
theme: 'light' | 'dark' | 'system';
|
theme: 'light' | 'dark' | 'black' | 'system';
|
||||||
biometricEnabled: boolean;
|
biometricEnabled: boolean;
|
||||||
onboardingComplete: boolean;
|
onboardingComplete: boolean;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"version": "0.1.2",
|
"version": "0.1.4",
|
||||||
"buildNumber": 1
|
"buildNumber": 1
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user