Merge pull request #4 from Macro-Deck-org/main

Develop 2.3.1
Macro-Deck-App · Jun 11, 2022 · fb1113c · fb1113c
2 parents 64900e0 + 3254040
commit fb1113c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/Macro Deck Client.Android/Assets/client.js b/Macro Deck Client.Android/Assets/client.js
@@ -78,6 +78,9 @@ function connect(url) {
 			var obj = JSON.parse(e.data);
 			switch (obj.Method) {
 				case JsonMethod.GET_CONFIG:
+					if (obj.Columns !== columns || obj.Rows !== rows || obj.ButtonBackground != buttonBackground) {
+						buttonsGenerated = false;
+					}
 					columns = obj.Columns;
 					rows = obj.Rows;
 					buttonSpacing = obj.ButtonSpacing;
@@ -101,9 +104,6 @@ function connect(url) {
 					var settingsObj = { "Brightness": brightness, "AutoConnect": autoConnect, "WakeLock": wakeLock };
 					document.location.hash = 'connected;' + JSON.stringify(settingsObj);
 
-					if (!buttonsGenerated) {
-						document.getElementById("button-container").innerHTML = '<div class="d-flex align-items-center justify-content-center" style="height: 500px;"><h1>Downloading icon packs and buttons... <span class="spinner-border spinner-border-lg" role="status" aria-hidden="true"></span></h1></div>';
-					}
 
 					var jsonObj = { "Method": JsonMethod.GET_BUTTONS };
 					doSend(JSON.stringify(jsonObj));

diff --git a/Macro Deck Client.Android/Macro Deck Client.Android.csproj b/Macro Deck Client.Android/Macro Deck Client.Android.csproj
@@ -63,9 +63,27 @@
     <AndroidSigningKeyAlias>SuchByte</AndroidSigningKeyAlias>
     <AndroidSigningKeyPass>hugo1930</AndroidSigningKeyPass>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <AndroidPackageFormat>aab</AndroidPackageFormat>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Play Store|AnyCPU'">
+    <OutputPath>bin\Play Store\</OutputPath>
+    <DebugType>portable</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <LangVersion>8.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
+    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <BundleAssemblies>false</BundleAssemblies>
+    <AndroidPackageFormat>aab</AndroidPackageFormat>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidSupportedAbis />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />

diff --git a/Macro Deck Client.Android/Properties/AndroidManifest.xml b/Macro Deck Client.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="230" android:versionName="2.3.0-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="231" android:versionName="2.3.1-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<application android:label="Macro Deck" android:theme="@style/MainTheme" android:usesCleartextTraffic="true" android:icon="@mipmap/launcher_foreground"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/Macro Deck Client/Macro Deck Client.csproj b/Macro Deck Client/Macro Deck Client.csproj
@@ -3,11 +3,12 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <Version>2.3.0-beta</Version>
+    <Version>2.3.1-beta</Version>
     <Authors>Manuel Mayer</Authors>
     <ApplicationIcon>Macro Deck 2021.ico</ApplicationIcon>
     <RootNamespace>SuchByte.MacroDeck</RootNamespace>
     <AssemblyName>Macro Deck Client</AssemblyName>
+    <Configurations>Debug;Release;Play Store</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -19,6 +20,10 @@
     <Optimize>false</Optimize>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Play Store|AnyCPU'">
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Remove="Resources\logo.png" />
   </ItemGroup>

diff --git a/Macro Deck Client/Pages/MainPage.xaml.cs b/Macro Deck Client/Pages/MainPage.xaml.cs
@@ -188,7 +188,7 @@ private void OnConnectionStateChanged(object sender, ConnectionStateChangedEvent
                     break;
                 case ConnectionState.ERROR:
                     SetWakeLock(false);
-                    DisplayAlert("Error", "Could not connect to host. Please check the wiki or get help in the Discord server.", "OK");
+                    DisplayAlert("Error", "Cannot connect to the host. Please make sure, you typed in the correct IP address, port and your firewall allows the connection. Check the FAQ in the Wiki for more information.", "OK");
                     try
                     {
                         Navigation.PopToRootAsync();