tsanie/Billing
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

report page

Browse Source
This commit is contained in:
Tsanie Lily 2022-03-09 15:03:20 +08:00
parent db055fa205
commit b5c531d128
24 changed files with 186 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Billing.Shared/Helper.cs
View File

@ -1,5 +1,8 @@
using System;
using Billing.Models;
using Billing.Views;
using System;
using System.Globalization;
using System.Linq;
using Xamarin.Essentials;
using Xamarin.Forms;
@ -75,6 +78,18 @@ namespace Billing
return color;
}
public static UIBill WrapBill(Bill b)
{
return new UIBill(b)
{
Icon = App.Categories.FirstOrDefault(c => c.Id == b.CategoryId)?.Icon ?? BaseModel.ICON_DEFAULT,
Name = b.Name,
DateCreation = b.CreateTime,
Amount = b.Amount,
Wallet = App.Accounts.FirstOrDefault(a => a.Id == b.WalletId)?.Name
};
}
public static bool IsSameDay(DateTime day1, DateTime day2)
{
return day1.Year == day2.Year && day1.DayOfYear == day2.DayOfYear;

3
Billing.Shared/Languages/en.xml
View File

@ -89,4 +89,7 @@
<AddCategory>Add Category</AddCategory>
<ConfirmDeleteCategory>Are you sure you want to delete the category: {0}?</ConfirmDeleteCategory>
<SelectCategory>Select Category</SelectCategory>
<TrackingChart>Tracking Chart</TrackingChart>
<NoResult>(no results)</NoResult>
<Top10>Top 10</Top10>
</root>

3
Billing.Shared/Languages/zh-CN.xml
View File

@ -89,4 +89,7 @@
<AddCategory>新建分类</AddCategory>
<ConfirmDeleteCategory>是否确认删除该分类：{0}？</ConfirmDeleteCategory>
<SelectCategory>选择类别</SelectCategory>
<TrackingChart>跟踪图表</TrackingChart>
<NoResult>（无记录）</NoResult>
<Top10>Top 10</Top10>
</root>

16
Billing.Shared/Views/BillPage.xaml.cs
View File

@ -72,7 +72,7 @@ namespace Billing.Views
Task.Run(() =>
{
var bills = App.Bills.Where(b => Helper.IsSameDay(b.CreateTime, e.Date));
Bills = new List<UIBill>(bills.OrderBy(b => b.CreateTime).Select(b => WrapBill(b)));
Bills = new List<UIBill>(bills.OrderBy(b => b.CreateTime).Select(b => Helper.WrapBill(b)));
RefreshBalance(Bills);
MainThread.BeginInvokeOnMainThread(async () => await scrollView.ScrollToAsync(0, 0, true));
});
@ -88,18 +88,6 @@ namespace Billing.Views
SetValue(BalanceProperty, income - spending);
}
private UIBill WrapBill(Bill b)
{
return new UIBill(b)
{
Icon = App.Categories.FirstOrDefault(c => c.Id == b.CategoryId)?.Icon ?? BaseModel.ICON_DEFAULT,
Name = b.Name,
DateCreation = b.CreateTime,
Amount = b.Amount,
Wallet = App.Accounts.FirstOrDefault(a => a.Id == b.WalletId)?.Name
};
}
private void UpdateBill(UIBill bill)
{
bill.Icon = App.Categories.FirstOrDefault(c => c.Id == bill.Bill.CategoryId)?.Icon ?? BaseModel.ICON_DEFAULT;
@ -196,7 +184,7 @@ namespace Billing.Views
e.Id = maxId + 1;
App.Bills.Add(e);
var bills = Bills;
bills.Add(WrapBill(e));
bills.Add(Helper.WrapBill(e));
Bills = bills.OrderBy(b => b.DateCreation).ToList();
}
else

62
Billing.Shared/Views/RankPage.xaml
View File

