nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Android build breaks

Browse source
This commit is contained in:
John Lewin 2017-01-26 16:50:35 -08:00
parent e97dda14c0
commit 1a373ec933
4 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AboutPage/UpdateControlData.cs
View file

@ -127,7 +127,9 @@ namespace MatterHackers.MatterControl
haveShowUpdateRequired = true;
if (!UserSettings.Instance.IsTouchScreen)
{
#if !__ANDROID__
UiThread.RunOnIdle(CheckForUpdateWindow.Show);
#endif
}
}
}
@ -436,7 +438,7 @@ namespace MatterHackers.MatterControl
{
//Change download file to friendly file name
System.IO.File.Move(updateFileName, friendlyFileName);
#if __ANDROID__
#if __ANDROID__
if (InstallUpdateFromMainActivity != null)
{
InstallUpdateFromMainActivity(this, null);

2
ApplicationView/AdvancedControlsPanel.cs
View file

@ -144,8 +144,10 @@ namespace MatterHackers.MatterControl
if (!UserSettings.Instance.IsTouchScreen)
{
#if !__ANDROID__
MenuOptionSettings.sliceSettingsPopOut = sliceSettingPopOut;
MenuOptionSettings.controlsPopOut = controlsPopOut;
#endif
}
var optionsControls = new PrinterConfigurationScrollWidget();

4
ApplicationView/MainApplicationWidget.cs
View file

@ -111,9 +111,11 @@ namespace MatterHackers.MatterControl
if (!UserSettings.Instance.IsTouchScreen)
{
#if !__ANDROID__
// The application menu bar, which is suppressed on Android
ApplicationMenuRow menuRow = new ApplicationMenuRow();
TopContainer.AddChild(menuRow);
#endif
}
menuSeparator = new GuiWidget();
@ -157,9 +159,11 @@ namespace MatterHackers.MatterControl
if (!UserSettings.Instance.IsTouchScreen)
{
#if !__ANDROID__
// The application menu bar, which is suppressed on Android
var menuRow = new ApplicationMenuRow();
container.AddChild(menuRow);
#endif
}
var menuSeparator = new GuiWidget()

14
DataStorage/Datastore.cs
View file

@ -182,20 +182,8 @@ namespace MatterHackers.MatterControl.DataStorage
/// <summary>
/// Returns the public storage folder (ex. download folder on Android)
/// </summary>
/// <returns></returns>
public string PublicDataStoragePath
{
get
{
return Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDownloads).ToString();
}
}
public string PublicDataStoragePath { get; } = Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDownloads).AbsolutePath;
#endif
public override string ToString()
{
return base.ToString();
}
}
public class Datastore