daniel/Jugenddienst-Stunden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Farben & Cleanup

Browse Source
This commit is contained in:
Daniel Pichler
2025-02-23 20:30:26 +01:00
parent 1a8eeec85d
commit c88bf148d4
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jugenddienst Stunden/Resources/Styles/Colors.xaml
View File

@@ -7,10 +7,10 @@
<!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml --> <!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
<Color x:Key="Primary">#F7931D</Color> <Color x:Key="Primary">#F7931D</Color>
<Color x:Key="PrimaryDark">#ac99ea</Color> <Color x:Key="PrimaryDark">#EC8A16</Color>
<Color x:Key="PrimaryDarkText">#242424</Color> <Color x:Key="PrimaryDarkText">#242424</Color>
<Color x:Key="Secondary">#DFD8F7</Color> <Color x:Key="Secondary">#DFD8F7</Color>
<Color x:Key="SecondaryDarkText">#9880e5</Color> <Color x:Key="SecondaryDarkText">#EC8A16</Color>
<Color x:Key="Tertiary">#2B0B98</Color> <Color x:Key="Tertiary">#2B0B98</Color>
<Color x:Key="TransparentColor">Transparent</Color> <Color x:Key="TransparentColor">Transparent</Color>

2
Jugenddienst Stunden/ViewModels/StundenViewModel.cs
View File

@@ -261,7 +261,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
DayTimes = new List<DayTime>(); DayTimes = new List<DayTime>();
//TODO: hier könnte auch ein Fehler kommen, dann wäre InfoEvent falsch. //TODO: hier könnte auch ein Fehler kommen, dann wäre InfoEvent falsch.
if (Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) { if (Settings.Version!=null && Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
InfoEvent?.Invoke(this, "Version: " + AppInfo.Current.VersionString.Substring(0, 5) + " verfügbar (" + Settings.Version + " installiert)"); InfoEvent?.Invoke(this, "Version: " + AppInfo.Current.VersionString.Substring(0, 5) + " verfügbar (" + Settings.Version + " installiert)");
} else { InfoEvent?.Invoke(this, e.Message); } } else { InfoEvent?.Invoke(this, e.Message); }
} finally { } finally {

2
Jugenddienst Stunden/Views/LoginPage.xaml
View File

@@ -62,7 +62,7 @@
<Entry x:Name="UsernameEntry" Placeholder="Benutzername (Mailadresse)" Keyboard="Email" /> <Entry x:Name="UsernameEntry" Placeholder="Benutzername (Mailadresse)" Keyboard="Email" />
<Entry x:Name="PasswordEntry" Placeholder="Passwort" IsPassword="True" /> <Entry x:Name="PasswordEntry" Placeholder="Passwort" IsPassword="True" />
<Entry x:Name="ServerEntry" Placeholder="Server (gleich wie im Browser)" Keyboard="Url" /> <Entry x:Name="ServerEntry" Placeholder="Server (gleich wie im Browser)" Keyboard="Url" />
<Button Text="Login" Clicked="OnLoginButtonClicked" /> <Button Text="Login" Clicked="OnLoginButtonClicked" TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}" />
</VerticalStackLayout> </VerticalStackLayout>
</VerticalStackLayout> </VerticalStackLayout>

6
Jugenddienst Stunden/Views/StundePage.xaml
View File

@@ -77,13 +77,15 @@
<Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40" AutoSize="TextChanges" FontSize="18" /> <Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40" AutoSize="TextChanges" FontSize="18" />
<Grid ColumnDefinitions="*,*" ColumnSpacing="4"> <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
<Button Grid.Column="1" Text="Speichern" <Button Grid.Column="1" Text="Speichern"
TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"
Command="{Binding SaveCommand}" /> Command="{Binding SaveCommand}" />
<Button Grid.Column="0" Text="Löschen" <Button Grid.Column="0" Text="Löschen"
Command="{Binding DeleteConfirmCommand}" Command="{Binding DeleteConfirmCommand}"
IsEnabled="{Binding DayTime.Id, Converter={StaticResource IntBoolConverter}}" IsEnabled="{Binding DayTime.Id, Converter={StaticResource IntBoolConverter}}"
IsVisible="{Binding FreistellungEnabled}" IsVisible="{Binding FreistellungEnabled}"
BackgroundColor="{StaticResource Gray500}"/> BackgroundColor="{StaticResource Gray500}"
TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"/>
</Grid> </Grid>

5
Jugenddienst Stunden/Views/StundenPage.xaml
View File

@@ -119,7 +119,10 @@
</CollectionView> </CollectionView>
<!--<BoxView HeightRequest="1" Grid.Row="2" Margin="0,5,0,15" />--> <!--<BoxView HeightRequest="1" Grid.Row="2" Margin="0,5,0,15" />-->
<Button Text="{Binding LoadOverview}" Command="{Binding LoadDataCommand}" Grid.Row="2" /> <Button Text="{Binding LoadOverview}"
Grid.Row="2"
Command="{Binding LoadDataCommand}"
TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}" />
<Border Padding="2" Grid.Row="3" Margin="0,10,0,0"> <Border Padding="2" Grid.Row="3" Margin="0,10,0,0">
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,Auto,*,Auto" Margin="10,2"> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,Auto,*,Auto" Margin="10,2">
<Label Grid.Row="0" Text="Soll:" /> <Label Grid.Row="0" Text="Soll:" />

2
Jugenddienst Stunden/Views/StundenPage.xaml.cs
View File

@@ -10,8 +10,6 @@ namespace Jugenddienst_Stunden.Views;
/// </summary> /// </summary>
public partial class StundenPage : ContentPage { public partial class StundenPage : ContentPage {
private int heightValue = 300;
/// <summary> /// <summary>
/// CTOR /// CTOR
/// </summary> /// </summary>