Skip to content

feat(ADFA-2839): Persist errors until dismissed #986

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

Open
dara-abijo-adfa wants to merge 1 commit into
base: stage
Choose a base branch
from
+15 −11
Open

feat(ADFA-2839): Persist errors until dismissed #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions app/src/main/java/com/itsaky/androidide/fragments/onboarding/PermissionsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import com.itsaky.androidide.events.InstallationEvent
import com.itsaky.androidide.tasks.doAsyncWithProgress
import com.itsaky.androidide.utils.PermissionsHelper
import com.itsaky.androidide.utils.flashError
import com.itsaky.androidide.utils.flashErrorForLong
import com.itsaky.androidide.utils.flashSuccess
import com.itsaky.androidide.utils.isAtLeastR
import com.itsaky.androidide.utils.viewLifecycleScope
Expand Down Expand Up @@ -150,7 +149,7 @@ class PermissionsFragment :
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.events.collect { event ->
when (event) {
is InstallationEvent.ShowError -> activity?.flashErrorForLong(event.message)
is InstallationEvent.ShowError -> activity?.flashError(event.message)
is InstallationEvent.InstallationResultEvent -> {}
}
}
Expand Down
22 changes: 13 additions & 9 deletions common/src/main/java/com/itsaky/androidide/utils/FlashbarActivityUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,27 @@ private fun Flashbar.Builder.applyIcon(iconType: IconType): Flashbar.Builder =
private fun Activity.showFlashBar(
msg: Any?,
iconType: IconType,
gravity: Flashbar.Gravity = Flashbar.Gravity.TOP,
gravity: Flashbar.Gravity = TOP,
duration: Long = Flashbar.DURATION_SHORT,
) {
val builder = flashbarBuilder(gravity, duration)
.applyIcon(iconType)

// Add a close button if the flashbar is an indefinite error
if (duration == DURATION_INDEFINITE && iconType == IconType.ERROR) {
builder.positiveActionText(getString(R.string.dismiss))
builder.positiveActionTapListener { it.dismiss() }
}

when (msg) {
null -> return
is Int ->
flashbarBuilder(gravity, duration)
.applyIcon(iconType)
builder
.message(msg)
.showOnUiThread()

is String ->
this
.flashbarBuilder(gravity, duration)
.applyIcon(iconType)
builder
.message(msg)
.showOnUiThread()

Expand Down Expand Up @@ -118,9 +124,7 @@ fun Activity.flashMessage(

fun Activity.flashSuccess(msg: String?) = showFlashBar(msg, IconType.SUCCESS)

fun Activity.flashError(msg: String?) = showFlashBar(msg, IconType.ERROR)

fun Activity.flashErrorForLong(msg: String?) = showFlashBar(msg = msg, iconType = IconType.ERROR, duration = DURATION_LONG)
fun Activity.flashError(msg: String?) = showFlashBar(msg, IconType.ERROR, duration = DURATION_INDEFINITE)

fun Activity.flashInfo(msg: String?) = showFlashBar(msg, IconType.INFO)

Expand Down
1 change: 1 addition & 0 deletions resources/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,4 +1132,5 @@
<string name="msg_diagnostics_copied">Diagnostics copied to clipboard</string>
<string name="msg_no_diagnostics_to_copy">No diagnostics to copy</string>
<string name="msg_clipboard_copy_failed">Failed to copy to clipboard</string>
<string name="dismiss">Dismiss</string>
</resources>