bybrooklyn/rookie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed splash screen and reworked start logic for a quick, efficient launch

Browse Source 
Removed the splash form, associated images, and all references to splash screen logic from the project. Refactored startup logic to run directly, with improved asynchronous initialization and cleanup.
This commit is contained in:
jp64k
2025-12-02 02:14:45 +01:00
parent b5dfcef34f
commit 6c6732c8d1
13 changed files with 175 additions and 7514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AndroidSideloader.csproj
View File

@@ -196,12 +196,6 @@
<Compile Include="RoundedRectangleF.cs" />
<Compile Include="Settings.cs" />
<Compile Include="Sideloader\GetDependencies.cs" />
<Compile Include="Splash.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Splash.Designer.cs">
<DependentUpon>Splash.cs</DependentUpon>
</Compile>
<Compile Include="Models\PublicConfig.cs" />
<Compile Include="NewApps.cs">
<SubType>Form</SubType>
@@ -260,9 +254,6 @@
<EmbeddedResource Include="DonorsListView.resx">
<DependentUpon>DonorsListView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Splash.resx">
<DependentUpon>Splash.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="NewApps.resx">
<DependentUpon>NewApps.cs</DependentUpon>
</EmbeddedResource>
@@ -328,10 +319,6 @@
<Content Include="ChangelogHistory.txt" />
<Content Include="Resources\pattern_cubes.png" />
<Content Include="Resources\pattern_herringbone.png" />
<Content Include="Resources\splashimage.png" />
<Content Include="Resources\splashimage_deps.png" />
<Content Include="Resources\splashimage_offline.png" />
<Content Include="Resources\splashimage_rclone.png" />
<None Include="Resources\battery.png" />
<None Include="Resources\ajax-loader.gif" />
<None Include="Resources\SearchGlass.PNG" />

237
MainForm.cs
View File

