-
Notifications
You must be signed in to change notification settings - Fork 2
Mahajapp code review2 #58
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
Open
pranavm7
wants to merge
2
commits into
main
Choose a base branch
from
mahajapp_CodeReview2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,17 @@ package com.cookit.dto | |
| import com.google.gson.annotations.Expose | ||
| import com.google.gson.annotations.SerializedName | ||
|
|
||
| /** | ||
| * A class to represent recipes | ||
| * | ||
| * This class serializes the JSON from IRecipeDAO and parses it into a kotlin object | ||
| * @property recipeID | ||
| * @property name Name of the recipe | ||
| * @property category Category of the recipe | ||
| * @property cuisine Cuisine of the recipe | ||
| * @property instructions Instructions of how to create the recipe | ||
| * @property imageURL URL of the image associated with the recipe | ||
| */ | ||
|
Comment on lines
+6
to
+16
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added documentation to the data class. |
||
| data class Recipe( | ||
| @SerializedName("idMeal")var recipeID : String = "", | ||
| @SerializedName("strMeal")var name : String = "", | ||
|
|
||
16 changes: 2 additions & 14 deletions
16
app/src/main/java/com/cookit/service/IngredientMapService.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,14 @@ | ||
| package com.cookit.service | ||
|
|
||
| /** | ||
| * Ingredient mapping service interface that has 2 functions | ||
| * [stringToMap] converts a string into a map | ||
| * [mapToString] converts a map to a string | ||
| */ | ||
|
Comment on lines
-3
to
-7
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please ignore these deletions, seems like the merge caused accidental deletions |
||
| interface IIngredientMapService { | ||
| fun stringToMap(input: String): MutableMap<String, String> | ||
| fun mapToString(input: MutableMap<String, String>): String | ||
| } | ||
|
|
||
| /** | ||
| * This implementation of the [IIngredientMapService] converts strings and maps based on the | ||
| * format expected from a text field in our UI. | ||
| * The format looks like this: | ||
| * ingredient=amount,\ningredient2=amount,\ningredient3=amount,\n ... ingredient20=amount | ||
| * \n is converted into a new line in the text field | ||
| */ | ||
| class TextFieldIngredientMapService : IIngredientMapService { | ||
| class IngredientMapService : IIngredientMapService { | ||
| override fun stringToMap(input: String): MutableMap<String, String> { | ||
| val outputMap = input.split(",\n").associate { | ||
| val (left, right) = it.trim().split("=") | ||
| val (left, right) = it.split("=") | ||
| left to right | ||
| }.toMutableMap() | ||
| return outputMap | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added comments to provide context for the function