Skip to content
Snippets Groups Projects
Commit e9aaadcf authored by Your Name's avatar Your Name
Browse files

adawdawdawd

parents 3dd2b16c 8a946d05
No related branches found
No related tags found
1 merge request!31Mascott animation
Showing
with 391 additions and 92 deletions
No preview for this file type
No preview for this file type
......@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:InnoLabProjektDektopApp"
StartupUri="Screens\Regulaer\03End.xaml">
StartupUri="Screens\Regulaer\Abonnement.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
......
......
......@@ -11,7 +11,8 @@ namespace InnoLabProjektDektopApp
/// </summary>
public partial class App : Application
{
private readonly NotifyIconManager _notifyIcon = new();
private readonly NotifyIconManager _notifyIconManager = new();
private static ProcessMonitor _processMonitor = new();
internal static ProcessMonitor GetProcessMonitor()
......@@ -27,13 +28,13 @@ namespace InnoLabProjektDektopApp
protected override void OnStartup(StartupEventArgs e)
{
_notifyIcon.Initialize();
_notifyIconManager.Initialize();
base.OnStartup(e);
}
protected override void OnExit(ExitEventArgs e)
{
_notifyIcon.Dispose();
_notifyIconManager.Dispose();
base.OnExit(e);
}
......
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Assets/filter.png

576 B

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Assets/play.png

814 B

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Assets/settings.png

2.7 KiB

......@@ -7,6 +7,9 @@
</None>
</ItemGroup>
<ItemGroup>
<Compile Update="Screens\Regulaer\Abonnement.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Screens\Templates\HeaderTemplate.xaml.cs">
<SubType>Code</SubType>
</Compile>
......@@ -45,6 +48,9 @@
<Page Update="Screens\Regulaer\01Overview.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Screens\Regulaer\Abonnement.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Screens\Templates\HeaderTemplate.xaml">
<SubType>Designer</SubType>
</Page>
......
......
......@@ -35,7 +35,7 @@ namespace InnoLabProjektDektopApp
private void Button_Click(object sender, RoutedEventArgs e)
{
//
this.NavigationService.Navigate(new Progress());
}
}
}
\ No newline at end of file
......@@ -8,16 +8,60 @@
mc:Ignorable="d">
<Grid>
<Label Content="Your way to working more focused" HorizontalAlignment="Center" Margin="0,119,0,0" VerticalAlignment="Top" Height="108" Width="780" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<TextBlock HorizontalAlignment="Center" Height="39" TextWrapping="Wrap" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et" VerticalAlignment="Top" Width="324" Margin="0,216,0,0"/>
<Label Content="Edit distracting items" HorizontalAlignment="Left" Height="30" Margin="68,393,0,0" VerticalAlignment="Top" Width="125"/>
<Label Content="Edit Settings" HorizontalAlignment="Left" Height="25" Margin="386,398,0,0" VerticalAlignment="Top" Width="92"/>
<Label Content="Start focus session" HorizontalAlignment="Left" Height="26" Margin="695,397,0,0" VerticalAlignment="Top" Width="130"/>
<TextBlock HorizontalAlignment="Left" Height="68" Margin="68,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="126"/>
<TextBlock HorizontalAlignment="Center" Height="68" Margin="0,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="124"/>
<TextBlock HorizontalAlignment="Left" Height="68" Margin="695,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="125"/>
<Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="68,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click1"/>
<Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="388,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
<Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="695,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
<Label Content="Your way to working more focused" HorizontalAlignment="Center" Margin="0,91,0,0" VerticalAlignment="Top" Height="108" Width="780" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
<Canvas HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,240,0,0">
<Path StrokeThickness="3" Canvas.Left="-261" Canvas.Top="45.833" HorizontalAlignment="Center" Stretch="Fill" VerticalAlignment="Top" Width="191" Height="30" Stroke="Black">
<Path.Data>
<PathGeometry>
<PathFigure StartPoint="20,100">
<BezierSegment Point1="100,100" Point2="200,0" Point3="300,50" />
</PathFigure>
</PathGeometry>
</Path.Data>
</Path>
<Path StrokeThickness="3" Canvas.Left="50.5" Canvas.Top="45.833" Stretch="Fill" Width="191" Height="30" Stroke="Black" HorizontalAlignment="Center" VerticalAlignment="Top">
<Path.Data>
<PathGeometry Figures="M20,100 C100,100 200,0 300,50"/>
</Path.Data>
</Path>
</Canvas>
<TextBlock HorizontalAlignment="Center" Height="39" TextWrapping="Wrap" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et" VerticalAlignment="Top" Width="324" Margin="0,188,0,0"/>
<Label Content="Edit distracting items" HorizontalAlignment="Left" Height="30" Margin="68,331,0,0" VerticalAlignment="Top" Width="125"/>
<Label Content="Edit Settings" HorizontalAlignment="Left" Height="25" Margin="386,336,0,0" VerticalAlignment="Top" Width="92"/>
<Label Content="Start focus session" HorizontalAlignment="Left" Height="26" Margin="695,335,0,0" VerticalAlignment="Top" Width="130"/>
<TextBlock HorizontalAlignment="Left" Height="68" Margin="68,366,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="126"/>
<TextBlock HorizontalAlignment="Center" Height="68" Margin="0,366,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="124"/>
<TextBlock HorizontalAlignment="Left" Height="68" Margin="695,366,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="125"/>
<!-- Pagination -->
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
<Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
<StackPanel Orientation="Horizontal">
<Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
<!-- Aktive Seite -->
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
<!-- Inaktive Seite -->
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
</StackPanel>
<!--
<Button Content="1" Width="20" Margin="5" Click="first_Page" />
<Button Content="2" Width="20" Margin="5" Click="Second_Page" />
<Button Content="3" Width="20" Margin="5" Click="third_Page" />
<Button Content="4" Width="20" Margin="5" Click="fourth_Page" />
<Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
-->
<Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
</StackPanel>
<Image HorizontalAlignment="Left" Height="57" Margin="81,269,0,0" VerticalAlignment="Top" Width="54" Source="/Screens/FirstLaunch/filter.png"/>
<Image HorizontalAlignment="Center" Height="57" Margin="0,269,0,0" VerticalAlignment="Top" Width="54" Source="/Screens/FirstLaunch/settings.png"/>
<Image HorizontalAlignment="Left" Height="57" Margin="731,269,0,0" VerticalAlignment="Top" Width="54" Source="/Screens/FirstLaunch/play.png"/>
</Grid>
</Page>
......@@ -32,5 +32,15 @@ namespace InnoLabProjektDektopApp
{
//this.Content = new AnotherWindow().Content;
}
private void PreviousPage_Click(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Startscreen());
}
private void NextPage_Click(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Distractions());
}
}
}
\ No newline at end of file
......@@ -268,6 +268,30 @@
</Border>
</StackPanel>
<!-- Pagination -->
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
<Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
<StackPanel Orientation="Horizontal">
<Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
<!-- Aktive Seite -->
<Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
<!-- Inaktive Seite -->
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
</StackPanel>
<!--
<Button Content="1" Width="20" Margin="5" Click="first_Page" />
<Button Content="2" Width="20" Margin="5" Click="Second_Page" />
<Button Content="3" Width="20" Margin="5" Click="third_Page" />
<Button Content="4" Width="20" Margin="5" Click="fourth_Page" />
<Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
-->
<Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
</StackPanel>
</Grid>
</Page>
......
......
......@@ -257,6 +257,14 @@ namespace InnoLabProjektDektopApp
}
}
private void PreviousPage_Click(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Progress());
}
private void NextPage_Click(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Settings());
}
}
}
......@@ -180,6 +180,30 @@ ToolTip="You can decide how long the focus and break period should be. The focus
</StackPanel>
<!-- Pagination -->
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
<Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
<StackPanel Orientation="Horizontal">
<Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
<!-- Aktive Seite -->
<Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
<!-- Inaktive Seite -->
<Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
<Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
</StackPanel>
<!--
<Button Content="1" Width="20" Margin="5" Click="first_Page" />
<Button Content="2" Width="20" Margin="5" Click="Second_Page" />
<Button Content="3" Width="20" Margin="5" Click="third_Page" />
<Button Content="4" Width="20" Margin="5" Click="fourth_Page" />
<Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
-->
<Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
</StackPanel>
</Grid>
</ScrollViewer>
......
......
......@@ -143,7 +143,15 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
private void PreviousPage_Click(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Distractions());
}
private void NextPage_Click(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Overview());
}
}
......
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/filter.png

