Skip to content

Commit f3dee0b

Browse files
committed
Updated Images
1 parent 7a7bf42 commit f3dee0b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+138
-96
lines changed

MarketCap/MainPage.xaml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
x:Class="MarketCap.MainPage">
77

88
<Border Margin="25" Padding="{OnPlatform Default=8, Android=7,iOS=7}" StrokeThickness="3" Stroke="Gray" StrokeShape="RoundRectangle 15">
9-
<chart:SfCartesianChart HorizontalOptions="Fill" VerticalOptions="FillAndExpand" >
9+
<chart:SfCartesianChart HorizontalOptions="Fill" VerticalOptions="FillAndExpand">
1010
<chart:SfCartesianChart.Title>
1111
<Grid>
1212
<Grid.RowDefinitions>
@@ -17,12 +17,12 @@
1717
<ColumnDefinition Width="Auto"/>
1818
</Grid.ColumnDefinitions>
1919

20-
<Path Data="M3.2999878,20.999992L3.2999878,31.099993 0,31.099993 0,24.300009z M7.4000244,16.900018L7.4000244,31.099993 4.0999756,31.099993 4.0999756,20.30001z M16.400024,16.499994L18.599976,18.700004 19.700012,17.599998 19.700012,31.099993 16.400024,31.099993z M23.799988,13.600001L23.799988,31.199999 20.5,31.199999 20.5,16.900018z M11.5,12.800013L11.5,31.099993 8.2000122,31.099993 8.2000122,16.1z M12.299988,12.400019L15.599976,15.700006 15.599976,31.099993 12.299988,31.099993z M27.900024,9.499996L27.900024,31.199999 24.599976,31.199999 24.599976,12.800013z M28.700012,9.1000021L29,9.1000021 32,12.100001 32,31.099993 28.700012,31.099993z M31.400024,0L31.099976,7.2000096 28.900024,4.9999983 18.200012,15.700006 17.900024,15.999993 11.700012,9.8000143 0.70001221,20.80001 0.70001221,15.800012 11.599976,4.8000167 17.900024,11.100002 26.400024,2.6000052 24.200012,0.4000244z" Fill="#FF000000" Margin="10,15,10,0" >
20+
<Path Data="M3.2999878,20.999992L3.2999878,31.099993 0,31.099993 0,24.300009z M7.4000244,16.900018L7.4000244,31.099993 4.0999756,31.099993 4.0999756,20.30001z M16.400024,16.499994L18.599976,18.700004 19.700012,17.599998 19.700012,31.099993 16.400024,31.099993z M23.799988,13.600001L23.799988,31.199999 20.5,31.199999 20.5,16.900018z M11.5,12.800013L11.5,31.099993 8.2000122,31.099993 8.2000122,16.1z M12.299988,12.400019L15.599976,15.700006 15.599976,31.099993 12.299988,31.099993z M27.900024,9.499996L27.900024,31.199999 24.599976,31.199999 24.599976,12.800013z M28.700012,9.1000021L29,9.1000021 32,12.100001 32,31.099993 28.700012,31.099993z M31.400024,0L31.099976,7.2000096 28.900024,4.9999983 18.200012,15.700006 17.900024,15.999993 11.700012,9.8000143 0.70001221,20.80001 0.70001221,15.800012 11.599976,4.8000167 17.900024,11.100002 26.400024,2.6000052 24.200012,0.4000244z" Fill="#FF000000" Margin="10,15,10,0">
2121
<Path.RenderTransform>
2222
<TransformGroup>
2323
<TransformGroup.Children>
24-
<RotateTransform Angle="0" />
25-
<ScaleTransform ScaleX="1" ScaleY="1" />
24+
<RotateTransform Angle="0"/>
25+
<ScaleTransform ScaleX="1" ScaleY="1"/>
2626
</TransformGroup.Children>
2727
</TransformGroup>
2828
</Path.RenderTransform>
@@ -41,8 +41,9 @@
4141
<chart:SfCartesianChart.TooltipBehavior>
4242
<chart:ChartTooltipBehavior/>
4343
</chart:SfCartesianChart.TooltipBehavior>
44+
4445
<chart:SfCartesianChart.XAxes>
45-
<chart:NumericalAxis Minimum="0" Maximum="400" ShowMajorGridLines="False">
46+
<chart:NumericalAxis Minimum="0" Maximum="400" ShowMajorGridLines="False">
4647
<chart:NumericalAxis.Title>
4748
<chart:ChartAxisTitle Text="Countries GDP Levels"/>
4849
</chart:NumericalAxis.Title>
@@ -59,7 +60,7 @@
5960
</chart:SfCartesianChart.XAxes>
6061