@@ -61,7 +61,6 @@ namespace AndroidSideloader
public static bool enviromentCreated = false;
public static PublicConfig PublicConfigFile;
public static string PublicMirrorExtraArgs = " --tpslimit 1.0 --tpslimit-burst 3";
public static Splash SplashScreen;
public static string storedIpPath;
public static string aaptPath;
private bool manualIP;
@@ -77,10 +76,6 @@ namespace AndroidSideloader
InitializeComponent();
Logger.Initialize();
InitializeTimeReferences();
SplashScreen = new Splash();
SplashScreen.Show();
CheckCommandLineArguments();
// Initialize debounce timer for search
@@ -224,45 +219,11 @@ namespace AndroidSideloader
{
_ = Logger.Log("Starting AndroidSideloader Application");
if (isOffline)
{
SplashScreen.UpdateBackgroundImage(AndroidSideloader.Properties.Resources.splashimage_offline);
changeTitle("Starting in Offline Mode...");
}
else
{
// download dependencies
GetDependencies.downloadFiles();
SplashScreen.UpdateBackgroundImage(AndroidSideloader.Properties.Resources.splashimage);
}
settings.MainDir = Environment.CurrentDirectory;
settings.Save();
if (Directory.Exists(Sideloader.TempFolder))
{
Directory.Delete(Sideloader.TempFolder, true);
_ = Directory.CreateDirectory(Sideloader.TempFolder);
}
// Delete the Debug file if it is more than 5MB
string logFilePath = settings.CurrentLogPath;
if (File.Exists(logFilePath))
{
FileInfo fileInfo = new FileInfo(logFilePath);
long fileSizeInBytes = fileInfo.Length;
long maxSizeInBytes = 5 * 1024 * 1024; // 5MB in bytes
if (fileSizeInBytes > maxSizeInBytes)
{
File.Delete(logFilePath);
}
}
if (!isOffline)
{
RCLONE.Init();
}
// Show the form immediately
this.Show();
Application.DoEvents();
// Basic UI setup
CenterToScreen();
gamesListView.View = View.Details;
gamesListView.FullRowSelect = true;
@@ -271,6 +232,60 @@ namespace AndroidSideloader
speedLabel.Text = String.Empty;
diskLabel.Text = String.Empty;
verLabel.Text = Updater.LocalVersion;
settings.MainDir = Environment.CurrentDirectory;
settings.Save();
changeTitle(isOffline ? "Starting in Offline Mode..." : "Initializing...");
// Non-blocking background cleanup
_ = Task.Run(() =>
{
try
{
if (Directory.Exists(Sideloader.TempFolder))
{
Directory.Delete(Sideloader.TempFolder, true);
_ = Directory.CreateDirectory(Sideloader.TempFolder);
}
}
catch (Exception ex)
{
Logger.Log($"Error cleaning temp folder: {ex.Message}", LogLevel.WARNING);
}
});
// Non-blocking log file cleanup
_ = Task.Run(() =>
{
try
{
string logFilePath = settings.CurrentLogPath;
if (File.Exists(logFilePath))
{
FileInfo fileInfo = new FileInfo(logFilePath);
if (fileInfo.Length > 5 * 1024 * 1024)
{
File.Delete(logFilePath);
}
}
}
catch { }
});
// Dependencies and RCLONE in background
if (!isOffline)
{
_ = Task.Run(() =>
{
changeTitle("Downloading Dependencies...");
GetDependencies.downloadFiles();
changeTitle("Initializing RCLONE...");
RCLONE.Init();
});
}
// Crashlog handling
if (File.Exists("crashlog.txt"))
{
if (File.Exists(settings.CurrentCrashPath))
@@ -278,7 +293,10 @@ namespace AndroidSideloader
File.Delete(settings.CurrentCrashPath);
}
DialogResult dialogResult = FlexibleMessageBox.Show(Program.form, $"Sideloader crashed during your last use.\nPress OK if you'd like to send us your crash log.\n\n NOTE: THIS CAN TAKE UP TO 30 SECONDS.", "Crash Detected", MessageBoxButtons.OKCancel);
DialogResult dialogResult = FlexibleMessageBox.Show(Program.form,
$"Sideloader crashed during your last use.\nPress OK if you'd like to send us your crash log.\n\n NOTE: THIS CAN TAKE UP TO 30 SECONDS.",
"Crash Detected", MessageBoxButtons.OKCancel);
if (dialogResult == DialogResult.OK)
{
if (File.Exists(Path.Combine(Environment.CurrentDirectory, "crashlog.txt")))
@@ -290,9 +308,18 @@ namespace AndroidSideloader
settings.Save();
Clipboard.SetText(UUID);
_ = RCLONE.runRcloneCommand_UploadConfig($"copy \"{settings.CurrentCrashPath}\" RSL-gameuploads:CrashLogs");
_ = FlexibleMessageBox.Show(Program.form, $"Your CrashLog has been copied to the server.\nPlease mention your CrashLogID ({settings.CurrentCrashName}) to the Mods.\nIt has been automatically copied to your clipboard.");
Clipboard.SetText(settings.CurrentCrashName);
// Upload in background
_ = Task.Run(() =>
{
_ = RCLONE.runRcloneCommand_UploadConfig($"copy \"{settings.CurrentCrashPath}\" RSL-gameuploads:CrashLogs");
this.Invoke(() =>
{
_ = FlexibleMessageBox.Show(Program.form,
$"Your CrashLog has been copied to the server.\nPlease mention your CrashLogID ({settings.CurrentCrashName}) to the Mods.\nIt has been automatically copied to your clipboard.");
Clipboard.SetText(settings.CurrentCrashName);
});
});
}
}
else
@@ -301,28 +328,32 @@ namespace AndroidSideloader
}
}
_ = Logger.Log("Attempting to Initalize ADB Server");
if (File.Exists(Path.Combine(Environment.CurrentDirectory, "platform-tools", "adb.exe")))
// ADB initialization in background
_ = Task.Run(() =>
{
_ = ADB.RunAdbCommandToString("kill-server");
_ = ADB.RunAdbCommandToString("start-server");
}
_ = Logger.Log("Attempting to Initialize ADB Server");
if (File.Exists(Path.Combine(Environment.CurrentDirectory, "platform-tools", "adb.exe")))
{
_ = ADB.RunAdbCommandToString("kill-server");
_ = ADB.RunAdbCommandToString("start-server");
}
});
// Continue with Form1_Shown
this.Form1_Shown(sender, e);
}
private async void Form1_Shown(object sender, EventArgs e)
{
searchTextBox.Enabled = false;
// Disclaimer thread
new Thread(() =>
{
Thread.Sleep(10000);
freeDisclaimer.Invoke(() =>
{
freeDisclaimer.Dispose();
});
freeDisclaimer.Invoke(() =>
{
freeDisclaimer.Enabled = false;
});
}).Start();
@@ -330,24 +361,33 @@ namespace AndroidSideloader
if (!isOffline)
{
string configFilePath = Path.Combine(Environment.CurrentDirectory, "vrp-public.json");
// Public config check
if (File.Exists(configFilePath))
{
await GetPublicConfigAsync();
if (!hasPublicConfig)
{
_ = FlexibleMessageBox.Show(Program.form, "Failed to fetch public mirror config, and the current one is unreadable.\r\nPlease ensure you can access https://vrpirates.wiki/ in your browser.", "Config Update Failed", MessageBoxButtons.OK);
_ = FlexibleMessageBox.Show(Program.form,
"Failed to fetch public mirror config, and the current one is unreadable.\r\nPlease ensure you can access https://vrpirates.wiki/ in your browser.",
"Config Update Failed", MessageBoxButtons.OK);
}
}
else if (settings.AutoUpdateConfig && settings.CreatePubMirrorFile)
{
DialogResult dialogResult = FlexibleMessageBox.Show(Program.form, "Rookie has detected that you are missing the public config file, would you like to create it?", "Public Config Missing", MessageBoxButtons.YesNo);
DialogResult dialogResult = FlexibleMessageBox.Show(Program.form,
"Rookie has detected that you are missing the public config file, would you like to create it?",
"Public Config Missing", MessageBoxButtons.YesNo);
if (dialogResult == DialogResult.Yes)
{
File.Create(configFilePath).Close(); // Ensure the file is closed after creation
File.Create(configFilePath).Close();
await GetPublicConfigAsync();
if (!hasPublicConfig)
{
_ = FlexibleMessageBox.Show(Program.form, "Failed to fetch public mirror config, and the current one is unreadable.\r\nPlease ensure you can access https://vrpirates.wiki/ in your browser.", "Config Update Failed", MessageBoxButtons.OK);
_ = FlexibleMessageBox.Show(Program.form,
"Failed to fetch public mirror config, and the current one is unreadable.\r\nPlease ensure you can access https://vrpirates.wiki/ in your browser.",
"Config Update Failed", MessageBoxButtons.OK);
}
}
else
@@ -358,20 +398,29 @@ namespace AndroidSideloader
}
}
string webViewDirectoryPath = Path.Combine(Path.GetPathRoot(Environment.SystemDirectory), "RSL", "EBWebView");
if (Directory.Exists(webViewDirectoryPath))
// WebView cleanup in background
_ = Task.Run(() =>
{
Directory.Delete(webViewDirectoryPath, true);
}
try
{
string webViewDirectoryPath = Path.Combine(Path.GetPathRoot(Environment.SystemDirectory), "RSL", "EBWebView");
if (Directory.Exists(webViewDirectoryPath))
{
Directory.Delete(webViewDirectoryPath, true);
}
}
catch { }
});
// Pre-initialize trailer player
// Pre-initialize trailer player in background
try
{
await EnsureTrailerEnvironmentAsync();
await EnsureTrailerEnvironmentAsync();
}
catch { /* swallow – prewarm should never crash startup */ }
}
// UI setup
remotesList.Items.Clear();
if (hasPublicConfig)
{
@@ -389,10 +438,9 @@ namespace AndroidSideloader
btnNoDevice.Text = "Enable Sideloading";
}
SplashScreen.Close();
progressBar.Style = ProgressBarStyle.Marquee;
// Update check
if (!debugMode && settings.CheckForUpdates && !isOffline)
{
Updater.AppName = "AndroidSideloader";
@@ -403,18 +451,17 @@ namespace AndroidSideloader
if (!isOffline)
{
changeTitle("Getting Upload Config...");
SideloaderRCLONE.updateUploadConfig();
await Task.Run(() => SideloaderRCLONE.updateUploadConfig());
_ = Logger.Log("Initializing Servers");
changeTitle("Initializing Servers...");
// Wait for mirrors to initialize
await initMirrors();
if (!UsingPublicConfig)
{
changeTitle("Grabbing the Games List...");
SideloaderRCLONE.initGames(currentRemote);
await Task.Run(() => SideloaderRCLONE.initGames(currentRemote));
}
}
else
@@ -449,7 +496,11 @@ namespace AndroidSideloader
ProcessOutput IPoutput = ADB.RunAdbCommandToString(IPcmndfromtxt);
if (IPoutput.Output.Contains("attempt failed") || IPoutput.Output.Contains("refused"))
{
_ = FlexibleMessageBox.Show(Program.form, "Attempt to connect to saved IP has failed. This is usually due to rebooting the device or not having a STATIC IP set in your router.\nYou must enable Wireless ADB again!");
this.Invoke(() =>
{
_ = FlexibleMessageBox.Show(Program.form,
"Attempt to connect to saved IP has failed. This is usually due to rebooting the device or not having a STATIC IP set in your router.\nYou must enable Wireless ADB again!");
});
settings.IPAddress = "";
settings.Save();
try { File.Delete(storedIpPath); }
@@ -468,6 +519,7 @@ namespace AndroidSideloader
}
});
// Metadata updates
if (UsingPublicConfig)
{
await Task.Run(() =>
@@ -490,11 +542,15 @@ namespace AndroidSideloader
SideloaderRCLONE.UpdateGamePhotos(currentRemote);
SideloaderRCLONE.UpdateNouns(currentRemote);
if (!Directory.Exists(SideloaderRCLONE.ThumbnailsFolder) ||
!Directory.Exists(SideloaderRCLONE.NotesFolder))
{
_ = FlexibleMessageBox.Show(Program.form,
"It seems you are missing the thumbnails and/or notes database, the first start of the sideloader takes a bit more time, so dont worry if it looks stuck!");
this.Invoke(() =>
{
_ = FlexibleMessageBox.Show(Program.form,
"It seems you are missing the thumbnails and/or notes database, the first start of the sideloader takes a bit more time, so dont worry if it looks stuck!");
});
}
});
}
@@ -508,28 +564,34 @@ namespace AndroidSideloader
nodeviceonstart = true;
}
listAppsBtn();
showAvailableSpace();
// Parallel execution
await Task.WhenAll(
Task.Run(() => listAppsBtn()),
Task.Run(() => showAvailableSpace())
);
downloadInstallGameButton.Enabled = true;
isLoading = false;
initListView(false);
string[] files = Directory.GetFiles(Environment.CurrentDirectory);
foreach (string file in files)
// Initialize list view in background
_ = Task.Run(() => initListView(false));
// Cleanup in background
_ = Task.Run(() =>
{
string fileName = file;
while (fileName.Contains("\\"))
string[] files = Directory.GetFiles(Environment.CurrentDirectory);
foreach (string file in files)
{
fileName = fileName.Substring(fileName.IndexOf("\\") + 1);
}
if (!fileName.Contains(settings.CurrentLogName) && !fileName.Contains(settings.CurrentCrashName))
{
if (!fileName.Contains("debuglog") && fileName.EndsWith(".txt"))
string fileName = Path.GetFileName(file);
if (!fileName.Contains(settings.CurrentLogName) &&
!fileName.Contains(settings.CurrentCrashName) &&
!fileName.Contains("debuglog") &&
fileName.EndsWith(".txt"))
{
System.IO.File.Delete(fileName);
try { System.IO.File.Delete(file); } catch { }
}
}
}
});
searchTextBox.Enabled = true;
@@ -541,6 +603,7 @@ namespace AndroidSideloader
}
}
private void timer_Tick(object sender, EventArgs e)
{
_ = ADB.RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");

6
MainForm.resx
View File

@@ -180,6 +180,12 @@
<metadata name="listApkButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>955, 17</value>
</metadata>
<metadata name="speedLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>798, 17</value>
</metadata>
<metadata name="etaLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>428, 56</value>
</metadata>
<metadata name="favoriteGame.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>855, 95</value>
</metadata>

78
Properties/Resources.Designer.cs generated
View File

@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,13 +13,13 @@ namespace AndroidSideloader.Properties {
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@@ -33,7 +33,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap ajax_loader {
get {
@@ -71,7 +71,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap battery {
get {
@@ -81,7 +81,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap Pattern {
get {
@@ -91,7 +91,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap pattern_cubes {
get {
@@ -101,7 +101,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap pattern_herringbone {
get {
@@ -111,7 +111,7 @@ namespace AndroidSideloader.Properties {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap SearchGlass {
get {
@@ -119,45 +119,5 @@ namespace AndroidSideloader.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap splashimage {
get {
object obj = ResourceManager.GetObject("splashimage", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap splashimage_deps {
get {
object obj = ResourceManager.GetObject("splashimage_deps", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap splashimage_offline {
get {
object obj = ResourceManager.GetObject("splashimage_offline", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap splashimage_rclone {
get {
object obj = ResourceManager.GetObject("splashimage_rclone", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

12
Properties/Resources.resx
View File

@@ -130,22 +130,10 @@
<data name="Pattern" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Pattern.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="splashimage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\splashimage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="splashimage_deps" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\splashimage_deps.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="splashimage_rclone" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\splashimage_rclone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pattern_cubes" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pattern_cubes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pattern_herringbone" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pattern_herringbone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="splashimage_offline" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\splashimage_offline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
Resources/splashimage.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
Resources/splashimage_deps.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
Resources/splashimage_offline.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
Resources/splashimage_rclone.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

4
Sideloader/GetDependencies.cs
View File

@@ -63,8 +63,6 @@ namespace AndroidSideloader
// Download required dependencies.
public static void downloadFiles()
{
MainForm.SplashScreen.UpdateBackgroundImage(AndroidSideloader.Properties.Resources.splashimage_deps);
WebClient client = new WebClient();
ServicePointManager.Expect100Continue = true;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
@@ -203,8 +201,6 @@ namespace AndroidSideloader
hasConfig = true;
}
MainForm.SplashScreen.UpdateBackgroundImage(AndroidSideloader.Properties.Resources.splashimage_rclone);
string architecture = Environment.Is64BitOperatingSystem ? "amd64" : "386";
string url = $"https://downloads.rclone.org/v{wantedRcloneVersion}/rclone-v{wantedRcloneVersion}-windows-{architecture}.zip";
if (useFallback == true) {

59
Splash.Designer.cs generated
View File

@@ -1,59 +0,0 @@
namespace AndroidSideloader
{
partial class Splash
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Splash));
this.SuspendLayout();
//
// Splash
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.CausesValidation = false;
this.ClientSize = new System.Drawing.Size(427, 250);
this.ControlBox = false;
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "Splash";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Splash";
this.ResumeLayout(false);
}
#endregion
}
}

19
Splash.cs
View File

@@ -1,19 +0,0 @@
using System;
using System.Drawing;
using System.Windows.Forms;
namespace AndroidSideloader
{
public partial class Splash : Form
{
public Splash()
{
InitializeComponent();
}
public void UpdateBackgroundImage(Image newImage)
{
this.BackgroundImage = newImage;
}
}
}

7261
Splash.resx
View File

File diff suppressed because it is too large Load Diff