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

haptic feedback

Browse Source
This commit is contained in:
Tsanie Lily
2022-03-16 16:45:10 +08:00
parent d3af69b31e
commit cac4735bc4
11 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Billing.Shared/Billing.Shared.projitems
View File

@ -24,6 +24,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Languages\Resource.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Languages\Resource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)MainShell.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)MainShell.xaml.cs">
<DependentUpon>MainShell.xaml</DependentUpon> <DependentUpon>MainShell.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Models\Category.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Models\Category.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Models\Account.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Models\Account.cs" />
@ -32,6 +33,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Themes\Light.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Themes\Light.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\BillingDate.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)UI\BillingDate.xaml.cs">
<DependentUpon>BillingDate.xaml</DependentUpon> <DependentUpon>BillingDate.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)UI\BillingPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\BillingPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\ColorPicker.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\ColorPicker.cs" />
@ -44,12 +46,15 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\WrapLayout.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\WrapLayout.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Views\AccountPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\AccountPage.xaml.cs">
<DependentUpon>AccountPage.xaml</DependentUpon> <DependentUpon>AccountPage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Views\AddAccountPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\AddAccountPage.xaml.cs">
<DependentUpon>AddAccountPage.xaml</DependentUpon> <DependentUpon>AddAccountPage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Views\AddBillPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\AddBillPage.xaml.cs">
<DependentUpon>AddBillPage.xaml</DependentUpon> <DependentUpon>AddBillPage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Views\AddCategoryPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\AddCategoryPage.xaml.cs">
<DependentUpon>AddCategoryPage.xaml</DependentUpon> <DependentUpon>AddCategoryPage.xaml</DependentUpon>
@ -57,6 +62,7 @@
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Views\BillPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\BillPage.xaml.cs">
<DependentUpon>BillPage.xaml</DependentUpon> <DependentUpon>BillPage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Views\CategoryPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\CategoryPage.xaml.cs">
<DependentUpon>CategoryPage.xaml</DependentUpon> <DependentUpon>CategoryPage.xaml</DependentUpon>
@ -76,6 +82,7 @@
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Views\SettingPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Views\SettingPage.xaml.cs">
<DependentUpon>SettingPage.xaml</DependentUpon> <DependentUpon>SettingPage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)UI\OptionsCells.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\OptionsCells.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Store\StoreHelper.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Store\StoreHelper.cs" />
@ -84,6 +91,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Models\IIdItem.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Models\IIdItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SplashPage.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)SplashPage.xaml.cs">
<DependentUpon>SplashPage.xaml</DependentUpon> <DependentUpon>SplashPage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Models\Logs.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Models\Logs.cs" />
</ItemGroup> </ItemGroup>

1
Billing.Shared/Languages/Resource.cs
View File

@ -16,6 +16,7 @@ namespace Billing.Languages
public static string ConfirmDeleteAccount => Text(nameof(ConfirmDeleteAccount)); public static string ConfirmDeleteAccount => Text(nameof(ConfirmDeleteAccount));
public static string ConfirmDeleteBill => Text(nameof(ConfirmDeleteBill)); public static string ConfirmDeleteBill => Text(nameof(ConfirmDeleteBill));
public static string TitleDateFormat => Text(nameof(TitleDateFormat)); public static string TitleDateFormat => Text(nameof(TitleDateFormat));
public static string TitleShortDateFormat => Text(nameof(TitleShortDateFormat));
public static string DateRangeFormat => Text(nameof(DateRangeFormat)); public static string DateRangeFormat => Text(nameof(DateRangeFormat));
public static string Custom => Text(nameof(Custom)); public static string Custom => Text(nameof(Custom));
public static string Monthly => Text(nameof(Monthly)); public static string Monthly => Text(nameof(Monthly));

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

@ -20,6 +20,7 @@
<NoRecords>Bills not yet generated</NoRecords> <NoRecords>Bills not yet generated</NoRecords>
<TapToMemo>Click here to record</TapToMemo> <TapToMemo>Click here to record</TapToMemo>
<TitleDateFormat>MM/dd/yyyy</TitleDateFormat> <TitleDateFormat>MM/dd/yyyy</TitleDateFormat>
<TitleShortDateFormat>MM/dd/yyyy</TitleShortDateFormat>
<DateRangeFormat>MM/dd</DateRangeFormat> <DateRangeFormat>MM/dd</DateRangeFormat>
<To>To</To> <To>To</To>
<Type>Type</Type> <Type>Type</Type>

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

@ -20,6 +20,7 @@
<NoRecords>还未产生账单</NoRecords> <NoRecords>还未产生账单</NoRecords>
<TapToMemo>点此记录</TapToMemo> <TapToMemo>点此记录</TapToMemo>
<TitleDateFormat>yyyy年MM月dd日</TitleDateFormat> <TitleDateFormat>yyyy年MM月dd日</TitleDateFormat>
<TitleShortDateFormat>yyyy/MM/dd</TitleShortDateFormat>
<DateRangeFormat>MM月dd日</DateRangeFormat> <DateRangeFormat>MM月dd日</DateRangeFormat>
<To>至</To> <To>至</To>
<Type>类型</Type> <Type>类型</Type>

12
Billing.Shared/Views/AddBillPage.xaml.cs
View File

@ -5,7 +5,9 @@ using Billing.Languages;
using Billing.Models; using Billing.Models;
using Billing.Store; using Billing.Store;
using Billing.UI; using Billing.UI;
using Xamarin.Essentials;
using Xamarin.Forms; using Xamarin.Forms;
using Resource = Billing.Languages.Resource;
namespace Billing.Views namespace Billing.Views
{ {
@ -171,6 +173,16 @@ namespace Billing.Views
category.LastUsed = DateTime.Now; category.LastUsed = DateTime.Now;
await StoreHelper.SaveCategoryItemAsync(category); await StoreHelper.SaveCategoryItemAsync(category);
try
{
HapticFeedback.Perform();
}
catch (FeatureNotSupportedException) { }
catch (Exception ex)
{
Helper.Error("haptic.feedback", ex);
}
} }
} }

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

