TizenRefApp-9069 Support Emergency number 04/146804/4
authorRuslan Zakharov <r.zakharov@samsung.com>
Wed, 30 Aug 2017 09:33:06 +0000 (12:33 +0300)
committerRuslan Zakharov <r.zakharov@samsung.com>
Fri, 1 Sep 2017 13:22:12 +0000 (16:22 +0300)
Added support of Emergency number

Change-Id: I07e4bd6f54db36b1cce85ce26cfae23b36358071

CallApp.Tizen/Call/Controls/ContactInformationPanel.xaml
CallApp.Tizen/Call/Controls/ContactInformationPanel.xaml.cs
CallApp.Tizen/Call/Controls/MergeSwapPanel.xaml
CallApp.Tizen/CallApp.Tizen.csproj
CallApp.Tizen/res/Call ID/348x348/call_photo_id_emergency.png [new file with mode: 0644]

index 6210e0c..489177e 100644 (file)
@@ -9,7 +9,7 @@
 
     <ContentView.Resources>
         <ResourceDictionary MergedWith="callThemes:CallTheme">
-            <ControlTemplate x:Key="HalfPanel">
+            <ControlTemplate x:Key="TopPanel">
                 <commonControls:CustomGrid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="232" />
@@ -49,7 +49,7 @@
                 </commonControls:CustomGrid>
             </ControlTemplate>
 
-            <ControlTemplate x:Key="MiniPanel">
+            <ControlTemplate x:Key="ActivePanel">
                 <commonControls:CustomGrid HeightRequest="172">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="160" />
@@ -79,7 +79,7 @@
                 </commonControls:CustomGrid>
             </ControlTemplate>
 
-            <ControlTemplate x:Key="MultiplePanel">
+            <ControlTemplate x:Key="ConferencePanel">
                 <commonControls:CustomGrid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="104" />
                            FontSize="27" Text="{TemplateBinding SecondaryText}" />
                 </commonControls:CustomGrid>
             </ControlTemplate>
+
+            <ControlTemplate x:Key="EmergencyPanel">
+                <commonControls:CustomGrid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="32" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="32" />
+                    </Grid.ColumnDefinitions>
+
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="24" />
+                        <RowDefinition Height="54" />
+                        <RowDefinition Height="33" />
+                        <RowDefinition Height="348" />
+                        <RowDefinition Height="71" />
+                        <RowDefinition Height="86" />
+                        <RowDefinition Height="96" />
+                    </Grid.RowDefinitions>
+
+                    <Label Grid.Column="1" Grid.Row="1" HorizontalOptions="Start" VerticalOptions="Center" TextColor="{StaticResource CallDefaultTextColor}"
+                           FontSize="27" Text="{TemplateBinding StatusText}" />
+
+                    <Image Grid.Column="1" Grid.Row="3" HorizontalOptions="Center" VerticalOptions="Center" Source="Call ID/348x348/call_photo_id_emergency.png" />
+
+                    <Label Grid.Column="1" Grid.Row="5" HorizontalOptions="Center" VerticalOptions="Center" TextColor="{StaticResource CallDefaultTextColor}"
+                           FontSize="47" Text="{TemplateBinding PrimaryText}" />
+                </commonControls:CustomGrid>
+            </ControlTemplate>
         </ResourceDictionary>
     </ContentView.Resources>
 
     <ContentView.Triggers>
-        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Half">
-            <Setter Property="ControlTemplate" Value="{StaticResource HalfPanel}" />
+        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Top">
+            <Setter Property="ControlTemplate" Value="{StaticResource TopPanel}" />
         </DataTrigger>
 
-        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Mini">
-            <Setter Property="ControlTemplate" Value="{StaticResource MiniPanel}" />
+        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Active">
+            <Setter Property="ControlTemplate" Value="{StaticResource ActivePanel}" />
         </DataTrigger>
 
-        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Multiple">
-            <Setter Property="ControlTemplate" Value="{StaticResource MultiplePanel}" />
+        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Conference">
+            <Setter Property="ControlTemplate" Value="{StaticResource ConferencePanel}" />
         </DataTrigger>
 
         <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Single">
             <Setter Property="ControlTemplate" Value="{StaticResource SinglePanel}" />
         </DataTrigger>
+
+        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference This}, Path=LayoutType}" Value="Emergency">
+            <Setter Property="ControlTemplate" Value="{StaticResource EmergencyPanel}" />
+        </DataTrigger>
     </ContentView.Triggers>
 </ContentView>
\ No newline at end of file
index 4ae7dd5..54120da 100644 (file)
@@ -25,10 +25,11 @@ namespace CallApp.Tizen.Call.Controls
         /// </summary>
         public enum LayoutTypes
         {
-            Half,
-            Mini,
-            Multiple,
-            Single
+            Active,
+            Conference,
+            Emergency,
+            Single,
+            Top
         }
 
         public ContactInformationPanel()
index 86dbafd..90c96ea 100644 (file)
@@ -6,7 +6,7 @@
              xmlns:loc="clr-namespace:CallApp.Tizen.loc">
 
     <StackLayout>
-        <callControls:ContactInformationPanel LayoutType="Half" StatusText="{x:Static loc:loc.OnHold}"
+        <callControls:ContactInformationPanel LayoutType="Top" StatusText="{x:Static loc:loc.OnHold}"
                                               PrimaryText="Test" SecondaryText="Test" />
 
         <StackLayout HeightRequest="122" Orientation="Horizontal">
index 85a440f..03589f1 100644 (file)
     <Content Include="res\Call ID\168x168\call_end_photo_id_default.png" />
     <Content Include="res\Call ID\348x348\call_photo_id.png" />
     <Content Include="res\Call ID\348x348\call_photo_id_conference.png" />
+    <Content Include="res\Call ID\348x348\call_photo_id_emergency.png" />
     <Content Include="res\Call ID\96x96\call_photo_id_conference.png" />
     <Content Include="res\call_active_ic_call.png" />
     <Content Include="res\call_btn_addcall.png" />
diff --git a/CallApp.Tizen/res/Call ID/348x348/call_photo_id_emergency.png b/CallApp.Tizen/res/Call ID/348x348/call_photo_id_emergency.png
new file mode 100644 (file)
index 0000000..85f0cd1
Binary files /dev/null and b/CallApp.Tizen/res/Call ID/348x348/call_photo_id_emergency.png differ