changed settings screen: user can define seconds now individually; affirmation...

changed settings screen: user can define seconds now individually; affirmation and insulting words option are now checkboxes and only visible if mascot visibility is selected

InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml

@@ -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\FirstLaunch\03_0Distractions.xaml">
+             StartupUri="Screens\FirstLaunch\04Settings.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml

@@ -30,8 +30,27 @@
     ToolTip="You can choose between 3 modes: In all modes, the mascot gives you visual feedback that you are currently distracting yourself. In full-blocking mode, the distracting item you try to reach is instantly automatically closed. In the warning mode, you receive a warning for X seconds during which you can re-decide if you want to enter the distracting item or not." />
             </StackPanel>
                 <RadioButton Content="full-blocking mode" GroupName="Modes" IsChecked="True" />
-            <RadioButton Content="X seconds warning mode" GroupName="Modes" />
-            <RadioButton Content="only mascot feedback mode" GroupName="Modes" />
+                <RadioButton Content="only mascot feedback mode" GroupName="Modes" Margin="0,5,0,0"/>
+
+                <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                    <RadioButton Content=""
+                     GroupName="Modes"
+                     VerticalAlignment="Center" />
+
+                    <ComboBox x:Name="SecondsComboBox"
+                  Width="50"
+                  Margin="0,0,5,0"
+                              SelectedIndex="2">
+                        <ComboBoxItem Content="3" />
+                        <ComboBoxItem Content="5" />
+                        <ComboBoxItem Content="10" />
+                        <ComboBoxItem Content="15" />
+                        <ComboBoxItem Content="30" />
+                    </ComboBox>
+                    <TextBlock Text="seconds warning mode"
+                   VerticalAlignment="Center" />
+                </StackPanel>
+
 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,10,0,0">
                 <TextBlock Style="{StaticResource Header2}" 
@@ -45,14 +64,14 @@ Margin="5,0,0,0"
 VerticalAlignment="Center"
 ToolTip="If the mascot is visible while you work, its emotions reflect how focused you are which can be motivating. Deselect the mascot if you find it annoying." />
             </StackPanel>
-            <RadioButton Content="yes" GroupName="MascotVisibility" IsChecked="True"/>
-            <RadioButton Content="no" GroupName="MascotVisibility" />
-
+                <RadioButton x:Name="MascotVisibleYes" Content="yes" GroupName="MascotVisibility" IsChecked="True" Checked="MascotVisibilityChanged"/>
+                <RadioButton x:Name="MascotVisibleNo" Content="no" GroupName="MascotVisibility" Checked="MascotVisibilityChanged"/>
 
 
+                <StackPanel x:Name="MotivationSection">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,10,0,0">
                     <TextBlock Style="{StaticResource Header2}" 
-                       Text="Do you want to receive words of affirmation during your focused work?" 
+                       Text="How do you want to be motivated by the mascot?" 
                        HorizontalAlignment="Left" />
                     <TextBlock Text="ⓘ"
 FontSize="14"
@@ -60,25 +79,22 @@ FontWeight="Bold"
 Foreground="Gray"
 Margin="5,0,0,0"
 VerticalAlignment="Center"
-ToolTip="If selected and you work focusedly, the mascot is going to tell you stuff like 'You have not distracted yourself for 30 minutes! I am proud of you!'" />
+ToolTip="If words of affirmation are selected and you work focusedly, the mascot is going to tell you stuff like 'You have not distracted yourself for 30 minutes! I am proud of you!' If insulting words are selected and you distract yourself during the focus mode, the mascot is going to tell you stuff like 'I have already finished 10 exercises - why are you not working focused like me?" />
                 </StackPanel>
-            <RadioButton Content="yes" GroupName="Affirmation" IsChecked="True"/>
-            <RadioButton Content="no" GroupName="Affirmation" />
-
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,10,0,0">
-                <TextBlock Style="{StaticResource Header2}" 
-                       Text="Do you want to receive insulting words when distracted?" 
-                       HorizontalAlignment="Left" />
-                <TextBlock Text="ⓘ"
-FontSize="14"
-FontWeight="Bold"
-Foreground="Gray"
-Margin="5,0,0,0"
-VerticalAlignment="Center"
-ToolTip="If selected and you distract yourself during the focus mdde, the mascot is going to tell you stuff like 'I have already finished 10 exercises - why are you not working focused like me?'" />
+                <StackPanel Orientation="Horizontal"  >
+                    <CheckBox IsChecked="True" VerticalAlignment="Center"/>
+                    <TextBlock
+Style="{StaticResource StandardText}" 
+Text="by words of affirmation"  Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal"  >
+                    <CheckBox IsChecked="True" VerticalAlignment="Center"/>
+                    <TextBlock
+Style="{StaticResource StandardText}" 
+Text="by insulting words"  Margin="10,0,0,0"/>
                 </StackPanel>
-            <RadioButton Content="yes" GroupName="InsultingWords" IsChecked="True"/>
-            <RadioButton Content="no" GroupName="InsultingWords" />
+                </StackPanel>
+
 
                 <!-- Frage 4 -->
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,10,0,0">

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs

