Refactor saving state handling in Dog and Profile view models; update application version to 1.283; comment out unused buttons in DogAdd and DogUpdate views for cleaner code.
This commit is contained in:
parent
9b6a847413
commit
5bb8a75169
@ -8,7 +8,7 @@
|
|||||||
x:Class="gehGassiApp.Controls.ShellTitleViewNoLogoControl">
|
x:Class="gehGassiApp.Controls.ShellTitleViewNoLogoControl">
|
||||||
|
|
||||||
<Grid x:Name="rootGrid" BindingContext="{x:Reference this}" ColumnDefinitions="40,*,Auto" ColumnSpacing="5" VerticalOptions="Fill" HorizontalOptions="Fill" Margin="{OnPlatform Default='16,0,16,0', iOS=0}" BackgroundColor="{StaticResource Transparent}" >
|
<Grid x:Name="rootGrid" BindingContext="{x:Reference this}" ColumnDefinitions="40,*,Auto" ColumnSpacing="5" VerticalOptions="Fill" HorizontalOptions="Fill" Margin="{OnPlatform Default='16,0,16,0', iOS=0}" BackgroundColor="{StaticResource Transparent}" >
|
||||||
<Border Grid.Column="0" Style="{StaticResource TitleViewIconBorder}" HorizontalOptions="StartAndExpand" IsVisible="{Binding ViewModel.NavigationBackPossible}">
|
<Border Grid.Column="0" Style="{StaticResource TitleViewIconBorder}" HorizontalOptions="StartAndExpand" IsVisible="{Binding ViewModel.NavigationBackPossible}" IsEnabled="{Binding ViewModel.IsNotSaving}">
|
||||||
<Image Style="{StaticResource TitleViewIconImage}">
|
<Image Style="{StaticResource TitleViewIconImage}">
|
||||||
<Image.Source>
|
<Image.Source>
|
||||||
<FontImageSource Glyph="{x:Static i:IconsMoon.Icon_Arrow_Left}" FontFamily="IconMoon" Size="{StaticResource FontLabelS}" Color="{AppThemeBinding Light={StaticResource Primary_DarkBlue}, Dark={StaticResource Primary_DarkBlue_Dark}}"></FontImageSource>
|
<FontImageSource Glyph="{x:Static i:IconsMoon.Icon_Arrow_Left}" FontFamily="IconMoon" Size="{StaticResource FontLabelS}" Color="{AppThemeBinding Light={StaticResource Primary_DarkBlue}, Dark={StaticResource Primary_DarkBlue_Dark}}"></FontImageSource>
|
||||||
|
|||||||
@ -453,6 +453,7 @@ namespace gehGassiApp.ViewModels.Dogs
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IsSaving = true;
|
||||||
IsNewPhoto = true;
|
IsNewPhoto = true;
|
||||||
|
|
||||||
var extension = ".png";
|
var extension = ".png";
|
||||||
@ -500,6 +501,7 @@ namespace gehGassiApp.ViewModels.Dogs
|
|||||||
|
|
||||||
PhotoPath = newFile;
|
PhotoPath = newFile;
|
||||||
Dog.Photo = PhotoPath;
|
Dog.Photo = PhotoPath;
|
||||||
|
IsSaving = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -454,6 +454,7 @@ namespace gehGassiApp.ViewModels.Dogs
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IsSaving = true;
|
||||||
IsNewPhoto = true;
|
IsNewPhoto = true;
|
||||||
|
|
||||||
var extension = ".png";
|
var extension = ".png";
|
||||||
@ -501,6 +502,7 @@ namespace gehGassiApp.ViewModels.Dogs
|
|||||||
|
|
||||||
PhotoPath = newFile;
|
PhotoPath = newFile;
|
||||||
Dog.Photo = PhotoPath;
|
Dog.Photo = PhotoPath;
|
||||||
|
IsSaving = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -772,6 +772,7 @@ namespace gehGassiApp.ViewModels
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IsSaving = true;
|
||||||
IsNewPhoto = true;
|
IsNewPhoto = true;
|
||||||
|
|
||||||
var extension = ".png";
|
var extension = ".png";
|
||||||
@ -819,6 +820,7 @@ namespace gehGassiApp.ViewModels
|
|||||||
|
|
||||||
PhotoPath = newFile;
|
PhotoPath = newFile;
|
||||||
AppUser.Photo = PhotoPath;
|
AppUser.Photo = PhotoPath;
|
||||||
|
IsSaving = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -961,6 +961,7 @@ namespace gehGassiApp.ViewModels
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IsSaving = true;
|
||||||
IsNewPhoto = true;
|
IsNewPhoto = true;
|
||||||
|
|
||||||
var extension = ".png";
|
var extension = ".png";
|
||||||
@ -1008,6 +1009,7 @@ namespace gehGassiApp.ViewModels
|
|||||||
|
|
||||||
PhotoPath = newFile;
|
PhotoPath = newFile;
|
||||||
AppUser.Photo = PhotoPath;
|
AppUser.Photo = PhotoPath;
|
||||||
|
IsSaving = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -85,7 +85,7 @@
|
|||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
|
||||||
<Button
|
<!--<Button
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
Background="{StaticResource Primary_DarkBlue}"
|
Background="{StaticResource Primary_DarkBlue}"
|
||||||
@ -157,7 +157,7 @@
|
|||||||
Size="18"
|
Size="18"
|
||||||
Color="{StaticResource Primary_White}" />
|
Color="{StaticResource Primary_White}" />
|
||||||
</Button.ImageSource>
|
</Button.ImageSource>
|
||||||
</Button>
|
</Button>-->
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Label
|
<Label
|
||||||
|
|||||||
@ -83,7 +83,7 @@
|
|||||||
</Button.ImageSource>
|
</Button.ImageSource>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button
|
<!--<Button
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
Background="{StaticResource Primary_DarkBlue}"
|
Background="{StaticResource Primary_DarkBlue}"
|
||||||
@ -155,7 +155,7 @@
|
|||||||
Size="18"
|
Size="18"
|
||||||
Color="{StaticResource Primary_White}" />
|
Color="{StaticResource Primary_White}" />
|
||||||
</Button.ImageSource>
|
</Button.ImageSource>
|
||||||
</Button>
|
</Button>-->
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Label
|
<Label
|
||||||
|
|||||||
@ -22,8 +22,8 @@
|
|||||||
<ApplicationIdGuid>284D2BDB-7FFC-485A-968F-8440A92578FE</ApplicationIdGuid>
|
<ApplicationIdGuid>284D2BDB-7FFC-485A-968F-8440A92578FE</ApplicationIdGuid>
|
||||||
|
|
||||||
<!-- Versions -->
|
<!-- Versions -->
|
||||||
<ApplicationDisplayVersion>1.281</ApplicationDisplayVersion>
|
<ApplicationDisplayVersion>1.283</ApplicationDisplayVersion>
|
||||||
<ApplicationVersion>281</ApplicationVersion>
|
<ApplicationVersion>283</ApplicationVersion>
|
||||||
|
|
||||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
||||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion>
|
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user