6162
<chart:SfCartesianChart.YAxes>
62-
<chart:NumericalAxis Minimum="0" Maximum="6000" Interval="1000" ShowMajorGridLines="False" LabelCreated="OnLabelCreated" PlotOffsetStart="10">
63+
<chart:NumericalAxis Minimum="0" Maximum="6000" Interval="1000" ShowMajorGridLines="False" LabelCreated="OnLabelCreated" PlotOffsetStart="10">
6364
<chart:NumericalAxis.Title>
6465
<chart:ChartAxisTitle Text="No of Companies"/>
6566
</chart:NumericalAxis.Title>
@@ -75,14 +76,14 @@
7576
</chart:NumericalAxis>
7677
</chart:SfCartesianChart.YAxes>
7778

78-
<model:BubbleExt XBindingPath="Gdp" MaximumRadius="{OnPlatform Android=28, Default=50, iOS=28}" MinimumRadius="5" EnableTooltip="True"
79+
<model:BubbleExt XBindingPath="Gdp" MaximumRadius="{OnPlatform Android=28, Default=50, iOS=28}" MinimumRadius="5" EnableTooltip="True"
7980
YBindingPath="Company" SizeValuePath="Size" Stroke="Black" StrokeWidth="2"
8081
ItemsSource="{Binding MarketCapData}"
8182
EnableAnimation="True">
8283

8384
<chart:BubbleSeries.TooltipTemplate>
8485
<DataTemplate>
85-
<Grid BackgroundColor="Black">
86+
<Grid BackgroundColor="Black">
8687
<Grid.RowDefinitions>
8788
<RowDefinition Height="Auto"/>
8889
<RowDefinition Height="Auto"/>
@@ -93,17 +94,15 @@
9394
</Grid.ColumnDefinitions>
9495
<Grid Grid.Row="0" Grid.Column="0" Margin="3,5,10,3">
9596
<HorizontalStackLayout HorizontalOptions="Center">
96-
97-
<Label Text="{Binding Item.Name}" FontSize="18" TextColor="White" HorizontalTextAlignment="Center" Margin="0,0,0,0"/>
97+
<Label Text="{Binding Item.Name}" FontSize="18" TextColor="White" HorizontalTextAlignment="Center" Margin="0,0,0,0"/>
9898
</HorizontalStackLayout>
9999
</Grid>
100-
<BoxView Grid.Row="1" Grid.Column="0" VerticalOptions="Center" BackgroundColor="White" HeightRequest="1" />
101-
100+
<BoxView Grid.Row="1" Grid.Column="0" VerticalOptions="Center" BackgroundColor="White" HeightRequest="1"/>
102101
<Grid Grid.Row="2" Grid.Column="0" Margin="3,5,10,3">
103102
<StackLayout>
104-
<Label Text="{Binding Item.Gdp,StringFormat='GDP : {0} '}" TextColor="White" VerticalTextAlignment="Center" HorizontalTextAlignment="Start" />
105-
<Label Text="{Binding Item.Company,StringFormat='Companies listed : {0} '}" TextColor="White" VerticalTextAlignment="Center" HorizontalTextAlignment="Start" />
106-
<Label Text="{Binding Item.Size,StringFormat='Market Cap : € {0} B '}" TextColor="White" VerticalTextAlignment="Center" HorizontalTextAlignment="Start" />
103+
<Label Text="{Binding Item.Gdp,StringFormat='GDP : {0} '}" TextColor="White" VerticalTextAlignment="Center" HorizontalTextAlignment="Start"/>
104+
<Label Text="{Binding Item.Company,StringFormat='Companies listed : {0} '}" TextColor="White" VerticalTextAlignment="Center" HorizontalTextAlignment="Start"/>
105+
<Label Text="{Binding Item.Size,StringFormat='Market Cap : € {0} B '}" TextColor="White" VerticalTextAlignment="Center" HorizontalTextAlignment="Start"/>
107106
</StackLayout>
108107
</Grid>
109108
</Grid>
@@ -112,6 +111,4 @@
112111
</model:BubbleExt>
113112
</chart:SfCartesianChart>
114113
</Border>
115-
116-
117114
</ContentPage>

