projects / profile / iot / apps / dotnet / fitness.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e86364d)
Set proper text labels fonts.
authorPiotr Czaja/Advanced Frameworks (PLT) /SRPOL/Engineer/Samsung Electronics <p.czaja@samsung.com>
Thu, 26 Aug 2021 13:14:53 +0000 (15:14 +0200)
committerPiotr Czaja <p.czaja@samsung.com>
Tue, 14 Sep 2021 11:01:34 +0000 (13:01 +0200)
Fitness/res/layout/BarView.xaml patch | blob | history
Fitness/res/layout/FitnessItemView.xaml patch | blob | history
Fitness/res/layout/MainView.xaml patch | blob | history
Fitness/res/layout/PlayingView.xaml patch | blob | history
Fitness/res/layout/SummaryView.xaml patch | blob | history

diff --git a/Fitness/res/layout/BarView.xaml b/Fitness/res/layout/BarView.xaml
index 03b61f99ea90b6ee8dabd7de12292148bb65cb1c..8e92643b608e0ea8b97f22f89ad6ba8b703c09a5 100644 (file)
--- a/Fitness/res/layout/BarView.xaml
+++ b/Fitness/res/layout/BarView.xaml
@@ -25,7 +25,13 @@
                PixelSize="32"
                HorizontalAlignment="Center"
                Position="{views:PositionInUnits X=190, Y=15}"
-               Size="{views:SizeInUnits Width=100, Height=10}"/>
+               Size="{views:SizeInUnits Width=100, Height=10}">
+        <TextLabel.FontStyle>
+            <PropertyMap>
+                <KeyValue Key="weight" Value="regular" />
+            </PropertyMap>
+        </TextLabel.FontStyle>
+    </TextLabel>
 
     <ctrl:NinePatchButton Text="next"
                           x:Name="next"
diff --git a/Fitness/res/layout/FitnessItemView.xaml b/Fitness/res/layout/FitnessItemView.xaml
index 288c4c91207cf3662c0e6530f6ccd9cfcd822d97..fbbdd463f2b6c1c480dd6a47d8ace984c789002a 100644 (file)
--- a/Fitness/res/layout/FitnessItemView.xaml
+++ b/Fitness/res/layout/FitnessItemView.xaml
@@ -16,15 +16,21 @@
                    HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                    ResourceUrl="{Binding ThumbnailUrl}"/>
-        
+
         <TextLabel x:Name="label"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                    PositionUsesPivotPoint="true"
                    PivotPoint="0.0, 1.0"
                    ParentOrigin="0.0, 1.0"
                    PixelSize="24"
-                   Text="{Binding Title}"/>
-        
+                   Text="{Binding Title}">
+            <TextLabel.FontStyle>
+                <PropertyMap>
+                    <KeyValue Key="weight" Value="regular" />
+                </PropertyMap>
+            </TextLabel.FontStyle>
+        </TextLabel>
+
         <ImageView x:Name="favourite"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                    Size="40, 40"
diff --git a/Fitness/res/layout/MainView.xaml b/Fitness/res/layout/MainView.xaml
index 712fd5eeae71ca4e646e3232d4d5ce907f941721..06c6e29e7262bea0a2942e31f7604a56f9d102c7 100644 (file)
--- a/Fitness/res/layout/MainView.xaml
+++ b/Fitness/res/layout/MainView.xaml
@@ -93,13 +93,19 @@
                         <LinearLayout LinearOrientation="Horizontal"
                                       LinearAlignment="Begin"/>
                     </View.Layout>
-                    
+
                     <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
                                Text="{Binding Path=Title}"
                                PixelSize="40"
                                VerticalAlignment="Center"
-                               TextColor="#000C2B"/>
-                    
+                               TextColor="#000C2B">
+                        <TextLabel.FontStyle>
+                            <PropertyMap>
+                                <KeyValue Key="weight" Value="regular" />
+                            </PropertyMap>
+                        </TextLabel.FontStyle>
+                    </TextLabel>
+
                     <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
                                Size="36, 48"
                                Margin="30, 30, 0, 0"
@@ -116,16 +122,22 @@
                     
                     <ImageView Size="28, 28"
                                ResourceUrl="*Resource*/layout/images/icon_time.png"/>
-                    
+
                     <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
                                Text="{Binding Duration, StringFormat=\{0:h\\:mm\\:ss\}}"
                                PixelSize="28"
                                Margin="8, 0, 0, 0"
                                VerticalAlignment="Center"
