Merge branch 'improvements/homescreen' into net9-upgradeyxc
. klsdfhgölsdfhg <yxc<yxc<yxc dfasdfasdf :wq :::::WQ W Q:WQ W Q:WQ:Wdfasdfasdf :wq :::::WQ W Q:WQ W Q:WQ:Wdfasdfasdf :wq :::::WQ W Q:WQ W Q:WQ:Wdfasdfasdf :wq :::::WQ W Q:WQ W Q:WQ:Wdfasdfasdf :wq :::::WQ W Q:WQ W Q:WQ:Wdfasdfasdf :wq :::::WQ W Q:WQ W Q:WQ:W:
This commit is contained in:
commit
c49c043801
@ -112,6 +112,12 @@ namespace gehGassiApp.ViewModels
|
||||
[ObservableProperty]
|
||||
private ObservableCollection<DogWalkerLookup> _walkers;
|
||||
|
||||
/// <summary>
|
||||
/// First 10 walkers for the home screen display
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private ObservableCollection<DogWalkerLookup> _first10Walkers;
|
||||
|
||||
[ObservableProperty]
|
||||
private DogWalkerLookup _selectedWalker;
|
||||
|
||||
@ -541,6 +547,9 @@ namespace gehGassiApp.ViewModels
|
||||
|
||||
Walkers = requests.Value.ToObservableCollection();
|
||||
|
||||
// Set First10Walkers for the home screen display
|
||||
First10Walkers = requests.Value.Take(10).ToObservableCollection();
|
||||
|
||||
_total = requests.Total;
|
||||
_skip = requests.Skip + requests.Take;
|
||||
}
|
||||
@ -549,6 +558,7 @@ namespace gehGassiApp.ViewModels
|
||||
_total = 0;
|
||||
_skip = 0;
|
||||
Walkers = null;
|
||||
First10Walkers = null;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -557,6 +567,7 @@ namespace gehGassiApp.ViewModels
|
||||
_total = 0;
|
||||
_skip = 0;
|
||||
Walkers = null;
|
||||
First10Walkers = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<controls:BaseContentPage
|
||||
x:Class="gehGassiApp.Views.HomeView"
|
||||
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
@ -23,20 +23,29 @@
|
||||
</controls:BaseContentPage.TitleView>
|
||||
|
||||
<ContentPage.Content>
|
||||
<AbsoluteLayout>
|
||||
<!-- Main scrollable content (full screen) -->
|
||||
<RefreshView
|
||||
x:Name="homeRefreshView"
|
||||
AbsoluteLayout.LayoutBounds="0,0,1,1"
|
||||
AbsoluteLayout.LayoutFlags="All"
|
||||
BackgroundColor="#ffffff"
|
||||
Command="{Binding RefreshWalkersCommand}"
|
||||
IsRefreshing="{Binding WalkersRefreshing}">
|
||||
<ScrollView>
|
||||
<Grid
|
||||
x:Name="rootHomeGrid"
|
||||
Padding="20,20,20,0"
|
||||
Padding="20,20,20,90"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
RowDefinitions="Auto,*"
|
||||
RowDefinitions="Auto,Auto"
|
||||
VerticalOptions="FillAndExpand">
|
||||
|
||||
<VerticalStackLayout
|
||||
x:Name="rootVerticalStackLayout"
|
||||
Grid.Row="0"
|
||||
HorizontalOptions="Fill"
|
||||
SizeChanged="rootVerticalStackLayout_SizeChanged"
|
||||
Spacing="0"
|
||||
VerticalOptions="FillAndExpand">
|
||||
VerticalOptions="Start">
|
||||
<Border x:Name="permissionStatusBorder" Style="{StaticResource PermissionStatusBorder}">
|
||||
<Label Style="{StaticResource PermissionStatusLabel}" Text="{x:Static res:Text.Permission_Location_Error}" />
|
||||
<Border.IsVisible>
|
||||
@ -112,100 +121,49 @@
|
||||
Style="{StaticResource H6_Blue}"
|
||||
Text="{x:Static res:Text.Common_DogWalkers_NearYou}" />
|
||||
|
||||
|
||||
|
||||
</VerticalStackLayout>
|
||||
|
||||
<controls:EmptyListViewControl
|
||||
Grid.Row="1"
|
||||
ImageHeight="150"
|
||||
IsBusy="{Binding IsBusy}"
|
||||
IsNotBusy="{Binding IsNotBusy}"
|
||||
IsVisible="{Binding Walkers, Converter={StaticResource IsListNullOrEmptyConverter}}"
|
||||
ListSource="{Binding Walkers}"
|
||||
NotFoundImage="walking_dogs"
|
||||
NotFoundText="{x:Static res:Text.Walker_NotFound}"
|
||||
RefreshCommand="{Binding RefreshWalkersCommand}"
|
||||
SearchImage="walking_dogs"
|
||||
SearchText="{x:Static res:Text.Walker_Searching}" />
|
||||
|
||||
<RefreshView
|
||||
x:Name="homeRefreshView"
|
||||
Grid.Row="1"
|
||||
BackgroundColor="#ffffff"
|
||||
Command="{Binding RefreshWalkersCommand}"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
IsRefreshing="{Binding WalkersRefreshing}"
|
||||
IsVisible="{Binding Walkers, Converter={StaticResource IsListNotNullOrEmptyConverter}}"
|
||||
Refreshing="RefreshView_Refreshing"
|
||||
VerticalOptions="FillAndExpand">
|
||||
<Grid HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
|
||||
<CollectionView
|
||||
x:Name="homeCollectionView"
|
||||
Background="#ffffff"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
ItemsSource="{Binding Walkers}"
|
||||
RemainingItemsThreshold="5"
|
||||
RemainingItemsThresholdReachedCommand="{Binding LoadMoreCommand}"
|
||||
Scrolled="homeCollectionView_Scrolled"
|
||||
SelectedItem="{Binding SelectedWalker}"
|
||||
SelectionMode="Single"
|
||||
VerticalOptions="Fill"
|
||||
VerticalScrollBarVisibility="Never">
|
||||
<CollectionView.ItemsLayout>
|
||||
<GridItemsLayout Orientation="Vertical" VerticalItemSpacing="12" />
|
||||
</CollectionView.ItemsLayout>
|
||||
<CollectionView.ItemTemplate>
|
||||
<!-- Walker StackLayout (first 10) -->
|
||||
<StackLayout
|
||||
x:Name="walkersStackLayout"
|
||||
BindableLayout.ItemsSource="{Binding First10Walkers}"
|
||||
Spacing="12">
|
||||
<BindableLayout.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<!--<SwipeView BackgroundColor="{StaticResource Primary_White}" Margin="0,0,0,12">
|
||||
<SwipeView.LeftItems>
|
||||
<SwipeItems>
|
||||
<SwipeItemView Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=BlockCommand}" CommandParameter="{Binding .}">
|
||||
<StackLayout HorizontalOptions="Center" VerticalOptions="Center">
|
||||
<Image Source="block_user" WidthRequest="24" HeightRequest="24" HorizontalOptions="Center" VerticalOptions="Center"/>
|
||||
<Label Text="{x:Static res:Text.Common_Block}" HorizontalOptions="Center" Style="{StaticResource BodyS_GreyDark}"></Label>
|
||||
</StackLayout>
|
||||
</SwipeItemView>
|
||||
</SwipeItems>
|
||||
</SwipeView.LeftItems>
|
||||
<SwipeView.RightItems>
|
||||
<SwipeItems>
|
||||
<SwipeItemView Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=ReportCommand}" CommandParameter="{Binding .}">
|
||||
<StackLayout HorizontalOptions="Center" VerticalOptions="Center">
|
||||
<Image Source="report_user" WidthRequest="24" HeightRequest="24" HorizontalOptions="Center" VerticalOptions="Center"/>
|
||||
<Label Text="{x:Static res:Text.Common_Report}" HorizontalOptions="Center" Style="{StaticResource BodyS_GreyDark}"></Label>
|
||||
</StackLayout>
|
||||
</SwipeItemView>
|
||||
</SwipeItems>
|
||||
</SwipeView.RightItems>-->
|
||||
<controls:WalkerListControl DogOwnerHasPremium="{Binding IsPremiumUser}" Walker="{Binding .}">
|
||||
<controls:WalkerListControl DogOwnerHasPremium="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=IsPremiumUser}" Walker="{Binding .}">
|
||||
<controls:WalkerListControl.GestureRecognizers>
|
||||
<TapGestureRecognizer Command="{Binding Source={RelativeSource AncestorType={x:Type viewmodels:HomeViewModel}}, Path=WalkerSelectedCommand}" CommandParameter="{Binding .}" />
|
||||
</controls:WalkerListControl.GestureRecognizers>
|
||||
</controls:WalkerListControl>
|
||||
<!--<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup Name="CommonStates">
|
||||
<VisualState Name="Selected">
|
||||
<VisualState.Setters>
|
||||
<Setter Property="BackgroundColor" Value="{StaticResource Primary_White}" />
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>-->
|
||||
<!--</SwipeView>-->
|
||||
</DataTemplate>
|
||||
</CollectionView.ItemTemplate>
|
||||
</CollectionView>
|
||||
</BindableLayout.ItemTemplate>
|
||||
</StackLayout>
|
||||
|
||||
<!-- "Alle anzeigen" Link Label -->
|
||||
<Label
|
||||
Margin="0,16,0,0"
|
||||
Style="{StaticResource LinkLabelStyle}"
|
||||
HorizontalOptions="Center"
|
||||
Text="Alle anzeigen">
|
||||
<Label.GestureRecognizers>
|
||||
<TapGestureRecognizer Command="{Binding NavigateCommand}" CommandParameter="{x:Static viewmodels:MenuSelected.Walkers}" />
|
||||
</Label.GestureRecognizers>
|
||||
</Label>
|
||||
|
||||
</VerticalStackLayout>
|
||||
|
||||
</Grid>
|
||||
</ScrollView>
|
||||
</RefreshView>
|
||||
|
||||
<!-- Floating Public Request Button (over content) -->
|
||||
<Button
|
||||
Grid.Row="0"
|
||||
Grid.RowSpan="2"
|
||||
Margin="0,0,0,10"
|
||||
Margin="0,0,0,20"
|
||||
AbsoluteLayout.LayoutBounds="0.5,1,300,90"
|
||||
AbsoluteLayout.LayoutFlags="PositionProportional"
|
||||
BackgroundColor="{StaticResource Primary}"
|
||||
Command="{Binding CreatePublicWalkRequestCommand}"
|
||||
ContentLayout="Left, 5"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
CornerRadius="15"
|
||||
HorizontalOptions="Center"
|
||||
LineBreakMode="TailTruncation"
|
||||
Text="{x:Static res:Text.PublicWalkRequest_Title}"
|
||||
VerticalOptions="End">
|
||||
@ -217,7 +175,7 @@
|
||||
</Button.ImageSource>
|
||||
</Button>
|
||||
|
||||
</Grid>
|
||||
</AbsoluteLayout>
|
||||
</ContentPage.Content>
|
||||
|
||||
|
||||
|
||||
@ -10,9 +10,11 @@ public partial class HomeView : BaseContentPage
|
||||
IDeviceInstallationService _deviceInstallationService;
|
||||
IDeviceInstallationService DeviceInstallationService => _deviceInstallationService ??= ServiceHelper.GetService<IDeviceInstallationService>();
|
||||
private HomeViewModel ViewModel => BindingContext as HomeViewModel;
|
||||
private bool _isRowHidden = false;
|
||||
private double _initialRowHeight;
|
||||
private bool _animationRunning = false;
|
||||
|
||||
// COMMENTED OUT: Animation variables for collapsing header
|
||||
//private bool _isRowHidden = false;
|
||||
//private double _initialRowHeight;
|
||||
//private bool _animationRunning = false;
|
||||
|
||||
/// <summary>
|
||||
/// Erstellt eine Instanz
|
||||
@ -31,10 +33,13 @@ public partial class HomeView : BaseContentPage
|
||||
await ViewModel.InitializeAsync(this);
|
||||
var width = DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density;
|
||||
ViewModel.NextWalkWidth = width * 0.8;
|
||||
_isRowHidden = false;
|
||||
_initialRowHeight = 0;
|
||||
_animationRunning = false;
|
||||
rootVerticalStackLayout.HeightRequest = -1;
|
||||
|
||||
// COMMENTED OUT: Animation initialization
|
||||
//_isRowHidden = false;
|
||||
//_initialRowHeight = 0;
|
||||
//_animationRunning = false;
|
||||
//rootVerticalStackLayout.HeightRequest = -1;
|
||||
|
||||
#if IOS
|
||||
if (DeviceInstallationService.NotificationsSupported)
|
||||
{
|
||||
@ -50,74 +55,78 @@ public partial class HomeView : BaseContentPage
|
||||
await ViewModel.DisappearingAsync(this);
|
||||
}
|
||||
|
||||
//Workaround für den IOS-Bug der Höhenberechnung! Siehe https://github.com/dotnet/maui/issues/8820
|
||||
private void rootVerticalStackLayout_SizeChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(!_isRowHidden && rootVerticalStackLayout.Height > _initialRowHeight)
|
||||
_initialRowHeight = rootVerticalStackLayout.Height;
|
||||
}
|
||||
|
||||
private async void homeCollectionView_Scrolled(object sender, ItemsViewScrolledEventArgs e)
|
||||
{
|
||||
if(_animationRunning)
|
||||
return;
|
||||
|
||||
if (e.VerticalDelta > 0 && e.VerticalOffset >= 50 && !_isRowHidden)
|
||||
{
|
||||
await HideHeader();
|
||||
}
|
||||
else if (e.VerticalDelta < 0 && e.VerticalOffset <= 50 && _isRowHidden)
|
||||
{
|
||||
await ShowHeader();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ShowHeader()
|
||||
{
|
||||
homeRefreshView.IsEnabled = false;
|
||||
homeCollectionView.IsEnabled = false;
|
||||
_isRowHidden = false;
|
||||
_animationRunning = true;
|
||||
var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, 0, _initialRowHeight);
|
||||
|
||||
MainThread.BeginInvokeOnMainThread(() =>
|
||||
{
|
||||
animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinIn);
|
||||
|
||||
});
|
||||
|
||||
await Task.Delay(500);
|
||||
_animationRunning = false;
|
||||
homeCollectionView.IsEnabled = true;
|
||||
homeRefreshView.IsEnabled = true;
|
||||
}
|
||||
|
||||
private async Task HideHeader()
|
||||
{
|
||||
homeRefreshView.IsEnabled = false;
|
||||
homeCollectionView.IsEnabled = false;
|
||||
_isRowHidden = true;
|
||||
_animationRunning = true;
|
||||
var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, _initialRowHeight, 0);
|
||||
|
||||
MainThread.BeginInvokeOnMainThread(() =>
|
||||
{
|
||||
animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinOut);
|
||||
|
||||
});
|
||||
|
||||
await Task.Delay(500);
|
||||
_animationRunning = false;
|
||||
homeCollectionView.IsEnabled = true;
|
||||
homeRefreshView.IsEnabled = true;
|
||||
}
|
||||
|
||||
private async void RefreshView_Refreshing(object sender, EventArgs e)
|
||||
{
|
||||
if (_isRowHidden)
|
||||
{
|
||||
await ShowHeader();
|
||||
}
|
||||
}
|
||||
// COMMENTED OUT: Workaround für den IOS-Bug der Höhenberechnung! Siehe https://github.com/dotnet/maui/issues/8820
|
||||
//private void rootVerticalStackLayout_SizeChanged(object sender, EventArgs e)
|
||||
//{
|
||||
// if(!_isRowHidden && rootVerticalStackLayout.Height > _initialRowHeight)
|
||||
// _initialRowHeight = rootVerticalStackLayout.Height;
|
||||
//}
|
||||
|
||||
// COMMENTED OUT: Scroll handler for collapsing animation
|
||||
//private async void homeCollectionView_Scrolled(object sender, ItemsViewScrolledEventArgs e)
|
||||
//{
|
||||
// if(_animationRunning)
|
||||
// return;
|
||||
//
|
||||
// if (e.VerticalDelta > 0 && e.VerticalOffset >= 50 && !_isRowHidden)
|
||||
// {
|
||||
// await HideHeader();
|
||||
// }
|
||||
// else if (e.VerticalDelta < 0 && e.VerticalOffset <= 50 && _isRowHidden)
|
||||
// {
|
||||
// await ShowHeader();
|
||||
// }
|
||||
//}
|
||||
|
||||
// COMMENTED OUT: Show header animation
|
||||
//private async Task ShowHeader()
|
||||
//{
|
||||
// homeRefreshView.IsEnabled = false;
|
||||
// homeCollectionView.IsEnabled = false;
|
||||
// _isRowHidden = false;
|
||||
// _animationRunning = true;
|
||||
// var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, 0, _initialRowHeight);
|
||||
|
||||
// MainThread.BeginInvokeOnMainThread(() =>
|
||||
// {
|
||||
// animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinIn);
|
||||
//
|
||||
// });
|
||||
|
||||
// await Task.Delay(500);
|
||||
// _animationRunning = false;
|
||||
// homeCollectionView.IsEnabled = true;
|
||||
// homeRefreshView.IsEnabled = true;
|
||||
//}
|
||||
|
||||
// COMMENTED OUT: Hide header animation
|
||||
//private async Task HideHeader()
|
||||
//{
|
||||
// homeRefreshView.IsEnabled = false;
|
||||
// homeCollectionView.IsEnabled = false;
|
||||
// _isRowHidden = true;
|
||||
// _animationRunning = true;
|
||||
// var animation = new Animation(v => rootVerticalStackLayout.HeightRequest = v, _initialRowHeight, 0);
|
||||
//
|
||||
// MainThread.BeginInvokeOnMainThread(() =>
|
||||
// {
|
||||
// animation.Commit(this, "HideRowAnimation", length: 500, easing: Easing.SinOut);
|
||||
//
|
||||
// });
|
||||
//
|
||||
// await Task.Delay(500);
|
||||
// _animationRunning = false;
|
||||
// homeCollectionView.IsEnabled = true;
|
||||
// homeRefreshView.IsEnabled = true;
|
||||
//}
|
||||
|
||||
// COMMENTED OUT: RefreshView refreshing handler
|
||||
//private async void RefreshView_Refreshing(object sender, EventArgs e)
|
||||
//{
|
||||
// if (_isRowHidden)
|
||||
// {
|
||||
// await ShowHeader();
|
||||
// }
|
||||
//}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user