MarketCap/MarketCap.csproj

Lines changed: 82 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -55,95 +55,138 @@
5555
</ItemGroup>
5656

5757
<ItemGroup>
58+
<None Remove="Resources\Images\Australia.png" />
5859
<None Remove="Resources\Images\australia1.png" />
60+
<None Remove="Resources\Images\Belgium.png" />
5961
<None Remove="Resources\Images\belgium1.png" />
62+
<None Remove="Resources\Images\Brazil.png" />
6063
<None Remove="Resources\Images\brazil1.png" />
64+
<None Remove="Resources\Images\Canada.png" />
6165
<None Remove="Resources\Images\canada1.png" />
66+
<None Remove="Resources\Images\Chile.png" />
6267
<None Remove="Resources\Images\chile1.png" />
68+
<None Remove="Resources\Images\china.png" />
6369
<None Remove="Resources\Images\china1.png" />
70+
<None Remove="Resources\Images\Denmark.png" />
6471
<None Remove="Resources\Images\denmark1.png" />
6572
<None Remove="Resources\Images\dotnet_bot.png" />
73+
<None Remove="Resources\Images\Finland.png" />
6674
<None Remove="Resources\Images\finland1.png" />
75+
<None Remove="Resources\Images\france.png" />
6776
<None Remove="Resources\Images\france1.png" />
77+
<None Remove="Resources\Images\Germany.png" />
6878
<None Remove="Resources\Images\germany1.png" />
6979
<None Remove="Resources\Images\hongkong1.png" />
80+
<None Remove="Resources\Images\india.png" />
7081
<None Remove="Resources\Images\india1.png" />
82+
<None Remove="Resources\Images\Indonesia.png" />
7183
<None Remove="Resources\Images\indonesia1.png" />
84+
<None Remove="Resources\Images\Iran.png" />
7285
<None Remove="Resources\Images\iran1.png" />
86+
<None Remove="Resources\Images\Israel.png" />
7387
<None Remove="Resources\Images\israel1.png" />
88+
<None Remove="Resources\Images\Italy.png" />
7489
<None Remove="Resources\Images\italy1.png" />
90+
<None Remove="Resources\Images\japan.png" />
7591
<None Remove="Resources\Images\japan1.png" />
92+
<None Remove="Resources\Images\Kuwait.png" />
93+
<None Remove="Resources\Images\Malaysia.png" />
7694
<None Remove="Resources\Images\malaysia1.png" />
95+
<None Remove="Resources\Images\Mexico.png" />
7796
<None Remove="Resources\Images\mexico1.png" />
97+
<None Remove="Resources\Images\Netherlands.png" />
7898
<None Remove="Resources\Images\netherlands1.png" />
99+
<None Remove="Resources\Images\Norway.png" />
79100
<None Remove="Resources\Images\norway1.png" />
101+
<None Remove="Resources\Images\Philippines.png" />
102+
<None Remove="Resources\Images\Poland.png" />
103+
<None Remove="Resources\Images\Qatar.png" />
104+
<None Remove="Resources\Images\Russia.png" />
80105
<None Remove="Resources\Images\russia1.png" />
106+
<None Remove="Resources\Images\SaudiArabia.png" />
81107
<None Remove="Resources\Images\saudiarabia1.png" />
108+
<None Remove="Resources\Images\Singapore.png" />
82109
<None Remove="Resources\Images\singapore1.png" />
110+
<None Remove="Resources\Images\SouthAfrica.png" />
83111
<None Remove="Resources\Images\southafrica1.png" />
112+
<None Remove="Resources\Images\SouthKorea.png" />
84113
<None Remove="Resources\Images\south_korea1.png" />
114+
<None Remove="Resources\Images\Spain.png" />
85115
<None Remove="Resources\Images\spain1.png" />
116+
<None Remove="Resources\Images\Sweden.png" />
86117
<None Remove="Resources\Images\sweden1.png" />
118+
<None Remove="Resources\Images\Switzerland.png" />
87119
<None Remove="Resources\Images\switzerland1.png" />
120+
<None Remove="Resources\Images\Taiwan.png" />
88121
<None Remove="Resources\Images\taiwan1.png" />
122+
<None Remove="Resources\Images\Thailand.png" />
89123
<None Remove="Resources\Images\thailand1.png" />
90124
<None Remove="Resources\Images\trend.png" />
125+
<None Remove="Resources\Images\Turkey.png" />
91126
<None Remove="Resources\Images\turkey1.png" />
92127
<None Remove="Resources\Images\uae1.png" />
93128
<None Remove="Resources\Images\uk1.png" />
129+
<None Remove="Resources\Images\UnitedArabEmirates.png" />
130+
<None Remove="Resources\Images\UnitedKingdom.png" />
131+
<None Remove="Resources\Images\UnitedStates.png" />
94132
<None Remove="Resources\Images\us1.png" />
133+
<None Remove="Resources\Images\Vietnam.png" />
95134
<None Remove="Resources\Images\vietnam1.png" />
96135
</ItemGroup>
97136

