karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Renamed Layout to RecordingLayout.

Browse Source 
Part of #1118.
This commit is contained in:
Dennis Guse
2022-11-22 06:46:56 +01:00
parent d3cf2957cc
commit 4ea70b15e7
30 changed files with 311 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+21 -23
View File
@@ -46,8 +46,8 @@ import de.dennisguse.opentracks.data.models.Speed;
import de.dennisguse.opentracks.io.file.TrackFileFormat;
import de.dennisguse.opentracks.io.file.TrackFilenameGenerator;
import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils;
import de.dennisguse.opentracks.ui.customRecordingLayout.Layout;
import de.dennisguse.opentracks.ui.customRecordingLayout.LayoutIO;
import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
import de.dennisguse.opentracks.util.IntentDashboardUtils;
import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -754,37 +754,35 @@ public class PreferencesUtils {
/**
* @return custom layout selected or the first one if any has been selected or the one selected is not exists anymore.
*/
@Deprecated //TODO Move parsing to LayoutIO
public static Layout getCustomLayout() {
public static RecordingLayout getCustomLayout() {
String csvCustomLayouts = getString(R.string.stats_custom_layouts_key, buildDefaultLayout());
String[] csvLines = csvCustomLayouts.split(CsvLayoutUtils.LINE_SEPARATOR);
String layoutSelected = getString(R.string.stats_custom_layout_selected_layout_key, null);
if (layoutSelected == null) {
return LayoutIO.fromCsv(csvLines[0], resources);
return RecordingLayoutIO.fromCsv(csvLines[0], resources);
}
for (String line : csvLines) {
Layout layout = LayoutIO.fromCsv(line, resources);
if (layout.sameName(layoutSelected)) {
return layout;
RecordingLayout recordingLayout = RecordingLayoutIO.fromCsv(line, resources);
if (recordingLayout.sameName(layoutSelected)) {
return recordingLayout;
}
}
return LayoutIO.fromCsv(csvLines[0], resources);
return RecordingLayoutIO.fromCsv(csvLines[0], resources);
}
//TODO Move string generation to LayoutIO
public static void updateCustomLayouts(@NonNull List<Layout> layouts) {
setString(R.string.stats_custom_layouts_key, layouts.stream().map(Layout::toCsv).collect(Collectors.joining(CsvLayoutUtils.LINE_SEPARATOR)));
public static void updateCustomLayouts(@NonNull List<RecordingLayout> recordingLayouts) {
setString(R.string.stats_custom_layouts_key, RecordingLayoutIO.toCSV(recordingLayouts));
}
public static void updateCustomLayout(@NonNull Layout layout) {
List<Layout> preferenceLayouts = PreferencesUtils.getAllCustomLayouts();
Optional<Layout> layoutToBeUpdated = preferenceLayouts.stream().filter(l -> l.sameName(layout)).findFirst();
public static void updateCustomLayout(@NonNull RecordingLayout recordingLayout) {
List<RecordingLayout> preferenceRecordingLayouts = PreferencesUtils.getAllCustomLayouts();
Optional<RecordingLayout> layoutToBeUpdated = preferenceRecordingLayouts.stream().filter(l -> l.sameName(recordingLayout)).findFirst();
if (layoutToBeUpdated.isPresent()) {
layoutToBeUpdated.get().replaceAllFields(layout.getFields());
layoutToBeUpdated.get().setColumnsPerRow(layout.getColumnsPerRow());
PreferencesUtils.updateCustomLayouts(preferenceLayouts);
layoutToBeUpdated.get().replaceAllFields(recordingLayout.getFields());
layoutToBeUpdated.get().setColumnsPerRow(recordingLayout.getColumnsPerRow());
PreferencesUtils.updateCustomLayouts(preferenceRecordingLayouts);
}
}
@@ -798,19 +796,19 @@ public class PreferencesUtils {
setString(R.string.stats_custom_layout_selected_layout_key, layoutName);
}
public static List<Layout> getAllCustomLayouts() {
List<Layout> layouts = new ArrayList<>();
public static List<RecordingLayout> getAllCustomLayouts() {
List<RecordingLayout> recordingLayouts = new ArrayList<>();
String csvCustomLayout = getString(R.string.stats_custom_layouts_key, buildDefaultLayout());
String[] csvLines = csvCustomLayout.split(CsvLayoutUtils.LINE_SEPARATOR);
for (String line : csvLines) {
layouts.add(LayoutIO.fromCsv(line, resources));
recordingLayouts.add(RecordingLayoutIO.fromCsv(line, resources));
}
return layouts;
return recordingLayouts;
}
public static List<String> getAllCustomLayoutNames() {
return getAllCustomLayouts().stream().map(Layout::getName).collect(Collectors.toList());
return getAllCustomLayouts().stream().map(RecordingLayout::getName).collect(Collectors.toList());
}
public static void resetCustomLayoutPreferences() {