Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix button padding and colors of lang button

Browse source
This commit is contained in:
Chumva 2018-05-02 16:23:12 +03:00
parent a50e5a6f56
commit c8418eae4c
1 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
OsmAnd/src/net/osmand/plus/mapcontextmenu/WikipediaDialogFragment.java
View file

@ -112,17 +112,27 @@ public class WikipediaDialogFragment extends BaseOsmAndDialogFragment {
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_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); R.color.ctx_menu_controller_button_text_color_dark_n, R.color.ctx_menu_controller_button_text_color_dark_p);
ColorStateList selectedLangColorStateList = AndroidUtils.createPressedColorStateList(
getContext(), darkMode,
R.color.icon_color, R.color.wikivoyage_active_light,
R.color.icon_color, R.color.wikivoyage_active_dark
);
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.setBackgroundResource(darkMode ? R.drawable.bt_round_long_night : R.drawable.bt_round_long_day);
readFullArticleButton.setTextColor(buttonColorStateList); readFullArticleButton.setTextColor(buttonColorStateList);
readFullArticleButton.setCompoundDrawablesWithIntrinsicBounds(getIcon(R.drawable.ic_world_globe_dark), null, null, null); readFullArticleButton.setCompoundDrawablesWithIntrinsicBounds(getActiveIcon(R.drawable.ic_world_globe_dark), null, null, null);
readFullArticleButton.setCompoundDrawablePadding((int) getResources().getDimension(R.dimen.content_padding_small)); readFullArticleButton.setCompoundDrawablePadding((int) getResources().getDimension(R.dimen.content_padding_small));
int paddingLeft = (int) getResources().getDimension(R.dimen.wikipedia_button_left_padding);
int paddingRight = (int) getResources().getDimension(R.dimen.dialog_content_margin);
readFullArticleButton.setPadding(paddingLeft, 0, paddingRight, 0);
selectLanguageTextView = (TextView) mainView.findViewById(R.id.select_language_text_view);
selectLanguageTextView.setTextColor(selectedLangColorStateList);
selectLanguageTextView.setCompoundDrawablesWithIntrinsicBounds(getSelectedLangIcon(), null, null, null);
selectLanguageTextView.setBackgroundResource(darkMode
? R.drawable.wikipedia_select_lang_bg_dark_n : R.drawable.wikipedia_select_lang_bg_light_n);
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));
selectLanguageTextView.setBackgroundResource(darkMode ? R.drawable.wikipedia_select_lang_bg_dark : R.drawable.wikipedia_select_lang_bg_light);
contentWebView = (WebView) mainView.findViewById(R.id.content_web_view); contentWebView = (WebView) mainView.findViewById(R.id.content_web_view);
WebSettings webSettings = contentWebView.getSettings(); WebSettings webSettings = contentWebView.getSettings();
webSettings.setJavaScriptEnabled(true); webSettings.setJavaScriptEnabled(true);
@ -130,6 +140,16 @@ public class WikipediaDialogFragment extends BaseOsmAndDialogFragment {
return mainView; return mainView;
} }
@NonNull
private Drawable getSelectedLangIcon() {
Drawable normal = getIcon(R.drawable.ic_action_map_language, R.color.icon_color);
if (Build.VERSION.SDK_INT >= 21) {
Drawable active = getActiveIcon(R.drawable.ic_action_map_language);
return AndroidUtils.createPressedStateListDrawable(normal, active);
}
return normal;
}
@NonNull @NonNull
private String getBaseUrl() { private String getBaseUrl() {
File wikivoyageDir = getMyApplication().getAppPath(IndexConstants.WIKIVOYAGE_INDEX_DIR); File wikivoyageDir = getMyApplication().getAppPath(IndexConstants.WIKIVOYAGE_INDEX_DIR);
@ -188,7 +208,7 @@ public class WikipediaDialogFragment extends BaseOsmAndDialogFragment {
} }
}); });
selectLanguageTextView.setText(langSelected); selectLanguageTextView.setText(Algorithms.capitalizeFirstLetter(langSelected));
selectLanguageTextView.setOnClickListener(new View.OnClickListener() { selectLanguageTextView.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -249,8 +269,8 @@ public class WikipediaDialogFragment extends BaseOsmAndDialogFragment {
optionsMenu.show(); optionsMenu.show();
} }
private Drawable getIcon(int resId) { private Drawable getActiveIcon(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; int colorId = darkMode ? R.color.wikivoyage_active_dark : R.color.wikivoyage_active_light;
return getIcon(resId, colorId); return getIcon(resId, colorId);
} }