Skip to content

Commit 4bec288

Browse files
author
Javier Suárez Ruiz
committed
Adjust Settings View to iOS
1 parent f923aa6 commit 4bec288

3 files changed

Lines changed: 29 additions & 3 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
x:Class="eShopOnContainers.Core.Views.SettingsView"
5-
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
5+
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
6+
xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
7+
xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
8+
xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
69
Title="Settings">
710
<ContentPage.Resources>
811
<ResourceDictionary>
@@ -39,14 +42,37 @@
3942
<Setter Property="Margin"
4043
Value="12, 12, 12, 0" />
4144
</Style>
45+
46+
<animations:StoryBoard
47+
x:Key="MockServicesAnimation"
48+
Target="{x:Reference MockServices}">
49+
<animations:FadeInAnimation
50+
Direction="Up">
51+
<animations:FadeInAnimation.Duration>
52+
<OnPlatform
53+
x:TypeArguments="x:String"
54+
Android="500"
55+
iOS="0"
56+
WinPhone="500"/>
57+
</animations:FadeInAnimation.Duration>
58+
</animations:FadeInAnimation>
59+
</animations:StoryBoard>
4260

4361
</ResourceDictionary>
4462
</ContentPage.Resources>
63+
<ContentPage.Triggers>
64+
<EventTrigger
65+
Event="Appearing">
66+
<triggers:BeginAnimation
67+
Animation="{StaticResource MockServicesAnimation}" />
68+
</EventTrigger>
69+
</ContentPage.Triggers>
4570
<Grid
4671
BackgroundColor="{StaticResource BackgroundColor}">
4772
<!-- SETTINGS -->
4873
<ScrollView>
49-
<StackLayout>
74+
<StackLayout
75+
x:Name="MockServices">
5076
<!-- MOCK SERVICES -->
5177
<Grid>
5278
<Grid.ColumnDefinitions>

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ namespace eShopOnContainers.Droid.Activities
1212
Label = "eShopOnContainers",
1313
Icon = "@drawable/icon",
1414
Theme = "@style/MainTheme",
15-
MainLauncher = true,
1615
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
1716
public class MainActivity : FormsAppCompatActivity
1817
{
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
33
<uses-sdk android:minSdkVersion="15" />
4+
<uses-permission android:name="android.permission.INTERNET" />
45
<application android:label="eShopOnContainers" android:icon="@drawable/icon"></application>
56
</manifest>

0 commit comments

Comments
 (0)