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.

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

LUN-132: Favorites #307

Merged
merged 20 commits into from
Jun 21, 2022
Merged

LUN-132: Favorites #307

merged 20 commits into from
Jun 21, 2022

Conversation

steffenkleinle
Copy link
Member

This pull request belongs to an issue on our bugtracker.
You can find it there by looking for an issue with the key which is mentioned in the title of this pull request.
It starts with the keyword LUN.

Hopefully my final favorites PR 🎉

@steffenkleinle steffenkleinle marked this pull request as draft May 31, 2022 10:54
src/components/FavoriteButton.tsx Outdated Show resolved Hide resolved
@@ -107,15 +100,13 @@ const AudioPlayer = ({ document, disabled, submittedAlternative }: AudioPlayerPr
}

return (
<StyledView>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this broke styling, button is not in the middle any more.
LUN-132-alignment-audio-icon

src/components/VocabularyList.tsx Outdated Show resolved Hide resolved
src/components/FavoriteButton.tsx Outdated Show resolved Hide resolved
src/components/DocumentImageSection.tsx Show resolved Hide resolved
src/constants/labels.json Outdated Show resolved Hide resolved
src/routes/FavoritesScreen.tsx Outdated Show resolved Hide resolved
src/services/AsyncStorage.ts Outdated Show resolved Hide resolved
src/routes/FavoritesScreen.tsx Show resolved Hide resolved
@ztefanie
Copy link
Member

Tested on Android emulator works like a charm. 👍

@ztefanie
Copy link
Member

ztefanie commented Jun 1, 2022

Please also add a release note

Base automatically changed from LUN-357-vocabulary-detail-screen to main June 1, 2022 09:17
# Conflicts:
#	src/components/VocabularyList.tsx
#	src/components/VocabularyListItem.tsx
#	src/constants/labels.json
#	src/routes/VocabularyDetailScreen.tsx
#	src/routes/VocabularyListScreen.tsx
#	src/routes/choice-exercises/__tests__/ArticleChoiceExerciseScreen.spec.tsx
#	src/routes/write-exercise/components/InteractionSection.tsx
@steffenkleinle steffenkleinle marked this pull request as ready for review June 1, 2022 14:09
Copy link
Contributor

@f1sh1918 f1sh1918 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix styling issues like shadow and positioning. I thought it would be possible that you can just do
styled(FavoriteButton) and set the margin but seems like that doesn't work with styled components

src/components/FavoriteButton.tsx Outdated Show resolved Hide resolved
src/components/VocabularyListItem.tsx Outdated Show resolved Hide resolved
src/components/FavoriteButton.tsx Show resolved Hide resolved
src/services/AsyncStorage.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@f1sh1918 f1sh1918 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested on ios

Copy link
Member

@ztefanie ztefanie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now you can enable the feature and bottom navigation bar.

@f1sh1918
Copy link
Contributor

f1sh1918 commented Jun 20, 2022

Now you can enable the feature and bottom navigation bar.

Steffen said we can merge it for him when everything is resolved. Favs in the bottom bar is enabled

@ztefanie ztefanie merged commit b68c707 into main Jun 21, 2022
@ztefanie ztefanie deleted the LUN-132-favorites branch June 21, 2022 06:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants