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

Fixes #4897: Follow up alpha MR6 fixes #4896

Merged
merged 60 commits into from
Mar 10, 2023
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
b39e47d
SW translation fixes + better UI.
BenHenning Jun 16, 2022
f2cbc0d
Expand concept card support.
BenHenning Aug 24, 2022
2e62688
Merge branch 'develop' into expand-concept-card-support
BenHenning Aug 24, 2022
76d38ed
Lint fixes.
BenHenning Aug 24, 2022
94a4140
Revert flag enabled for development.
BenHenning Aug 25, 2022
7322714
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Jan 12, 2023
19f0e69
Fixes a few things for the upcoming MR6 release.
BenHenning Jan 12, 2023
17efba6
Merge branch 'expand-concept-card-support' into assorted-alpha-mr6-fixes
BenHenning Jan 12, 2023
b58c798
Add mark chapter supported for admins.
BenHenning Jan 13, 2023
a502725
Fix in-lesson language switching.
BenHenning Jan 14, 2023
50615ab
Add support for multiple solution types.
BenHenning Jan 18, 2023
970dfaf
Lint & static check fixes.
BenHenning Jan 19, 2023
a3efa90
Remove TODO for soon-to-be-fixed issue.
BenHenning Jan 19, 2023
1d0c122
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Jan 19, 2023
20255ec
Multiple fixes.
BenHenning Jan 19, 2023
62a3ab3
Fix broken titles in subtopics after conversion.
BenHenning Jan 19, 2023
3a2dee0
Catalog tests to add.
BenHenning Jan 19, 2023
c40d89b
Fix test build breakages.
BenHenning Jan 19, 2023
87cd106
Fix test functional breakages.
BenHenning Jan 19, 2023
598a00c
Add new tests.
BenHenning Jan 20, 2023
c109c7c
Fix broken Gradle tests.
BenHenning Jan 20, 2023
51b83f3
Address reviewer comments.
BenHenning Jan 20, 2023
afc3817
Update version.bzl
BenHenning Jan 20, 2023
8065e64
Assorted fixes.
BenHenning Jan 20, 2023
1346329
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Jan 26, 2023
39dafc0
Many more fixes/changes per feedback.
BenHenning Jan 30, 2023
c0dc1a5
Address reviewer comments.
BenHenning Jan 30, 2023
a1a33d4
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Jan 30, 2023
5b220b7
Merge branch 'develop' into adjust-version-codes-based-on-flavors
BenHenning Jan 30, 2023
6eaa68c
Use latest commit for versioning, instead.
BenHenning Jan 30, 2023
a64d1a2
Fix broken tests.
BenHenning Jan 30, 2023
c021017
Fix more broken tests.
BenHenning Jan 30, 2023
c64a91d
Merge branch 'develop' into adjust-version-codes-based-on-flavors
BenHenning Jan 31, 2023
c4ad811
Fix broken Gradle tests.
BenHenning Jan 31, 2023
3f12d91
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Jan 31, 2023
b793d0d
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Feb 1, 2023
4a6b904
Merge branch 'develop' into adjust-version-codes-based-on-flavors
BenHenning Feb 1, 2023
c8eb925
Merge branch 'develop' into adjust-version-codes-based-on-flavors
BenHenning Feb 28, 2023
a8f24c3
Update versions for a Kenya alpha re-release.
BenHenning Feb 28, 2023
4539b0a
Merge branch 'adjust-version-codes-based-on-flavors' into assorted-al…
BenHenning Feb 28, 2023
8cd35d9
Merge branch 'assorted-alpha-mr6-fixes' of github.com:oppia/oppia-and…
BenHenning Mar 1, 2023
84bd2f1
Main follow-up alpha MR6 fixes.
BenHenning Mar 10, 2023
642030c
Remove AtomicEnum.
BenHenning Mar 10, 2023
e49a622
Merge branch 'develop' into adjust-version-codes-based-on-flavors
BenHenning Mar 10, 2023
ca3250e
Merge branch 'adjust-version-codes-based-on-flavors' into assorted-al…
BenHenning Mar 10, 2023
fbf2d09
Merge branch 'assorted-alpha-mr6-fixes' into follow-up-alpha-mr6-fixes
BenHenning Mar 10, 2023
3210121
Some follow-up test fixes.
BenHenning Mar 10, 2023
3a8d645
Test fixes following develop update.
BenHenning Mar 10, 2023
c78aa95
Merge branch 'assorted-alpha-mr6-fixes' into follow-up-alpha-mr6-fixes
BenHenning Mar 10, 2023
fbeeb0c
Gradle build & lint fixes.
BenHenning Mar 10, 2023
7ba388a
Fix testing module Gradle build.
BenHenning Mar 10, 2023
245d48a
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Mar 10, 2023
0f71b8c
Gate long-term event tracking.
BenHenning Mar 10, 2023
75debc2
Merge branch 'assorted-alpha-mr6-fixes' into follow-up-alpha-mr6-fixes
BenHenning Mar 10, 2023
679411e
More test fixes & clean-up, per event gating.
BenHenning Mar 10, 2023
136504a
Revert unnecessary change.
BenHenning Mar 10, 2023
8b00d64
Merge branch 'develop' into assorted-alpha-mr6-fixes
BenHenning Mar 10, 2023
a7c8374
Merge branch 'assorted-alpha-mr6-fixes' into follow-up-alpha-mr6-fixes
BenHenning Mar 10, 2023
1d04649
Gradle test build fix.
BenHenning Mar 10, 2023
d0eedea
Address reviewer comments.
BenHenning Mar 10, 2023
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
Assorted fixes.
- Fixes a test broken in Gradle.
- Repurposes a now unused color for the new secondary button style.
- Fixes landscape support in profile_edit_fragment for the new modify
progress flow.
BenHenning committed Jan 20, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8065e64c97103d022e0ac64b7a2ff63eee2603ad
22 changes: 21 additions & 1 deletion app/src/main/res/layout-land/profile_edit_fragment.xml
Original file line number Diff line number Diff line change
@@ -111,6 +111,26 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/profile_rename_button" />

