Unos pequeños fixes

OmniGUI · Nov 5, 2017 · fece5d6 · fece5d6
1 parent 8d81c3d
commit fece5d6
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/AndroidApp/AndroidApp.csproj b/AndroidApp/AndroidApp.csproj
@@ -15,8 +15,8 @@
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/AndroidApp/MainActivity.cs b/AndroidApp/MainActivity.cs
@@ -29,7 +29,7 @@ protected override void OnCreate(Bundle bundle)
 
             var assemblies = typeof(MainActivity).Assembly
                 .GetReferencedAssemblies()
-                .Concat(new[] { new AssemblyName("OmniGui.Xaml") })
+                .Concat(new[] { new AssemblyName("OmniGui.Xaml"), new AssemblyName("OmniGui") })
                 .Select(Assembly.Load)
                 .ToList();
 

diff --git a/OmniGui.Android/OmniGui.Android.csproj b/OmniGui.Android/OmniGui.Android.csproj
@@ -14,8 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/ViewModels/Layout.xaml b/ViewModels/Layout.xaml
@@ -1,3 +1,40 @@
-<ScrollContentPresenter xmlns="root" Background="Azure" xmlns:local="using:Common;assembly=Common">
-    <Image Source="wallpaper.png" Stretch="None" />
-</ScrollContentPresenter>
+<Grid xmlns="root" Background="Azure" xmlns:local="using:Common;assembly=Common" >
+    <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition />
+    </Grid.RowDefinitions>
+
+
+    <StackPanel Gap="8" Margin="8">
+
+        <TextBlock Text="{Bind TargetProperty=Title}" HorizontalAlignment="Center" />
+        <TextBox FontSize="30" />
+        <Button Command="{Bind TargetProperty=ShowMessageCommand}">Click me!</Button>
+
+    </StackPanel>
+
+    <List Grid.Row="1" Source="{Bind TargetProperty=People}" Margin="8">
+        <List.ItemTemplate>
+            <DataTemplate>
+                <Border BorderThickness="1" BorderBrush="#6BB0FF" Background="White">
+                    <Grid Margin="8">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="40" />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Image Source="smiley.png" />
+                        <TextBlock Margin="15" VerticalAlignment="Center" Grid.Column="1" HorizontalAlignment="Center"
+                                   Text="{Bind TargetProperty=Name}" />
+                        <TextBlock FontWeight="Bold" Margin="15" VerticalAlignment="Center" Grid.Column="2"
+                                   Text="{Bind TargetProperty=Surname}" />
+                    </Grid>
+                </Border>
+            </DataTemplate>
+        </List.ItemTemplate>
+    </List>
+
+    <Image Grid.Row="2" Margin="20" VerticalAlignment="Center" RequestedSize="240,-" Source="mario.png" />
+
+</Grid>