98137
<ItemGroup>
99-
<EmbeddedResource Include="Resources\Images\us1.png" />
138+
<EmbeddedResource Include="Resources\Images\Canada.png" />
100139
</ItemGroup>
101140

102141
<ItemGroup>
103-
<EmbeddedResource Include="Resources\Images\australia1.png" />
104-
<EmbeddedResource Include="Resources\Images\belgium1.png" />
105-
<EmbeddedResource Include="Resources\Images\brazil1.png" />
106-
<EmbeddedResource Include="Resources\Images\canada1.png" />
107-
<EmbeddedResource Include="Resources\Images\chile1.png" />
108-
<EmbeddedResource Include="Resources\Images\china1.png" />
109-
<EmbeddedResource Include="Resources\Images\denmark1.png" />
110-
<EmbeddedResource Include="Resources\Images\dotnet_bot.png" />
111-
<EmbeddedResource Include="Resources\Images\finland1.png" />
112-
<EmbeddedResource Include="Resources\Images\france1.png" />
113-
<EmbeddedResource Include="Resources\Images\germany1.png" />
114-
<EmbeddedResource Include="Resources\Images\hongkong1.png" />
115-
<EmbeddedResource Include="Resources\Images\india1.png" />
116-
<EmbeddedResource Include="Resources\Images\indonesia1.png" />
117-
<EmbeddedResource Include="Resources\Images\iran1.png" />
118-
<EmbeddedResource Include="Resources\Images\israel1.png" />
119-
<EmbeddedResource Include="Resources\Images\italy1.png" />
120-
<EmbeddedResource Include="Resources\Images\japan1.png" />
121-
<EmbeddedResource Include="Resources\Images\malaysia1.png" />
122-
<EmbeddedResource Include="Resources\Images\mexico1.png" />
123-
<EmbeddedResource Include="Resources\Images\netherlands1.png" />
124-
<EmbeddedResource Include="Resources\Images\norway1.png" />
125-
<EmbeddedResource Include="Resources\Images\russia1.png" />
126-
<EmbeddedResource Include="Resources\Images\saudiarabia1.png" />
127-
<EmbeddedResource Include="Resources\Images\singapore1.png" />
128-
<EmbeddedResource Include="Resources\Images\southafrica1.png" />
129-
<EmbeddedResource Include="Resources\Images\south_korea1.png" />
130-
<EmbeddedResource Include="Resources\Images\spain1.png" />
131-
<EmbeddedResource Include="Resources\Images\sweden1.png" />
132-
<EmbeddedResource Include="Resources\Images\switzerland1.png" />
133-
<EmbeddedResource Include="Resources\Images\taiwan1.png" />
134-
<EmbeddedResource Include="Resources\Images\thailand1.png" />
135-
<EmbeddedResource Include="Resources\Images\trend.png" />
136-
<EmbeddedResource Include="Resources\Images\turkey1.png" />
137-
<EmbeddedResource Include="Resources\Images\uae1.png" />
138-
<EmbeddedResource Include="Resources\Images\uk1.png" />
139-
<EmbeddedResource Include="Resources\Images\vietnam1.png" />
142+
<EmbeddedResource Include="Resources\Images\Australia.png" />
143+
<EmbeddedResource Include="Resources\Images\Belgium.png" />
144+
<EmbeddedResource Include="Resources\Images\Brazil.png" />
145+
<EmbeddedResource Include="Resources\Images\Chile.png" />
146+
</ItemGroup>
147+
148+
<ItemGroup>
149+
<EmbeddedResource Include="Resources\Images\China.png" />
150+
<EmbeddedResource Include="Resources\Images\Denmark.png" />
151+
<EmbeddedResource Include="Resources\Images\Finland.png" />
152+
<EmbeddedResource Include="Resources\Images\France.png" />
153+
<EmbeddedResource Include="Resources\Images\Germany.png" />
154+
<EmbeddedResource Include="Resources\Images\India.png" />
155+
<EmbeddedResource Include="Resources\Images\Indonesia.png" />
156+
<EmbeddedResource Include="Resources\Images\Iran.png" />
157+
<EmbeddedResource Include="Resources\Images\Israel.png" />
158+
<EmbeddedResource Include="Resources\Images\Italy.png" />
159+
<EmbeddedResource Include="Resources\Images\Japan.png" />
160+
<EmbeddedResource Include="Resources\Images\Kuwait.png" />
161+
<EmbeddedResource Include="Resources\Images\Malaysia.png" />
162+
<EmbeddedResource Include="Resources\Images\Mexico.png" />
163+
<EmbeddedResource Include="Resources\Images\Netherlands.png" />
164+
<EmbeddedResource Include="Resources\Images\Norway.png" />
165+
<EmbeddedResource Include="Resources\Images\Philippines.png" />
166+
<EmbeddedResource Include="Resources\Images\Poland.png" />
167+
<EmbeddedResource Include="Resources\Images\Qatar.png" />
168+
<EmbeddedResource Include="Resources\Images\Russia.png" />
169+
<EmbeddedResource Include="Resources\Images\SaudiArabia.png" />
170+
<EmbeddedResource Include="Resources\Images\Singapore.png" />
171+
<EmbeddedResource Include="Resources\Images\SouthAfrica.png" />
172+
<EmbeddedResource Include="Resources\Images\SouthKorea.png" />
173+
<EmbeddedResource Include="Resources\Images\Spain.png" />
174+
<EmbeddedResource Include="Resources\Images\Sweden.png" />
175+
<EmbeddedResource Include="Resources\Images\Switzerland.png" />
176+
<EmbeddedResource Include="Resources\Images\Taiwan.png" />
177+
<EmbeddedResource Include="Resources\Images\Thailand.png" />
178+
<EmbeddedResource Include="Resources\Images\Turkey.png" />
179+
<EmbeddedResource Include="Resources\Images\UnitedArabEmirates.png" />
180+
<EmbeddedResource Include="Resources\Images\UnitedKingdom.png" />
181+
<EmbeddedResource Include="Resources\Images\UnitedStates.png" />
182+
<EmbeddedResource Include="Resources\Images\Vietnam.png" />
140183
</ItemGroup>
141184

