Browse Source

Adjust Settings View to iOS

pull/49/merge
Javier Suárez Ruiz 8 years ago
parent
commit
4bec288ee0
3 changed files with 29 additions and 3 deletions
  1. +28
    -2
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
  2. +0
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs
  3. +1
    -0
      src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Properties/AndroidManifest.xml

+ 28
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml View File

@ -2,7 +2,10 @@
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="eShopOnContainers.Core.Views.SettingsView" x:Class="eShopOnContainers.Core.Views.SettingsView"
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
Title="Settings"> Title="Settings">
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
@ -39,14 +42,37 @@
<Setter Property="Margin" <Setter Property="Margin"
Value="12, 12, 12, 0" /> Value="12, 12, 12, 0" />
</Style> </Style>
<animations:StoryBoard
x:Key="MockServicesAnimation"
Target="{x:Reference MockServices}">
<animations:FadeInAnimation
Direction="Up">
<animations:FadeInAnimation.Duration>
<OnPlatform
x:TypeArguments="x:String"
Android="500"
iOS="0"
WinPhone="500"/>
</animations:FadeInAnimation.Duration>
</animations:FadeInAnimation>
</animations:StoryBoard>
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Triggers>
<EventTrigger
Event="Appearing">
<triggers:BeginAnimation
Animation="{StaticResource MockServicesAnimation}" />
</EventTrigger>
</ContentPage.Triggers>
<Grid <Grid
BackgroundColor="{StaticResource BackgroundColor}"> BackgroundColor="{StaticResource BackgroundColor}">
<!-- SETTINGS --> <!-- SETTINGS -->
<ScrollView> <ScrollView>
<StackLayout>
<StackLayout
x:Name="MockServices">
<!-- MOCK SERVICES --> <!-- MOCK SERVICES -->
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>


+ 0
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs View File

@ -12,7 +12,6 @@ namespace eShopOnContainers.Droid.Activities
Label = "eShopOnContainers", Label = "eShopOnContainers",
Icon = "@drawable/icon", Icon = "@drawable/icon",
Theme = "@style/MainTheme", Theme = "@style/MainTheme",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : FormsAppCompatActivity public class MainActivity : FormsAppCompatActivity
{ {


+ 1
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Properties/AndroidManifest.xml View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
<uses-sdk android:minSdkVersion="15" /> <uses-sdk android:minSdkVersion="15" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:label="eShopOnContainers" android:icon="@drawable/icon"></application> <application android:label="eShopOnContainers" android:icon="@drawable/icon"></application>
</manifest> </manifest>

Loading…
Cancel
Save