Fix #5592 : Enable submit button after linking items in Drag & Drop Sort Interaction #5597

TanishMoral11 · 2024-12-14T16:18:58Z

Explanation

Fixes #5592 , where the submit button did not become enabled after linking items in the Drag & Drop Sort Interaction. Previously, even when the items were correctly linked, the submit button remained disabled, preventing users from proceeding.

Changes Made

Updated logic to track linking and unlinking of items as a meaningful "state change."
Ensured that the submit button becomes enabled as soon as items are linked or unlinked.
Refactored the relevant functions to make sure the submit button reflects changes in real-time.

This change improves the overall UX, making it more intuitive for users to submit their answers after linking items.

Essential Checklist

The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix [BUG]: Submit Button Stays Disabled After Linking Items in Drag-and-Drop Input #5592 ".)
Any changes to scripts/assets files have their rationale included in the PR explanation.
The PR follows the style guide.
The PR does not contain any unnecessary code changes from Android Studio (reference).
The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
The PR is assigned to the appropriate reviewers (reference).

After Changes Video :

2024-12-14_21-35-10.mp4

Screenshot of Passing Tests :

…eraction

TanishMoral11 · 2024-12-14T16:29:47Z

Hey @adhiamboperes , Could You PTAL !!

github-actions · 2024-12-14T17:40:18Z

Coverage Report

Results

Number of files assessed: 1
Overall Coverage: 0.00%
Coverage Analysis: PASS ✅

Exempted coverage

Files exempted from coverage

File	Exemption Reason
DragAndDropSortInteractionViewModel.kt app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt	This file is exempted from having a test file; skipping coverage check.

Refer test_file_exemptions.textproto for the comprehensive list of file exemptions and their required coverage percentages.

To learn more, visit the Oppia Android Code Coverage wiki page

github-actions · 2024-12-15T04:17:39Z

APK & AAB differences analysis

Note that this is a summarized snapshot. See the CI artifacts for detailed differences.

Dev

Expand to see flavor specifics

Universal APK

APK file size: 19 MiB (old), 19 MiB (new), 4 bytes (Added)

APK download size (estimated): 17 MiB (old), 17 MiB (new), 470 bytes (Removed)

Method count: 260195 (old), 260195 (new), 0 (No change)

Features: 2 (old), 2 (new), 0 (No change)

Permissions: 6 (old), 6 (new), 0 (No change)

Resources: 6818 (old), 6818 (new), 0 (No change)

Anim: 43 (old), 43 (new), 0 (No change)
Animator: 26 (old), 26 (new), 0 (No change)
Array: 15 (old), 15 (new), 0 (No change)
Attr: 922 (old), 922 (new), 0 (No change)
Bool: 9 (old), 9 (new), 0 (No change)
Color: 967 (old), 967 (new), 0 (No change)
Dimen: 1048 (old), 1048 (new), 0 (No change)
Drawable: 380 (old), 380 (new), 0 (No change)
Id: 1275 (old), 1275 (new), 0 (No change)
Integer: 37 (old), 37 (new), 0 (No change)
Interpolator: 11 (old), 11 (new), 0 (No change)
Layout: 380 (old), 380 (new), 0 (No change)
Menu: 3 (old), 3 (new), 0 (No change)
Mipmap: 1 (old), 1 (new), 0 (No change)
Plurals: 10 (old), 10 (new), 0 (No change)
Raw: 2 (old), 2 (new), 0 (No change)
String: 852 (old), 852 (new), 0 (No change)
Style: 831 (old), 831 (new), 0 (No change)
Xml: 6 (old), 6 (new), 0 (No change)

Lesson assets: 111 (old), 111 (new), 0 (No change)

AAB differences

Expand to see AAB specifics

Supported configurations:

hdpi (same)
ldpi (same)
mdpi (same)
tvdpi (same)
xhdpi (same)
xxhdpi (same)
xxxhdpi (same)

Base APK

APK file size: 18 MiB (old), 18 MiB (new), 4 bytes (Added)
APK download size (estimated): 17 MiB (old), 17 MiB (new), 454 bytes (Removed)

Configuration hdpi

APK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change)
APK download size (estimated): 18 KiB (old), 18 KiB (new), 0 bytes (No change)

