Skip to content

Commit

Permalink
Merge pull request #76 from OpenIPC/feature/redesign-ui
Browse files Browse the repository at this point in the history 
Feature/redesign UI
  • Loading branch information
@mikecarr
mikecarr authored Feb 7, 2025
2 parents 0af7fe5 + 06fa738 commit 453afe0
Show file tree
Hide file tree
Showing 33 changed files with 365 additions and 138 deletions.
1 change: 0 additions & 1 deletion OpenIPC_Config.Android/OpenIPC_Config.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0"/>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0"/>
Expand Down
1 change: 0 additions & 1 deletion OpenIPC_Config.Browser/OpenIPC_Config.Browser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0"/>
<PackageReference Include="YamlDotNet" Version="16.1.3"/>
Expand Down
1 change: 0 additions & 1 deletion OpenIPC_Config.Desktop/OpenIPC_Config.Desktop.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0"/>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0"/>
Expand Down
1 change: 0 additions & 1 deletion OpenIPC_Config.Tests/OpenIPC_Config.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0"/>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0"/>
Expand Down
1 change: 0 additions & 1 deletion OpenIPC_Config.iOS/OpenIPC_Config.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0"/>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0"/>
Expand Down
19 changes: 12 additions & 7 deletions OpenIPC_Config/App.axaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,13 @@ private IConfigurationRoot LoadConfiguration()
var configPath = GetConfigPath();

// Create default settings if not present
if (!File.Exists(configPath))
{
//if (!File.Exists(configPath))
//{
// create the file
var defaultSettings = createDefaultAppSettings();
File.WriteAllText(configPath, defaultSettings.ToString());
Log.Information($"Default appsettings.json created at {configPath}");
}
//}

// Build configuration
var configuration = new ConfigurationBuilder()
Expand Down Expand Up @@ -349,19 +350,23 @@ private JObject createDefaultAppSettings()
),
new JProperty("Serilog",
new JObject(
new JProperty("Using", new JArray("Serilog.Sinks.Console", "Serilog.Sinks.RollingFile")),
new JProperty("Using", new JArray("Serilog.Sinks.Console", "Serilog.Sinks.File")),
new JProperty("MinimumLevel", "Verbose"),
new JProperty("WriteTo",
new JArray(
new JObject(
new JProperty("Name", "Console")
),
new JObject(
new JProperty("Name", "RollingFile"),
new JProperty("Name", "File"),
new JProperty("Args",
new JObject(
new JProperty("pathFormat",
$"{OpenIPC.AppDataConfigDirectory}/Logs/configurator-{{Date}}.log")
new JProperty("path",
$"{OpenIPC.AppDataConfigDirectory}/Logs/configurator.log"),
new JProperty("rollingInterval",
"Day"),
new JProperty("retainedFileCountLimit",
"5")
)
)
)
Expand Down
4 changes: 0 additions & 4 deletions OpenIPC_Config/Assets/Icons/icon-firmware.svg
View file

This file was deleted.

3 changes: 3 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconair_camera_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconair_firmware_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconair_firmware_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...PC_Config/Assets/Icons/iconoir_camera.svg → ...nfig/Assets/Icons/iconoir_camera_dark.svg
View file
File renamed without changes
0 OpenIPC_Config/Assets/Icons/iconoir_drag.svg → ...Config/Assets/Icons/iconoir_drag_dark.svg
View file
File renamed without changes
6 changes: 6 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconoir_drag_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...C_Config/Assets/Icons/iconoir_presets.svg → ...fig/Assets/Icons/iconoir_presets_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconoir_presets_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ..._Config/Assets/Icons/iconoir_settings.svg → ...ig/Assets/Icons/iconoir_settings_dark.svg
View file
File renamed without changes
8 changes: 8 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconoir_settings_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 OpenIPC_Config/Assets/Icons/iconoir_wifi.svg → ...Config/Assets/Icons/iconoir_wifi_dark.svg
View file
File renamed without changes
6 changes: 6 additions & 0 deletions OpenIPC_Config/Assets/Icons/iconoir_wifi_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion OpenIPC_Config/OpenIPC_Config.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0"/>
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="SSH.NET" Version="2024.1.0"/>
Expand Down
2 changes: 1 addition & 1 deletion OpenIPC_Config/Styles/Styles.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- Default Window Style -->
<Style Selector="Window">
<Setter Property="Width" Value="900" />
<Setter Property="Height" Value="815" />
<Setter Property="Height" Value="715" />
<!-- <Setter Property="RequestedThemeVariant" Value="Dark" /> -->
<Setter Property="RequestedThemeVariant" Value="Light" />
</Style>
Expand Down
7 changes: 6 additions & 1 deletion OpenIPC_Config/ViewModels/CameraSettingsTabViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,14 @@ private void InitializeCollections()
Luminance = new ObservableCollection<string>(Enumerable.Range(1, 100).Select(i => (i * 5).ToString()));

Flip = new ObservableCollection<string> { "true", "false" };
SelectedFlip = "false";

Mirror = new ObservableCollection<string> { "true", "false" };

SelectedMirror = "false";

FpvEnabled = new ObservableCollection<string> { "true", "false" };
SelectedFpvEnabled = "false";

FpvNoiseLevel = new ObservableCollection<string> { "", "0", "1", "2" };


Expand Down
Loading

0 comments on commit 453afe0

Please sign in to comment.