Skip to content

Commit b4c52e8

Browse files
Sergio0694Sergio0694
authored
Merge pull request #25 from Sergio0694/dev
Minor changes and tweaks
2 parents dd17af3 + 70734f3 commit b4c52e8

File tree

11 files changed

+92
-51
lines changed

11 files changed

+92
-51
lines changed

‎Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -179,6 +179,7 @@
179179
<Compile Include="DataModels\SQLite\Enums\SavedSourceCodeType.cs" />
180180
<Compile Include="DataModels\SQLite\GroupedSourceCodesCategory.cs" />
181181
<Compile Include="DataModels\SQLite\SampleCodeRecord.cs" />
182+
<Compile Include="DataModels\SQLite\SampleSourceCode.cs" />
182183
<Compile Include="DataModels\SQLite\SourceCode.cs" />
183184
<Compile Include="DataModels\SQLite\Enums\SourceCodeTitleScore.cs" />
184185
<Compile Include="Enums\SourceCodeShareType.cs" />

‎Brainf_ck-sharp.UWP/DataModels/SQLite/SampleSourceCode.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using Brainf_ck_sharp_UWP.Helpers;
3+
using SQLite.Net.Attributes;
4+
5+
namespace Brainf_ck_sharp_UWP.DataModels.SQLite
6+
{
7+
/// <summary>
8+
/// A model for a sample source code that supports the automatic localization of its display name
9+
/// </summary>
10+
public class SampleSourceCode : SourceCode
11+
{
12+
/// <summary>
13+
/// Gets the display name for the current instance
14+
/// </summary>
15+
[NotNull]
16+
public override String Title
17+
{
18+
get
19+
{
20+
String localized = LocalizationManager.GetResource(Uid);
21+
return localized.Length > 0 ? localized : base.Title;
22+
}
23+
set => base.Title = value;
24+
}
25+
}
26+
}

‎Brainf_ck-sharp.UWP/DataModels/SQLite/SourceCode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class SourceCode
2020
/// Gets or sets the title of the saved code
2121
/// </summary>
2222
[Column(nameof(Title)), NotNull, Unique]
23-
public String Title { get; set; }
23+
public virtual String Title { get; set; }
2424

2525
/// <summary>
2626
/// Gets or sets the actual code stored as plain text