@@ -20,20 +20,25 @@ namespace InnoLabProjektDektopApp
         {
             InitializeComponent();
             GlobalSettings.setDefaults(this);
+            MascotVisibilityChanged(null, null);
         }
-        private void Option1_Click(object sender, RoutedEventArgs e)
+        private void MascotVisibilityChanged(object sender, RoutedEventArgs e)
         {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option2_Click(object sender, RoutedEventArgs e)
+            if (MotivationSection == null)
+                return; // Beende die Methode, wenn MotivationSection noch nicht existiert.
+
+            if (MascotVisibleNo.IsChecked == true)
             {
-            //this.Content = new AnotherWindow().Content;
+                MotivationSection.Visibility = Visibility.Collapsed; // Hide the section
             }
-        private void Option3_Click(object sender, RoutedEventArgs e)
+            else
             {
-            //this.Content = new AnotherWindow().Content;
+                MotivationSection.Visibility = Visibility.Visible; // Show the section
+            }
         }
 
+
+
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
 

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs

-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "722CEC0754A69A290956448C60B605124995AEF6"
+#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2DEDC9624A7085F1363F3F7BDB3110EA433383A8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -55,7 +55,7 @@ namespace InnoLabProjektDektopApp {
             _contentLoaded = true;
             
             #line 5 "..\..\..\App.xaml"
-            this.StartupUri = new System.Uri("Screens\\FirstLaunch\\03_0Distractions.xaml", System.UriKind.Relative);
+            this.StartupUri = new System.Uri("Screens\\FirstLaunch\\04Settings.xaml", System.UriKind.Relative);
             
             #line default
             #line hidden

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("CoFlow")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+73b87c35786d586dd4756e6dc3b52f54e681c448")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e2961321cc151ee7cede4bf9555c257ed2b23914")]
 [assembly: System.Reflection.AssemblyProductAttribute("CoFlow")]
 [assembly: System.Reflection.AssemblyTitleAttribute("CoFlow")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache

-f518015b9be01a55fffb14ff88314555d169a3f0bb27c1bc2bc0d9f25efbc1b4
+24cbb5cef908bf0a3eb96bffcadda39115f0192aa8844737e19920cfab54e06a

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.FileListAbsolute.txt

@@ -334,6 +334,13 @@ C:\Users\Phili\Source\Repos\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopA
 C:\Users\Phili\Source\Repos\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\InnoLabProjektDektopApp.genruntimeconfig.cache
 C:\Users\Phili\Source\Repos\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\ref\InnoLabProjektDektopApp.dll
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\blockedProcesses.json
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\distractingWebsites.json
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\gamesicon.png
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\pornicon.png
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\programsicon.png
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\shoppingicon.png
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\socialmediaicon.png
+D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\otherwebsitesicon.png
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\CoFlow.exe
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\CoFlow.deps.json
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\CoFlow.runtimeconfig.json
@@ -382,10 +389,3 @@ D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\Inno
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\CoFlow.pdb
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\InnoLabProjektDektopApp.genruntimeconfig.cache
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\ref\CoFlow.dll
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\distractingWebsites.json
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\otherwebsitesicon.png
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\pornicon.png
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\programsicon.png
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\shoppingicon.png
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\socialmediaicon.png
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\bin\Debug\net8.0-windows\Assets\gamesicon.png

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs

-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "61FB8010297A7DA80B362860DB7102270DDA6530"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "270B341505B1A30E3D1D99B22074D779CCEBBB87"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs

-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "70F75463F00F115CDC8063E45010958B93468414"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0D4685245942886784251546CE55DCBDA31BE979"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -42,6 +42,38 @@ namespace InnoLabProjektDektopApp {
     /// </summary>
     public partial class Settings : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 40 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox SecondsComboBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton MascotVisibleYes;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton MascotVisibleNo;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 71 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel MotivationSection;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -73,8 +105,32 @@ namespace InnoLabProjektDektopApp {
             switch (connectionId)
             {
             case 1:
+            this.SecondsComboBox = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 2:
+            this.MascotVisibleYes = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            this.MascotVisibleYes.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.MascotVisibleNo = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            this.MascotVisibleNo.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.MotivationSection = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 5:
             
-            #line 109 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             ((System.Windows.Controls.ComboBox)(target)).SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
             
             #line default

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs

-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "70F75463F00F115CDC8063E45010958B93468414"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0D4685245942886784251546CE55DCBDA31BE979"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -42,6 +42,38 @@ namespace InnoLabProjektDektopApp {
     /// </summary>
     public partial class Settings : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 40 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox SecondsComboBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton MascotVisibleYes;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.RadioButton MascotVisibleNo;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 71 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel MotivationSection;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -73,8 +105,32 @@ namespace InnoLabProjektDektopApp {
             switch (connectionId)
             {
             case 1:
+            this.SecondsComboBox = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 2:
+            this.MascotVisibleYes = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            this.MascotVisibleYes.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.MascotVisibleNo = ((System.Windows.Controls.RadioButton)(target));
+            
+            #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            this.MascotVisibleNo.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.MotivationSection = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 5:
             
-            #line 109 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             ((System.Windows.Controls.ComboBox)(target)).SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
             
             #line default