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-357: Replace vocabulary detail modal with own route #306

Merged
merged 11 commits into from
Jun 1, 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.

Done:

  • Use own VocabularyDetail route for vocabulary detail (previously: VocabularyDetailModal)
  • Move VocabularyList to own component (preparation for LUN-132: Favorites)

@@ -0,0 +1,44 @@
import React from 'react'
Copy link
Member Author

Choose a reason for hiding this comment

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

Just moved from VocabularyListScreen

@@ -2,11 +2,11 @@ import React, { ReactElement } from 'react'
import { widthPercentageToDP as wp } from 'react-native-responsive-screen'
Copy link
Member Author

Choose a reason for hiding this comment

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

This is why I don't really like route specific component folders, once it is used in multiple routes it has to be moved/renamed.

Copy link
Member

Choose a reason for hiding this comment

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

Yes i see, but the need to move and rename a file, just happend for the first time and will maybe occur once in a few weeks/months, whereas I am looking for files every day and finding them in a folder with ~100 files is a really a pain.

Copy link
Member Author

@steffenkleinle steffenkleinle May 31, 2022

Choose a reason for hiding this comment

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

yeah there are different opinions about this which is definitely fine. I personally find it worse that I have to look in multiple folders to find the right file than to find the file in a large folder. No need to change this though, especially if you favor the other way.

Copy link
Contributor

Choose a reason for hiding this comment

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

it is now merged. you can base on it

Copy link
Member Author

@steffenkleinle steffenkleinle May 31, 2022

Choose a reason for hiding this comment

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

Already on it 🚀 Assuming your comment is regarding #286 and not this discussion :D

@steffenkleinle steffenkleinle force-pushed the LUN-357-vocabulary-detail-screen branch from 0a4429c to c4dfe41 Compare May 30, 2022 15:20
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.

Nice work 🎉

@@ -2,11 +2,11 @@ import React, { ReactElement } from 'react'
import { widthPercentageToDP as wp } from 'react-native-responsive-screen'
Copy link
Member

Choose a reason for hiding this comment

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

Yes i see, but the need to move and rename a file, just happend for the first time and will maybe occur once in a few weeks/months, whereas I am looking for files every day and finding them in a folder with ~100 files is a really a pain.

src/components/VocabularyListItem.tsx Outdated Show resolved Hide resolved
src/routes/VocabularyDetailScreen.tsx Outdated Show resolved Hide resolved
src/routes/home/HomeScreen.tsx Outdated Show resolved Hide resolved
src/routes/home/components/DisciplineCard.tsx Outdated Show resolved Hide resolved
@ztefanie
Copy link
Member

I think also the Feedback modal should be added to both screens. If you do not want / can do it now, please open a ticket, so we do not forget about it.

@steffenkleinle
Copy link
Member Author

I think also the Feedback modal should be added to both screens. If you do not want / can do it now, please open a ticket, so we do not forget about it.

Currently not possible since #286 is still open which obviously blocks this. Created https://issues.tuerantuer.org/browse/LUN-358

…tail-screen

# Conflicts:
#	src/routes/vocabulary-list/VocabularyListScreen.tsx
#	src/routes/vocabulary-list/__tests__/VocabularyListScreen.spec.tsx
@steffenkleinle steffenkleinle requested a review from ztefanie May 31, 2022 10:50
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.

Tested again. Works fine

@steffenkleinle
Copy link
Member Author

Tested again. Works fine

so the list header is not broken as mentioned here? #307 (comment)

@ztefanie
Copy link
Member

Sorry, did not test this again, just checked for the "finish"-button of the last word.

…tail-screen

# Conflicts:
#	src/routes/vocabulary-list/VocabularyListScreen.tsx
#	src/routes/vocabulary-list/components/VocabularyListModal.tsx
#	src/routes/vocabulary-list/components/__tests__/VocabularyListModal.spec.tsx
@steffenkleinle
Copy link
Member Author

Sorry, did not test this again, just checked for the "finish"-button of the last word.

I am quite sure this was already broken before, will fix.

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.

Everything looks fine on ios. Nice work. I'm just not sure if there should be a way to go back to the vocabulary list as before? Have you clarified this with design team that the exercise closes now

@steffenkleinle
Copy link
Member Author

Everything looks fine on ios. Nice work. I'm just not sure if there should be a way to go back to the vocabulary list as before? Have you clarified this with design team that the exercise closes now

Please check again

@steffenkleinle steffenkleinle enabled auto-merge June 1, 2022 09:02
@steffenkleinle steffenkleinle merged commit 35dc0cb into main Jun 1, 2022
@steffenkleinle steffenkleinle deleted the LUN-357-vocabulary-detail-screen branch June 1, 2022 09:17
@steffenkleinle steffenkleinle mentioned this pull request Jun 1, 2022
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