Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating readme #119

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Updating readme #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
183e7d2
updated colors
MykhailoDav Jan 23, 2025
7cccf29
updated screenshots
MykhailoDav Jan 23, 2025
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
Binary file modified res/DarkTheme.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/LightTheme.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/ThemeSettingPage.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/W11_android.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/W11_ios.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/WeekendCalendar_android.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/WeekendCalendar_ios.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/android.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/ios.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/mac.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/win.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions samples/SampleApp/AppShell.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
xmlns:local="clr-namespace:SampleApp.Views;assembly=SampleApp"
Shell.TitleColor="{toolkit:AppThemeResource TextColor}"
Shell.FlyoutBehavior="Disabled">
<Shell.Resources>
<ResourceDictionary>
<toolkit:AppThemeColor
x:Key="ShellColor"
Dark="#FF243138"
Light="#FFE2E3D4"/>
</ResourceDictionary>
</Shell.Resources>
<TabBar>
<Tab Icon="calendar"
Title="MainPage">
Expand Down
43 changes: 27 additions & 16 deletions samples/SampleApp/Controls/ThemeButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,29 @@
x:Name="This">
<ContentView.Resources>
<ControlTemplate x:Key="RadioButtonTemplate">
<Grid Margin="4" WidthRequest="100">
<ContentPresenter />
<Grid Margin="4"
WidthRequest="100">
<ContentPresenter/>
</Grid>
</ControlTemplate>

<Style TargetType="RadioButton">
<Setter Property="ControlTemplate" Value="{StaticResource RadioButtonTemplate}" />
<Setter Property="ControlTemplate"
Value="{StaticResource RadioButtonTemplate}"/>
</Style>

<toolkit:AppThemeColor
x:Key="CheeckedColor"
Dark="#B3FCF8"
Light="#2F3E46" />
Dark="{StaticResource FrenchPassc}"
Light="{StaticResource LimedSpruce}"/>
<toolkit:AppThemeColor
x:Key="UncheckedColor"
Dark="#2F3E46"
Light="#c2c5aa" />
Dark="{StaticResource LimedSpruce}"
Light="{StaticResource FoggyGray}"/>
</ContentView.Resources>

<RadioButton GroupName="{Binding GroupName, Source={x:Reference This}}" IsChecked="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}">
<RadioButton GroupName="{Binding GroupName, Source={x:Reference This}}"
IsChecked="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}">
<RadioButton.Content>
<Border
HeightRequest="100"
Expand All @@ -44,13 +47,15 @@
Binding="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}"
TargetType="Label"
Value="True">
<Setter Property="TextColor" Value="{toolkit:AppThemeResource UncheckedColor}" />
<Setter Property="TextColor"
Value="{toolkit:AppThemeResource UncheckedColor}"/>
</DataTrigger>
<DataTrigger
Binding="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}"
TargetType="Label"
Value="False">
<Setter Property="TextColor" Value="{toolkit:AppThemeResource CheeckedColor}" />
<Setter Property="TextColor"
Value="{toolkit:AppThemeResource CheeckedColor}"/>
</DataTrigger>
</Label.Triggers>
</Label>
Expand All @@ -64,13 +69,15 @@
Binding="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}"
TargetType="Label"
Value="True">
<Setter Property="TextColor" Value="{toolkit:AppThemeResource UncheckedColor}" />
<Setter Property="TextColor"
Value="{toolkit:AppThemeResource UncheckedColor}"/>
</DataTrigger>
<DataTrigger
Binding="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}"
TargetType="Label"
Value="False">
<Setter Property="TextColor" Value="{toolkit:AppThemeResource CheeckedColor}" />
<Setter Property="TextColor"
Value="{toolkit:AppThemeResource CheeckedColor}"/>
</DataTrigger>
</Label.Triggers>
</Label>
Expand All @@ -80,15 +87,19 @@
Binding="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}"
TargetType="Border"
Value="True">
<Setter Property="Stroke" Value="{toolkit:AppThemeResource CheeckedColor}" />
<Setter Property="BackgroundColor" Value="{toolkit:AppThemeResource CheeckedColor}" />
<Setter Property="Stroke"
Value="{toolkit:AppThemeResource CheeckedColor}"/>
<Setter Property="BackgroundColor"
Value="{toolkit:AppThemeResource CheeckedColor}"/>
</DataTrigger>
<DataTrigger
Binding="{Binding IsChecked, Source={x:Reference This}, Mode=TwoWay}"
TargetType="Border"
Value="False">
<Setter Property="Stroke" Value="{toolkit:AppThemeResource CheeckedColor}" />
<Setter Property="BackgroundColor" Value="{toolkit:AppThemeResource UncheckedColor}" />
<Setter Property="Stroke"
Value="{toolkit:AppThemeResource CheeckedColor}"/>
<Setter Property="BackgroundColor"
Value="{toolkit:AppThemeResource UncheckedColor}"/>
</DataTrigger>
</Border.Triggers>
</Border>
Expand Down
6 changes: 6 additions & 0 deletions samples/SampleApp/Resources/Styles/Colors.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<Color x:Key="MineShaft">#212121</Color>
<Color x:Key="Mystic">#edf2f4</Color>
<Color x:Key="Tasman">#CAD2C5</Color>
<Color x:Key="FrenchPassc">#B3FCF8</Color>