Configuration ldpi

APK file size: 49 KiB (old), 49 KiB (new), 0 bytes (No change)
APK download size (estimated): 14 KiB (old), 14 KiB (new), 0 bytes (No change)

Configuration mdpi

APK file size: 45 KiB (old), 45 KiB (new), 0 bytes (No change)
APK download size (estimated): 14 KiB (old), 14 KiB (new), 0 bytes (No change)

Configuration tvdpi

APK file size: 86 KiB (old), 86 KiB (new), 0 bytes (No change)
APK download size (estimated): 29 KiB (old), 29 KiB (new), 0 bytes (No change)

Configuration xhdpi

APK file size: 57 KiB (old), 57 KiB (new), 0 bytes (No change)
APK download size (estimated): 21 KiB (old), 21 KiB (new), 0 bytes (No change)

Configuration xxhdpi

APK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change)
APK download size (estimated): 29 KiB (old), 29 KiB (new), 0 bytes (No change)

Configuration xxxhdpi

APK file size: 63 KiB (old), 63 KiB (new), 0 bytes (No change)
APK download size (estimated): 28 KiB (old), 28 KiB (new), 0 bytes (No change)

Alpha

Expand to see flavor specifics

Universal APK

APK file size: 11 MiB (old), 11 MiB (new), 312 bytes (Added)

APK download size (estimated): 10 MiB (old), 10 MiB (new), 197 bytes (Removed)

Method count: 116265 (old), 116265 (new), 0 (No change)

Features: 2 (old), 2 (new), 0 (No change)

Permissions: 6 (old), 6 (new), 0 (No change)

Resources: 5786 (old), 5786 (new), 0 (No change)

Anim: 33 (old), 33 (new), 0 (No change)
Animator: 24 (old), 24 (new), 0 (No change)
Array: 14 (old), 14 (new), 0 (No change)
Attr: 888 (old), 888 (new), 0 (No change)
Bool: 8 (old), 8 (new), 0 (No change)
Color: 820 (old), 820 (new), 0 (No change)
Dimen: 780 (old), 780 (new), 0 (No change)
Drawable: 342 (old), 342 (new), 0 (No change)
Id: 1221 (old), 1221 (new), 0 (No change)
Integer: 32 (old), 32 (new), 0 (No change)
Interpolator: 11 (old), 11 (new), 0 (No change)
Layout: 343 (old), 343 (new), 0 (No change)
Menu: 1 (old), 1 (new), 0 (No change)
Mipmap: 1 (old), 1 (new), 0 (No change)
Plurals: 10 (old), 10 (new), 0 (No change)
String: 785 (old), 785 (new), 0 (No change)
Style: 472 (old), 472 (new), 0 (No change)
Xml: 1 (old), 1 (new), 0 (No change)

Lesson assets: 111 (old), 111 (new), 0 (No change)

AAB differences

Expand to see AAB specifics

Supported configurations:

hdpi (same)
ldpi (same)
mdpi (same)
tvdpi (same)
xhdpi (same)
xxhdpi (same)
xxxhdpi (same)

Base APK

APK file size: 11 MiB (old), 11 MiB (new), 316 bytes (Added)
APK download size (estimated): 10 MiB (old), 10 MiB (new), 495 bytes (Added)

Configuration hdpi

APK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change)
APK download size (estimated): 17 KiB (old), 17 KiB (new), 0 bytes (No change)

Configuration ldpi

APK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change)
APK download size (estimated): 13 KiB (old), 13 KiB (new), 0 bytes (No change)

Configuration mdpi

APK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change)
APK download size (estimated): 13 KiB (old), 13 KiB (new), 0 bytes (No change)

Configuration tvdpi

APK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change)
APK download size (estimated): 27 KiB (old), 27 KiB (new), 0 bytes (No change)

Configuration xhdpi

APK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change)
APK download size (estimated): 20 KiB (old), 20 KiB (new), 0 bytes (No change)

Configuration xxhdpi

APK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change)
APK download size (estimated): 28 KiB (old), 28 KiB (new), 0 bytes (No change)

Configuration xxxhdpi