@ -15,7 +15,7 @@
<Grid>
<StackLayout Margin="30, 0, 0, 0" HorizontalOptions="Center" VerticalOptions="Center"
Orientation="Horizontal" Spacing="10">
<ui:TintImageButton Source="calendar.png" WidthRequest="20" HeightRequest="20"
<ui:TintImageButton Source="left.png" WidthRequest="20" HeightRequest="20"
VerticalOptions="Center" HorizontalOptions="Start"
Command="{Binding LeftCommand}"/>
<Label Text="{Binding Title}"
@ -35,12 +35,66 @@
</Shell.TitleView>
<ContentPage.ToolbarItems>
<ToolbarItem Order="Primary" IconImageSource="plus.png" Command="{Binding FilterCommand}"/>
<ToolbarItem Order="Primary" IconImageSource="filter.png" Command="{Binding FilterCommand}"/>
</ContentPage.ToolbarItems>
<ScrollView>
<ContentPage.Resources>
<ui:NegativeConverter x:Key="negativeConverter"/>
<ui:MoneyConverter x:Key="moneyConverter" Absolute="True"/>
<ui:BalanceColorConverter x:Key="colorConverter"/>
<ui:TimeConverter x:Key="timeConverter"/>
<ui:IconConverter x:Key="iconConverter"/>
<Style x:Key="titleLabel" TargetType="Label">
<Setter Property="FontSize" Value="16"/>
<Setter Property="Margin" Value="10, 20, 10, 10"/>
<!--<Setter Property="TextColor" Value="{DynamicResource SecondaryTextColor}"/>-->
</Style>
<Style x:Key="promptLabel" TargetType="Label">
<Setter Property="HeightRequest" Value="240"/>
<Setter Property="FontSize" Value="15"/>
<Setter Property="VerticalOptions" Value="Start"/>
<Setter Property="HorizontalTextAlignment" Value="Center"/>
<Setter Property="VerticalTextAlignment" Value="Center"/>
<Setter Property="TextColor" Value="{DynamicResource SecondaryTextColor}"/>
</Style>
</ContentPage.Resources>
<ScrollView x:Name="scroller">
<StackLayout>
<chart:ChartView HeightRequest="240" Chart="{Binding Chart}"/>
<Label Text="{r:Text TrackingChart}" Style="{StaticResource titleLabel}"/>
<chart:ChartView HeightRequest="240" Chart="{Binding Chart}"
IsVisible="{Binding NoResult, Converter={StaticResource negativeConverter}}"/>
<Label Text="{r:Text NoResult}" Style="{StaticResource promptLabel}"
IsVisible="{Binding NoResult}"/>
<Label Text="{r:Text Top10}" Style="{StaticResource titleLabel}"/>
<ui:GroupStackLayout IsVisible="{Binding NoResult, Converter={StaticResource negativeConverter}}"
ItemsSource="{Binding TopBills}" RowHeight="50">
<ui:GroupStackLayout.ItemTemplate>
<DataTemplate x:DataType="v:UIBill">
<Grid Padding="20, 0" ColumnSpacing="10"
ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, Auto">
<ui:TintImage Source="{Binding Icon, Converter={StaticResource iconConverter}}"
WidthRequest="26" HeightRequest="20" VerticalOptions="Center"/>
<Label Grid.Column="1" Text="{Binding Name}" TextColor="{DynamicResource TextColor}"
VerticalOptions="Center"
FontSize="Default" FontAttributes="Bold"/>
<Label Grid.Column="2" Text="{Binding Amount, Converter={StaticResource moneyConverter}}"
TextColor="{Binding Amount, Converter={StaticResource colorConverter}}"
VerticalOptions="Center"/>
<StackLayout Grid.Row="1" Grid.Column="1" Spacing="6" Orientation="Horizontal">
<Label Text="{Binding DateCreation, Converter={StaticResource timeConverter}}"
FontSize="10" TextColor="{DynamicResource SecondaryTextColor}"/>
<Label Text="{Binding Wallet}"
FontSize="10" TextColor="{DynamicResource SecondaryTextColor}"/>
</StackLayout>
</Grid>
</DataTemplate>
</ui:GroupStackLayout.ItemTemplate>
</ui:GroupStackLayout>
<Label Text="{r:Text NoResult}" Style="{StaticResource promptLabel}"
IsVisible="{Binding NoResult}"/>
</StackLayout>
</ScrollView>
</ui:BillingPage>

58
Billing.Shared/Views/RankPage.xaml.cs
View File

