Fixes #166: Story activity UI structure #195

hareshkh · 2019-09-29T18:38:42Z

Explanation

Checklist

The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
The PR follows the style guide.
The PR does not contain any unnecessary auto-generated code from Android Studio.
The PR is made from a branch that's not called "develop".
The PR is assigned to an appropriate reviewer.

have yet been added.

hareshkh · 2019-09-29T18:45:07Z

Changing base branch for now to show correct diff in the PR.

BenHenning

Thanks @hareshkh! This is a great start. Is this ready for review now?

I left a couple of preliminary comments without knowing if a deeper review is needed yet.

app/src/main/java/org/oppia/app/story/StoryActivity.kt

app/src/main/java/org/oppia/app/story/StoryFragmentController.kt

hareshkh · 2019-09-30T06:21:44Z

@BenHenning, the PR is not ready for a deeper review yet, I have to add the RecyclerView. I am reading about a few things. I will try to do it ASAP.

BenHenning · 2019-10-07T08:33:46Z

Hi @hareshkh. Have you made any recent progress on this?

BenHenning · 2019-10-18T07:37:25Z

@hareshkh is this ready for me to look at again?

If so, can you please merge the latest develop into this branch and resolve the conflicts, then assign the PR to me when it's ready for review?

app/src/main/AndroidManifest.xml

BenHenning

Thanks @hareshkh! Overall, the PR LGTM except the static state bit being added into StoryActivity. Let's resolve that.

Can you also attach some screenshots of what the new activity looks like in the initial comment of the PR to provide a visual reference?

app/src/main/AndroidManifest.xml

app/src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt

app/src/main/java/org/oppia/app/recyclerview/RecyclerViewBindingAdapter.kt

app/src/main/java/org/oppia/app/story/StoryActivityPresenter.kt

app/src/main/java/org/oppia/app/story/StoryFragment.kt

app/src/main/res/layout/story_fragment.xml

app/src/main/res/layout/story_header_view.xml

app/src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt

BenHenning

Thanks @hareshkh! I think we can simplify this slightly after merging in develop since there were some downstream changes to the home activity.

app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt

app/src/main/java/org/oppia/app/recyclerview/RecyclerViewBindingAdapter.kt

app/src/main/java/org/oppia/app/story/ExplorationSelector.kt

app/src/main/java/org/oppia/app/story/StoryActivity.kt

app/src/main/java/org/oppia/app/story/StoryFragment.kt

app/src/main/java/org/oppia/app/story/StoryFragmentPresenter.kt

app/src/main/java/org/oppia/app/story/StoryViewModel.kt

app/src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt

Conflicts: app/src/main/AndroidManifest.xml app/src/main/java/org/oppia/app/databinding/DrawableBindingAdapters.kt app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt app/src/main/res/drawable/rounded_rect_background.xml app/src/main/res/layout/home_fragment.xml app/src/main/res/values/strings.xml

…android into story-activity-ui-structure Conflicts: app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt app/src/main/res/layout/home_fragment.xml

isolating story fragment tests), and miscellaneous tweaks.

don't set up the intent properly.

BenHenning · 2019-11-06T08:41:38Z

All remaining changes seem addressed. @rt4914 can you verify just the new commits briefly to make sure another pair of eyes verifies them?

rt4914

LGTM. Test cases are working.

Some nit changes.

app/build.gradle

rt4914

One test related comment

app/build.gradle

app/src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt

BenHenning · 2019-11-07T05:26:34Z

Thanks @rt4914 for the comments, and @hareshkh for following up. The fixes LGTM, going ahead and merging this.

BenHenning and others added 2 commits September 20, 2019 01:33

Introduce a generic data-binding-enabled RecyclerView adapter. No tests

0e9eaea

have yet been added.

Initial structure commit

0ae1439

hareshkh changed the base branch from develop to introduce-data-binding-recycler-view-adapter September 29, 2019 18:42

BenHenning requested changes Sep 29, 2019

View reviewed changes

app/src/main/java/org/oppia/app/story/StoryActivity.kt Outdated Show resolved Hide resolved

app/src/main/java/org/oppia/app/story/StoryActivity.kt Outdated Show resolved Hide resolved

app/src/main/java/org/oppia/app/story/StoryFragmentController.kt Outdated Show resolved Hide resolved

BenHenning assigned hareshkh Sep 29, 2019

Minor changes

14c8633

Merges develop

2df7459

hareshkh changed the base branch from introduce-data-binding-recycler-view-adapter to develop October 8, 2019 19:01

hareshkh and others added 11 commits October 11, 2019 09:40

Adds story fragment layout

446df70

Passes storyId to fragment presenter