APK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change)
APK download size (estimated): 27 KiB (old), 27 KiB (new), 0 bytes (No change)

Beta

Expand to see flavor specifics

Universal APK

APK file size: 11 MiB (old), 11 MiB (new), 284 bytes (Added)

APK download size (estimated): 10 MiB (old), 10 MiB (new), 600 bytes (Removed)

Method count: 116271 (old), 116271 (new), 0 (No change)

Features: 2 (old), 2 (new), 0 (No change)

Permissions: 6 (old), 6 (new), 0 (No change)

Resources: 5786 (old), 5786 (new), 0 (No change)

Anim: 33 (old), 33 (new), 0 (No change)
Animator: 24 (old), 24 (new), 0 (No change)
Array: 14 (old), 14 (new), 0 (No change)
Attr: 888 (old), 888 (new), 0 (No change)
Bool: 8 (old), 8 (new), 0 (No change)
Color: 820 (old), 820 (new), 0 (No change)
Dimen: 780 (old), 780 (new), 0 (No change)
Drawable: 342 (old), 342 (new), 0 (No change)
Id: 1221 (old), 1221 (new), 0 (No change)
Integer: 32 (old), 32 (new), 0 (No change)
Interpolator: 11 (old), 11 (new), 0 (No change)
Layout: 343 (old), 343 (new), 0 (No change)
Menu: 1 (old), 1 (new), 0 (No change)
Mipmap: 1 (old), 1 (new), 0 (No change)
Plurals: 10 (old), 10 (new), 0 (No change)
String: 785 (old), 785 (new), 0 (No change)
Style: 472 (old), 472 (new), 0 (No change)
Xml: 1 (old), 1 (new), 0 (No change)

Lesson assets: 111 (old), 111 (new), 0 (No change)

AAB differences

Expand to see AAB specifics

Supported configurations:

hdpi (same)
ldpi (same)
mdpi (same)
tvdpi (same)
xhdpi (same)
xxhdpi (same)
xxxhdpi (same)

Base APK

APK file size: 11 MiB (old), 11 MiB (new), 284 bytes (Added)
APK download size (estimated): 10 MiB (old), 10 MiB (new), 245 bytes (Removed)

Configuration hdpi

APK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change)
APK download size (estimated): 17 KiB (old), 17 KiB (new), 0 bytes (No change)

Configuration ldpi

APK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change)
APK download size (estimated): 13 KiB (old), 13 KiB (new), 0 bytes (No change)

Configuration mdpi

APK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change)
APK download size (estimated): 13 KiB (old), 13 KiB (new), 0 bytes (No change)

Configuration tvdpi

APK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change)
APK download size (estimated): 27 KiB (old), 27 KiB (new), 0 bytes (No change)

Configuration xhdpi

APK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change)
APK download size (estimated): 20 KiB (old), 20 KiB (new), 0 bytes (No change)

Configuration xxhdpi

APK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change)
APK download size (estimated): 28 KiB (old), 28 KiB (new), 0 bytes (No change)

Configuration xxxhdpi

APK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change)
APK download size (estimated): 27 KiB (old), 27 KiB (new), 0 bytes (No change)

Ga

Expand to see flavor specifics

Universal APK

APK file size: 11 MiB (old), 11 MiB (new), 308 bytes (Added)

APK download size (estimated): 10 MiB (old), 10 MiB (new), 1711 bytes (Removed)

Method count: 116271 (old), 116271 (new), 0 (No change)

Features: 2 (old), 2 (new), 0 (No change)

Permissions: 6 (old), 6 (new), 0 (No change)

Resources: 5786 (old), 5786 (new), 0 (No change)

Anim: 33 (old), 33 (new), 0 (No change)
Animator: 24 (old), 24 (new), 0 (No change)
Array: 14 (old), 14 (new), 0 (No change)
Attr: 888 (old), 888 (new), 0 (No change)
Bool: 8 (old), 8 (new), 0 (No change)
Color: 820 (old), 820 (new), 0 (No change)
Dimen: 780 (old), 780 (new), 0 (No change)
Drawable: 342 (old), 342 (new), 0 (No change)
Id: 1221 (old), 1221 (new), 0 (No change)
Integer: 32 (old), 32 (new), 0 (No change)
Interpolator: 11 (old), 11 (new), 0 (No change)
Layout: 343 (old), 343 (new), 0 (No change)
Menu: 1 (old), 1 (new), 0 (No change)
Mipmap: 1 (old), 1 (new), 0 (No change)
Plurals: 10 (old), 10 (new), 0 (No change)
String: 785 (old), 785 (new), 0 (No change)
Style: 472 (old), 472 (new), 0 (No change)
Xml: 1 (old), 1 (new), 0 (No change)

