diff --git a/TheGameExtreme/Media/Apple.png b/TheGameExtreme/Media/Apple.png new file mode 100644 index 0000000..a8533f0 Binary files /dev/null and b/TheGameExtreme/Media/Apple.png differ diff --git a/TheGameExtreme/Media/Moon.jpg b/TheGameExtreme/Media/Moon.jpg new file mode 100644 index 0000000..b8ec22a Binary files /dev/null and b/TheGameExtreme/Media/Moon.jpg differ diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index 4d76aa9..5ffaf23 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -34,9 +34,17 @@ + + + + + + + + diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs index 75839ea..a90a17e 100644 --- a/TheGameExtreme/view/MainPage.xaml.cs +++ b/TheGameExtreme/view/MainPage.xaml.cs @@ -17,14 +17,15 @@ namespace TheGameExtreme.view [DesignTimeVisible(false)] public partial class MainPage : ContentPage { - //private bool isFirst = true; - //private Main viewmodel; - //private List stacks = new List(); - //Button button = new Button(); + private bool isFirst = true; + private Main viewmodel; + private List stacks = new List(); + Button button = new Button(); List playersNames; SKBitmap bitmap; + SKBitmap bitmap2; SKMatrix matrix = SKMatrix.MakeIdentity(); // Touch information long touchId = -1; @@ -40,32 +41,34 @@ namespace TheGameExtreme.view string resourceID = "TheGameExtreme.Media.thegame.jpg"; + string resourceID2 = "TheGameExtreme.Media.moon.jpg"; Assembly assembly = GetType().GetTypeInfo().Assembly; - using (Stream stream = assembly.GetManifestResourceStream(resourceID)) - { - bitmap = SKBitmap.Decode(stream); - } + Stream stream = assembly.GetManifestResourceStream(resourceID); + bitmap = SKBitmap.Decode(stream); + Stream stream2 = assembly.GetManifestResourceStream(resourceID2); + bitmap2 = SKBitmap.Decode(stream2); - /*stacks.Add(checkbox0); - stacks.Add(checkbox1); - stacks.Add(checkbox2); - stacks.Add(checkbox3); - button.Text = "Retry"; - button.Clicked += retry; + + //stacks.Add(checkbox0); + //stacks.Add(checkbox1); + //stacks.Add(checkbox2); + //stacks.Add(checkbox3); + //button.Text = "Retry"; + //button.Clicked += retry; viewmodel = new Main(playersNames); - viewmodel.BindingChanged += OnBindingChanged; + //viewmodel.BindingChanged += OnBindingChanged; //viewmodel.PlayerChanged += OnPlayerChanged; - Alert.SetBinding(Label.TextProperty, new Binding("Alert", source: viewmodel)); - pseudo.SetBinding(Label.TextProperty, new Binding("Pseudo", source: viewmodel)); + //Alert.SetBinding(Label.TextProperty, new Binding("Alert", source: viewmodel)); + //pseudo.SetBinding(Label.TextProperty, new Binding("Pseudo", source: viewmodel)); - inflateHand();*/ + inflateHand(); } @@ -81,6 +84,7 @@ namespace TheGameExtreme.view // Display the bitmap canvas.SetMatrix(matrix); canvas.DrawBitmap(bitmap, new SKPoint()); + canvas.DrawBitmap(bitmap2, new SKPoint(500, 500)); } @@ -134,23 +138,23 @@ namespace TheGameExtreme.view - //private void OnPlayerChanged(object sender, PlayerChangedEventArgs args) - //{ - // inflateHand(); - //} - - /*private void inflateHand() + private void OnPlayerChanged(object sender, PlayerChangedEventArgs args) { - Hand.Children.Clear(); - for (int i = 0; i < viewmodel.CurrentHand.Count; i++) - { - Button card = new Button(); - card.Text = viewmodel.CurrentHand[i].Value.ToString(); - card.Clicked += played; - Hand.Children.Add(card); - } + inflateHand(); } + private void inflateHand() + { + //Hand.Children.Clear(); + //for (int i = 0; i < viewmodel.CurrentHand.Count; i++) + //{ + // Button card = new Button(); + // card.Text = viewmodel.CurrentHand[i].Value.ToString(); + // card.Clicked += played; + // Hand.Children.Add(card); + //} + } + /* private void OnBindingChanged(object sender, TopRangeChangedEventArgs args) { switch (args.NumStackChanged)