-                               TextColor="#000C2B"/>
-                
+                               TextColor="#000C2B">
+                        <TextLabel.FontStyle>
+                            <PropertyMap>
+                                <KeyValue Key="weight" Value="regular" />
+                            </PropertyMap>
+                        </TextLabel.FontStyle>
+                    </TextLabel>
+
                 </View>
-                
+
                 <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
                            Size="{views:SizeInUnits Width=107}"
                            Text="{Binding Description}"
@@ -136,8 +148,14 @@
                            Ellipsis="false"
                            MultiLine="true"
                            TextColor="#000C2B"
-                           EnableAutoScroll="true"/>
-            
+                           EnableAutoScroll="true">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
             </View>
             
             <ImageView PositionUsesPivotPoint="true"
diff --git a/Fitness/res/layout/PlayingView.xaml b/Fitness/res/layout/PlayingView.xaml
index ac9d0183f42582ca03f761c451a3a4552ae8e411..0869a16fc176ef1b1993fcdf0040db022f910ca8 100644 (file)
--- a/Fitness/res/layout/PlayingView.xaml
+++ b/Fitness/res/layout/PlayingView.xaml
@@ -68,16 +68,28 @@
                        HorizontalAlignment="Center"
                        Margin="{views:ExtentsInUnits Start=48}"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-                       Size="{views:SizeInUnits Width=102, Height=50}"/>
-            
+                       Size="{views:SizeInUnits Width=102, Height=50}">
+                <TextLabel.FontStyle>
+                    <PropertyMap>
+                        <KeyValue Key="weight" Value="bold" />
+                    </PropertyMap>
+                </TextLabel.FontStyle>
+            </TextLabel>
+
             <TextLabel Text="Time left"
                        TextColor="#000C2B"
                        PixelSize="24"
                        HorizontalAlignment="Center"
                        Margin="{views:ExtentsInUnits Start=87}"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-                       Size="{views:SizeInUnits Width=28, Height=9}"/>
-        
+                       Size="{views:SizeInUnits Width=28, Height=9}">
+                <TextLabel.FontStyle>
+                    <PropertyMap>
+                        <KeyValue Key="weight" Value="regular" />
+                    </PropertyMap>
+                </TextLabel.FontStyle>
+            </TextLabel>
+
         </View>
         
         <!--Cemera Preview-->
@@ -103,29 +115,47 @@
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
-                
+
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding Hold}"
                            TextColor="#000C2B"
                            PixelSize="40"
                            HorizontalAlignment="Center"
                            Margin="{views:ExtentsInUnits Start=87}"
-                           Size="{views:SizeInUnits Width=36, Height=16}"/>
-                
+                           Size="{views:SizeInUnits Width=36, Height=16}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding Repetitions}"
                            TextColor="#000C2B"
                            PixelSize="40"
                            HorizontalAlignment="Center"
-                           Size="{views:SizeInUnits Width=36, Height=16}"/>
-                
+                           Size="{views:SizeInUnits Width=36, Height=16}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding Score}"
                            TextColor="#000C2B"
                            PixelSize="40"
                            HorizontalAlignment="Center"
-                           Size="{views:SizeInUnits Width=36, Height=16}"/>
-            
+                           Size="{views:SizeInUnits Width=36, Height=16}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
             </View>
             
             <!--Description-->
@@ -134,26 +164,44 @@
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
-                
+
                 <TextLabel Text="Hold"
                            TextColor="#000C2B"
                            PixelSize="24"
                            HorizontalAlignment="Center"
                            Margin="{views:ExtentsInUnits Start=87}"
-                           Size="{views:SizeInUnits Width=36, Height=16}"/>
-                
+                           Size="{views:SizeInUnits Width=36, Height=16}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
                 <TextLabel Text="Count"
                            TextColor="#000C2B"
                            PixelSize="24"
                            HorizontalAlignment="Center"
-                           Size="{views:SizeInUnits Width=36, Height=16}"/>
-                
+                           Size="{views:SizeInUnits Width=36, Height=16}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
                 <TextLabel Text="Score"
                            TextColor="#000C2B"
                            PixelSize="24"
                            HorizontalAlignment="Center"