Lesson assets: 111 (old), 111 (new), 0 (No change)

AAB differences

Expand to see AAB specifics

Supported configurations:

hdpi (same)
ldpi (same)
mdpi (same)
tvdpi (same)
xhdpi (same)
xxhdpi (same)
xxxhdpi (same)

Base APK

APK file size: 11 MiB (old), 11 MiB (new), 308 bytes (Added)
APK download size (estimated): 10 MiB (old), 10 MiB (new), 229 bytes (Removed)

Configuration hdpi

APK file size: 43 KiB (old), 43 KiB (new), 0 bytes (No change)
APK download size (estimated): 17 KiB (old), 17 KiB (new), 0 bytes (No change)

Configuration ldpi

APK file size: 44 KiB (old), 44 KiB (new), 0 bytes (No change)
APK download size (estimated): 13 KiB (old), 13 KiB (new), 0 bytes (No change)

Configuration mdpi

APK file size: 38 KiB (old), 38 KiB (new), 0 bytes (No change)
APK download size (estimated): 13 KiB (old), 13 KiB (new), 0 bytes (No change)

Configuration tvdpi

APK file size: 73 KiB (old), 73 KiB (new), 0 bytes (No change)
APK download size (estimated): 27 KiB (old), 27 KiB (new), 0 bytes (No change)

Configuration xhdpi

APK file size: 50 KiB (old), 50 KiB (new), 0 bytes (No change)
APK download size (estimated): 20 KiB (old), 20 KiB (new), 0 bytes (No change)

Configuration xxhdpi

APK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change)
APK download size (estimated): 28 KiB (old), 28 KiB (new), 0 bytes (No change)

Configuration xxxhdpi

APK file size: 55 KiB (old), 55 KiB (new), 0 bytes (No change)
APK download size (estimated): 27 KiB (old), 27 KiB (new), 0 bytes (No change)

TanishMoral11 · 2024-12-16T11:18:20Z

Hey @adhiamboperes , PTAL !!
The PR is ready for review.

adhiamboperes

Thanks @TanishMoral11!

A UI test to verify the change in StateFragmentTest.kt is required.

adhiamboperes · 2024-12-17T09:44:43Z

...java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt

@@ -246,15 +250,24 @@ class DragAndDropSortInteractionViewModel private constructor(
      dragDropInteractionContentViewModel.itemIndex = index
      dragDropInteractionContentViewModel.listSize = _choiceItems.size
    }
-    // to update the list
+
+    // *Update the list*


Here and below: please format comment correctly. Asterisks are only used in kdocs.

adhiamboperes · 2024-12-17T10:40:48Z

