You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/07/09 01:49:16 UTC
git commit: updated to remove conflicts with vibration
Updated Branches:
refs/heads/master 5146cde3c -> e5042b313
updated to remove conflicts with vibration
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/e5042b31
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/e5042b31
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/e5042b31
Branch: refs/heads/master
Commit: e5042b3135a9a802af331bb736b720464e579cd1
Parents: 5146cde
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Jul 8 16:49:00 2013 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Jul 8 16:49:00 2013 -0700
----------------------------------------------------------------------
plugin.xml | 4 +++
src/wp/Notification.cs | 2 +-
src/wp/NotificationBox.xaml | 62 +++++++++++++++++++++++++++++++++++++
src/wp/NotificationBox.xaml.cs | 41 ++++++++++++++++++++++++
4 files changed, 108 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/e5042b31/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 78acb7b..8ee7f4a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -57,6 +57,8 @@
</config-file>
<source-file src="src/wp/Notification.cs" />
+ <source-file src="src/wp/NotificationBox.xaml.cs" />
+ <source-file src="src/wp/NotificationBox.xaml" />
</platform>
<!-- wp8 -->
@@ -68,6 +70,8 @@
</config-file>
<source-file src="src/wp/Notification.cs" />
+ <source-file src="src/wp/NotificationBox.xaml.cs" />
+ <source-file src="src/wp/NotificationBox.xaml" />
</platform>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/e5042b31/src/wp/Notification.cs
----------------------------------------------------------------------
diff --git a/src/wp/Notification.cs b/src/wp/Notification.cs
index 8306ce0..ce93f55 100644
--- a/src/wp/Notification.cs
+++ b/src/wp/Notification.cs
@@ -27,7 +27,7 @@ using System.Diagnostics;
namespace WPCordovaClassLib.Cordova.Commands
{
- public class Notification : BaseCommand
+ public class NotificationDialogs : BaseCommand
{
static ProgressBar progressBar = null;
const int DEFAULT_DURATION = 5;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/e5042b31/src/wp/NotificationBox.xaml
----------------------------------------------------------------------
diff --git a/src/wp/NotificationBox.xaml b/src/wp/NotificationBox.xaml
new file mode 100644
index 0000000..1ca5d5f
--- /dev/null
+++ b/src/wp/NotificationBox.xaml
@@ -0,0 +1,62 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<UserControl x:Class="WPCordovaClassLib.Cordova.UI.NotificationBox"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ mc:Ignorable="d"
+ FontFamily="{StaticResource PhoneFontFamilyNormal}"
+ FontSize="{StaticResource PhoneFontSizeNormal}"
+ Foreground="{StaticResource PhoneForegroundBrush}"
+ d:DesignHeight="800" d:DesignWidth="480" VerticalAlignment="Stretch">
+
+ <Grid x:Name="LayoutRoot"
+ Background="{StaticResource PhoneSemitransparentBrush}" VerticalAlignment="Stretch">
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="*"/>
+ </Grid.RowDefinitions>
+
+
+ <!--TitlePanel contains the name of the application and page title-->
+ <StackPanel x:Name="TitlePanel"
+ Grid.Row="0"
+ Background="{StaticResource PhoneSemitransparentBrush}">
+ <TextBlock x:Name="PageTitle"
+ Text="Title"
+ Margin="10,10"
+ Style="{StaticResource PhoneTextTitle2Style}"/>
+
+ <TextBlock x:Name="SubTitle"
+ Text="Subtitle"
+ TextWrapping="Wrap"
+ Margin="10,10"
+ Style="{StaticResource PhoneTextTitle3Style}"/>
+
+ <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
+ <StackPanel x:Name="ButtonPanel"
+ Margin="10,10"
+ Orientation="Horizontal"/>
+ </ScrollViewer>
+
+ </StackPanel>
+ </Grid>
+</UserControl>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/e5042b31/src/wp/NotificationBox.xaml.cs
----------------------------------------------------------------------
diff --git a/src/wp/NotificationBox.xaml.cs b/src/wp/NotificationBox.xaml.cs
new file mode 100644
index 0000000..50b2f2a
--- /dev/null
+++ b/src/wp/NotificationBox.xaml.cs
@@ -0,0 +1,41 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace WPCordovaClassLib.Cordova.UI
+{
+ public partial class NotificationBox : UserControl
+ {
+ public NotificationBox()
+ {
+ InitializeComponent();
+ }
+ }
+}