-                           Size="{views:SizeInUnits Width=36, Height=16}"/>
-            
+                           Size="{views:SizeInUnits Width=36, Height=16}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
+
             </View>
         
         </View>
diff --git a/Fitness/res/layout/SummaryView.xaml b/Fitness/res/layout/SummaryView.xaml
index 1855e545c0f86c164acd3484563c25da746df6aa..81d7abe912760d8ae3e5f4aa46529a1a5e1211df 100644 (file)
--- a/Fitness/res/layout/SummaryView.xaml
+++ b/Fitness/res/layout/SummaryView.xaml
@@ -35,8 +35,14 @@
                        HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                        Size="{views:SizeInUnits Height=14}"
                        HorizontalAlignment="Center"
-                       TextColor="#000C2B"/>
-            
+                       TextColor="#000C2B">
+                <TextLabel.FontStyle>
+                    <PropertyMap>
+                        <KeyValue Key="weight" Value="regular" />
+                    </PropertyMap>
+                </TextLabel.FontStyle>
+            </TextLabel>
+
             <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                   HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                   Weight="1"/>
@@ -45,9 +51,8 @@
                        PixelSize="32"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                        HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-                       Margin="{views:ExtentsInUnits Start=27}"
                        Size="{views:SizeInUnits Height=11}"
-                       HorizontalAlignment="Begin"
+                       HorizontalAlignment="Center"
                        TextColor="#000C2B"/>
             
             <View Size="{views:SizeInUnits Height=7}"/>
@@ -63,7 +68,13 @@
                                HorizontalAlignment="End"
                                Weight="1"
                                PixelSize="32"
-                               Size="{views:SizeInUnits Height=11}"/>
+                               Size="{views:SizeInUnits Height=11}">
+                        <TextLabel.FontStyle>
+                            <PropertyMap>
+                                <KeyValue Key="weight" Value="regular" />
+                            </PropertyMap>
+                        </TextLabel.FontStyle>
+                    </TextLabel>
                 </View>
                 
                 <View Size="{views:SizeInUnits Width=11}"/>
@@ -73,8 +84,13 @@
                            HorizontalAlignment="Begin"
                            Weight="1"
                            PixelSize="32"
-                           Size="{views:SizeInUnits Height=11}"/>
-            
+                           Size="{views:SizeInUnits Height=11}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
             </View>
             
             <View Size="{views:SizeInUnits Height=4}"/>
@@ -90,18 +106,29 @@
                                HorizontalAlignment="End"
                                Weight="1"
                                PixelSize="32"
-                               Size="{views:SizeInUnits Height=11}"/>
+                               Size="{views:SizeInUnits Height=11}">
+                        <TextLabel.FontStyle>
+                            <PropertyMap>
+                                <KeyValue Key="weight" Value="regular" />
+                            </PropertyMap>
+                        </TextLabel.FontStyle>
+                    </TextLabel>
                 </View>
                 
                 <View Size="{views:SizeInUnits Width=11}"/>
-                
+
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding TotalCount}"
                            HorizontalAlignment="Begin"
                            Weight="1"
                            PixelSize="32"
-                           Size="{views:SizeInUnits Height=11}"/>
-            
+                           Size="{views:SizeInUnits Height=11}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
             </View>
             
             <View Size="{views:SizeInUnits Height=4}"/>
@@ -117,18 +144,29 @@
                                HorizontalAlignment="End"
                                Weight="1"
                                PixelSize="32"
-                               Size="{views:SizeInUnits Height=11}"/>
+                               Size="{views:SizeInUnits Height=11}">
+                        <TextLabel.FontStyle>
+                            <PropertyMap>
+                                <KeyValue Key="weight" Value="regular" />
+                            </PropertyMap>
+                        </TextLabel.FontStyle>
+                    </TextLabel>
                 </View>
                 
                 <View Size="{views:SizeInUnits Width=11}"/>
-                
+
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding AverageScore}"
                            HorizontalAlignment="Begin"
                            Weight="1"
                            PixelSize="32"
-                           Size="{views:SizeInUnits Height=11}"/>
-            
+                           Size="{views:SizeInUnits Height=11}">
+                    <TextLabel.FontStyle>
+                        <PropertyMap>
+                            <KeyValue Key="weight" Value="regular" />
+                        </PropertyMap>
+                    </TextLabel.FontStyle>
+                </TextLabel>
             </View>
             
             <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
Domain: Applications / IoT;