576 B

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/play.png

814 B

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/settings.png

2.7 KiB

<Page x:Class="InnoLabProjektDektopApp.Screens.Regulaer.Abonnement"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:InnoLabProjektDektopApp.Screens.Regulaer"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="Abonnement">
<Border Background="#1E1E1E" Padding="20">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- Titel & Beschreibung -->
<StackPanel Grid.Row="0" Margin="0,0,0,80">
<TextBlock Text="Available subscription plans" FontSize="24" Foreground="White" FontWeight="Bold"/>
<TextBlock TextWrapping="Wrap" Text="Become a premium member for even more features! With the free version, you already have great tools to stay focused and work better. But with Premium, you’ll unlock extra features to work even smarter and make it more personal." FontSize="14" Foreground="Gray"/>
</StackPanel>
<Border Background="#2A2A2A" Padding="10" CornerRadius="5" Margin="0,80,0,34">
<TextBlock>
<Run Text="Your current membership: " Foreground="LightGray" FontWeight="Bold"/>
<Run Text="Free" Foreground="White"/>
</TextBlock>
</Border>
<!-- Feature Tabelle -->
<Border Background="#2A2A2A" Padding="10" CornerRadius="10" Margin="0,126,0,27" Grid.RowSpan="3">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!-- Header -->
<Grid Margin="0,0,0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Feature" Foreground="White" FontWeight="Bold" Grid.Column="0"/>
<TextBlock Text="Free" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="Premium (€4,99/month or €20/year)" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
<!-- Feature Liste -->
<StackPanel Grid.Row="1">
<Border BorderBrush="#444" BorderThickness="0,0,0,1" Padding="5" Margin="0,0,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Start and manage focus session" Foreground="White" Grid.Column="0"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
</Border>
<Border BorderBrush="#444" BorderThickness="0,0,0,1" Padding="5" Margin="0,0,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="View today’s session stats after it ends" Foreground="White" Grid.Column="0"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
</Border>
<Border BorderBrush="#444" BorderThickness="0,0,0,1" Padding="5" Margin="0,0,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Detailed stats (days, weeks, months)" Foreground="White" Grid.Column="0"/>
<TextBlock Text="✖" Foreground="Red" FontSize="16" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
</Border>
<Border BorderBrush="#444" BorderThickness="0,0,0,1" Padding="5" Margin="0,0,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Specify work sessions" Foreground="White" Grid.Column="0"/>
<TextBlock Text="✖" Foreground="Red" FontSize="16" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
</Border>
<Border BorderBrush="#444" BorderThickness="0,0,0,1" Padding="5" Margin="0,0,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Analyze peak productivity times" Foreground="White" Grid.Column="0"/>
<TextBlock Text="✖" Foreground="Red" FontSize="16" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
</Border>
<Border BorderBrush="#444" BorderThickness="0,0,0,1" Padding="5" Margin="0,0,0,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Customize mascot (accessories, skins)" Foreground="White" Grid.Column="0"/>
<TextBlock Text="✖" Foreground="Red" FontSize="16" HorizontalAlignment="Center" Grid.Column="1"/>
<TextBlock Text="✔" Foreground="Green" FontSize="16" HorizontalAlignment="Center" Grid.Column="2"/>
</Grid>
</Border>
<!-- Weitere Features nach demselben Muster hinzufügen -->
</StackPanel>
</Grid>
</Border>
<!-- Premium Button -->
<Button Content="Try premium now" Grid.Row="2" Background="#4CAF50" Foreground="White" FontSize="16" Padding="10,5" HorizontalAlignment="Left" Margin="0,20,0,-11" Cursor="Hand"/>
</Grid>
</Border>
</Page>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace InnoLabProjektDektopApp.Screens.Regulaer
{
/// <summary>
/// Interaction logic for Abonnement.xaml
/// </summary>
public partial class Abonnement : Page
{
public Abonnement()
{
InitializeComponent();
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment