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

Merge pull request #7881 from osmandapp/fix_7858

Browse source 
Fix #7858
This commit is contained in:
max-klaus 2019-11-08 17:24:48 +03:00 committed by GitHub
commit 78ddbabe3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/res/layout/simple_list_menu_item.xml
View file

@ -10,12 +10,12 @@
android:layout_height="wrap_content"
android:minHeight="@dimen/list_item_height"
android:layout_gravity="center_vertical"
android:drawablePadding="24dp"
android:drawablePadding="@dimen/bottom_sheet_icon_margin"
android:gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingRight = "16dp"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingRight = "@dimen/content_padding"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textStyle="normal"
tools:drawableStart="@drawable/ic_action_search_dark"

36
OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
View file

@ -5,6 +5,7 @@ import android.content.BroadcastReceiver;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
@ -16,11 +17,13 @@ import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.plus.ApplicationMode;
@ -241,7 +244,6 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
protected void showConfirmDialog(final String prefId, final Object newValue) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.change_default_settings);
String appModeName = selectedAppMode.toHumanString(this);
String currentModeText = getString(R.string.apply_to_current_profile, appModeName);
@ -252,17 +254,35 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
strings[1] = new SpannableString(currentModeText);
strings[1].setSpan(new StyleSpan(Typeface.BOLD), start, start + appModeName.length(), 0);
final LayoutInflater themedInflater = UiUtilities.getInflater(this, !settings.isLightContent());
final ArrayAdapter<SpannableString> singleChoiceAdapter = new ArrayAdapter<SpannableString>(this, R.layout.simple_list_menu_item, R.id.title, strings) {
final int[] icons = new int[2];
icons[0] = R.drawable.ic_action_copy;
icons[1] = selectedAppMode.getIconRes();
final boolean nightMode = !settings.isLightContent();
final OsmandApplication app = getMyApplication();
final LayoutInflater themedInflater = UiUtilities.getInflater(this, nightMode);
//set up dialog title
View dialogTitle = themedInflater.inflate(R.layout.bottom_sheet_item_simple, null);
dialogTitle.findViewById(R.id.icon).setVisibility(View.GONE);
TextView tvTitle = dialogTitle.findViewById(R.id.title);
tvTitle.setText(R.string.change_default_settings);
int textSize = (int) app.getResources().getDimension(R.dimen.dialog_header_text_size);
tvTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
builder.setCustomTitle(dialogTitle);
final ArrayAdapter<SpannableString> singleChoiceAdapter = new ArrayAdapter<SpannableString>(this, R.layout.bottom_sheet_item_simple, R.id.title, strings) {
@NonNull
@Override
public View getView(int position, View convertView, @NonNull ViewGroup parent) {
View v = convertView;
if (v == null) {
v = themedInflater.inflate(R.layout.simple_list_menu_item, parent, false);
v = themedInflater.inflate(R.layout.bottom_sheet_item_simple, parent, false);
}
TextView title = (TextView) v.findViewById(R.id.title);
title.setText(getItem(position));
int activeColor = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
Drawable icon = app.getUIUtilities().getIcon(icons[position], activeColor);
((TextView) v.findViewById(R.id.title)).setText(getItem(position));
((ImageView) v.findViewById(R.id.icon)).setImageDrawable(icon);
return v;
}
};
@ -280,6 +300,8 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
});
builder.setNegativeButton(R.string.discard_changes, null);
builder.show();
AlertDialog dialog = builder.create();
dialog.getListView().setDividerHeight(0);
dialog.show();
}
}