<Button
android:id="@+id/profile_mark_chapters_for_completion_button"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/general_item_background_border"
android:fontFamily="sans-serif"
android:gravity="start|center_vertical"
android:minHeight="48dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/profile_edit_mark_chapter_completion"
android:textAllCaps="false"
android:textColor="@color/component_color_shared_primary_text_color"
android:textSize="16sp"
android:visibility="@{viewModel.isAllowedToMarkFinishedChapters ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/profile_reset_button" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/profile_edit_allow_download_container"
android:layout_width="match_parent"
@@ -121,7 +141,7 @@
android:visibility="@{viewModel.showEditDownloadAccess ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/profile_reset_button">
app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">

<TextView
android:id="@+id/profile_edit_allow_download_heading"
2 changes: 1 addition & 1 deletion app/src/main/res/values-night/color_palette.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<color name="color_palette_toolbar_shadow_color">@color/color_def_black_24</color>
<color name="color_palette_toolbar_text_color">@color/color_def_white</color>
<color name="color_palette_secondary_toolbar_color">@color/color_def_forest_green</color>
<color name="color_palette_shared_resume_lesson_start_over_button_color">@color/color_def_oppia_green</color>
<color name="color_palette_secondary_button_background_color">@color/color_def_oppia_green</color>
<color name="color_palette_status_bar_color">@color/color_def_dark_green</color>
<color name="color_palette_action_bar_color">@color/color_def_oppia_green</color>
<color name="color_palette_highlighted_background_color">@color/color_def_highlight_blue_darker</color>
2 changes: 1 addition & 1 deletion app/src/main/res/values/color_palette.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<color name="color_palette_toolbar_shadow_color">@color/color_def_black_24</color>
<color name="color_palette_toolbar_text_color">@color/color_def_white</color>
<color name="color_palette_secondary_toolbar_color">@color/color_def_oppia_green</color>
<color name="color_palette_shared_resume_lesson_start_over_button_color">@color/color_def_oppia_green</color>
<color name="color_palette_secondary_button_background_color">@color/color_def_oppia_green</color>
<color name="color_palette_status_bar_color">@color/color_def_dark_green</color>
<color name="color_palette_action_bar_color">@color/color_def_oppia_green</color>
<color name="color_palette_highlighted_background_color">@color/color_def_highlight_blue</color>
2 changes: 1 addition & 1 deletion app/src/main/res/values/component_colors.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<color name="component_color_shared_previous_responses_header_item_container_background_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_shared_transparent_background_color">@color/color_palette_transparent_background_color</color>
<color name="component_color_shared_white_background_color">@color/color_palette_shared_white_background_color</color>
<color name="component_color_shared_secondary_button_background_color">@color/color_palette_secondary_toolbar_color</color>
<color name="component_color_shared_secondary_button_background_color">@color/color_palette_secondary_button_background_color</color>
<color name="component_color_shared_hints_background_color">@color/color_palette_shared_hints_background_color</color>
<color name="component_color_shared_previous_responses_header_item_text_color">@color/color_palette_highlighted_text_color</color>
<color name="component_color_shared_input_interaction_edit_text_color">@color/color_palette_highlighted_text_color</color>
Original file line number Diff line number Diff line change
@@ -168,6 +168,7 @@ class ProfileEditFragmentTest {
}

@Test
@Config(qualifiers = "land")
fun testProfileEdit_configChange_startWithUserProfile_clickDelete_checkOpensDeletionDialog() {
launch<ProfileEditFragmentTestActivity>(
ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
@@ -184,6 +185,7 @@ class ProfileEditFragmentTest {
}

@Test
@Config(qualifiers = "land")
fun testProfileEdit_startWithUserProfile_clickDelete_configChange_checkDeletionDialogIsVisible() {
launch<ProfileEditFragmentTestActivity>(
ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
@@ -258,6 +260,7 @@ class ProfileEditFragmentTest {
}

@Test
@Config(qualifiers = "land")
fun testProfileEdit_configChange_userHasDownloadAccess_downloadsEnabled_checkSwitchIsChecked() {
TestPlatformParameterModule.forceEnableDownloadsSupport(true)
val addProfileProvider = profileManagementController.addProfile(
@@ -415,6 +418,7 @@ class ProfileEditFragmentTest {
}

@Test
@Config(qualifiers = "land")
fun testProfileEdit_studyOn_landscape_hasMarkChaptersCompletedButton() {
TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
launch<ProfileEditFragmentTestActivity>(
Original file line number Diff line number Diff line change
@@ -1664,6 +1664,7 @@ class StateFragmentLocalTest {
}

@Test
@RunOn(buildEnvironments = [BuildEnvironment.BAZEL]) // Languages unsupported in Gradle builds.
fun testStateFragment_stateWithAlgebraicExpr_showSolution_solutionHasCorrectHtmlContentDesc() {
launchForExploration(TEST_EXPLORATION_ID_5).use { scenario ->
// Play through the first three states.