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.

Sign up for GitHub

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

Jump to bottom

Fixes #3641 Use finish() instead of intent for smoother navigation #5557

Merged
merged 8 commits into from
Nov 15, 2024
Merged

Fixes #3641 Use finish() instead of intent for smoother navigation #5557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54c7bd1
Fix: Use finish() instead of intent for smoother navigation (#3641)
theayushyadav11 Oct 21, 2024
32b1dca
Removed TODO
theayushyadav11 Oct 28, 2024
6fb90cd
Added test for BackPress
theayushyadav11 Nov 13, 2024
5c73e27
added test for BackPress
theayushyadav11 Nov 13, 2024
defee21
Merge branch 'develop' of github.com:oppia/oppia-android into usingFi…
theayushyadav11 Nov 14, 2024
1a9fc26
Brought the deleted file back and fixed the code structure
theayushyadav11 Nov 14, 2024
8c3955d
Merge branch 'develop' of github.com:oppia/oppia-android into usingFi…
theayushyadav11 Nov 14, 2024
4eb4269
Merge branch 'usingFinish' of github.com:theayushyadav11/oppia-androi…
theayushyadav11 Nov 14, 2024
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
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class ExitProfileDialogFragment : InjectableDialogFragment() {
dialog.dismiss()
}
.setPositiveButton(R.string.home_activity_back_dialog_exit) { _, _ ->
// TODO(#3641): Investigate on using finish instead of intent.
val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!)
if (!restoreLastCheckedItem) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
Expand Down
5 changes: 1 addition & 4 deletions app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ class AddProfileActivity : InjectableAutoLocalizedAppCompatActivity() {
}

override fun onSupportNavigateUp(): Boolean {
// TODO(#3641): Investigate on using finish instead of intent.
val intent = Intent(this, ProfileChooserActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(intent)
finish()
return false
}

Expand Down
10 changes: 10 additions & 0 deletions app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.test.core.app.ActivityScenario.launch
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
import androidx.test.espresso.action.ViewActions.pressImeActionButton
Expand Down Expand Up @@ -1748,6 +1749,15 @@ class AddProfileActivityTest {
assertThat(currentScreenName).isEqualTo(ScreenName.ADD_PROFILE_ACTIVITY)
}

@Test
fun testAddProfileActivity_onBackPressed_finishActivity() {
val scenario = launch(AddProfileActivity::class.java)
onView(isRoot()).perform(ViewActions.pressBack())
testCoroutineDispatchers.runCurrent()
scenario.onActivity { activity ->
assertThat(activity.isFinishing).isTrue()
}
}
private fun createAddProfileActivityIntent(): Intent {
return AddProfileActivity.createAddProfileActivityIntent(
ApplicationProvider.getApplicationContext(),
Expand Down
Loading