...java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt

  }

  private fun getSubmitTimeError(): DragAndDropSortInteractionError {
-    return if (_originalChoiceItems == _choiceItems) {
+    val hasItemsChanged = _originalChoiceItems.size != _choiceItems.size ||


Suggested change

val hasItemsChanged = _originalChoiceItems.size != _choiceItems.size ||

val haveItemsChanged = _originalChoiceItems.size != _choiceItems.size ||

TanishMoral11 · 2024-12-17T12:09:33Z

Hey @adhiamboperes PTAL !!

Before Changes :
https://github.com/user-attachments/assets/ed2f0dc1-432d-4b5b-833d-7438d9557f3c

After Changes :
https://github.com/user-attachments/assets/12e8d0b1-0f98-46d2-beae-600419fa4d6e

StateFragmentTest.kt Screen Shot :

oppiabot · 2024-12-17T12:12:38Z

Unassigning @TanishMoral11 since a re-review was requested. @TanishMoral11, please make sure you have addressed all review comments. Thanks!

github-actions · 2024-12-17T12:57:13Z

Coverage Report

Results

Number of files assessed: 4
Overall Coverage: 0.00%
Coverage Analysis: PASS ✅

Exempted coverage

Files exempted from coverage

File	Exemption Reason
DragAndDropSortInteractionViewModel.kt app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt	This file is exempted from having a test file; skipping coverage check.
ClassroomListViewModel.kt app/src/main/java/org/oppia/android/app/classroom/ClassroomListViewModel.kt	This file is exempted from having a test file; skipping coverage check.
ClassroomListFragmentPresenter.kt app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt	This file is exempted from having a test file; skipping coverage check.
ClassroomListActivity.kt app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt	This file is incompatible with code coverage tooling; skipping coverage check.

Refer test_file_exemptions.textproto for the comprehensive list of file exemptions and their required coverage percentages.

To learn more, visit the Oppia Android Code Coverage wiki page

fix: Enable submit button after linking items in Drag & Drop Sort Int…

499fde0

…eraction

TanishMoral11 requested a review from a team as a code owner December 14, 2024 16:18

TanishMoral11 requested a review from adhiamboperes December 14, 2024 16:18

oppiabot bot assigned adhiamboperes Dec 14, 2024

adhiamboperes requested changes Dec 17, 2024

View reviewed changes

adhiamboperes assigned TanishMoral11 and unassigned adhiamboperes Dec 17, 2024

Resolved Issues

cbd7196

TanishMoral11 requested a review from adhiamboperes December 17, 2024 12:10

oppiabot bot assigned adhiamboperes and unassigned TanishMoral11 Dec 17, 2024

	val hasItemsChanged = _originalChoiceItems.size != _choiceItems.size \|\|
	val haveItemsChanged = _originalChoiceItems.size != _choiceItems.size \|\|

Fix #5592 : Enable submit button after linking items in Drag & Drop Sort Interaction #5597

Are you sure you want to change the base?

Fix #5592 : Enable submit button after linking items in Drag & Drop Sort Interaction #5597

Conversation

TanishMoral11 commented Dec 14, 2024 • edited by adhiamboperes Loading

Explanation

Changes Made

This change improves the overall UX, making it more intuitive for users to submit their answers after linking items.

Essential Checklist

TanishMoral11 commented Dec 14, 2024

github-actions bot commented Dec 14, 2024

Coverage Report

Results

Exempted coverage

github-actions bot commented Dec 15, 2024

APK & AAB differences analysis

Dev

Universal APK

AAB differences

Base APK

Configuration hdpi

Configuration ldpi

Configuration mdpi

Configuration tvdpi

Configuration xhdpi

Configuration xxhdpi

Configuration xxxhdpi

Alpha

Universal APK

AAB differences

Base APK

Configuration hdpi

Configuration ldpi

Configuration mdpi

Configuration tvdpi

Configuration xhdpi

Configuration xxhdpi

Configuration xxxhdpi

Beta

Universal APK

AAB differences

Base APK

Configuration hdpi

Configuration ldpi

Configuration mdpi

Configuration tvdpi

Configuration xhdpi

Configuration xxhdpi

Configuration xxxhdpi

Ga

Universal APK

AAB differences

Base APK

Configuration hdpi

Configuration ldpi

Configuration mdpi

Configuration tvdpi

Configuration xhdpi

Configuration xxhdpi

Configuration xxxhdpi

TanishMoral11 commented Dec 16, 2024 • edited Loading

adhiamboperes left a comment

Choose a reason for hiding this comment

adhiamboperes Dec 17, 2024

Choose a reason for hiding this comment

TanishMoral11 Dec 17, 2024

Choose a reason for hiding this comment

adhiamboperes Dec 17, 2024

Choose a reason for hiding this comment

TanishMoral11 Dec 17, 2024

Choose a reason for hiding this comment

TanishMoral11 commented Dec 17, 2024

oppiabot bot commented Dec 17, 2024

github-actions bot commented Dec 17, 2024

Coverage Report

Results

Exempted coverage

TanishMoral11 commented Dec 14, 2024 •

edited by adhiamboperes

Loading

TanishMoral11 commented Dec 16, 2024 •

edited

Loading