Skip to content

Commit fec92ba

Browse files
ayydanyayydany
committed
Some more optimizations.
Will warn the user if adb.exe is not found.
1 parent 335bfd7 commit fec92ba

File tree

5 files changed

+231
-8
lines changed

5 files changed

+231
-8
lines changed

‎GrandHeroFarmer/Grand Hero Farmer.csproj

+14-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</DocumentationFile>
3535
</PropertyGroup>
3636
<PropertyGroup>
37-
<ApplicationIcon>razz-berry.ico</ApplicationIcon>
37+
<ApplicationIcon>Resources\razz-berry.ico</ApplicationIcon>
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="SharpAdbClient, Version=2.2.0.0, Culture=neutral, PublicKeyToken=d728076f5d82a2e8, processorArchitecture=MSIL">
@@ -56,6 +56,11 @@
5656
<Compile Include="Helpers\ConsoleLogger.cs" />
5757
<Compile Include="Program.cs" />
5858
<Compile Include="Properties\AssemblyInfo.cs" />
59+
<Compile Include="Properties\Resources.Designer.cs">
60+
<AutoGen>True</AutoGen>
61+
<DesignTime>True</DesignTime>
62+
<DependentUpon>Resources.resx</DependentUpon>
63+
</Compile>
5964
</ItemGroup>
6065
<ItemGroup>
6166
<None Include="App.config" />
@@ -67,9 +72,17 @@
6772
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6873
</Content>
6974
<Content Include="razz-berry.ico" />
75+
<None Include="Resources\razz-berry.ico" />
76+
<None Include="Resources\Icon.ico" />
7077
</ItemGroup>
7178
<ItemGroup>
7279
<Folder Include="adb\" />
7380
</ItemGroup>
81+
<ItemGroup>
82+
<EmbeddedResource Include="Properties\Resources.resx">
83+
<Generator>ResXFileCodeGenerator</Generator>
84+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
85+
</EmbeddedResource>
86+
</ItemGroup>
7487
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7588
</Project>

‎GrandHeroFarmer/Helpers/Android.cs

+20-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using SharpAdbClient;
22
using System;
33
using System.Collections.Generic;
4+
using System.IO;
45
using System.Linq;
56
using System.Net;
67
using System.Text;
@@ -11,18 +12,30 @@ namespace GrandHeroFarmer.Helpers
1112
{
1213
public class Android
1314
{
15+
private readonly AdbServer _server;
1416
private DeviceData _device;
1517

1618
public Android()
1719
{
18-
AdbServer server = new AdbServer();
19-
var result = server.StartServer(@"adb\adb.exe", restartServerIfNewer: false);
20+
if (File.Exists(@"adb\adb.exe"))
21+
{
22+
_server = new AdbServer();
23+
_server.StartServer(@"adb\adb.exe", restartServerIfNewer: false);
24+
ConnectToAndroid();
2025

21-
ConnectToAndroid();
26+
var monitor = new DeviceMonitor(new AdbSocket(new IPEndPoint(IPAddress.Loopback, AdbClient.AdbServerPort)));
27+
monitor.DeviceDisconnected += this.OnDeviceDisconnected;
28+
monitor.Start();
29+
}
30+
else
31+
{
32+
ConsoleLogger.Write("adb.exe not found. ", Type.Error, true);
33+
ConsoleLogger.WriteLine("Did you extract everything from the zip?", Type.Default, false);
34+
ConsoleLogger.WriteLine("Press Enter to exit.", Type.Default, true);
2235

23-
var monitor = new DeviceMonitor(new AdbSocket(new IPEndPoint(IPAddress.Loopback, AdbClient.AdbServerPort)));
24-
monitor.DeviceDisconnected += this.OnDeviceDisconnected;
25-
monitor.Start();
36+
Console.ReadLine();
37+
Environment.Exit(0);
38+
}
2639
}
2740

2841
/// <summary>
@@ -36,12 +49,12 @@ private void ConnectToAndroid()
3649
ConsoleLogger.Write("Trying to get device information... ", Type.Default);
3750
if(AdbClient.Instance.GetDevices().Count != 0)
3851
{
52+
3953
_device = AdbClient.Instance.GetDevices().First();
4054
foundDevice = true;
4155
ConsoleLogger.WriteLine(_device.Name + " connected!", Type.Info, false);
4256
return;
4357
}
44-
4558
ConsoleLogger.WriteLine("Failed! No Device was found!", Type.Error, false);
4659
ConsoleLogger.Write("Check the connection and press", Type.Default);
4760
ConsoleLogger.Write(" Enter ", Type.Info, false);

‎GrandHeroFarmer/Properties/Resources.Designer.cs

+73
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GrandHeroFarmer/Properties/Resources.resx

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\razz-berry.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
</root>

‎GrandHeroFarmer/razz-berry.ico ‎GrandHeroFarmer/Resources/razz-berry.ico

File renamed without changes.

0 commit comments

Comments
 (0)