Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@
<PublishReadyToRun>false</PublishReadyToRun>
</PropertyGroup>

<ItemGroup>
<None Remove="Resources\mipmap-hdpi\ic_launcher.png" />
<None Remove="Resources\mipmap-mdpi\ic_launcher.png" />
<None Remove="Resources\mipmap-xhdpi\ic_launcher.png" />
<None Remove="Resources\mipmap-xxhdpi\ic_launcher.png" />
<None Remove="Resources\mipmap-xxxhdpi\ic_launcher.png" />
<ItemGroup>
<None Remove="Resources\values-night\colors.xml" />
<None Remove="Resources\values-night\styles.xml" />
<None Remove="Resources\values\colors.xml" />
Expand All @@ -47,15 +42,8 @@
</ItemGroup>

<ItemGroup>
<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
</ItemGroup>

<ItemGroup>
<MauiSplashScreen Include="Resources\splash.svg" BaseSize="128,128" Color="#990000" />
<MauiSplashScreen Include="Resources\splash.svg" BaseSize="128,128" Color="#1976D2" />
<MauiIcon Include="Resources\appicon.svg" BaseSize="64,64" ForegroundScale="0.65" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion BrickController2/BrickController2.Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace BrickController2.Droid
{
[Activity(
Label = "BrickController2",
Icon = "@mipmap/ic_launcher",
Icon = "@mipmap/appicon",
Theme = "@style/MainTheme",
MainLauncher = true,
ConfigurationChanges =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<uses-feature android:name="android.hardware.bluetooth" android:required="true" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
<application android:label="BrickController2.Android" android:icon="@mipmap/ic_launcher"></application>
<application android:label="BrickController2.Android" android:icon="@mipmap/appicon"></application>
</manifest>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
91 changes: 1 addition & 90 deletions BrickController2/BrickController2.Android/Resources/splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="launcher_background">#000000</color>
<color name="colorPrimary">#CC0000</color>
<color name="colorPrimaryDark">#990000</color>
<color name="colorAccent">#FF4081</color>
<color name="colorPrimary">#2196F3</color>
<color name="colorPrimaryDark">#1976D2</color>
<color name="colorAccent">#00BCD4</color>
</resources>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="launcher_background">#ffffff</color>
<color name="colorPrimary">#CC0000</color>
<color name="colorPrimaryDark">#990000</color>
<color name="colorAccent">#FF4081</color>
<color name="colorPrimary">#2196F3</color>
<color name="colorPrimaryDark">#1976D2</color>
<color name="colorAccent">#00BCD4</color>
</resources>
6 changes: 5 additions & 1 deletion BrickController2/BrickController2/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
<ResourceDictionary Source="UI/Themes/LightTheme.xaml"/>

<!-- Global targets -->

<Style TargetType="NavigationPage">
<Setter Property="BarBackgroundColor" Value="{DynamicResource NavigationBarColor}"/>
<Setter Property="BarTextColor" Value="{DynamicResource NavigationBarItemColor}"/>
</Style>

<Style TargetType="Label">
<Setter Property="TextColor" Value="{DynamicResource PrimaryTextColor}"/>
</Style>
Expand Down
4 changes: 1 addition & 3 deletions BrickController2/BrickController2/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[assembly: XamlCompilation(XamlCompilationOptions.Skip)]
namespace BrickController2
{
public partial class App : Application
public partial class App : Application
{
private readonly ViewModelFactory _viewModelFactory;
private readonly PageFactory _pageFactory;
Expand Down Expand Up @@ -75,8 +75,6 @@ private NavigationPage GetMainPage(CreationListPageViewModel? viewModel = defaul
var vm = viewModel ?? _viewModelFactory(typeof(CreationListPageViewModel), null);
var page = _pageFactory(typeof(CreationListPage), vm);
var navigationPage = _navigationPageFactory(page);
navigationPage.BarBackgroundColor = Colors.Red;
navigationPage.BarTextColor = Colors.White;
return navigationPage;
}

Expand Down
22 changes: 11 additions & 11 deletions BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
<Color x:Key="NegativeColor">DarkRed</Color>

<Color x:Key="PageBackgroundColor">Black</Color>
<Color x:Key="NavigationBarColor">DarkRed</Color>
<Color x:Key="NavigationBarColor">#1976D2</Color>
<Color x:Key="NavigationBarItemColor">White</Color>
<Color x:Key="HeaderBackgroundColor">#303030</Color>
<Color x:Key="HeaderItemColor">White</Color>
<Color x:Key="DividerColor">#303030</Color>
<Color x:Key="DividerColor">#BDBDBD</Color>
<Color x:Key="FooterBackgroudColor">#303030</Color>
<Color x:Key="DialogBackgroundColor">#202020</Color>
<Color x:Key="DialogBorderColor">Gray</Color>
<Color x:Key="DeleteSwipeItemBackgroundColor">Red</Color>
<Color x:Key="SwipeItemBackgroundColor">Green</Color>
<Color x:Key="DeleteSwipeItemBackgroundColor">#00BCD4</Color>
<Color x:Key="SwipeItemBackgroundColor">#1976D2</Color>
<Color x:Key="CollectionViewHeaderBackgroundColor">#202020</Color>
<Color x:Key="CollectionViewSelectedItemBackgroundColor">#404040</Color>
<Color x:Key="SwitchOnColor">Green</Color>
<Color x:Key="SwitchThumbColor">LightGreen</Color>
<Color x:Key="SwitchOnColor">#2196F3</Color>
<Color x:Key="SwitchThumbColor">#BBDEFB</Color>
<Color x:Key="SwitchThumbColorOff">#606060</Color>
<Color x:Key="SliderMinimumTrackColor">#606060</Color>
<Color x:Key="SliderMaximumTrackColor">#606060</Color>
<Color x:Key="SliderThumbColor">LightGray</Color>
<Color x:Key="ButtonBackgroundColor">#606060</Color>
<Color x:Key="ButtonTextColor">White</Color>
<Color x:Key="CheckBoxCheckedColor">LightGreen</Color>
<Color x:Key="RadioButtonSelectedColor">Red</Color>
<Color x:Key="ProgressColor">Green</Color>
<Color x:Key="CheckBoxCheckedColor">#BBDEFB</Color>
<Color x:Key="RadioButtonSelectedColor">#2196F3</Color>
<Color x:Key="ProgressColor">#2196F3</Color>
<Color x:Key="PickerTextColor">LightBlue</Color>
<Color x:Key="FloatingButtonColor">Red</Color>
<Color x:Key="InlineButtonColor">Green</Color>
<Color x:Key="FloatingButtonColor">#2196F3</Color>
<Color x:Key="InlineButtonColor">#2196F3</Color>

</ResourceDictionary>
20 changes: 10 additions & 10 deletions BrickController2/BrickController2/UI/Themes/LightTheme.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
<Color x:Key="NegativeColor">LightPink</Color>

<Color x:Key="PageBackgroundColor">White</Color>
<Color x:Key="NavigationBarColor">Red</Color>
<Color x:Key="NavigationBarColor">#1976D2</Color>
<Color x:Key="NavigationBarItemColor">White</Color>
<Color x:Key="HeaderBackgroundColor">LightGray</Color>
<Color x:Key="HeaderItemColor">Black</Color>
<Color x:Key="DividerColor">#c0c0c0</Color>
<Color x:Key="FooterBackgroudColor">#e0e0e0</Color>
<Color x:Key="DialogBackgroundColor">White</Color>
<Color x:Key="DialogBorderColor">White</Color>
<Color x:Key="DeleteSwipeItemBackgroundColor">LightPink</Color>
<Color x:Key="SwipeItemBackgroundColor">LightGreen</Color>
<Color x:Key="DeleteSwipeItemBackgroundColor">#00BCD4</Color>
<Color x:Key="SwipeItemBackgroundColor">#BBDEFB</Color>
<Color x:Key="CollectionViewHeaderBackgroundColor">#f0f0f0</Color>
<Color x:Key="CollectionViewSelectedItemBackgroundColor">Gray</Color>
<Color x:Key="SwitchOnColor">LightGreen</Color>
<Color x:Key="SwitchThumbColor">DarkGreen</Color>
<Color x:Key="SwitchOnColor">#BBDEFB</Color>
<Color x:Key="SwitchThumbColor">#1976D2</Color>
<Color x:Key="SwitchThumbColorOff">Gray</Color>
<Color x:Key="SliderMinimumTrackColor">#c0c0c0</Color>
<Color x:Key="SliderMaximumTrackColor">#c0c0c0</Color>
<Color x:Key="SliderThumbColor">#303030</Color>
<Color x:Key="ButtonBackgroundColor">LightGray</Color>
<Color x:Key="ButtonTextColor">Black</Color>
<Color x:Key="CheckBoxCheckedColor">Green</Color>
<Color x:Key="RadioButtonSelectedColor">Red</Color>
<Color x:Key="ProgressColor">DarkGreen</Color>
<Color x:Key="CheckBoxCheckedColor">#2196F3</Color>
<Color x:Key="RadioButtonSelectedColor">#2196F3</Color>
<Color x:Key="ProgressColor">#1976D2</Color>
<Color x:Key="PickerTextColor">DarkBlue</Color>
<Color x:Key="FloatingButtonColor">Red</Color>
<Color x:Key="InlineButtonColor">Green</Color>
<Color x:Key="FloatingButtonColor">#2196F3</Color>
<Color x:Key="InlineButtonColor">#2196F3</Color>

</ResourceDictionary>