@ -1,5 +1,4 @@
using Billing.Languages;
using Billing.Models;
using Billing.Models;
using Billing.Themes;
using Billing.UI;
using Microcharts;
@ -8,7 +7,10 @@ using SkiaSharp.Views.Forms;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Xamarin.Essentials;
using Xamarin.Forms;
using Resource = Billing.Languages.Resource;
namespace Billing.Views
{
@ -16,6 +18,7 @@ namespace Billing.Views
{
private static readonly BindableProperty ChartProperty = Helper.Create<Chart, RankPage>(nameof(Chart));
private static readonly BindableProperty TopBillsProperty = Helper.Create<IList<UIBill>, RankPage>(nameof(TopBills));
private static readonly BindableProperty NoResultProperty = Helper.Create<bool, RankPage>(nameof(NoResult));
public Chart Chart
{
@ -27,6 +30,11 @@ namespace Billing.Views
get => (IList<UIBill>)GetValue(TopBillsProperty);
set => SetValue(TopBillsProperty, value);
}
public bool NoResult
{
get => (bool)GetValue(NoResultProperty);
set => SetValue(NoResultProperty, value);
}
public Command LeftCommand { get; }
public Command RightCommand { get; }
@ -45,17 +53,25 @@ namespace Billing.Views
public override void OnLoaded()
{
SetMonth(DateTime.Today);
Task.Run(() => SetMonth(DateTime.Today));
}
private void OnLeftCommand()
{
SetMonth(current.AddMonths(-1));
Task.Run(() =>
{
MainThread.BeginInvokeOnMainThread(async () => await scroller.ScrollToAsync(0, 0, true));
SetMonth(current.AddMonths(-1));
});
}
private void OnRightCommand()
{
SetMonth(current.AddMonths(1));
Task.Run(() =>
{
MainThread.BeginInvokeOnMainThread(async () => await scroller.ScrollToAsync(0, 0, true));
SetMonth(current.AddMonths(1));
});
}
private void SetMonth(DateTime date)
@ -87,7 +103,7 @@ namespace Billing.Views
{
entries.Add(new((float)amount)
{
Label = day.ToString("MM/dd"),
Label = day.ToString("MM-dd"),
ValueLabel = amount.ToString("#,##0.##"),
Color = primaryColor,
TextColor = textColor,
@ -96,12 +112,30 @@ namespace Billing.Views
}
}
Chart = new LineChart
{
BackgroundColor = SKColors.Transparent,
LabelTextSize = 20,
Entries = entries
};
if (entries.Count > 0)
{
NoResult = false;
Chart = new LineChart
{
BackgroundColor = SKColors.Transparent,
LabelTextSize = 24,
Entries = entries
};
if (type == CategoryType.Income)
{
TopBills = bills.Where(b => b.Amount > 0).OrderByDescending(b => b.Amount).Take(10).Select(b => Helper.WrapBill(b)).ToList();
}
else
{
TopBills = bills.Where(b => b.Amount < 0).OrderBy(b => b.Amount).Take(10).Select(b => Helper.WrapBill(b)).ToList();
}
}
else
{
NoResult = true;
Chart = null;
TopBills = null;
}
}
}
}

18
Billing.sln
View File

@ -44,9 +44,9 @@ Global
{B4CD3B27-C58F-4B6B-B60E-35E515A73E5B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B4CD3B27-C58F-4B6B-B60E-35E515A73E5B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B4CD3B27-C58F-4B6B-B60E-35E515A73E5B}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|Any CPU.Build.0 = Debug|iPhone
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|Any CPU.Deploy.0 = Debug|iPhone
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|iPhone.ActiveCfg = Debug|iPhone
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|iPhone.Build.0 = Debug|iPhone
{5C4F1C35-6F66-4063-9605-A9F37FCABBA8}.Debug|iPhone.Deploy.0 = Debug|iPhone
@ -66,14 +66,14 @@ Global
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhone.Build.0 = Debug|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|Any CPU.Build.0 = Release|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhone.Build.0 = Release|iPhoneSimulator
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhone.ActiveCfg = Release|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhone.Build.0 = Release|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6A012FCA-3B1C-4593-ADD7-0751E5815C67}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

24
Billing/Billing.Android/Billing.Android.csproj
View File

@ -518,6 +518,30 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\rank.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\filter.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\left.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\filter.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\left.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\filter.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\left.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\filter.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\left.png" />
</ItemGroup>
<Import Project="..\..\Billing.Shared\Billing.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>

10
Billing/Billing.Android/Renderers/TintImageButtonRenderer.cs
View File

@ -32,9 +32,13 @@ namespace Billing.Droid.Renderers
{
base.OnElementChanged(e);
if (Drawable != null && Element is TintImageButton image)
{
Drawable.SetTint(TintHelper.GetTintColor(image)?.ToAndroid() ?? 0);
if (e.NewElement is TintImageButton image)
{
SetBackgroundColor(Android.Graphics.Color.Transparent);
if (Drawable != null)
{
Drawable.SetTint(TintHelper.GetTintColor(image)?.ToAndroid() ?? 0);
}
}
}
}

BIN
Billing/Billing.Android/Resources/drawable-mdpi/filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

BIN
Billing/Billing.Android/Resources/drawable-mdpi/left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

BIN
Billing/Billing.Android/Resources/drawable-xhdpi/filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

BIN
Billing/Billing.Android/Resources/drawable-xhdpi/left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

BIN
Billing/Billing.Android/Resources/drawable-xxhdpi/filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
Billing/Billing.Android/Resources/drawable-xxhdpi/left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B

BIN
Billing/Billing.Android/Resources/drawable/filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

BIN
Billing/Billing.Android/Resources/drawable/left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 370 B

18
Billing/Billing.iOS/Billing.iOS.csproj
View File

@ -457,6 +457,24 @@
<ItemGroup>
<BundleResource Include="Resources\rank%403x.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\filter.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\filter%402x.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\filter%403x.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\left.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\left%402x.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\left%403x.png" />
</ItemGroup>
<Import Project="..\..\Billing.Shared\Billing.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>

BIN
Billing/Billing.iOS/Resources/filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

BIN
Billing/Billing.iOS/Resources/filter@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

BIN
Billing/Billing.iOS/Resources/filter@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
Billing/Billing.iOS/Resources/left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

BIN
Billing/Billing.iOS/Resources/left@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

BIN
Billing/Billing.iOS/Resources/left@3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B