-
Notifications
You must be signed in to change notification settings - Fork 526
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…s of inactive cards. (#2422) * Lock and blur * Replace color/white with #FFFFFF * Add \n * Move isBlurred to LessonThumbnailImageView. * Remove unused import. * Move dependency on Glide away from from ImageLoader. * Remove unneeded line. * Refactor Transformation-related code, add KDocs. * Renaming. * Remove unused import. * Reformat. * Add Mockk test * Add Mockk test - lint * Add blurring tests. * Mock ImageLoader in StoryActivityTest. * Add delay before image loading. * Nits and improvements. * Remove unused import. * Remove unused import. * Set image resources in LessonThumbnailImageView in addition to calling GlideImageLoader. * BlurTransformation re-write. * BlurTransformation re-write. * Add TestImageLoaderModule to some tests. * Lint * Add TestImageLoaderModule to more tests. * Add TestImageLoaderModule to more tests. * Update utility/src/main/java/org/oppia/android/util/parser/BlurTransformation.kt Co-authored-by: Ben Henning <[email protected]> * Update utility/src/main/java/org/oppia/android/util/parser/BlurTransformation.kt Co-authored-by: Ben Henning <[email protected]> * TestGlideImageLoader Refactor. * Reformat. * Reformat. * Reformat. * Nits and comments. * Revert changes in landscape design. * Change BlurTransformation to return a copy instead of 'toTransform'. * Update app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt Co-authored-by: Ben Henning <[email protected]> * Refactor TestGlideImageLoader. * Nits Co-authored-by: Ben Henning <[email protected]>
- Loading branch information
1 parent
9524453
commit 2bcd511
Showing
15 changed files
with
356 additions
and
21 deletions.
There are no files selected for viewing
This file contains 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 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 |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="80dp" | ||
android:height="80dp" | ||
android:tint="#FFFFFF" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:fillColor="#FFFFFF" | ||
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" /> | ||
</vector> |
This file contains 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 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 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 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 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 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
4 changes: 4 additions & 0 deletions
4
app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt
This file contains 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,9 +1,13 @@ | ||
package org.oppia.android.app.utility | ||
|
||
import org.mockito.ArgumentCaptor | ||
import org.mockito.Mockito.any | ||
|
||
/** | ||
* Returns ArgumentCaptor.capture() as nullable type to avoid java.lang.IllegalStateException | ||
* when null is returned. | ||
*/ | ||
fun <T> capture(argumentCaptor: ArgumentCaptor<T>): T = argumentCaptor.capture() | ||
|
||
/** Matches anything, including nulls. */ | ||
fun <T> anyOrNull(): T = any() |
Oops, something went wrong.