Added support for portrait layout

Macro-Deck-App · Jan 19, 2022 · f25be74 · f25be74
1 parent 1def18d
commit f25be74
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/Macro Deck Client.Android/Assets/client.js b/Macro Deck Client.Android/Assets/client.js
@@ -278,12 +278,6 @@ function autoSize() {
 	var width = window.screen.width, height = window.screen.height;
     var buttonSizeX, buttonSizeY;
 
-    if (rowsCount > columnsCount)
-    {	
-		rowsCount = (divs.length / rows.length);
-        columnsCount = rows.length;
-
-    }
     buttonSizeX = width / columnsCount;
     buttonSizeY = height / rowsCount;
     buttonSize = Math.min(buttonSizeX, buttonSizeY);

diff --git a/Macro Deck Client.Android/Macro Deck Client.Android.csproj b/Macro Deck Client.Android/Macro Deck Client.Android.csproj
@@ -62,7 +62,7 @@
     <AndroidSigningKeyAlias>SuchByte</AndroidSigningKeyAlias>
     <AndroidSigningKeyPass>hugo1930</AndroidSigningKeyPass>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <AndroidPackageFormat>aab</AndroidPackageFormat>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
   </PropertyGroup>

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="210" android:versionName="2.1.0-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="211" android:versionName="2.1.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
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <Version>2.1.0-beta</Version>
+    <Version>2.1.1-beta</Version>
     <Authors>Manuel Mayer</Authors>
     <ApplicationIcon>Macro Deck 2021.ico</ApplicationIcon>
     <RootNamespace>SuchByte.MacroDeck</RootNamespace>