Merge pull request #270 from OudomMunint/dev

Dev => Main
OudomMunint · Jan 29, 2025 · 86a6bc2 · 86a6bc2
2 parents 76aa774 + 8aa5051
commit 86a6bc2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/Views/Dashboard.xaml b/Views/Dashboard.xaml
@@ -8,7 +8,7 @@
              Title="">
 
     <Shell.TitleView>
-        <HorizontalStackLayout HorizontalOptions="Center" Spacing="{OnPlatform iOS=130, Android=115}">
+        <HorizontalStackLayout HorizontalOptions="Center">
             <!-- Title -->
             <views:HeaderGrid x:Name="HeaderGrid" VerticalOptions="Center" HorizontalOptions="Center" />
         </HorizontalStackLayout>
@@ -33,8 +33,8 @@
         <!-- <views:HeaderGrid x:Name="HeaderGrid" Grid.Row="0" Grid.ColumnSpan="{OnIdiom Phone=3, Tablet=5}" /> -->
 
         <!-- Labels -->
-        <Border Grid.Row="1" Grid.Column="0" Style="{DynamicResource ChartBorder}">
-            <ScrollView Padding="{OnIdiom Phone='0,0,0,0', Tablet='10,10,10,10'}">
+        <Border Grid.Row="1" Grid.Column="0" Style="{DynamicResource ChartBorder}" Padding="10">
+            <ScrollView Padding="{OnIdiom Phone='0,0,0,0', Tablet='10,10,10,10'}" VerticalScrollBarVisibility="Default">
                 <StackLayout>
                     <!--<Label Text="👋 Hello!" VerticalOptions="Start" HorizontalOptions="Start" FontSize="Title" FontFamily="Inter-Regular"/>-->
                     <Label x:Name="todoitems" FontAttributes="Bold" Style="{StaticResource PriorityLabel}" />

diff --git a/Views/Settings.xaml.cs b/Views/Settings.xaml.cs
@@ -111,6 +111,7 @@ async void Reset_Button_Pressed(System.Object sender, System.EventArgs e)
             foreach (var item in allitems)
             {
                 await database.DeleteItemAsync(item);
+                Preferences.Set("BiometricsEnabled", false);
             }
             // Navigate with main thread!!!
             MainThread.BeginInvokeOnMainThread(async () =>

diff --git a/Views/TodoListPage.xaml b/Views/TodoListPage.xaml
@@ -50,8 +50,8 @@
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="250"/>
                     <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="50"/>
                 </Grid.ColumnDefinitions>
                 <!-- Search Bar -->
                 <SearchBar HorizontalOptions="StartAndExpand" Grid.Row="0" Grid.Column="0" Placeholder="Search" x:Name="SearchBar"

diff --git a/Views/TodoitemPage.xaml b/Views/TodoitemPage.xaml
@@ -93,12 +93,12 @@
                         <Border Style="{DynamicResource InputBorder}" Padding="7" Margin="0,10,0,0" HorizontalOptions="FillAndExpand">
                             <StackLayout>
                                 <Label x:Name="attsize" Text="{Binding AttachmentSize}" FontFamily="Inter-Regular" FontSize="15" TextColor="{AppThemeBinding Dark=Gray, Light=DarkGray}"
-                                        HorizontalTextAlignment="Center" Margin="15,10,15,10" />
+                                        HorizontalTextAlignment="Center" />
                                 <Image x:Name="attachmentImage" Source="{Binding Attachment, Converter={StaticResource ByteArrayToImageSourceConverter}}" Margin="15" />
                                 <Label x:Name="attlabel" Text="No Attachment found. If attachment is already added, click save." FontFamily="Inter-Regular" FontSize="15"
-                                        TextColor="{AppThemeBinding Dark=Gray, Light=DarkGray}" HorizontalTextAlignment="Center" Margin="15,0,15,15" />
+                                        TextColor="{AppThemeBinding Dark=Gray, Light=Gray}" HorizontalTextAlignment="Center" Margin="15,0,15,15" />
                                 <Button Text="Delete Attachment" Clicked="DeleteAttachmentClicked" FontFamily="Inter-Regular" BackgroundColor="Red" TextColor="White"
-                                        MaximumWidthRequest="{OnPlatform iOS=150, Android=200}" HorizontalOptions="Center" Margin="0,15,0,10" />
+                                        MaximumWidthRequest="{OnPlatform iOS=165, Android=200}" HorizontalOptions="Center" Margin="0,0,0,10" />
                             </StackLayout>
                         </Border>
                     </StackLayout>
@@ -117,8 +117,9 @@
 
                             <Switch x:Name="DoneSwitch" Grid.Column="1" Grid.Row="0" HorizontalOptions="EndAndExpand" IsToggled="{Binding Done}" />
 
-                            <BoxView Grid.Row="1" Grid.ColumnSpan="3" HeightRequest="1" Margin="{OnPlatform iOS='0,8,0,0'}"
-                                    Color="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
+                            <BoxView Grid.Row="1" Grid.ColumnSpan="3" HeightRequest="1"
+                                    Color="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}"
+                                    VerticalOptions="Center"/>
 
                             <Label Grid.Row="2" Grid.Column="0" Text="Pin as Favourite" HorizontalOptions="Start" VerticalOptions="Center" FontFamily="Inter-Bold" Margin="10,0,10,0" />
 

diff --git a/Views/TodoitemPage.xaml.cs b/Views/TodoitemPage.xaml.cs
@@ -104,7 +104,7 @@ private void UpdateToolbarTitle()
             if (string.IsNullOrWhiteSpace(NameField.Text))
             {
                 itemTitle.FormattedText = new FormattedString();
-                itemTitle.FormattedText.Spans.Add(new Span { Text = "Creating new task", FontAttributes = FontAttributes.Bold });
+                itemTitle.FormattedText.Spans.Add(new Span { Text = "Create task", FontAttributes = FontAttributes.Bold });
             }
             else
             {