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

Fix #2134: Fix concept card naming/linking #2980

Merged
merged 64 commits into from
Apr 23, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
5e33b02
Add support for loading proto versions of lessons.
BenHenning Mar 23, 2021
a3d5f4a
Upgrade Espresso versions to work around build issues.
BenHenning Mar 23, 2021
a017e09
Merge branch 'fix-protobuf-duplication-issue' into add-support-for-pr…
BenHenning Mar 23, 2021
1815e06
Lint fix post-copying from #2927.
BenHenning Mar 23, 2021
97b28ef
Fix Glide in Bazel.
BenHenning Mar 23, 2021
6aadb95
Fix concept card name escaping.
BenHenning Mar 23, 2021
156b01e
Copy over test fix from #2927.
BenHenning Mar 23, 2021
37547c9
Remove image loading annotation.
BenHenning Mar 23, 2021
b33ff7a
Add caching module to needed test suites.
BenHenning Mar 23, 2021
a6a2121
Merge branch 'add-support-for-proto-lesson-loading-from-local-assets'…
BenHenning Mar 23, 2021
e8b8d1f
Merge branch 'fix-glide-image-loading' into fix-concept-card-name-ren…
BenHenning Mar 23, 2021
441e2ae
Add support for importing text protos as assets.
BenHenning Mar 24, 2021
927508b
Add gitignore for Android Studio Bazel plugin output.
BenHenning Mar 24, 2021
d39e926
Import textproto versions of existing dev assets.
BenHenning Mar 24, 2021
9079ab6
Undo Espresso version change since it breaks Bazel tests.
BenHenning Mar 24, 2021
be5b785
Fix tests.
BenHenning Mar 25, 2021
34333eb
Use correct Espresso core.
BenHenning Mar 25, 2021
a691bcf
Move coroutine dispatchers.
BenHenning Apr 3, 2021
8ab7437
Refactor testing utilities build graph.
BenHenning Apr 3, 2021
a78b59d
Introduce dedicated test for TestCoroutineDispatcher.
BenHenning Apr 6, 2021
1e138b9
Add tests for TestCoroutineDispatcher.
BenHenning Apr 8, 2021
797ff85
Merge branch 'develop' into add-coroutine-dispatcher-tests
BenHenning Apr 8, 2021
b45b212
Workaround ktlint semicolon issue.
BenHenning Apr 8, 2021
5db9e82
Lint fixes.
BenHenning Apr 8, 2021
236a4f0
Fix test post-merge.
BenHenning Apr 9, 2021
54dc9bc
Merge branch 'develop' into add-coroutine-dispatcher-tests
BenHenning Apr 9, 2021
dc8be26
Move CoroutineDispatcher to be part of threading.
BenHenning Apr 9, 2021
f2ef2b2
Lint fixes.
BenHenning Apr 9, 2021
12d42dc
Merge branch 'develop' into fix-protobuf-duplication-issue
BenHenning Apr 12, 2021
b0eb428
Undo version upgrade.
BenHenning Apr 12, 2021
138b83a
Merge branch 'fix-protobuf-duplication-issue' into add-support-for-pr…
BenHenning Apr 12, 2021
8601fde
Fix broken tests.
BenHenning Apr 12, 2021
7f6ba6d
Lint fixes.
BenHenning Apr 12, 2021
6aa8dbf
Add a bit more proto loading test coverage.
BenHenning Apr 12, 2021
b2a116b
Comment fix.
BenHenning Apr 12, 2021
c6fa23c
Lint fixes.
BenHenning Apr 12, 2021
3fae8d3
Address earlier TODO.
BenHenning Apr 13, 2021
caed7a7
Merge branch 'add-support-for-proto-lesson-loading-from-local-assets'…
BenHenning Apr 13, 2021
467e90b
Post-merge restructure.
BenHenning Apr 13, 2021
522c9b6
Merge branch 'develop' into add-support-for-proto-lesson-loading-from…
BenHenning Apr 13, 2021
6d16f2a
Merge branch 'add-support-for-proto-lesson-loading-from-local-assets'…
BenHenning Apr 13, 2021
adab013
Post-merge fixes.
BenHenning Apr 13, 2021
38d797e
Merge branch 'fix-glide-image-loading' into fix-concept-card-name-ren…
BenHenning Apr 13, 2021
537ec36
Merge branch 'develop' into add-coroutine-dispatcher-tests
BenHenning Apr 13, 2021
5b48ada
Add tests for new tag handlers.
BenHenning Apr 14, 2021
4ab42a2
Fix broken test build.
BenHenning Apr 14, 2021
661da02
Merge branch 'add-coroutine-dispatcher-tests' into fix-glide-image-lo…
BenHenning Apr 14, 2021
4d8d5be
Post-merge lint fixes.
BenHenning Apr 14, 2021
5ae75e4
Merge branch 'add-coroutine-dispatcher-tests' into add-support-for-pr…
BenHenning Apr 14, 2021
76270d3
Merge branch 'add-support-for-proto-lesson-loading-from-local-assets'…
BenHenning Apr 14, 2021
a5d8d17
Merge branch 'fix-glide-image-loading' into fix-concept-card-name-ren…
BenHenning Apr 14, 2021
5d40f2b
Lint fixes.
BenHenning Apr 14, 2021
c5ee89d
Address reviewer comment.
BenHenning Apr 14, 2021
39ab486
Post-merge fix.
BenHenning Apr 14, 2021
770252a
Fix typo.
BenHenning Apr 14, 2021
9e99d27
Merge branch 'develop' into add-coroutine-dispatcher-tests
BenHenning Apr 15, 2021
31f4f9b
Merge branch 'add-coroutine-dispatcher-tests' into add-support-for-pr…
BenHenning Apr 15, 2021
fe0cd33
Merge branch 'add-support-for-proto-lesson-loading-from-local-assets'…
BenHenning Apr 15, 2021
bf1b6a6
Merge branch 'fix-glide-image-loading' into fix-concept-card-name-ren…
BenHenning Apr 15, 2021
3fddc33
Merge branch 'develop' into add-support-for-proto-lesson-loading-from…
BenHenning Apr 15, 2021
e6b41a9
Merge branch 'add-support-for-proto-lesson-loading-from-local-assets'…
BenHenning Apr 15, 2021
e5369b5
Merge branch 'fix-glide-image-loading' into fix-concept-card-name-ren…
BenHenning Apr 15, 2021
92b4cc3
Merge branch 'develop' into fix-glide-image-loading
BenHenning Apr 23, 2021
19ea66c
Merge branch 'fix-glide-image-loading' into fix-concept-card-name-ren…
BenHenning Apr 23, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove image loading annotation.
This will be added in a later branch in the chain.
  • Loading branch information