@ -13,29 +13,28 @@
Shell.TabBarIsVisible="True"> Shell.TabBarIsVisible="True">
<Shell.TitleView> <Shell.TitleView>
<Grid> <StackLayout HorizontalOptions="Center" VerticalOptions="Center"
<StackLayout HorizontalOptions="Center" VerticalOptions="Center" Orientation="Horizontal" Spacing="10">
Orientation="Horizontal" Spacing="10"> <ui:TintImageButton Source="left.png" WidthRequest="20" HeightRequest="20"
<ui:TintImageButton Source="left.png" WidthRequest="20" HeightRequest="20" VerticalOptions="Center" HorizontalOptions="Start"
VerticalOptions="Center" HorizontalOptions="Start" Command="{Binding LeftCommand}"/>
Command="{Binding LeftCommand}"/> <Label Text="{Binding Title}"
<Label Text="{Binding Title}" TextColor="{DynamicResource PrimaryColor}"
TextColor="{DynamicResource PrimaryColor}" FontSize="{OnPlatform Android=20, iOS=18}"
FontSize="{OnPlatform Android=20, iOS=18}"> Padding="10, 0">
<Label.GestureRecognizers> <Label.GestureRecognizers>
<TapGestureRecognizer Command="{Binding FilterCommand}"/> <TapGestureRecognizer Command="{Binding FilterCommand}"/>
</Label.GestureRecognizers> </Label.GestureRecognizers>
<Label.FontFamily> <Label.FontFamily>
<OnPlatform x:TypeArguments="x:String" <OnPlatform x:TypeArguments="x:String"
Android="OpenSans-SemiBold.ttf#OpenSans-SemiBold" Android="OpenSans-SemiBold.ttf#OpenSans-SemiBold"
iOS="OpenSans-Bold"/> iOS="OpenSans-Bold"/>
</Label.FontFamily> </Label.FontFamily>
</Label> </Label>
<ui:TintImageButton Source="right.png" WidthRequest="20" HeightRequest="20" <ui:TintImageButton Source="right.png" WidthRequest="20" HeightRequest="20"
VerticalOptions="Center" HorizontalOptions="End" VerticalOptions="Center" HorizontalOptions="End"
Command="{Binding RightCommand}"/> Command="{Binding RightCommand}"/>
</StackLayout> </StackLayout>
</Grid>
</Shell.TitleView> </Shell.TitleView>
<!--<ContentPage.ToolbarItems> <!--<ContentPage.ToolbarItems>

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

@ -79,7 +79,7 @@ namespace Billing.Views
page.isLocked = false; page.isLocked = false;
if (!page.isFreezed) if (!page.isFreezed)
{ {
var format = Resource.TitleDateFormat; var format = Resource.TitleShortDateFormat;
page.Title = page.StartDate.ToString(format) + " ~ " + page.EndDate.ToString(format); page.Title = page.StartDate.ToString(format) + " ~ " + page.EndDate.ToString(format);
page.LoadData(); page.LoadData();
} }

2
Billing/Billing.Android/Properties/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1.315" package="org.tsanie.billing" android:installLocation="auto" android:versionCode="13"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1.316" package="org.tsanie.billing" android:installLocation="auto" android:versionCode="15">
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30" /> <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30" />
<application android:label="@string/applabel" android:theme="@style/MainTheme"></application> <application android:label="@string/applabel" android:theme="@style/MainTheme"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

2
Billing/Billing.Android/Properties/AssemblyInfo.cs
View File

@ -28,3 +28,5 @@ using Android.App;
[assembly: UsesPermission(Android.Manifest.Permission.Internet)] [assembly: UsesPermission(Android.Manifest.Permission.Internet)]
[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
[assembly: UsesPermission(Android.Manifest.Permission.ReadExternalStorage)] [assembly: UsesPermission(Android.Manifest.Permission.ReadExternalStorage)]
[assembly: UsesPermission(Android.Manifest.Permission.ManageExternalStorage)]
[assembly: UsesPermission(Android.Manifest.Permission.Vibrate)]

3
Billing/Billing.iOS/Billing.iOS.csproj
View File

@ -14,7 +14,7 @@
<AssemblyName>Billing.iOS</AssemblyName> <AssemblyName>Billing.iOS</AssemblyName>
<MtouchEnableSGenConc>true</MtouchEnableSGenConc> <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<ProvisioningType>automatic</ProvisioningType> <ProvisioningType>manual</ProvisioningType>
<LangVersion>9.0</LangVersion> <LangVersion>9.0</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@ -67,6 +67,7 @@
<MtouchLink>SdkOnly</MtouchLink> <MtouchLink>SdkOnly</MtouchLink>
<MtouchInterpreter>-all</MtouchInterpreter> <MtouchInterpreter>-all</MtouchInterpreter>
<MtouchUseLlvm>true</MtouchUseLlvm> <MtouchUseLlvm>true</MtouchUseLlvm>
<OptimizePNGs>true</OptimizePNGs>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Definition.cs" /> <Compile Include="Definition.cs" />

4
Billing/Billing.iOS/Info.plist
View File

@ -80,9 +80,9 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>13</string> <string>15</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.1.315</string> <string>1.1.316</string>
<key>LSApplicationQueriesSchemes</key> <key>LSApplicationQueriesSchemes</key>
<array> <array>
<string>mailto</string> <string>mailto</string>