142185
<ItemGroup>
143186
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
144187
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
145188
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
146-
<PackageReference Include="Syncfusion.Maui.Charts" Version="27.1.52" />
189+
<PackageReference Include="Syncfusion.Maui.Charts" Version="*" />
147190
</ItemGroup>
148191

149192
</Project>

MarketCap/Model/MarkerCapModel.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ public class MarketCapModel
1010
{
1111
public string Name { get; set; }
1212
public Microsoft.Maui.Graphics.IImage? ImageIcon { get; set; }
13-
1413
public double Company { get; set; }
1514
public double Size { get; set; }
1615
public double Gdp { get; set; }
17-
public MarketCapModel() { }
16+
17+
public MarketCapModel()
18+
{
19+
20+
}
1821

1922
public MarketCapModel(double value, double size, double weight, string name, Microsoft.Maui.Graphics.IImage imageIcon)
2023
{

MarketCap/Platforms/iOS/Info.plist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</array>
1616
<key>UISupportedInterfaceOrientations</key>
1717
<array>
18-
<string>UIInterfaceOrientationPortrait</string>
1918
<string>UIInterfaceOrientationLandscapeLeft</string>
2019
<string>UIInterfaceOrientationLandscapeRight</string>
2120
</array>
3.05 KB
1.07 KB
3.06 KB
1.46 KB
1.58 KB
2.73 KB

0 commit comments

Comments
 (0)