Remove progress dialogs #1280
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package com.firebase.ui.auth.ui; | ||
|
|
||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
| import android.os.Handler; | ||
| import android.support.annotation.Nullable; | ||
| import android.support.annotation.RestrictTo; | ||
| import android.view.ContextThemeWrapper; | ||
| import android.view.Gravity; | ||
| import android.view.View; | ||
| import android.view.ViewGroup; | ||
| import android.widget.FrameLayout; | ||
|
|
||
| import com.firebase.ui.auth.R; | ||
|
|
||
| import me.zhanghai.android.materialprogressbar.MaterialProgressBar; | ||
|
|
||
| /** | ||
| * Base classes for activities that are just simple overlays. | ||
| */ | ||
| @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) | ||
| public class InvisibleActivityBase extends HelperActivityBase { | ||
|
|
||
| // Minimum time that the spinner will stay on screen, once it is shown. | ||
| private static final long MIN_SPINNER_MS = 750; | ||
|
|
||
| private Handler mHandler = new Handler(); | ||
| private MaterialProgressBar mProgressBar; | ||
|
|
||
| // Last time that the progress bar was actually shown | ||
| private long mLastShownTime = 0; | ||
|
|
||
| @Override | ||
| protected void onCreate(@Nullable Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.fui_activity_invisible); | ||
|
|
||
| // Create an indeterminate, circular progress bar in the app's theme | ||
| mProgressBar = new MaterialProgressBar(new ContextThemeWrapper(this, getFlowParams().themeId)); | ||
| mProgressBar.setIndeterminate(true); | ||
| mProgressBar.setVisibility(View.GONE); | ||
|
|
||
| // Set bar to float in the center | ||
| FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( | ||
| ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); | ||
| params.gravity = Gravity.CENTER; | ||
|
|
||
| // Add to the container | ||
| FrameLayout container = findViewById(R.id.invisible_frame); | ||
| container.addView(mProgressBar, params); | ||
| } | ||
|
|
||
| @Override | ||
| public void showProgress(int message) { | ||
| if (mProgressBar.getVisibility() == View.VISIBLE) { | ||
| mHandler.removeCallbacksAndMessages(null); | ||
|
There was a problem hiding this comment. Glad to see you know that trick too! I've been burned so many times using |
||
| return; | ||
| } | ||
|
|
||
| mLastShownTime = System.currentTimeMillis(); | ||
| mProgressBar.setVisibility(View.VISIBLE); | ||
|
There was a problem hiding this comment. So I'm wondering, what if we also had a really small (like 300ms) delay to show progress? Would that make the app feel faster? There was a problem hiding this comment. So do you mean possibly avoid showing it at all for things that take under 300ms? Sounds like a great idea to me. There was a problem hiding this comment. Actually since we are launching into a different activity here (which affects a lot of things underlying) it's better to show immediately. |
||
| } | ||
|
|
||
| @Override | ||
| public void hideProgress() { | ||
| doAfterTimeout(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| mLastShownTime = 0; | ||
| mProgressBar.setVisibility(View.GONE); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void finish(int resultCode, @Nullable Intent intent) { | ||
| setResult(resultCode, intent); | ||
| doAfterTimeout(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| finish(); | ||
|
There was a problem hiding this comment. Could you explain your reasoning for waiting to finish? Since there's no text to read or anything like that, I feel like we should finish instantly. Or did that feel janky? There was a problem hiding this comment. Added a comment. Basically sometimes we call |
||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * For certain actions (like finishing or hiding the progress dialog) we want to make sure | ||
| * that we have shown the progress state for at least MIN_SPINNER_MS to prevent flickering. | ||
| * | ||
| * This method performs some action after the window has passed, or immediately if we have | ||
| * already waited longer than that. | ||
| */ | ||
| private void doAfterTimeout(Runnable runnable) { | ||
| long currentTime = System.currentTimeMillis(); | ||
| long diff = currentTime - mLastShownTime; | ||
|
|
||
| // 'diff' is how long it's been since we showed the spinner, so in the | ||
| // case where diff is greater than our minimum spinner duration then our | ||
| // remaining wait time is 0. | ||
| long remaining = Math.max(MIN_SPINNER_MS - diff, 0); | ||
|
|
||
| mHandler.postDelayed(runnable, remaining); | ||
| } | ||
| } | ||
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,16 @@ | ||
| package com.firebase.ui.auth.ui; | ||
|
|
||
| import android.support.annotation.RestrictTo; | ||
| import android.support.annotation.StringRes; | ||
|
|
||
| /** | ||
| * View (Activity or Fragment, normally) that can respond to progress events. | ||
| */ | ||
| @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) | ||
| public interface ProgressView { | ||
|
|
||
| void showProgress(@StringRes int message); | ||
|
|
||
| void hideProgress(); | ||
|
|
||
| } |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So we haven't gotten rid of all of progress dialogs yet?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think once you're done with Phone auth we can really kill the whole ProgressDialogHolder thing.