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

Merge pull request #9558 from osmandapp/custom_track_colors

Browse source 
Track appearance fixes
This commit is contained in:
max-klaus 2020-08-04 10:34:29 +03:00 committed by GitHub
commit 87ff91268b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
View file

@ -174,6 +174,13 @@ public class TrackAppearanceFragment extends ContextMenuScrollFragment implement
if (view != null) { if (view != null) {
trackIcon = view.findViewById(R.id.track_icon); trackIcon = view.findViewById(R.id.track_icon);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
openMenuHeaderOnly();
}
});
if (isPortrait()) { if (isPortrait()) {
updateCardsLayout(); updateCardsLayout();
} }

22
OsmAnd/src/net/osmand/plus/track/TrackColoringCard.java
View file

@ -23,6 +23,9 @@ import com.google.android.material.internal.FlowLayout;
import net.osmand.AndroidUtils; import net.osmand.AndroidUtils;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.plus.GPXDatabase;
import net.osmand.plus.GPXDatabase.GpxDataItem;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
@ -247,6 +250,9 @@ public class TrackColoringCard extends BaseCard implements ColorPickerListener {
private void updateHeader() { private void updateHeader() {
AndroidUiHelper.updateVisibility(view.findViewById(R.id.icon), false); AndroidUiHelper.updateVisibility(view.findViewById(R.id.icon), false);
View headerView = view.findViewById(R.id.header_view);
headerView.setBackgroundDrawable(null);
TextView titleView = view.findViewById(R.id.title); TextView titleView = view.findViewById(R.id.title);
titleView.setText(R.string.select_color); titleView.setText(R.string.select_color);
@ -282,9 +288,25 @@ public class TrackColoringCard extends BaseCard implements ColorPickerListener {
} }
} }
saveCustomColors(); saveCustomColors();
saveCustomColorsToTracks(prevColor, newColor);
updateContent(); updateContent();
} }
private void saveCustomColorsToTracks(int prevColor, int newColor) {
List<GpxDataItem> gpxDataItems = app.getGpxDbHelper().getItems();
for (GPXDatabase.GpxDataItem dataItem : gpxDataItems) {
if (prevColor == dataItem.getColor()) {
app.getGpxDbHelper().updateColor(dataItem, newColor);
}
}
List<SelectedGpxFile> files = app.getSelectedGpxHelper().getSelectedGPXFiles();
for (SelectedGpxFile selectedGpxFile : files) {
if (prevColor == selectedGpxFile.getGpxFile().getColor(0)) {
selectedGpxFile.getGpxFile().setColor(newColor);
}
}
}
private void saveCustomColors() { private void saveCustomColors() {
List<String> colorNames = new ArrayList<>(); List<String> colorNames = new ArrayList<>();
for (Integer color : customColors) { for (Integer color : customColors) {

3
OsmAnd/src/net/osmand/plus/track/TrackWidthCard.java
View file

@ -99,6 +99,9 @@ public class TrackWidthCard extends BaseCard {
private void updateHeader() { private void updateHeader() {
AndroidUiHelper.updateVisibility(view.findViewById(R.id.icon), false); AndroidUiHelper.updateVisibility(view.findViewById(R.id.icon), false);
View headerView = view.findViewById(R.id.header_view);
headerView.setBackgroundDrawable(null);
TextView titleView = view.findViewById(R.id.title); TextView titleView = view.findViewById(R.id.title);
titleView.setText(R.string.select_track_width); titleView.setText(R.string.select_track_width);