Skip to content

issue/2222 theme preview title #2264

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

Merged
merged 1 commit into from
Jan 29, 2015
Merged

issue/2222 theme preview title #2264

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
7 changes: 5 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/themes/ThemePreviewFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
mWebView.getSettings().setUserAgentString(DESKTOP_UA);
mWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);

mWebView.setWebChromeClient(new WPWebChromeClient(getActivity(), (ProgressBar) view.findViewById(
R.id.progress_bar)));
mWebView.setWebChromeClient(
new WPWebChromeClient(
getActivity(),
(ProgressBar) view.findViewById(R.id.progress_bar),
false));

mWebView.setWebViewClient(new WPWebViewClient(mBlog));

Expand Down
28 changes: 20 additions & 8 deletions libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPWebChromeClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,35 @@
import android.widget.ProgressBar;

public class WPWebChromeClient extends WebChromeClient {
private ProgressBar mProgressBar;
private Activity mActivity;
private final ProgressBar mProgressBar;
private final Activity mActivity;
private final boolean mAutoUpdateActivityTitle;

public WPWebChromeClient(Activity activity, ProgressBar progressBar) {
mActivity = activity;
mProgressBar = progressBar;
mAutoUpdateActivityTitle = true;
}

public WPWebChromeClient(Activity activity,
ProgressBar progressBar,
boolean autoUpdateActivityTitle) {
mActivity = activity;
mProgressBar = progressBar;
mAutoUpdateActivityTitle = autoUpdateActivityTitle;
}

public void onProgressChanged(WebView webView, int progress) {
if (!mActivity.isFinishing()) {
if (mActivity != null && !mActivity.isFinishing() && mAutoUpdateActivityTitle) {
mActivity.setTitle(webView.getTitle());
}
if (progress == 100) {
mProgressBar.setVisibility(View.GONE);
} else {
mProgressBar.setVisibility(View.VISIBLE);
mProgressBar.setProgress(progress);
if (mProgressBar != null) {
if (progress == 100) {
mProgressBar.setVisibility(View.GONE);
} else {
mProgressBar.setVisibility(View.VISIBLE);
mProgressBar.setProgress(progress);
}
}
}
}