Fix display scaling.

angelinn · May 11, 2024 · 4e7a983 · 4e7a983
1 parent f813244
commit 4e7a983
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 28 deletions.
diff --git a/src/TramlineFive/TramlineFive.Maui/App.xaml b/src/TramlineFive/TramlineFive.Maui/App.xaml
@@ -18,12 +18,13 @@
 
                     <Style TargetType="Label">
                         <Setter Property="TextColor" Value="{DynamicResource LabelTextColor}" />
+                        <Setter Property="FontAutoScalingEnabled" Value="False" />
                     </Style>
 
                     <Style TargetType="Picker">
                         <Setter Property="TextColor" Value="{DynamicResource LabelTextColor}" />
                     </Style>
-
+                    
                     <vm:ViewModelLocator x:Key="Locator" />
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>

diff --git a/src/TramlineFive/TramlineFive.Maui/MauiProgram.cs b/src/TramlineFive/TramlineFive.Maui/MauiProgram.cs
@@ -11,8 +11,6 @@
 using TramlineFive.Services.Main;
 using SkgtService;
 using Android.Content.Res;
-using OpenWeatherMap.Cache.Extensions;
-using static OpenWeatherMap.Cache.Enums;
 
 namespace TramlineFive.Maui
 {

diff --git a/src/TramlineFive/TramlineFive.Maui/Pages/FavouritesPage.xaml b/src/TramlineFive/TramlineFive.Maui/Pages/FavouritesPage.xaml
@@ -25,21 +25,30 @@
                     <RoundRectangle CornerRadius="20" />
                 </Border.StrokeShape>
                 <Grid>
-                <StackLayout HorizontalOptions="Center" BackgroundColor="Transparent" Padding="20">
-                        <Label Text="wb_sunny" FontFamily="MaterialIconsOutlinedRegular.otf" FontSize="42" TextColor="{DynamicResource BlueAccentColor}" HorizontalOptions="Center" Margin="0,10,0,10" Opacity="0.7" />
-                        <Label Text="София" HorizontalOptions="Center" FontSize="24"/>
-
-                        <HorizontalStackLayout Margin="0,20,0,0">
-                            <Label Text="cloud" FontFamily="MaterialIconsOutlinedRegular.otf" FontSize="25" TextColor="{DynamicResource BlueAccentColor}" HorizontalOptions="Center"  Opacity="0.7" VerticalOptions="Center" />
-                            <Label Text="{Binding Forecast.Current, StringFormat='Температура: {0}° C'}" FontSize="18" VerticalOptions="Center" Margin="5,0,0,0" />
-                        </HorizontalStackLayout>
-                        <HorizontalStackLayout>
-                            <Label Text="water_drop" FontFamily="MaterialIconsOutlinedRegular.otf" FontSize="25" TextColor="{DynamicResource BlueAccentColor}" HorizontalOptions="Center"  Opacity="0.7" VerticalOptions="Center" />
-                            <Label Text="{Binding Forecast.RH, StringFormat='Относителна влажност: {0}%'}" VerticalOptions="Center" FontSize="18" HorizontalTextAlignment="Start" Margin="5,0,0,0" />
-
-                        </HorizontalStackLayout>
-                    </StackLayout>
-                    <Label Text="{Binding Forecast.Time, StringFormat='Данни от open-meteo, {0}'}" VerticalOptions="End" HorizontalOptions="Center" Margin="0,0,0,20" />
+                    <Grid HorizontalOptions="Center" BackgroundColor="Transparent" Padding="20">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <StackLayout Grid.Row="0">
+                            <HorizontalStackLayout>
+                                <Label Text="fmd_good" FontFamily="MaterialIconsOutlinedRegular.otf" FontSize="24" TextColor="{DynamicResource BlueAccentColor}" VerticalOptions="Center" Margin="0,10,5,5" Opacity="0.7" />
+                                <Label Text="София" VerticalOptions="Center" FontSize="Medium"/>
+                            </HorizontalStackLayout>
+                            <HorizontalStackLayout Margin="0,20,0,0" Grid.Row="1">
+                                <Label Text="wb_sunny" FontFamily="MaterialIconsOutlinedRegular.otf" FontSize="25" TextColor="{DynamicResource BlueAccentColor}" HorizontalOptions="Center"  Opacity="0.7" VerticalOptions="Center" />
+                                <Label Text="{Binding Forecast.Current, StringFormat='Температура: {0}° C'}" FontSize="Default" VerticalOptions="Center" Margin="5,0,0,0" />
+                            </HorizontalStackLayout>
+                            <HorizontalStackLayout Grid.Row="2">
+                                <Label Text="water_drop" FontFamily="MaterialIconsOutlinedRegular.otf" FontSize="25" TextColor="{DynamicResource BlueAccentColor}" HorizontalOptions="Center"  Opacity="0.7" VerticalOptions="Center" />
+                                <Label Text="{Binding Forecast.RH, StringFormat='Относителна влажност: {0}%'}" VerticalOptions="Center" FontSize="Default" HorizontalTextAlignment="Start" Margin="5,0,0,0" />
+
+                            </HorizontalStackLayout>
+                        </StackLayout>
+
+                        <Label Grid.Row="1" Text="{Binding Forecast.Time, StringFormat='Данни от open-meteo, {0}'}" FontSize="Caption" HorizontalOptions="Center" Margin="0,0,0,0" />
+                    </Grid>
                 </Grid>
             </Border>
         </Grid>
@@ -79,31 +88,33 @@
 
                                     <Grid>
                                         <Grid.Behaviors>
-                                                <mct:TouchBehavior DefaultAnimationDuration="250"
+                                            <mct:TouchBehavior DefaultAnimationDuration="250"
                                                     DefaultAnimationEasing="{x:Static Easing.CubicInOut}"
                                                     PressedOpacity="0.6"
                                                     PressedScale="0.8" />
-                                            </Grid.Behaviors>
-                                            
+                                        </Grid.Behaviors>
+
                                         <Border Background="{DynamicResource BackgroundColor}" Stroke="Transparent">
                                             <Border.StrokeShape>
                                                 <RoundRectangle CornerRadius="20" />
                                             </Border.StrokeShape>
-                                                
+
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="60" />
                                                     <ColumnDefinition Width="*" />
                                                     <ColumnDefinition Width="60" />
                                                 </Grid.ColumnDefinitions>
 
-                                                <Label FontFamily="mir" Text="tram" TextColor="{DynamicResource IconsColor}" FontSize="31" VerticalOptions="Center" HorizontalOptions="Center" />
+                                                <StackLayout VerticalOptions="Center">
+                                                    <Label FontFamily="mir" Text="tram" TextColor="{DynamicResource IconsColor}" FontSize="31" VerticalOptions="Center" HorizontalOptions="Center" />
+                                                    <Label Text="{Binding StopCode, StringFormat='{0}'}" Background="Transparent" TextColor="{DynamicResource DetailsTextColor}" HorizontalOptions="Center" Margin="0,3,0,0" FontSize="Caption" />
+                                                </StackLayout>
 
                                                 <StackLayout VerticalOptions="Center" Grid.Column="1" Spacing="0">
 
                                                     <StackLayout Orientation="Horizontal" Margin="0,0,0,0">
-                                                        <Label Text="{Binding Name}" />
-                                                        <Label Text="{Binding StopCode, StringFormat=' ({0})'}" FontSize="Small" />
+                                                        <Label Text="{Binding Name}" Background="Transparent" />
                                                     </StackLayout>
 
                                                     <CollectionView ItemsSource="{Binding Lines}" Margin="0,5,0,0">

diff --git a/src/TramlineFive/TramlineFive.Maui/Pages/HistoryPage.xaml b/src/TramlineFive/TramlineFive.Maui/Pages/HistoryPage.xaml
@@ -47,7 +47,7 @@
                                                 <Label Text="{Binding StopCode, StringFormat=' ({0})'}" />
                                             </StackLayout>
 
-                                            <Label Text="{Binding TimeString}" FontSize="Small" TextColor="{DynamicResource DetailsTextColor}" Margin="0,5,0,0" />
+                                            <Label Text="{Binding TimeString}" TextColor="{DynamicResource DetailsTextColor}" Margin="0,5,0,0" />
                                         </StackLayout>
                                     </Grid>
                                 </Border>

diff --git a/src/TramlineFive/TramlineFive.Maui/Platforms/Android/AndroidManifest.xml b/src/TramlineFive/TramlineFive.Maui/Platforms/Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.openbulgariasoftware.trammy" android:versionName="3.15" android:versionCode="43">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.openbulgariasoftware.trammy" android:versionName="3.17" android:versionCode="47">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

diff --git a/src/TramlineFive/TramlineFive.Maui/TramlineFive.Maui.csproj b/src/TramlineFive/TramlineFive.Maui/TramlineFive.Maui.csproj
@@ -141,7 +141,6 @@
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
 		<PackageReference Include="Mapsui.Maui" Version="4.1.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<PackageReference Include="OpenWeatherMap.Cache" Version="1.10.3" />
 		<PackageReference Include="Plugin.LocalNotification" Version="11.1.2" />
 		<PackageReference Include="Sentry.Maui" Version="4.5.0" />
 	</ItemGroup>