Skip to content

Commit 073f878

Browse files
author
Bianca Marina Stana
committed
Cleaned up some code
1 parent f283103 commit 073f878

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1654
-1247
lines changed

Assets/Editor/LSDataImporter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public override void OnImportAsset(AssetImportContext context)
1212
{
1313
var wordDatabase = ScriptableObject.CreateInstance<WordDatabase>();
1414
JsonUtility.FromJsonOverwrite(File.ReadAllText(context.assetPath), wordDatabase);
15-
15+
1616
context.AddObjectToAsset("main obj", wordDatabase);
1717
context.SetMainObject(wordDatabase);
1818
}
19-
}
19+
}
2020
}

Assets/Resources/UITk/MainView.uxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
</UnityEngine.Localization.LocalizedString>
240240
</Bindings>
241241
</ui:Label>
242-
242+
243243
<ui:VisualElement name="resultButtonContainer" style="flex-grow: 1; flex-direction: row; margin-top: 10px; align-items: center;">
244244
<ui:Button name="resultMainMenuButton">
245245
<Bindings>

Assets/Scripts/Closed Captions/ClosedCaptionsManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void Awake()
4141
m_SubtitleViewer.surface = GetComponent<UIDocument>();
4242
m_SubtitleViewer.displaySettings = m_DisplaySettings;
4343
}
44-
44+
4545
void Start()
4646
{
4747
// Create a map of audio clip names to subtitles.

Assets/Scripts/Closed Captions/SrtParser.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ List<SubtitleItem> ParseStream(Stream srtStream, Encoding encoding)
8686

8787
subtitleItem.text = text;
8888

89-
if ((subtitleItem.startTime.milliseconds != 0
90-
|| subtitleItem.endTime.milliseconds != 0)
91-
&& !string.IsNullOrEmpty(subtitleItem.text))
89+
if ((subtitleItem.startTime.milliseconds != 0 ||
90+
subtitleItem.endTime.milliseconds != 0) &&
91+
!string.IsNullOrEmpty(subtitleItem.text))
9292
{
9393
// Parsing succeeded.
9494
subtitleItems.Add(subtitleItem);
@@ -109,7 +109,7 @@ List<SubtitleItem> ParseStream(Stream srtStream, Encoding encoding)
109109
bool TryParseTimecodeLine(string line, out int startTime, out int endTime)
110110
{
111111
var parts = line.Split(k_Delimiters, StringSplitOptions.None);
112-
112+
113113
if (parts.Length != 2)
114114
{
115115
startTime = -1;
@@ -153,7 +153,7 @@ static IEnumerable<string> GetSrtSubtitleParts(TextReader textReader)
153153
}
154154

155155
/// <summary>
156-
/// Takes an srt timecode as a string and parses it into a double (in seconds). A srt timecode reads as follows:
156+
/// Takes an SRT timecode as a string and parses it into a double (in seconds). A srt timecode reads as follows:
157157
/// 00:00:20,000
158158
/// </summary>
159159
/// <param name="timecode">The timecode to parse</param>
@@ -167,9 +167,9 @@ static int ParseSrtTimecode(string timecode)
167167
{
168168
return -1;
169169
}
170-
170+
171171
timecode = match.Value;
172-
172+
173173
if (TimeSpan.TryParse(timecode.Replace(',', '.'), out var result))
174174
{
175175
return (int)result.TotalMilliseconds;
@@ -182,7 +182,7 @@ public Subtitle Parse(string content)
182182
{
183183
var subtitle = ScriptableObject.CreateInstance<Subtitle>();
184184
var stream = new MemoryStream(Encoding.UTF8.GetBytes(content ?? ""));
185-
185+
186186
subtitle.items = ParseStream(stream, Encoding.UTF8);
187187
return subtitle;
188188
}

Assets/Scripts/Closed Captions/SubtitleViewer.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ class SubtitleViewer : MonoBehaviour
1818
VisualElement m_CachedRootVisualElement;
1919
SubtitlePlayer m_CachedPlayer;
2020

21-
public SubtitleDisplaySettings currentDisplaySettings => displaySettings == null ? SubtitleDisplaySettings.GetDefault() : displaySettings;
21+
public SubtitleDisplaySettings currentDisplaySettings => displaySettings == null ?
22+
SubtitleDisplaySettings.GetDefault() : displaySettings;
2223

2324
void CreateSubtitleView()
2425
{
25-
m_SubtitleView = new ListView()
26+
m_SubtitleView = new ListView
2627
{
2728
style =
2829
{
@@ -160,11 +161,11 @@ static void SetPickingModeToIgnore(VisualElement rootElement)
160161
{
161162
return;
162163
}
163-
164+
164165
foreach (var child in rootElement.hierarchy.Children())
165166
{
166167
child.pickingMode = PickingMode.Ignore;
167-
168+
168169
// Prevent the input interaction with the subtitles UI.
169170
SetPickingModeToIgnore(child);
170171
}

0 commit comments

Comments
 (0)