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

Mu8/javier/issue13 create characters detail activity #54

Merged

Conversation

jamacado
Copy link
Contributor

Create Characters Detail Activity #13

Anotación 2020-02-21 223453

  • create characters detail activity
  • create adapter for comics by character

Testing Done

  • Nexus 6P

How to test:

  • Run the application and click en character, select one character.

Signed-off-by:

aliceresponde and others added 9 commits January 26, 2020 19:16
Signed-off-by: Alicia Beltran <[email protected]>
…/MU8 into mu8/alice/issue-32-persist-comics

Signed-off-by: Alicia Beltran <[email protected]>

# Conflicts:
#	data/src/main/java/com/architect/coders/mu8/data/comics/ComicsMapper.kt
…/MU8 into mu8/javier/issue13-create-characters-detail-activity

# Conflicts:
#	presentation/src/main/java/com/architect/coders/mu8/characters/CharactersActivity.kt
…/MU8 into mu8/alice/issue-32-persist-comics

Signed-off-by: Alicia Beltran <[email protected]>

# Conflicts:
#	data/src/main/java/com/architect/coders/mu8/data/DataApp.kt
…/MU8 into mu8/javier/issue13-create-characters-detail-activity

# Conflicts:
#	presentation/src/main/java/com/architect/coders/mu8/characters/CharactersActivity.kt
…m/Architect-Coders/MU8 into mu8/javier/issue13-create-characters-detail-activity

# Conflicts:
#	data/src/main/java/com/architect/coders/mu8/data/comics/ComicsEntity.kt
…/MU8 into mu8/javier/issue13-create-characters-detail-activity

# Conflicts:
#	data/src/main/java/com/architect/coders/mu8/data/characters/CharactersRepositoryImpl.kt
#	data/src/main/java/com/architect/coders/mu8/data/comics/ComicRepositoryImpl.kt
#	data/src/main/java/com/architect/coders/mu8/data/comics/ComicsDAO.kt
#	data/src/main/java/com/architect/coders/mu8/data/comics/ComicsEntity.kt
#	data/src/main/java/com/architect/coders/mu8/data/database/MU8Database.kt
Copy link
Collaborator

@recaldev recaldev left a comment

Choose a reason for hiding this comment

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

Please solve the comments

…/MU8 into mu8/javier/issue13-create-characters-detail-activity

� Conflicts:
�	presentation/src/main/java/com/architect/coders/mu8/utils/BindingAdapters.kt
…/MU8 into mu8/javier/issue13-create-characters-detail-activity

� Conflicts:
�	data/src/main/java/com/architect/coders/mu8/data/database/MU8Database.kt
@recaldev recaldev merged commit 8953dcd into development-mu8 Mar 19, 2020
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