feat: compact target mark view

leaftail1880 · Oct 21, 2024 · 2a3a111 · 2a3a111
1 parent 23f3b21
commit 2a3a111
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 30 deletions.
diff --git a/src/models/settings.ts b/src/models/settings.ts
@@ -44,6 +44,7 @@ class SettingsStore {
 	markStyle: 'background' | 'border' = 'background'
 	showMarkWeightTip = true
 	collapseLongAssignmentText = false
+	targetMarkCompact = false
 
 	/**
 	 * Map containing per student overrides

diff --git a/src/screens/settings/marks/Marks.tsx b/src/screens/settings/marks/Marks.tsx
@@ -42,6 +42,11 @@ export default observer(function Notifications(
 					title='"Вес: " перед весом оценки'
 					setting="showMarkWeightTip"
 				/>
+				<SwitchSetting
+					title="Компактное отображение"
+					description="Компактное отображение целевой оценки"
+					setting="targetMarkCompact"
+				/>
 			</List.Section>
 			{student && (
 				<List.Section title="Для ученика">

diff --git a/src/screens/totals/term/MarksInline.tsx b/src/screens/totals/term/MarksInline.tsx
@@ -1,7 +1,7 @@
 import { observer } from 'mobx-react-lite'
 import React, { useMemo } from 'react'
 import { ScrollView, StyleProp, View, ViewStyle } from 'react-native'
-import { Text } from 'react-native-paper'
+import { Chip, Text } from 'react-native-paper'
 import Loading from '~components/Loading'
 import Mark from '~components/Mark'
 import { styles } from '~constants'
@@ -155,35 +155,53 @@ export default observer(function SubjectMarksInline(
 					style={{ padding: Spacings.s2, alignSelf: 'center' }}
 				/>
 			</View>
-			<View
-				style={{
-					flex: 1,
-					flexDirection: 'row',
-					flexWrap: 'wrap',
-					padding: Spacings.s2,
-				}}
-			>
-				{toGetTarget && (
-					<View style={[styles.stretch, { gap: Spacings.s1 }]}>
-						<Text>До </Text>
-						<Mark
-							mark={student?.targetMark}
-							duty={false}
-							style={{ padding: Spacings.s1 }}
-						/>
-						<Text>нужно {toGetTarget}x</Text>
-
-						<Mark
-							duty={false}
-							style={{ padding: Spacings.s1, paddingHorizontal: Spacings.s2 }}
-							textStyle={{ fontSize: 10 }}
-							subTextStyle={{ fontSize: 8 }}
-							weight={student?.defaultMarkWeight}
-							mark={student?.defaultMark}
-						/>
-					</View>
-				)}
-			</View>
+			{toGetTarget && (
+				<View
+					style={{
+						flex: 1,
+						flexDirection: 'row',
+						flexWrap: 'wrap',
+						padding: Spacings.s2,
+						gap: Spacings.s2,
+					}}
+				>
+					{Settings.targetMarkCompact && (
+						<Chip mode="flat" compact>
+							<Text>
+								<Text>Нужно </Text>
+								<Text
+									style={{ fontWeight: 'bold', color: Theme.colors.primary }}
+								>
+									{toGetTarget}x
+								</Text>
+							</Text>
+						</Chip>
+					)}
+					{!Settings.targetMarkCompact && (
+						<View style={[styles.stretch, { gap: Spacings.s1 }]}>
+							<Text>До</Text>
+							<Mark
+								mark={student?.targetMark}
+								duty={false}
+								style={{ padding: Spacings.s1 }}
+							/>
+							<Text>нужно </Text>
+							<Text style={{ fontWeight: 'bold', color: Theme.colors.primary }}>
+								{toGetTarget}x
+							</Text>
+
+							<Mark
+								duty={false}
+								style={{ padding: Spacings.s1, paddingHorizontal: Spacings.s2 }}
+								textStyle={{ fontSize: 10 }}
+								subTextStyle={{ fontSize: 8 }}
+								weight={student?.defaultMarkWeight}
+								mark={student?.defaultMark}
+							/>
+						</View>
+					)}
+				</View>
+			)}
 		</>
 	)
 })