Skip to content
This repository has been archived by the owner on Dec 18, 2023. It is now read-only.

Commit

Permalink
Merge pull request #17 from Macro-Deck-App/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@manuelmayer-dev
manuelmayer-dev authored Aug 28, 2023
2 parents 3e42a8c + 350e7e0 commit bc7ccbc
Show file tree
Hide file tree
Showing 68 changed files with 176 additions and 15 deletions.
81 changes: 81 additions & 0 deletions Macro Deck Client.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34009.444
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Macro Deck Client.Android", "src\Macro Deck Client.Android\Macro Deck Client.Android.csproj", "{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Macro Deck Client", "src\Macro Deck Client\Macro Deck Client.csproj", "{190FB466-888A-44F1-9CD5-5BFA7C534C1F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Release|Any CPU = Release|Any CPU
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|iPhone.Build.0 = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|Any CPU.Build.0 = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|Any CPU.Deploy.0 = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|iPhone.ActiveCfg = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|iPhone.Build.0 = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|iPhone.Deploy.0 = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{28C7A6E0-2AB0-4CBC-BAF4-02468E63437B}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|Any CPU.Build.0 = Debug|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|Any CPU.Deploy.0 = Debug|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|iPhone.ActiveCfg = Debug|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|iPhone.Build.0 = Debug|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|iPhone.Deploy.0 = Debug|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|Any CPU.Deploy.0 = Release|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|iPhone.ActiveCfg = Release|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|iPhone.Build.0 = Release|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|iPhone.Deploy.0 = Release|iPhone
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{A5C705D9-9E16-44EC-A441-87E8A7037CCF}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|iPhone.Build.0 = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|Any CPU.Build.0 = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|iPhone.ActiveCfg = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|iPhone.Build.0 = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|iPhone.Deploy.0 = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{190FB466-888A-44F1-9CD5-5BFA7C534C1F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EBD3C5D0-F55D-4AF5-AB61-79B5386C3D2B}
EndGlobalSection
EndGlobal
0 ...lient.Android/AndroidBrightnessService.cs → ...lient.Android/AndroidBrightnessService.cs
View file
File renamed without changes.
0 ... Client.Android/AndroidWakeLockService.cs → ... Client.Android/AndroidWakeLockService.cs
View file
File renamed without changes.
0 ...Deck Client.Android/AppVersionProvider.cs → ...Deck Client.Android/AppVersionProvider.cs
View file
File renamed without changes.
0 ...k Client.Android/Assets/ElementQueries.js → ...k Client.Android/Assets/ElementQueries.js
View file
File renamed without changes.
0 ...eck Client.Android/Assets/ResizeSensor.js → ...eck Client.Android/Assets/ResizeSensor.js
View file
File renamed without changes.
0 ... Deck Client.Android/Assets/bootstrap.css → ... Deck Client.Android/Assets/bootstrap.css
View file
File renamed without changes.
0 ...k Client.Android/Assets/bootstrap.css.map → ...k Client.Android/Assets/bootstrap.css.map
View file
File renamed without changes.
0 ...o Deck Client.Android/Assets/bootstrap.js → ...o Deck Client.Android/Assets/bootstrap.js
View file
File renamed without changes.
0 ...ck Client.Android/Assets/bootstrap.js.map → ...ck Client.Android/Assets/bootstrap.js.map
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions Macro Deck Client.Android/Assets/client.js → ...acro Deck Client.Android/Assets/client.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ function connect(url) {
button.style.backgroundImage = 'url(data:image/gif;base64,' + this.buttons[i].IconBase64 + ')';
}

button.classList.toggle("btn-secondary", !this.buttons[i].BackgroundColorHex);

if (this.buttons[i].BackgroundColorHex) {
button.classList.toggle("btn-secondary", !this.buttons[i].BackgroundColorHex);
button.style.backgroundColor = this.buttons[i].BackgroundColorHex;
}
}
Expand Down Expand Up @@ -223,9 +223,9 @@ function connect(url) {
button.style.backgroundImage = '';
}

button.classList.toggle("btn-secondary", !obj.Buttons[0].BackgroundColorHex);

if (obj.Buttons[0].BackgroundColorHex) {
button.classList.toggle("btn-secondary", !obj.Buttons[0].BackgroundColorHex);
button.style.backgroundColor = obj.Buttons[0].BackgroundColorHex;
}
}
Expand Down
0 Macro Deck Client.Android/Assets/index.html → ...cro Deck Client.Android/Assets/index.html
View file
File renamed without changes.
0 ...Client.Android/Assets/jquery-3.5.1.min.js → ...Client.Android/Assets/jquery-3.5.1.min.js
View file
File renamed without changes.
0 Macro Deck Client.Android/Assets/style.css → ...acro Deck Client.Android/Assets/style.css
View file
File renamed without changes.
0 ...roid/Assets/url-search-params-polyfill.js → ...roid/Assets/url-search-params-polyfill.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ....Android/Macro Deck Client.Android.csproj → ....Android/Macro Deck Client.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand Down
0 Macro Deck Client.Android/MainActivity.cs → ...Macro Deck Client.Android/MainActivity.cs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nt.Android/Properties/AndroidManifest.xml → ...nt.Android/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="240" android:versionName="2.4.0-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="242" android:versionName="2.4.2-beta" package="com.suchbyte.macrodeck" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<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" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
Expand Down
0 ...Client.Android/Properties/AssemblyInfo.cs → ...Client.Android/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ....Android/Renderer/CustomEntityRenderer.cs → ....Android/Renderer/CustomEntityRenderer.cs
View file
File renamed without changes.
0 ...droid/Renderer/NoChacheWebViewRenderer.cs → ...droid/Renderer/NoChacheWebViewRenderer.cs
View file
File renamed without changes.
0 ...ient.Android/Resources/AboutResources.txt → ...ient.Android/Resources/AboutResources.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nt.Android/Resources/Resource.designer.cs → ...nt.Android/Resources/Resource.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...roid/Resources/mipmap-anydpi-v26/icon.xml → ...roid/Resources/mipmap-anydpi-v26/icon.xml
View file
File renamed without changes.
0 ...esources/mipmap-anydpi-v26/icon_round.xml → ...esources/mipmap-anydpi-v26/icon_round.xml
View file
File renamed without changes.
0 ...nt.Android/Resources/mipmap-hdpi/icon.png → ...nt.Android/Resources/mipmap-hdpi/icon.png
View file
File renamed without changes
0 ...urces/mipmap-hdpi/launcher_foreground.png → ...urces/mipmap-hdpi/launcher_foreground.png
View file
File renamed without changes
0 ...nt.Android/Resources/mipmap-mdpi/icon.png → ...nt.Android/Resources/mipmap-mdpi/icon.png
View file
File renamed without changes
0 ...urces/mipmap-mdpi/launcher_foreground.png → ...urces/mipmap-mdpi/launcher_foreground.png
View file
File renamed without changes
0 ...t.Android/Resources/mipmap-xhdpi/icon.png → ...t.Android/Resources/mipmap-xhdpi/icon.png
View file
File renamed without changes
0 ...rces/mipmap-xhdpi/launcher_foreground.png → ...rces/mipmap-xhdpi/launcher_foreground.png
View file
File renamed without changes
0 ....Android/Resources/mipmap-xxhdpi/icon.png → ....Android/Resources/mipmap-xxhdpi/icon.png
View file
File renamed without changes
0 ...ces/mipmap-xxhdpi/launcher_foreground.png → ...ces/mipmap-xxhdpi/launcher_foreground.png
View file
File renamed without changes
0 ...Android/Resources/mipmap-xxxhdpi/icon.png → ...Android/Resources/mipmap-xxxhdpi/icon.png
View file
File renamed without changes
0 ...es/mipmap-xxxhdpi/launcher_foreground.png → ...es/mipmap-xxxhdpi/launcher_foreground.png
View file
File renamed without changes
0 ...lient.Android/Resources/values/colors.xml → ...lient.Android/Resources/values/colors.xml
View file
File renamed without changes.
0 ...lient.Android/Resources/values/styles.xml → ...lient.Android/Resources/values/styles.xml
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions src/Macro Deck Client/.idea/.idea.Macro Deck Client.dir/.idea/discord.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/Macro Deck Client/.idea/.idea.Macro Deck Client.dir/.idea/encodings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/Macro Deck Client/.idea/.idea.Macro Deck Client.dir/.idea/indexLayout.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/Macro Deck Client/.idea/.idea.Macro Deck Client.dir/.idea/projectSettingsUpdater.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/Macro Deck Client/.idea/.idea.Macro Deck Client.dir/.idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 57 additions & 0 deletions src/Macro Deck Client/.idea/.idea.Macro Deck Client.dir/.idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Macro Deck Client/App.xaml → src/Macro Deck Client/App.xaml
View file
File renamed without changes.
0 Macro Deck Client/App.xaml.cs → src/Macro Deck Client/App.xaml.cs
View file
File renamed without changes.
0 Macro Deck Client/AssemblyInfo.cs → src/Macro Deck Client/AssemblyInfo.cs
View file
File renamed without changes.
0 Macro Deck Client/BroadcastReceiver.cs → src/Macro Deck Client/BroadcastReceiver.cs
View file
File renamed without changes.
0 Macro Deck Client/ConnectionItem.xaml → src/Macro Deck Client/ConnectionItem.xaml
View file
File renamed without changes.
0 Macro Deck Client/ConnectionItem.xaml.cs → src/Macro Deck Client/ConnectionItem.xaml.cs
View file
File renamed without changes.
0 Macro Deck Client/DeviceItem.xaml → src/Macro Deck Client/DeviceItem.xaml
View file
File renamed without changes.
0 Macro Deck Client/DeviceItem.xaml.cs → src/Macro Deck Client/DeviceItem.xaml.cs
View file
File renamed without changes.
0 Macro Deck Client/IAppVersionProvider.cs → src/Macro Deck Client/IAppVersionProvider.cs
View file
File renamed without changes.
0 Macro Deck Client/IBaseUrl.cs → src/Macro Deck Client/IBaseUrl.cs
View file
File renamed without changes.
0 Macro Deck Client/IBrightnessService.cs → src/Macro Deck Client/IBrightnessService.cs
View file
File renamed without changes.
0 Macro Deck Client/IWakeLockService.cs → src/Macro Deck Client/IWakeLockService.cs
View file
File renamed without changes.
0 Macro Deck Client/Macro Deck 2021.ico → src/Macro Deck Client/Macro Deck 2021.ico
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Macro Deck Client/Macro Deck Client.csproj → ...acro Deck Client/Macro Deck Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<Version>2.4.0-beta</Version>
<Version>2.4.1-beta</Version>
<Authors>Manuel Mayer</Authors>
<ApplicationIcon>Macro Deck 2021.ico</ApplicationIcon>
<RootNamespace>SuchByte.MacroDeck</RootNamespace>
Expand Down
0 Macro Deck Client/Pages/DeckPage.xaml → src/Macro Deck Client/Pages/DeckPage.xaml
View file
File renamed without changes.
0 Macro Deck Client/Pages/DeckPage.xaml.cs → src/Macro Deck Client/Pages/DeckPage.xaml.cs
View file
File renamed without changes.
0 Macro Deck Client/Pages/MainPage.xaml → src/Macro Deck Client/Pages/MainPage.xaml
View file
File renamed without changes.
0 Macro Deck Client/Pages/MainPage.xaml.cs → src/Macro Deck Client/Pages/MainPage.xaml.cs
View file
File renamed without changes.
0 ...k Client/Properties/Resources.Designer.cs → ...k Client/Properties/Resources.Designer.cs
View file
File renamed without changes.
0 Macro Deck Client/Properties/Resources.resx → ...cro Deck Client/Properties/Resources.resx
View file
File renamed without changes.
0 Macro Deck Client/Resources/logo.png → src/Macro Deck Client/Resources/logo.png
View file
File renamed without changes
0 Macro Deck Client/Settings/ClientSettings.cs → ...ro Deck Client/Settings/ClientSettings.cs
View file
File renamed without changes.
0 ...ck Client/Utils/ImageResourceExtension.cs → ...ck Client/Utils/ImageResourceExtension.cs
View file
File renamed without changes.
0 ...eck Client/Utils/RandomStringGenerator.cs → ...eck Client/Utils/RandomStringGenerator.cs
View file
File renamed without changes.
8 changes: 0 additions & 8 deletions verified_devices.txt
View file

This file was deleted.

0 comments on commit bc7ccbc

Please sign in to comment.