Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(mobile): ✨ Add explanation when pressing grammar label #2219

Merged
merged 1 commit into from
Jul 29, 2023
Merged

feat(mobile): ✨ Add explanation when pressing grammar label #2219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified mobile/.yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
Empty file added mobile/.yarn/versions/e44b2b3e.yml
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion mobile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"homepage": "https://openarabic.io",
"repository": "https://github.com/edenmind/OpenArabic",
"version": "1444.12.328",
"version": "1444.12.329",
"authors": [
"Yunus Andreasson <yunus@edenmind.com> (https://github.com/YunusAndreasson)"
],
Expand Down
2 changes: 1 addition & 1 deletion mobile/screens/text-grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function TextGrammar({ route }) {
</Text>

<PlaySound
audioFileNames={`https://openarabic.ams3.digitaloceanspaces.com/audio/${filename}`}
audioFileName={`https://openarabic.ams3.digitaloceanspaces.com/audio/${filename}`}
buttonText={'Play'}
/>
<Divider style={{ marginBottom: 20, opacity: 0 }} />
Expand Down
85 changes: 85 additions & 0 deletions mobile/screens/words-setup-difficulty-level.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,31 @@ import { View, Image } from 'react-native'
import { Divider, Surface, Text, useTheme, Chip } from 'react-native-paper'
import { useSharedStyles } from '../styles/common.js'
import PropTypes from 'prop-types'
import ModalScrollView from '../components/modal-scroll-view.js'
import {
getNoun,
getVerb,
getParticle,
getDefinite,
getPresent,
getPlural,
getPronouns,
getFuture,
getDual,
getPassive,
getCompound
} from '../services/grammar-service.js'
import { formatGrammar } from '../services/ui-services.js'

const WordsSetupDifficultyLevel = (props) => {
const theme = useTheme()
const sharedStyle = useSharedStyles(theme)
let source
let goal
const [visible, setVisible] = React.useState(false)
const hideModal = () => setVisible(false)
const [title, setTitle] = React.useState('')
const [explanation, setExplanation] = React.useState('')

switch (props.difficultyLevel) {
case 10: {
Expand All @@ -26,24 +45,40 @@ const WordsSetupDifficultyLevel = (props) => {
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Noun')
setExplanation(formatGrammar(getNoun(), sharedStyle))
}}
>
Noun
</Chip>
<Chip
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Verb')
setExplanation(formatGrammar(getVerb(), sharedStyle))
}}
>
Verb
</Chip>
<Chip
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Particle')
setExplanation(formatGrammar(getParticle(), sharedStyle))
}}
>
Particle
</Chip>
</View>
<Text variant="labelSmall">Press label for explanation</Text>
</>
)

Expand All @@ -62,13 +97,23 @@ const WordsSetupDifficultyLevel = (props) => {
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Definite')
setExplanation(formatGrammar(getDefinite(), sharedStyle))
}}
>
Definite
</Chip>
<Chip
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Present')
setExplanation(formatGrammar(getPresent(), sharedStyle))
}}
>
Present
</Chip>
Expand All @@ -77,6 +122,11 @@ const WordsSetupDifficultyLevel = (props) => {
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Plural')
setExplanation(formatGrammar(getPlural(), sharedStyle))
}}
>
Plural
</Chip>
Expand All @@ -85,10 +135,16 @@ const WordsSetupDifficultyLevel = (props) => {
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Pronoun')
setExplanation(formatGrammar(getPronouns(), sharedStyle))
}}
>
Pronoun
</Chip>
</View>
<Text variant="labelSmall">Press label for explanation</Text>
</>
)

Expand All @@ -107,31 +163,52 @@ const WordsSetupDifficultyLevel = (props) => {
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Future')
setExplanation(formatGrammar(getFuture(), sharedStyle))
}}
>
Future
</Chip>
<Chip
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Dual')
setExplanation(formatGrammar(getDual(), sharedStyle))
}}
>
Dual
</Chip>
<Chip
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Compound')
setExplanation(formatGrammar(getCompound(), sharedStyle))
}}
>
Compound
</Chip>
<Chip
style={{ margin: 3, backgroundColor: theme.colors.tertiary }}
compact={true}
selectedColor={theme.colors.onTertiary}
onPress={() => {
setVisible(true)
setTitle('Passive')
setExplanation(formatGrammar(getPassive(), sharedStyle))
}}
>
Passive
</Chip>
</View>
<Text variant="labelSmall">Press label for explanation</Text>
</>
)

Expand All @@ -149,6 +226,14 @@ const WordsSetupDifficultyLevel = (props) => {
<Divider style={{ ...sharedStyle.divider, opacity: 0 }} />
{goal}
</View>
<ModalScrollView
visible={visible}
content={<View>{explanation}</View>}
title={title}
hideModal={hideModal}
height="87%"
titleLanguage="english"
/>
</Surface>
)
}
Expand Down
Loading
Loading