‎Brainf_ck-sharp.UWP/Helpers/LocalizationManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public static class LocalizationManager
1919
/// Returns the string with the given resource key
2020
/// </summary>
2121
/// <param name="resource">The key of the resource to retrieve</param>
22+
[NotNull]
2223
public static String GetResource([NotNull] String resource)
2324
{
2425
try

‎Brainf_ck-sharp.UWP/MultilingualResources/Brainf_ck-sharp.UWP.it.xlf

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -224,18 +224,6 @@
224224
<source>Browse code library</source>
225225
<target state="translated">Sfoglia libreria codici</target>
226226
</trans-unit>
227-
<trans-unit id="Sum" translate="yes" xml:space="preserve">
228-
<source>Sum</source>
229-
<target state="translated">Somma</target>
230-
</trans-unit>
231-
<trans-unit id="UnicodeSum" translate="yes" xml:space="preserve">
232-
<source>Unicode sum</source>
233-
<target state="translated">Somma Unicode</target>
234-
</trans-unit>
235-
<trans-unit id="UnicodeValue" translate="yes" xml:space="preserve">
236-
<source>Unicode value</source>
237-
<target state="translated">Valore Unicode</target>
238-
</trans-unit>
239227
<trans-unit id="RunTitle" translate="yes" xml:space="preserve">
240228
<source>Run</source>
241229
<target state="translated">Esegui</target>
@@ -350,10 +338,6 @@
350338
<source>The new source code has been saved correctly</source>
351339
<target state="translated">Il nuovo codice sorgente è stato salvato correttamente</target>
352340
</trans-unit>
353-
<trans-unit id="HeaderComments" translate="yes" xml:space="preserve">
354-
<source>Header comments</source>
355-
<target state="translated">Header commentato</target>
356-
</trans-unit>
357341
<trans-unit id="Debug" translate="yes" xml:space="preserve">
358342
<source>Debug</source>
359343
<target state="translated">Debug</target>
@@ -366,10 +350,6 @@
366350
<source>New line</source>
367351
<target state="translated">Nuova riga</target>
368352
</trans-unit>
369-
<trans-unit id="MoveButtonmLabel" translate="yes" xml:space="preserve">
370-
<source>Move</source>
371-
<target state="translated">Sposta cursore</target>
372-
</trans-unit>
373353
<trans-unit id="About" translate="yes" xml:space="preserve">
374354
<source>About</source>
375355
<target state="translated">Informazioni</target>
@@ -938,6 +918,26 @@ In questo modo sarà più facile aiutarti e potrai contribuire a rendere l'app a
938918
<source>Before jumping straight into the app, it might be a good idea to read the user guide to make sure you remember all there is to know about the language!</source>
939919
<target state="translated">Prima di passare subito all'azione, è una buona idea leggere la guida dell'app per essere sicuri di ricordarsi tutto ciò che c'è da sapere sul linguaggio!</target>
940920
</trans-unit>
921+
<trans-unit id="MoveButton.Label" translate="yes" xml:space="preserve">
922+
<source>Move</source>
923+
<target state="translated">Sposta cursore</target>
924+
</trans-unit>
925+
<trans-unit id="0441153F-E40A-4AEC-8373-8A552697778B" translate="yes" xml:space="preserve">
926+
<source>Sum</source>
927+
<target state="translated">Somma</target>
928+
</trans-unit>
929+
<trans-unit id="78BAA70A-0DAF-4BB6-B09A-CDA9537D2FFF" translate="yes" xml:space="preserve">
930+
<source>Unicode sum</source>
931+
<target state="translated">Somma Unicode</target>
932+
</trans-unit>
933+
<trans-unit id="10768D40-5E3D-4787-9CB8-2A0ABBE26EFC" translate="yes" xml:space="preserve">
934+
<source>Unicode value</source>
935+
<target state="translated">Valore Unicode</target>
936+
</trans-unit>
937+
<trans-unit id="63156CB7-1BD1-46EA-A705-AC2ADD4A5F11" translate="yes" xml:space="preserve">
938+
<source>Header comments</source>
939+
<target state="translated">Header commentato</target>
940+
</trans-unit>
941941
</group>
942942
</body>
943943
</file>

‎Brainf_ck-sharp.UWP/PopupService/FlyoutManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ private static void AdjustPopupSize([NotNull] FlyoutDisplayInfo info, bool stack
190190
else
191191
{
192192
// Calculate and adjust the right popup height
193-
info.Container.Height = screenHeight - margin <= maxHeight
193+
info.Container.Height = screenHeight - margin <= maxHeight || // The expanded popup will cover the whole screen
194+
ApiInformationHelper.IsMobileDevice && screenHeight < 860 // High-DPI phone, show a fullscreen popup anyways
194195
? screenHeight - (ApiInformationHelper.IsMobileDevice ? 0 : margin)
195196
: maxHeight;
196197
info.Popup.VerticalOffset = screenHeight / 2 - info.Container.Height / 2 + StatusBarHelper.OccludedHeight;

‎Brainf_ck-sharp.UWP/SQLiteDatabase/SQLiteManager.cs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ from code in table
234234
private static readonly IReadOnlyCollection<SampleCodeRecord> SamplesMap = new List<SampleCodeRecord>
235235
{
236236
new SampleCodeRecord("HelloWorld.txt", "Hello world!", Guid.Parse("6B4C55E6-7009-48EC-96C5-C73552D9F257")),
237-
new SampleCodeRecord("UnicodeValue.txt", LocalizationManager.GetResource("UnicodeValue"), Guid.Parse("10768D40-5E3D-4787-9CB8-2A0ABBE26EFC")),
238-
new SampleCodeRecord("UnicodeSum.txt", LocalizationManager.GetResource("UnicodeSum"), Guid.Parse("78BAA70A-0DAF-4BB6-B09A-CDA9537D2FFF")),
239-
new SampleCodeRecord("Sum.txt", LocalizationManager.GetResource("Sum"), Guid.Parse("0441153F-E40A-4AEC-8373-8A552697778B")),
240-
new SampleCodeRecord("HeaderComments.txt", LocalizationManager.GetResource("HeaderComments"), Guid.Parse("63156CB7-1BD1-46EA-A705-AC2ADD4A5F11")),
237+
new SampleCodeRecord("UnicodeValue.txt", LocalizationManager.GetResource("10768D40-5E3D-4787-9CB8-2A0ABBE26EFC"), Guid.Parse("10768D40-5E3D-4787-9CB8-2A0ABBE26EFC")),
238+
new SampleCodeRecord("UnicodeSum.txt", LocalizationManager.GetResource("78BAA70A-0DAF-4BB6-B09A-CDA9537D2FFF"), Guid.Parse("78BAA70A-0DAF-4BB6-B09A-CDA9537D2FFF")),
239+
new SampleCodeRecord("Sum.txt", LocalizationManager.GetResource("0441153F-E40A-4AEC-8373-8A552697778B"), Guid.Parse("0441153F-E40A-4AEC-8373-8A552697778B")),
240+
new SampleCodeRecord("HeaderComments.txt", LocalizationManager.GetResource("63156CB7-1BD1-46EA-A705-AC2ADD4A5F11"), Guid.Parse("63156CB7-1BD1-46EA-A705-AC2ADD4A5F11")),
241241
new SampleCodeRecord("ExecuteIfZero.txt", "if (x == 0) then { }", Guid.Parse("6DABC8A8-E32C-49A1-A348-CF836FEF276D"))
242242
};
243243

@@ -313,7 +313,15 @@ public async Task<IList<GroupedSourceCodesCategory>> LoadSavedCodesAsync()
313313
{
314314
if (SamplesMap.Any(sample => sample.Uid.Equals(Guid.Parse(code.Uid))))
315315
{
316-
samples.AddSorted(code, entry => SamplesMap.IndexOf(sample => sample.Uid.Equals(Guid.Parse(entry.Uid))));
316+
SampleSourceCode wrapper = new SampleSourceCode
317+
{
318+
Uid = code.Uid,
319+
Title = code.Title,
320+
Code = code.Code,
321+
CreatedTime = code.CreatedTime,
322+
ModifiedTime = code.ModifiedTime
323+
};
324+
samples.AddSorted(wrapper, entry => SamplesMap.IndexOf(sample => sample.Uid.Equals(Guid.Parse(entry.Uid))));
317325
}
318326
else if (code.Favorited) favorites.AddSorted(code, entry => entry.Title);
319327
else original.AddSorted(code, entry => entry.Title);

‎Brainf_ck-sharp.UWP/Strings/en-US/Resources.resw

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,13 @@
298298
<data name="SampleCodes" xml:space="preserve">
299299
<value>Sample codes</value>
300300
</data>
301-
<data name="Sum" xml:space="preserve">
301+
<data name="0441153F-E40A-4AEC-8373-8A552697778B" xml:space="preserve">
302302
<value>Sum</value>
303303
</data>
304-
<data name="UnicodeSum" xml:space="preserve">
304+
<data name="78BAA70A-0DAF-4BB6-B09A-CDA9537D2FFF" xml:space="preserve">
305305
<value>Unicode sum</value>
306306
</data>
307-
<data name="UnicodeValue" xml:space="preserve">
307+
<data name="10768D40-5E3D-4787-9CB8-2A0ABBE26EFC" xml:space="preserve">
308308
<value>Unicode value</value>
309309
</data>
310310
<data name="SaveAsButton.Label" xml:space="preserve">
@@ -393,13 +393,13 @@
393393
<data name="Debug" xml:space="preserve">
394394
<value>Debug</value>
395395
</data>
396-
<data name="HeaderComments" xml:space="preserve">
396+
<data name="63156CB7-1BD1-46EA-A705-AC2ADD4A5F11" xml:space="preserve">
397397
<value>Header comments</value>
398398
</data>
399399
<data name="RedoButton.Label" xml:space="preserve">
400400
<value>Redo</value>
401401
</data>
402-
<data name="MoveButtonmLabel" xml:space="preserve">
402+
<data name="MoveButton.Label" xml:space="preserve">
403403
<value>Move</value>
404404
</data>
405405
<data name="NewLineButton.Label" xml:space="preserve">

‎Brainf_ck-sharp.UWP/Strings/it/Resources.resw

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,6 @@
177177
<data name="CodeLibraryButton.Label" xml:space="preserve">
178178
<value>Sfoglia libreria codici</value>
179179
</data>
180-
<data name="Sum" xml:space="preserve">
181-
<value>Somma</value>
182-
</data>
183-
<data name="UnicodeSum" xml:space="preserve">
184-
<value>Somma Unicode</value>
185-
</data>
186-
<data name="UnicodeValue" xml:space="preserve">
187-
<value>Valore Unicode</value>
188-
</data>
189180
<data name="RunTitle" xml:space="preserve">
190181
<value>Esegui</value>
191182
</data>
@@ -272,9 +263,6 @@
272263
<data name="CodeSavedBody" xml:space="preserve">
273264
<value>Il nuovo codice sorgente è stato salvato correttamente</value>
274265
</data>
275-
<data name="HeaderComments" xml:space="preserve">
276-
<value>Header commentato</value>
277-
</data>
278266
<data name="Debug" xml:space="preserve">
279267
<value>Debug</value>
280268
</data>
@@ -284,9 +272,6 @@
284272
<data name="NewLineButton.Label" xml:space="preserve">
285273
<value>Nuova riga</value>
286274
</data>
287-
<data name="MoveButtonmLabel" xml:space="preserve">
288-
<value>Sposta cursore</value>
289-
</data>
290275
<data name="About" xml:space="preserve">
291276
<value>Informazioni</value>
292277
</data>
@@ -714,4 +699,19 @@ In questo modo sarà più facile aiutarti e potrai contribuire a rendere l'app a
714699
<data name="WelcomePart4.Text" xml:space="preserve">
715700
<value>Prima di passare subito all'azione, è una buona idea leggere la guida dell'app per essere sicuri di ricordarsi tutto ciò che c'è da sapere sul linguaggio!</value>
716701
</data>
702+
<data name="MoveButton.Label" xml:space="preserve">
703+
<value>Sposta cursore</value>
704+
</data>
705+
<data name="0441153F-E40A-4AEC-8373-8A552697778B" xml:space="preserve">
706+
<value>Somma</value>
707+
</data>
708+
<data name="78BAA70A-0DAF-4BB6-B09A-CDA9537D2FFF" xml:space="preserve">
709+
<value>Somma Unicode</value>
710+
</data>
711+
<data name="10768D40-5E3D-4787-9CB8-2A0ABBE26EFC" xml:space="preserve">
712+
<value>Valore Unicode</value>
713+
</data>
714+
<data name="63156CB7-1BD1-46EA-A705-AC2ADD4A5F11" xml:space="preserve">
715+
<value>Header commentato</value>
716+
</data>
717717
</root>

‎Brainf_ck-sharp.UWP/ViewModels/FlyoutsViewModels/ChangelogViewFlyoutViewModel.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,18 @@ private static IList<JumpListGroup<ChangelogReleaseInfo, IReadOnlyList<String>>>
3030
// Create the output collection
3131
return new List<JumpListGroup<ChangelogReleaseInfo, IReadOnlyList<String>>>
3232
{
33-
CreateChangelogEntry("1.4.0.0", 2017, 1, 10, new List<String>
33+
CreateChangelogEntry("1.4.1.0", 2017, 10, 4, new List<String>
34+
{
35+
"Minor improvements and UI tweaks"
36+
}),
37+
CreateChangelogEntry("1.4.0.0", 2017, 9, 28, new List<String>
3438
{
3539
"Added new support for PBrain extensions",
3640
"Added a detailed user guide to the Brainf*ck language",
3741
"IDE indentation guides rendering improved",
3842
"Minor fixes and improvements"
3943
}),
40-
CreateChangelogEntry("1.3.1.0", 2017, 7, 9, new List<String>
44+
CreateChangelogEntry("1.3.1.0", 2017, 9, 7, new List<String>
4145
{
4246
"Added an option to clear the Stdin buffer when executing a script from the Console or the IDE",
4347
"Speed optimizations to the interpreter",

0 commit comments

Comments
 (0)