Skip to content

Commit 44c6b4d

Browse files
NeoCoderMatrix86NeoCoderMatrix86
authored
Merge pull request #529 from NeoCoderMatrix86/515-edit-multiple-tracks-modal-not-optimized-for-mobile
Edit multiple tracks modal not optimized for mobile
2 parents bd26e19 + 9b2d068 commit 44c6b4d

5 files changed

Lines changed: 155 additions & 121 deletions

File tree

‎AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,23 @@ namespace AudioCuesheetEditor.Model.UI
1919
{
2020
public enum DynamicEditValue
2121
{
22-
EnteredValueEquals = 0,
23-
EnteredValueAdd = 1,
24-
EnteredValueSubstract = 2
22+
DoNotChange = 0,
23+
EnteredValueEquals = 1,
24+
EnteredValueAdd = 2,
25+
EnteredValueSubstract = 3
2526
}
26-
public class EditMultipleTracksModalResult(Track editedTrack, Boolean isLinkedToPreviousTrackChanged, Boolean positionChanged, Boolean artistChanged, Boolean titleChanged, Boolean beginChanged, Boolean endChanged, Boolean lengthChanged, Boolean flagsChanged, Boolean pregapChanged, Boolean postgapChanged, DynamicEditValue? positionEditMode = null, DynamicEditValue? beginEditMode = null, DynamicEditValue? endEditMode = null, DynamicEditValue? lengthEditMode = null, DynamicEditValue? pregapEditMode = null, DynamicEditValue? postgapEditMode = null)
27+
public class EditMultipleTracksModalResult(Track editedTrack, DynamicEditValue isLinkedToPreviousTrackChanged, DynamicEditValue positionEditMode, DynamicEditValue artistEditMode, DynamicEditValue titleEditMode, DynamicEditValue beginEditMode, DynamicEditValue endEditMode, DynamicEditValue lengthEditMode, DynamicEditValue flagsEditMode, DynamicEditValue pregapEditMode, DynamicEditValue postgapEditMode)
2728
{
2829
public Track EditedTrack { get; } = editedTrack;
29-
public Boolean IsLinkedToPreviousTrackChanged { get; } = isLinkedToPreviousTrackChanged;
30-
public Boolean PositionChanged { get; } = positionChanged;
31-
public DynamicEditValue? PositionEditMode { get; } = positionEditMode;
32-
public Boolean ArtistChanged { get; } = artistChanged;
33-
public Boolean TitleChanged { get; } = titleChanged;
34-
public Boolean BeginChanged { get; } = beginChanged;
35-
public DynamicEditValue? BeginEditMode { get; } = beginEditMode;
36-
public Boolean EndChanged { get; } = endChanged;
37-
public DynamicEditValue? EndEditMode { get; } = endEditMode;
38-
public Boolean LengthChanged { get; } = lengthChanged;
39-
public DynamicEditValue? LengthEditMode { get; } = lengthEditMode;
40-
public Boolean FlagsChanged { get; } = flagsChanged;
41-
public Boolean PregapChanged { get; } = pregapChanged;
42-
public DynamicEditValue? PregapEditMode { get; } = pregapEditMode;
43-
public Boolean PostgapChanged { get; } = postgapChanged;
44-
public DynamicEditValue? PostgapEditMode { get; } = postgapEditMode;
30+
public DynamicEditValue IsLinkedToPreviousTrackEditMode { get; } = isLinkedToPreviousTrackChanged;
31+
public DynamicEditValue PositionEditMode { get; } = positionEditMode;
32+
public DynamicEditValue ArtistEditMode { get; } = artistEditMode;
33+
public DynamicEditValue TitleEditMode { get; } = titleEditMode;
34+
public DynamicEditValue BeginEditMode { get; } = beginEditMode;
35+
public DynamicEditValue EndEditMode { get; } = endEditMode;
36+
public DynamicEditValue LengthEditMode { get; } = lengthEditMode;
37+
public DynamicEditValue FlagsEditMode { get; } = flagsEditMode;
38+
public DynamicEditValue PregapEditMode { get; } = pregapEditMode;
39+
public DynamicEditValue PostgapEditMode { get; } = postgapEditMode;
4540
}
4641
}

