Nextrek
Diff Revisions
659
vs
660
for /Android/SmartCharging/SmartCharging_WP/SmartCharging/StandardUserLoggedInPage.xaml
|
@@ -11,11 +11,7 @@ |
11 |
11 |
|
|
12 |
12 |
|
<Grid x:Name="LayoutRoot" Background="#2cdaff"> |
13 |
13 |
|
|
14 |
|
- |
<Grid.ChildrenTransitions> |
15 |
|
- |
<TransitionCollection> |
16 |
|
- |
<EntranceThemeTransition/> |
17 |
|
- |
</TransitionCollection> |
18 |
|
- |
</Grid.ChildrenTransitions> |
|
14 |
+ |
|
19 |
15 |
|
|
20 |
16 |
|
<Grid.RowDefinitions> |
21 |
17 |
|
<RowDefinition Height="*"/> |
|
@@ -24,8 +20,10 @@ |
24 |
20 |
|
</Grid.RowDefinitions> |
25 |
21 |
|
|
26 |
22 |
|
|
27 |
|
- |
<Image Grid.Row="0" Source="Assets/splash-half.png" NineGrid="0" IsHoldingEnabled="False" IsHitTestVisible="False" IsDoubleTapEnabled="False" IsRightTapEnabled="False" IsTapEnabled="False" RenderTransformOrigin="0.5,0.5" > |
28 |
|
- |
</Image> |
|
23 |
+ |
<!--<Image Grid.Row="0" Source="Assets/splash-half.png" NineGrid="0" IsHoldingEnabled="False" IsHitTestVisible="False" IsDoubleTapEnabled="False" IsRightTapEnabled="False" IsTapEnabled="False" RenderTransformOrigin="0.5,0.5" > |
|
24 |
+ |
</Image>--> |
|
25 |
+ |
|
|
26 |
+ |
<local:Header Grid.Row="0"></local:Header> |
29 |
27 |
|
|
30 |
28 |
|
<!--TODO: Content should be placed within the following grid--> |
31 |
29 |
|
<Rectangle Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Stroke="White" Fill="White" ></Rectangle> |
|
@@ -58,7 +56,7 @@ |
58 |
56 |
|
<Button x:Name="ChargeWithPreferenceButton" x:Uid="ChargeWithPreferenceButton" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" BorderBrush="#FF564966" Content="Ricarica con preferenze" Foreground="#FF564966" Margin="0" Height="64" Style="{StaticResource ButtonStyleFlat}" FontSize="14" /> |
59 |
57 |
|
|
60 |
58 |
|
|
61 |
|
- |
<ComboBox x:Name="SiteTypeCombo" x:Uid="SiteTypeCombo" PlaceholderText="Tipologie di locali" Grid.Row="2" Grid.RowSpan="100" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Header="" Foreground="#FF666666" Background="#FFD1D1D1" SelectionChanged="SiteTypeCombo_SelectionChanged" MaxDropDownHeight="50" VerticalContentAlignment="Stretch" VerticalAlignment="Top" Height="60" BorderThickness="1"> |
|
59 |
+ |
<!--<ComboBox x:Name="SiteTypeCombo" x:Uid="SiteTypeCombo" PlaceholderText="Tipologie di locali" Grid.Row="2" Grid.RowSpan="100" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Header="" Foreground="#FF666666" Background="#FFD1D1D1" SelectionChanged="SiteTypeCombo_SelectionChanged" MaxDropDownHeight="50" VerticalContentAlignment="Stretch" VerticalAlignment="Top" Height="60" BorderThickness="1"> |
62 |
60 |
|
|
63 |
61 |
|
<ComboBoxItem> |
64 |
62 |
|
<x:String>Item 1</x:String> |
|
@@ -75,13 +73,36 @@ |
75 |
73 |
|
<ComboBoxItem> |
76 |
74 |
|
<x:String>Item 5</x:String> |
77 |
75 |
|
</ComboBoxItem> |
78 |
|
- |
</ComboBox> |
79 |
|
- |
|
|
76 |
+ |
</ComboBox>--> |
80 |
77 |
|
|
|
78 |
+ |
<Button x:Name="SiteTypeButton" x:Uid="SiteTypeButton" Content="Tipologie di locali" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Style="{StaticResource ButtonStyleFlat}" FontSize="14" Padding="0,0,10,0" BorderThickness="0" Margin="0,3,3,3" Background="#FFD1D1D1" Foreground="#FF666666"> |
|
79 |
+ |
|
|
80 |
+ |
<Button.Flyout > |
|
81 |
+ |
<Flyout > |
|
82 |
+ |
<ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto"> |
|
83 |
+ |
<ListView x:Name="SiteTypeList"> |
|
84 |
+ |
<ListView.ItemsPanel> |
|
85 |
+ |
<ItemsPanelTemplate> |
|
86 |
+ |
<StackPanel Orientation="Vertical"></StackPanel> |
|
87 |
+ |
</ItemsPanelTemplate> |
|
88 |
+ |
</ListView.ItemsPanel> |
|
89 |
+ |
<ListView.ItemTemplate> |
|
90 |
+ |
<DataTemplate> |
|
91 |
+ |
<ListBoxItem Content="{Binding Label}" FontSize="20" Tapped="ListBoxItem_Tapped" Margin="10,10"></ListBoxItem> |
|
92 |
+ |
</DataTemplate> |
|
93 |
+ |
</ListView.ItemTemplate> |
|
94 |
+ |
</ListView> |
|
95 |
+ |
</ScrollViewer> |
|
96 |
+ |
</Flyout> |
|
97 |
+ |
|
|
98 |
+ |
</Button.Flyout> |
|
99 |
+ |
</Button> |
81 |
100 |
|
|
|
101 |
+ |
|
82 |
102 |
|
</Grid> |
83 |
103 |
|
|
|
104 |
+ |
<ProgressRing x:Name="Loader" IsActive="True" Grid.RowSpan="100" Grid.ColumnSpan="100" Background="#99000000" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" IsHitTestVisible="True" Visibility="Collapsed" Foreground="#FF2CDAFF"/> |
|
105 |
+ |
|
84 |
106 |
|
|
85 |
|
- |
|
86 |
107 |
|
</Grid> |
87 |
108 |
|
</Page> |