From 7cbba3d6253c0110dd5908370a6bd486c4092853 Mon Sep 17 00:00:00 2001 From: Chumva Date: Wed, 2 May 2018 13:40:37 +0300 Subject: [PATCH] changed appbar,statusbar and refactored WikipediaDialogFragment --- .../res/layout/wikipedia_dialog_fragment.xml | 105 +++++++----------- .../WikipediaDialogFragment.java | 86 ++++++++------ 2 files changed, 89 insertions(+), 102 deletions(-) diff --git a/OsmAnd/res/layout/wikipedia_dialog_fragment.xml b/OsmAnd/res/layout/wikipedia_dialog_fragment.xml index ea3267d555..5bc645d6b2 100644 --- a/OsmAnd/res/layout/wikipedia_dialog_fragment.xml +++ b/OsmAnd/res/layout/wikipedia_dialog_fragment.xml @@ -9,79 +9,54 @@ android:background="?attr/wikivoyage_bg_color" android:orientation="vertical"> - + - + - + - - - - - - - - - - - + - "; private static final String FOOTER_INNER = ""; - private View mainView; private WebView contentWebView; + private TextView articleToolbarText; + private TextView readFullArticleButton; + private TextView selectLanguageTextView; private boolean darkMode; private Amenity amenity; @@ -79,9 +84,16 @@ public class WikipediaDialogFragment extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - Dialog dialog = new Dialog(getContext(), getTheme()); - if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) { - dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_Alpha; + int themeId = darkMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme_LightStatusBar; + Dialog dialog = new Dialog(getContext(), themeId); + if (!getSettings().DO_NOT_USE_ANIMATIONS.get()) { + Window window = dialog.getWindow(); + if (window != null) { + window.getAttributes().windowAnimations = R.style.Animations_Alpha; + if (Build.VERSION.SDK_INT >= 21) { + window.setStatusBarColor(getResolvedColor(getStatusBarColor())); + } + } } return dialog; } @@ -90,32 +102,17 @@ public class WikipediaDialogFragment extends DialogFragment { @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - mainView = inflater.inflate(R.layout.wikipedia_dialog_fragment, container, false); + View mainView = inflater.inflate(R.layout.wikipedia_dialog_fragment, container, false); - mainView.setBackgroundColor(ContextCompat.getColor(getContext(), darkMode ? R.color.ctx_menu_bottom_view_bg_dark : R.color.ctx_menu_bottom_view_bg_light)); + setupToolbar((Toolbar) mainView.findViewById(R.id.toolbar)); - AppBarLayout appBarLayout = (AppBarLayout) mainView.findViewById(R.id.app_bar); - appBarLayout.setBackgroundColor(ContextCompat.getColor(getContext(), darkMode ? R.color.ctx_menu_buttons_bg_dark: R.color.ctx_menu_buttons_bg_light)); - - int toolbarTextColor = ContextCompat.getColor(getContext(), R.color.dashboard_subheader_text_light); - - ImageButton backButton = (ImageButton) mainView.findViewById(R.id.back_button); - backButton.setImageDrawable(getMyApplication().getIconsCache().getPaintedIcon(R.drawable.ic_arrow_back, toolbarTextColor)); - backButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - dismiss(); - } - }); - - TextView titleTextView = (TextView) mainView.findViewById(R.id.title_text_view); - titleTextView.setTextColor(toolbarTextColor); + articleToolbarText = (TextView) mainView.findViewById(R.id.title_text_view); ColorStateList buttonColorStateList = AndroidUtils.createPressedColorStateList(getContext(), darkMode, R.color.ctx_menu_controller_button_text_color_light_n, R.color.ctx_menu_controller_button_text_color_light_p, R.color.ctx_menu_controller_button_text_color_dark_n, R.color.ctx_menu_controller_button_text_color_dark_p); - final TextView readFullArticleButton = (TextView) mainView.findViewById(R.id.read_full_article); + readFullArticleButton = (TextView) mainView.findViewById(R.id.read_full_article); readFullArticleButton.setBackgroundResource(darkMode ? R.drawable.bt_round_long_night : R.drawable.bt_round_long_day); readFullArticleButton.setTextColor(buttonColorStateList); @@ -125,7 +122,7 @@ public class WikipediaDialogFragment extends DialogFragment { readFullArticleButton.setCompoundDrawablesWithIntrinsicBounds(getIcon(R.drawable.ic_world_globe_dark), null, null, null); readFullArticleButton.setCompoundDrawablePadding((int) getResources().getDimension(R.dimen.content_padding_small)); - final TextView selectLanguageTextView = mainView.findViewById(R.id.select_language_text_view); + selectLanguageTextView = mainView.findViewById(R.id.select_language_text_view); selectLanguageTextView.setTextColor(buttonColorStateList); selectLanguageTextView.setCompoundDrawablesWithIntrinsicBounds(getIcon(R.drawable.ic_action_map_language), null, null, null); selectLanguageTextView.setCompoundDrawablePadding((int) getResources().getDimension(R.dimen.context_menu_padding_margin_small)); @@ -186,9 +183,8 @@ public class WikipediaDialogFragment extends DialogFragment { final String langSelected = lng; final String title = amenity.getName(langSelected); - ((TextView) mainView.findViewById(R.id.title_text_view)).setText(title); - - mainView.findViewById(R.id.read_full_article).setOnClickListener(new View.OnClickListener() { + articleToolbarText.setText(title); + readFullArticleButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { String article = "https://" + langSelected.toLowerCase() + ".wikipedia.org/wiki/" + title.replace(' ', '_'); @@ -196,7 +192,6 @@ public class WikipediaDialogFragment extends DialogFragment { } }); - final TextView selectLanguageTextView = mainView.findViewById(R.id.select_language_text_view); selectLanguageTextView.setText(langSelected); selectLanguageTextView.setOnClickListener(new View.OnClickListener() { @Override @@ -260,11 +255,7 @@ public class WikipediaDialogFragment extends DialogFragment { private Drawable getIcon(int resId) { int colorId = darkMode ? R.color.ctx_menu_controller_button_text_color_dark_n : R.color.ctx_menu_controller_button_text_color_light_n; - return getMyApplication().getIconsCache().getIcon(resId, colorId); - } - - private OsmandApplication getMyApplication() { - return (OsmandApplication) getActivity().getApplication(); + return getIcon(resId, colorId); } public static boolean showInstance(AppCompatActivity activity, Amenity amenity, String lang) { @@ -289,4 +280,25 @@ public class WikipediaDialogFragment extends DialogFragment { public static boolean showInstance(AppCompatActivity activity, Amenity amenity) { return showInstance(activity, amenity, null); } + + protected void setupToolbar(Toolbar toolbar) { + toolbar.setNavigationIcon(getIcon(R.drawable.ic_arrow_back, R.color.icon_color)); + toolbar.setNavigationContentDescription(R.string.access_shared_string_navigate_up); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + } + + @ColorRes + protected int getStatusBarColor() { + return darkMode ? R.color.status_bar_wikivoyage_article_dark : R.color.status_bar_wikivoyage_article_light; + } + + @ColorInt + protected int getResolvedColor(@ColorRes int colorId) { + return ContextCompat.getColor(getContext(), colorId); + } }