‎AudioCuesheetEditor/Services/UI/DialogManager.cs‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,24 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
5757
var length = editMultipleTracksModalResult.EditedTrack.Length;
5858
var preGap = editMultipleTracksModalResult.EditedTrack.PreGap;
5959
var postGap = editMultipleTracksModalResult.EditedTrack.PostGap;
60-
Boolean copyTrackPosition = editMultipleTracksModalResult.PositionChanged;
61-
Boolean copyTrackBegin = editMultipleTracksModalResult.BeginChanged;
62-
Boolean copyTrackEnd = editMultipleTracksModalResult.EndChanged;
63-
Boolean copyTrackLength = editMultipleTracksModalResult.LengthChanged;
64-
Boolean copyTrackPreGap = editMultipleTracksModalResult.PregapChanged;
65-
Boolean copyTrackPostGap = editMultipleTracksModalResult.PostgapChanged;
66-
//First process dynamic edit, because we need to increase each value seperately
60+
Boolean copyIsLinkedToPreviousTrack = editMultipleTracksModalResult.IsLinkedToPreviousTrackEditMode == DynamicEditValue.EnteredValueEquals;
61+
Boolean copyTrackPosition = true;
62+
Boolean copyTrackArtist = editMultipleTracksModalResult.ArtistEditMode == DynamicEditValue.EnteredValueEquals;
63+
Boolean copyTrackTitle = editMultipleTracksModalResult.TitleEditMode == DynamicEditValue.EnteredValueEquals;
64+
Boolean copyTrackBegin = true;
65+
Boolean copyTrackEnd = true;
66+
Boolean copyTrackLength = true;
67+
Boolean copyTrackFlags = editMultipleTracksModalResult.FlagsEditMode == DynamicEditValue.EnteredValueEquals;
68+
Boolean copyTrackPreGap = true;
69+
Boolean copyTrackPostGap = true;
70+
//First process dynamic edit, because we need to increase each value separately
6771
switch (editMultipleTracksModalResult.PositionEditMode)
6872
{
73+
case DynamicEditValue.DoNotChange:
74+
copyTrackPosition = false;
75+
break;
6976
case DynamicEditValue.EnteredValueEquals:
77+
copyTrackPosition = true;
7078
break;
7179
case DynamicEditValue.EnteredValueAdd:
7280
editMultipleTracksModalResult.EditedTrack.Position += track.Position;
@@ -83,7 +91,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
8391
}
8492
switch (editMultipleTracksModalResult.BeginEditMode)
8593
{
94+
case DynamicEditValue.DoNotChange:
95+
copyTrackBegin = false;
96+
break;
8697
case DynamicEditValue.EnteredValueEquals:
98+
copyTrackBegin = true;
8799
break;
88100
case DynamicEditValue.EnteredValueAdd:
89101
var newValue = editMultipleTracksModalResult.EditedTrack.Begin + track.Begin;
@@ -100,7 +112,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
100112
}
101113
switch (editMultipleTracksModalResult.EndEditMode)
102114
{
115+
case DynamicEditValue.DoNotChange:
116+
copyTrackEnd = false;
117+
break;
103118
case DynamicEditValue.EnteredValueEquals:
119+
copyTrackEnd = true;
104120
break;
105121
case DynamicEditValue.EnteredValueAdd:
106122
var newValue = editMultipleTracksModalResult.EditedTrack.End + track.End;
@@ -117,7 +133,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
117133
}
118134
switch (editMultipleTracksModalResult.LengthEditMode)
119135
{
136+
case DynamicEditValue.DoNotChange:
137+
copyTrackLength = false;
138+
break;
120139
case DynamicEditValue.EnteredValueEquals:
140+
copyTrackLength = true;
121141
break;
122142
case DynamicEditValue.EnteredValueAdd:
123143
var newValue = editMultipleTracksModalResult.EditedTrack.Length + track.Length;
@@ -134,7 +154,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
134154
}
135155
switch (editMultipleTracksModalResult.PregapEditMode)
136156
{
157+
case DynamicEditValue.DoNotChange:
158+
copyTrackPreGap = false;
159+
break;
137160
case DynamicEditValue.EnteredValueEquals:
161+
copyTrackPreGap = true;
138162
break;
139163
case DynamicEditValue.EnteredValueAdd:
140164
var newValue = editMultipleTracksModalResult.EditedTrack.PreGap + track.PreGap;
@@ -151,7 +175,11 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
151175
}
152176
switch (editMultipleTracksModalResult.PostgapEditMode)
153177
{
178+
case DynamicEditValue.DoNotChange:
179+
copyTrackPostGap = false;
180+
break;
154181
case DynamicEditValue.EnteredValueEquals:
182+
copyTrackPostGap = true;
155183
break;
156184
case DynamicEditValue.EnteredValueAdd:
157185
var newValue = editMultipleTracksModalResult.EditedTrack.PostGap + track.PostGap;
@@ -173,7 +201,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
173201
editMultipleTracksModalResult.EditedTrack.PreGap = preGap;
174202
editMultipleTracksModalResult.EditedTrack.PostGap = postGap;
175203
//Now copy all values
176-
track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: editMultipleTracksModalResult.IsLinkedToPreviousTrackChanged, setPosition: copyTrackPosition, setArtist: editMultipleTracksModalResult.ArtistChanged, setTitle: editMultipleTracksModalResult.TitleChanged, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: editMultipleTracksModalResult.FlagsChanged, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
204+
track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: copyTrackPosition, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
177205
}
178206
}
179207
}

‎AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,11 @@
123123
<data name="Begin" xml:space="preserve">
124124
<value>Start</value>
125125
</data>
126-
<data name="Calculate" xml:space="preserve">
127-
<value>Berechnen</value>
128-
</data>
129126
<data name="Change" xml:space="preserve">
130127
<value>Ändern</value>
131128
</data>
132129
<data name="Edit tracks" xml:space="preserve">
133-
<value>Spuren bearbeiten</value>
130+
<value>Titel bearbeiten</value>
134131
</data>
135132
<data name="End" xml:space="preserve">
136133
<value>Ende</value>

0 commit comments

Comments
 (0)