BenHenning committed Mar 23, 2021
commit 37547c92d85a129575c577bf59669392d424084c
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ import javax.inject.Qualifier

// TODO: move these qualifiers to their own files.

/**
* Corresponds to an injectable boolean indicating whether images (including thumbnails) should be
* retrieved from the app's local assets.
*/
@Qualifier annotation class LoadImagesFromAssets

/**
* Corresponds to an injectable boolean indicating whether lessons are contained in the app's local
* assets, and that these lessons are encoded using protos.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ class CachingModule {
@TopicListToCache
fun provideTopicListToCache() = listOf(FRACTIONS_TOPIC, RATIOS_TOPIC)

@Provides
@LoadImagesFromAssets
fun provideLoadImagesFromAssets(): Boolean = false

@Provides
@LoadLessonProtosFromAssets
fun provideLoadLessonProtosFromAssets(): Boolean = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.oppia.android.util.caching.testing
import dagger.Module
import dagger.Provides
import org.oppia.android.util.caching.CacheAssetsLocally
import org.oppia.android.util.caching.LoadImagesFromAssets
import org.oppia.android.util.caching.LoadLessonProtosFromAssets
import org.oppia.android.util.caching.TopicListToCache

Expand All @@ -21,10 +20,6 @@ class CachingTestModule {
@TopicListToCache
fun provideTopicListToCache(): List<String> = listOf()

@Provides
@LoadImagesFromAssets
fun provideLoadImagesFromAssets(): Boolean = false

@Provides
@LoadLessonProtosFromAssets
fun provideLoadLessonProtosFromAssets(): Boolean = false
Expand Down