fa10f3b

Passes storyId to ViewModel

8bb838a

Adds code to retrieve story live data

770fdb0

Merges branch 'develop'

39fca77

Adds button in home-activity and back button in action bar

01b629d

Sets story title in action bar

75307df

Adds chapter summary

8d6c3a7

Adds chapter list to viewModel

9d70736

Adds chapter list item

62afbf4

Adds recyclerview

3f5e390

hareshkh added 3 commits October 18, 2019 19:06

Adds placeholder thumbnail view

cbfadb1

Merges branch develop

32f468c

Adds chapter progress

62362f5

hareshkh assigned BenHenning and unassigned hareshkh Oct 18, 2019

hareshkh added 2 commits October 21, 2019 10:19

Converts string concat

3ecbafb

Shows story thumbnail

34c300b

Adds exploration loading test

70d7a16

BenHenning reviewed Nov 3, 2019

View reviewed changes

app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved

BenHenning requested changes Nov 3, 2019

View reviewed changes

BenHenning assigned hareshkh and unassigned BenHenning Nov 3, 2019

hareshkh added 2 commits November 4, 2019 02:44

Some review comment changes

c3d075d

Minor cosmetic changes

1d3fa6c

This was referenced Nov 4, 2019

Fix part of #134: Home fragment low fi with TopicList #289

Merged

Fix #302: Start SplashActivity upon opening the app #303

Merged

hareshkh added 4 commits November 6, 2019 00:50

Listeners to invoke ExplorationActivity

f9ae447

StoryId can be null

c51b394

Merge branch 'develop'

d94c543

Remove unrequired changes

b05e786

hareshkh assigned BenHenning and unassigned hareshkh Nov 6, 2019

BenHenning requested changes Nov 6, 2019

View reviewed changes

BenHenning added 5 commits November 5, 2019 23:21

Merge branch 'story-activity-ui-structure' of github.com:oppia/oppia-…

da81a13

…android into story-activity-ui-structure Conflicts: app/src/main/java/org/oppia/app/home/HomeFragmentPresenter.kt app/src/main/res/layout/home_fragment.xml

Undo small accidental edits to home fragment/presenter post merge.

12886ec

Address reviewer comments (including introducing a test activity for

8e1253a

isolating story fragment tests), and miscellaneous tweaks.

Add checkNotNull check in test activity to help quick-fail tests if they

4a3c07b

don't set up the intent properly.

rt4914 approved these changes Nov 6, 2019

View reviewed changes

app/build.gradle Outdated Show resolved Hide resolved

app/build.gradle Outdated Show resolved Hide resolved

rt4914 approved these changes Nov 6, 2019

View reviewed changes

app/build.gradle Outdated Show resolved Hide resolved

app/src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt Outdated Show resolved Hide resolved

hareshkh added 2 commits November 7, 2019 02:06

Removes unrequired gradle change

8219df2

Add intent extras check in test

d296bd4

BenHenning approved these changes Nov 7, 2019

View reviewed changes

BenHenning merged commit 2944a67 into develop Nov 7, 2019

BenHenning deleted the story-activity-ui-structure branch November 7, 2019 05:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #166: Story activity UI structure #195

Fixes #166: Story activity UI structure #195

hareshkh commented Sep 29, 2019 •

edited by BenHenning

Loading

hareshkh commented Sep 29, 2019

BenHenning left a comment

hareshkh commented Sep 30, 2019

BenHenning commented Oct 7, 2019

BenHenning commented Oct 18, 2019 •

edited

Loading

BenHenning left a comment

BenHenning left a comment

BenHenning commented Nov 6, 2019

rt4914 left a comment

rt4914 left a comment

BenHenning commented Nov 7, 2019

Fixes #166: Story activity UI structure #195

Fixes #166: Story activity UI structure #195

Conversation

hareshkh commented Sep 29, 2019 • edited by BenHenning Loading

Explanation

Checklist

hareshkh commented Sep 29, 2019

BenHenning left a comment

Choose a reason for hiding this comment

hareshkh commented Sep 30, 2019

BenHenning commented Oct 7, 2019

BenHenning commented Oct 18, 2019 • edited Loading

BenHenning left a comment

Choose a reason for hiding this comment

BenHenning left a comment

Choose a reason for hiding this comment

BenHenning commented Nov 6, 2019

rt4914 left a comment

Choose a reason for hiding this comment

rt4914 left a comment

Choose a reason for hiding this comment

BenHenning commented Nov 7, 2019

hareshkh commented Sep 29, 2019 •

edited by BenHenning

Loading

BenHenning commented Oct 18, 2019 •

edited

Loading