<toolkit:AppThemeColor
x:Key="DaysLabelTextColor"
Expand Down Expand Up @@ -72,4 +74,8 @@
x:Key="TextColor"
Dark="{StaticResource Locust}"
Light="{StaticResource LimedSpruce}"/>
<toolkit:AppThemeColor
x:Key="ShellColor"
Dark="#FF243138"
Light="#FFE2E3D4"/>
</ResourceDictionary>
17 changes: 10 additions & 7 deletions samples/SampleApp/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
xmlns:model="clr-namespace:SampleApp.Model"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
Title="Calendar Plugin for .NET MAUI"
android:NavigationBar.Color="{toolkit:AppThemeResource BackgroundColorfullPageColor}"
android:NavigationBar.Color="{toolkit:AppThemeResource ShellColor}"
BackgroundColor="{toolkit:AppThemeResource BackgroundColorfullPageColor}"
Shell.BackgroundColor="{toolkit:AppThemeResource BackgroundColorfullPageColor}"
Shell.TitleColor="{toolkit:AppThemeResource TextColor}">
<ContentPage.Behaviors>
<toolkit:StatusBarBehavior StatusBarColor="{toolkit:AppThemeResource BackgroundColorfullPageColor}"/>
</ContentPage.Behaviors>
<ContentPage.Resources>
<ResourceDictionary>
<toolkit:AppThemeColor
Expand All @@ -23,7 +26,7 @@
Light="#000000"/>

<Style x:Key="LabelMainPageStyle"
TargetType="Label">
TargetType="Label">
<Setter Property="FontAttributes"
Value="Bold"/>
<Setter Property="FontSize"
Expand All @@ -36,7 +39,7 @@
Value="{toolkit:AppThemeResource LabelColor}"/>
</Style>
<Style x:Key="ButtonMainPageStyle"
TargetType="Button">
TargetType="Button">
<Setter Property="HorizontalOptions"
Value="Fill"/>
<Setter Property="BackgroundColor"
Expand All @@ -62,7 +65,7 @@
</ContentPage.Resources>
<ScrollView>
<VerticalStackLayout HorizontalOptions="Fill"
Spacing="6">
Spacing="6">
<Label
Margin="0,30,0,0"
Style="{StaticResource LabelMainPageStyle}"
Expand All @@ -88,13 +91,13 @@
Style="{StaticResource ButtonMainPageStyle}"
Text="Range Event Calendar"/>
<Label Style="{StaticResource LabelMainPageStyle}"
Text="Calendars from Devices"/>
Text="Calendars from Devices"/>
<Button
Clicked="Windows11Calendar"
Style="{StaticResource ButtonMainPageStyle}"
Text="Windows 11 Calendar"/>
<Label Style="{StaticResource LabelMainPageStyle}"
Text="Picker Popup"/>
Text="Picker Popup"/>
<Button
Clicked="PickerPopup"
Style="{StaticResource ButtonMainPageStyle}"
Expand All @@ -108,7 +111,7 @@
Style="{StaticResource ButtonMainPageStyle}"
Text="Range Start-End Selection Calendar"/>
<Label Style="{StaticResource LabelMainPageStyle}"
Text="Week View Calendars"/>
Text="Week View Calendars"/>
<Button
Clicked="WeekViewCalendar"
Style="{StaticResource ButtonMainPageStyle}"
Expand Down
2 changes: 2 additions & 0 deletions samples/SampleApp/Views/RangeSelectionPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
DaysTitleColor="{toolkit:AppThemeResource DaysTitleLabelTextColor}"
DayTappedCommand="{Binding DayTappedCommand}"
Events="{Binding Events}"
SelectedTodayTextColor="{toolkit:AppThemeResource DeselectedDayLabelTextColor}"
SelectedDayTextColor="{toolkit:AppThemeResource DeselectedDayLabelTextColor}"
DeselectedDayTextColor="{toolkit:AppThemeResource DeselectedDayLabelTextColor}"
SelectedDatesRangeBackgroundColor="{toolkit:AppThemeResource BackgroundColorfullPageColor}"
SelectedDayBackgroundColor="{toolkit:AppThemeResource ButtonColor}"
Expand Down
Loading