Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxim-saplin
maxim-saplin committed Jun 26, 2019
1 parent a02bad9 commit ccc5ace
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 28 deletions.
36 changes: 18 additions & 18 deletions CrossPlatformDiskTest.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ VisualStudioVersion = 16.0.29020.237
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Saplin.CPDT.UICore", "Saplin.CPDT.UICore\Saplin.CPDT.UICore.csproj", "{3116756D-0111-400C-BC53-1DBBC195FBB7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Saplin.CPDT.WPF", "Saplin.CPDT.WPF\Saplin.CPDT.WPF.csproj", "{C55F73EA-53AE-4E86-A6E3-B86517288BB6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Saplin.CPDT.Android", "Saplin.CPDT.Android\Saplin.CPDT.Android.csproj", "{6A84BA8D-A85D-4293-BC21-EE856012ADA3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Saplin.CPDT.Mac", "Saplin.CPDT.Mac\Saplin.CPDT.Mac.csproj", "{E73EDEA1-DF38-40F4-A3D9-82C3EC186008}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Saplin.CPDT.WPF", "Saplin.CPDT.WPF\Saplin.CPDT.WPF.csproj", "{80EB2325-BF66-4941-9A5D-A06B7D707C4F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -38,22 +38,6 @@ Global
{3116756D-0111-400C-BC53-1DBBC195FBB7}.Release|x64.Build.0 = Release|Any CPU
{3116756D-0111-400C-BC53-1DBBC195FBB7}.Release|x86.ActiveCfg = Release|Any CPU
{3116756D-0111-400C-BC53-1DBBC195FBB7}.Release|x86.Build.0 = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|ARM.Build.0 = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|x64.ActiveCfg = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|x64.Build.0 = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|x86.ActiveCfg = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Debug|x86.Build.0 = Debug|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|Any CPU.Build.0 = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|ARM.ActiveCfg = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|ARM.Build.0 = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|x64.ActiveCfg = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|x64.Build.0 = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|x86.ActiveCfg = Release|Any CPU
{C55F73EA-53AE-4E86-A6E3-B86517288BB6}.Release|x86.Build.0 = Release|Any CPU
{6A84BA8D-A85D-4293-BC21-EE856012ADA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A84BA8D-A85D-4293-BC21-EE856012ADA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A84BA8D-A85D-4293-BC21-EE856012ADA3}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -86,6 +70,22 @@ Global
{E73EDEA1-DF38-40F4-A3D9-82C3EC186008}.Release|x64.Build.0 = Release|Any CPU
{E73EDEA1-DF38-40F4-A3D9-82C3EC186008}.Release|x86.ActiveCfg = Release|Any CPU
{E73EDEA1-DF38-40F4-A3D9-82C3EC186008}.Release|x86.Build.0 = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|ARM.Build.0 = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|x64.ActiveCfg = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|x64.Build.0 = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|x86.ActiveCfg = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Debug|x86.Build.0 = Debug|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|Any CPU.Build.0 = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|ARM.ActiveCfg = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|ARM.Build.0 = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|x64.ActiveCfg = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|x64.Build.0 = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|x86.ActiveCfg = Release|Any CPU
{80EB2325-BF66-4941-9A5D-A06B7D707C4F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file modified References/CPDT.Extra.Android.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Saplin.CPDT.UICore/ViewModels/DriveTestViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public ICommand TestDrive
freeMem: freeMemService == null ? null : (Func<long>)(freeMemService.GetBytesFree),
flusher: flushService == null ? null :
new WriteBufferFlusher(flushService.OpenFile, flushService.Flush, flushService.Close),
mockFileStream: true
mockFileStream: false
);

FileNameAndTime = testSuite.FilePath+", "+string.Format("{0:HH:mm:ss} {0:d.MM.yyyy}", TestStartedTime);
Expand Down
6 changes: 3 additions & 3 deletions Saplin.CPDT.UICore/Views/MainPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
NavigationPage.HasBackButton="False"
BackgroundColor="Black" Padding="0">
<ContentPage.Content>
<AbsoluteLayout x:Name="absoluteLayout" BackgroundColor="Transparent">
<ScrollView x:Name="scrollView" BackgroundColor="Transparent" VerticalScrollBarVisibility="Default" HorizontalScrollBarVisibility="Default" AbsoluteLayout.LayoutBounds="1.0 ,1.0, 1.0, 1.0" AbsoluteLayout.LayoutFlags="All">
<StackLayout x:Name="stackLayout" BackgroundColor="Transparent" Orientation="Vertical" BindingContext="{x:Static vm:ViewModelContainer.DriveTestViewModel}" Padding="10, 10, 10, 10">
<AbsoluteLayout x:Name="absoluteLayout">
<ScrollView x:Name="scrollView" VerticalScrollBarVisibility="Default" HorizontalScrollBarVisibility="Default" AbsoluteLayout.LayoutBounds="1.0 ,1.0, 1.0, 1.0" AbsoluteLayout.LayoutFlags="All">
<StackLayout x:Name="stackLayout" Orientation="Vertical" BindingContext="{x:Static vm:ViewModelContainer.DriveTestViewModel}" Padding="10, 10, 10, 10">
<!-- In code behind -->
<!-- <local:Title x:Name="title" QuitClicked="OnQuit"/>-->
<!--<local:SimpleUI/>-->
Expand Down
1 change: 0 additions & 1 deletion Saplin.CPDT.UICore/Views/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ private void ApplyTheme()

backgroundColor = Color.White;
}

}

private void AdaptLayoytToScreenWidth()
Expand Down
5 changes: 0 additions & 5 deletions global.json
View file

This file was deleted.

0 comments on commit ccc5ace

Please sign in to comment.