blahba.com/flower-story
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

version up

Browse Source
This commit is contained in:
Tsanie Lily 2023-07-31 17:11:39 +08:00
parent befbc7fc9b
commit 8419c9d389
41 changed files with 1053 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FlowerApp/AppShell.xaml
View File

@ -7,9 +7,19 @@
Shell.FlyoutBehavior="Disabled"
Title="Flower Story">
<ShellContent
Title="{l:Lang home, Default=Garden Square}"
ContentTemplate="{DataTemplate l:HomePage}"
Route="HomePage" />
<TabBar>
<Tab Title="{l:Lang home, Default=Garden}"
Route="Home" Icon="flower_tulip.png">
<ShellContent ContentTemplate="{DataTemplate l:HomePage}"/>
</Tab>
<Tab Title="{l:Lang squarePage, Default=Square}"
Route="User" Icon="cube.png">
<ShellContent ContentTemplate="{DataTemplate l:SquarePage}"/>
</Tab>
<Tab Title="{l:Lang userPage, Default=Profile}"
Route="User" Icon="user.png">
<ShellContent ContentTemplate="{DataTemplate l:UserPage}"/>
</Tab>
</TabBar>
</Shell>

97
FlowerApp/Controls/AppContentPage.cs
View File

@ -1,59 +1,82 @@
namespace Blahblah.FlowerApp;
using Blahblah.FlowerApp.Data;
using Microsoft.Extensions.Logging;
public class AppContentPage : ContentPage
namespace Blahblah.FlowerApp;
public class AppContentPage : ContentPage, ILoggerContent
{
protected static string L(string key, string defaultValue = "")
{
return LocalizationResource.GetText(key, defaultValue);
}
public ILogger Logger { get; init; } = null!;
protected static Task<T?> FetchAsync<T>(string url, CancellationToken cancellation = default)
{
return Extensions.FetchAsync<T>(url, cancellation);
}
public FlowerDatabase Database { get; init; } = null!;
protected T GetValue<T>(BindableProperty property)
{
return (T)GetValue(property);
}
protected Task AlertError(string error)
bool hasLoading = true;
ContentView? loading;
#if __IOS__
private async Task DoLoading(bool flag)
#else
private Task DoLoading(bool flag)
#endif
{
return Alert(LocalizationResource.GetText("error", "Error"), error);
if (loading == null && hasLoading)
{
try
{
loading = (ContentView)FindByName("loading");
}
catch
{
hasLoading = false;
}
}
if (loading != null)
{
if (flag)
{
#if __IOS__
loading.IsVisible = true;
await loading.FadeTo(1, easing: Easing.CubicOut);
#else
loading.Opacity = 1;
loading.IsVisible = true;
#endif
}
else
{
#if __IOS__
await loading.FadeTo(0, easing: Easing.CubicIn);
loading.IsVisible = false;
#else
loading.IsVisible = false;
loading.Opacity = 0;
#endif
}
}
#if __ANDROID__
return Task.CompletedTask;
#endif
}
protected Task Alert(string title, string message, string? cancel = null)
protected Task Loading(bool flag)
{
cancel ??= LocalizationResource.GetText("ok", "Ok");
IsBusy = flag;
if (MainThread.IsMainThread)
{
return DisplayAlert(title, message, cancel);
return DoLoading(flag);
}
var taskSource = new TaskCompletionSource();
var source = new TaskCompletionSource();
MainThread.BeginInvokeOnMainThread(async () =>
{
await DisplayAlert(title, message, cancel);
taskSource.TrySetResult();
await DoLoading(flag);
source.TrySetResult();
});
return taskSource.Task;
}
protected Task<bool> Confirm(string title, string question, string? accept = null, string? cancel = null)
{
accept ??= LocalizationResource.GetText("yes", "Yes");
cancel ??= LocalizationResource.GetText("no", "No");
if (MainThread.IsMainThread)
{
return DisplayAlert(title, question, accept, cancel);
}
var taskSource = new TaskCompletionSource<bool>();
MainThread.BeginInvokeOnMainThread(async () =>
{
var result = await DisplayAlert(title, question, accept, cancel);
taskSource.TrySetResult(result);
});
return taskSource.Task;
return source.Task;
}
}

20
FlowerApp/Controls/AppConverters.cs Normal file
View File

@ -0,0 +1,20 @@
using System.Globalization;
namespace Blahblah.FlowerApp;
internal class VisibleIfNotNullConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
if (value is string s)
{
return !string.IsNullOrEmpty(s);
}
return value != null;
}
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}

23
FlowerApp/Controls/AppResources.cs
View File

@ -1,8 +1,29 @@
namespace Blahblah.FlowerApp;
using Blahblah.FlowerApp.Data.Model;
using static Blahblah.FlowerApp.Extensions;
namespace Blahblah.FlowerApp;
internal class AppResources
{
public const string EmptyCover = "empty_flower.jpg";
public const int EmptyUserId = -1;
public static readonly Size EmptySize = new(512, 339);
static readonly UserItem emptyUser = new()
{
Id = EmptyUserId,
Name = L("guest", "Guest")
};
static UserItem? user;
public static UserItem User => user ?? emptyUser;
public static bool IsLogined => user != null;
public static void SetUser(UserItem user)
{
AppResources.user = user;
}
}

12
FlowerApp/Controls/FlowerClientItem.cs
View File

@ -1,12 +1,12 @@
using Blahblah.FlowerApp.Data.Model;
using static Blahblah.FlowerApp.PropertyExtension;
using static Blahblah.FlowerApp.Extensions;
namespace Blahblah.FlowerApp.Controls;
public class FlowerClientItem : BindableObject
{
static readonly BindableProperty NameProperty = CreateProperty<string, FlowerClientItem>(nameof(Name));
static readonly BindableProperty CategoryProperty = CreateProperty<int, FlowerClientItem>(nameof(Category));
static readonly BindableProperty CategoryIdProperty = CreateProperty<int, FlowerClientItem>(nameof(CategoryId));
static readonly BindableProperty CoverProperty = CreateProperty<ImageSource?, FlowerClientItem>(nameof(Cover));
static readonly BindableProperty BoundsProperty = CreateProperty<Rect, FlowerClientItem>(nameof(Bounds));
@ -18,10 +18,10 @@ public class FlowerClientItem : BindableObject
get => (string)GetValue(NameProperty);
set => SetValue(NameProperty, value);
}
public int Category
public int CategoryId
{
get => (int)GetValue(CategoryProperty);
set => SetValue(CategoryProperty, value);
get => (int)GetValue(CategoryIdProperty);
set => SetValue(CategoryIdProperty, value);
}
public ImageSource? Cover
{
@ -46,7 +46,7 @@ public class FlowerClientItem : BindableObject
{
FlowerItem = item;
Name = item.Name;
Category = item.Category;
CategoryId = item.CategoryId;
if (item.Photos?.Length > 0 && item.Photos[0] is PhotoItem cover)
{

11
FlowerApp/Controls/ILoggerContent.cs Normal file
View File

@ -0,0 +1,11 @@
using Blahblah.FlowerApp.Data;
using Microsoft.Extensions.Logging;
namespace Blahblah.FlowerApp;
public interface ILoggerContent
{
public ILogger Logger { get; }
public FlowerDatabase Database { get; }
}

34
FlowerApp/Controls/ItemSearchHandler.cs Normal file
View File

@ -0,0 +1,34 @@
using Blahblah.FlowerApp.Controls;
using static Blahblah.FlowerApp.Extensions;
namespace Blahblah.FlowerApp;
public class ItemSearchHandler : SearchHandler
{
public static readonly BindableProperty FlowersProperty = CreateProperty<FlowerClientItem[], ItemSearchHandler>(nameof(Flowers));
public FlowerClientItem[] Flowers
{
get => (FlowerClientItem[])GetValue(FlowersProperty);
set => SetValue(FlowersProperty, value);
}
protected override void OnQueryChanged(string oldValue, string newValue)
{
base.OnQueryChanged(oldValue, newValue);
if (string.IsNullOrWhiteSpace(newValue))
{
ItemsSource = null;
}
else
{
ItemsSource = Flowers?.Where(f => f.Name.Contains(newValue, StringComparison.OrdinalIgnoreCase)).ToList();
}
}
protected override void OnItemSelected(object item)
{
base.OnItemSelected(item);
}
}

9
FlowerApp/Controls/PropertyExtension.cs
View File

@ -1,9 +0,0 @@
namespace Blahblah.FlowerApp;
internal sealed class PropertyExtension
{
public static BindableProperty CreateProperty<T, V>(string propertyName, T? defaultValue = default)
{
return BindableProperty.Create(propertyName, typeof(T), typeof(V), defaultValue);
}
}

9
FlowerApp/Data/Constants.cs
View File

@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using SQLite;
using SQLite;
namespace Blahblah.FlowerApp.Data;
@ -12,6 +11,8 @@ internal sealed class Constants
public const string LastTokenName = "last_token";
public const string BaseUrl = "https://app.blahblaho.com";
public const string AppVersion = "0.2.731";
public const string UserAgent = $"FlowerApp/{AppVersion}";
public const SQLiteOpenFlags SQLiteFlags =
SQLiteOpenFlags.ReadWrite |
@ -32,7 +33,7 @@ internal sealed class Constants
authorization = auth;
}
public static async Task<Definitions?> Initialize(ILogger logger, string? version, CancellationToken cancellation = default)
public static async Task<Definitions?> Initialize(ILoggerContent logger, string? version, CancellationToken cancellation = default)
{
try
{
@ -47,7 +48,7 @@ internal sealed class Constants
}
catch (Exception ex)
{
logger.LogError("error occurs on fetching version and definitions, {error}", ex);
logger.LogError(ex, $"error occurs on fetching version and definitions, {ex.Message}");
}
return null;

154
FlowerApp/Data/FlowerDatabase.cs
View File

@ -4,27 +4,17 @@ using SQLite;
namespace Blahblah.FlowerApp.Data;
public class FlowerDatabase
public class FlowerDatabase : ILoggerContent
{
private SQLiteAsyncConnection database = null!;
public ILogger Logger { get; }
private readonly ILogger logger;
public FlowerDatabase Database => this;
private SQLiteAsyncConnection database = null!;
public FlowerDatabase(ILogger<FlowerDatabase> logger)
{
this.logger = logger;
Task.Run(async () =>
{
try
{
await Setup();
}
catch (Exception ex)
{
logger.LogError("error occurs on setup, {error}", ex);
}
});
Logger = logger;
}
private Dictionary<int, NamedItem>? categories;
@ -49,29 +39,68 @@ public class FlowerDatabase
return Constants.EventUnknown;
}
private async Task Setup()
private async Task Init()
{
if (database is not null)
{
return;
}
#if DEBUG
Logger.LogInformation("database path: {path}", Constants.DatabasePath);
#endif
database = new SQLiteAsyncConnection(Constants.DatabasePath, Constants.SQLiteFlags);
#if DEBUG1
var result =
#endif
await database.CreateTablesAsync(CreateFlags.None,
typeof(FlowerItem),
typeof(RecordItem),
typeof(PhotoItem),
typeof(UserItem),
typeof(DefinitionItem),
typeof(ParamItem),
typeof(LogItem));
#if DEBUG1
foreach (var item in result.Results)
{
this.LogInformation($"create table {item.Key}, result: {item.Value}");
}
#endif
}
public async Task Setup()
{
await Init();
#if DEBUG
Constants.SetAuthorization("RF4mfoUur0vHtWzHwD42ka0FhIfGaPnBxoQgrXOYEDg=");
#if DEBUG1
var token = "RF4mfoUur0vHtWzHwD42ka0FhIfGaPnBxoQgrXOYEDg=";
#else
var token = await database.Table<ParamItem>().FirstOrDefaultAsync(p => p.Code == Constants.LastTokenName);
if (token != null)
{
Constants.SetAuthorization(token.Value);
}
var tk = await database.Table<ParamItem>().FirstOrDefaultAsync(p => p.Code == Constants.LastTokenName);
var token = tk?.Value;
#endif
if (token is string t)
{
Constants.SetAuthorization(t);
var user = await database.Table<UserItem>().FirstOrDefaultAsync(u => u.Token == t);
if (user != null)
{
AppResources.SetUser(user);
}
}
var version = await database.Table<ParamItem>().FirstOrDefaultAsync(p => p.Code == Constants.ApiVersionName);
var definition = await Constants.Initialize(logger, version?.Value);
var definition = await Constants.Initialize(this, version?.Value);
if (definition != null)
{
categories = definition.Categories;
events = definition.Events;
logger.LogInformation("new version founded, from ({from}) to ({to})", version?.Value, definition.ApiVersion);
this.LogInformation($"new version founded, from ({version?.Value}) to ({definition.ApiVersion})");
if (version == null)
{
@ -113,7 +142,7 @@ public class FlowerDatabase
});
}
var rows = await database.InsertAllAsync(defs);
logger.LogInformation("{count} definitions, {rows} rows inserted", defs.Count, rows);
this.LogInformation($"{defs.Count} definitions, {rows} rows inserted");
}
else
{
@ -139,32 +168,10 @@ public class FlowerDatabase
}
}
private async Task Init()
public async Task<int> AddLog(LogItem log)
{
if (database is not null)
{
return;
}
database = new SQLiteAsyncConnection(Constants.DatabasePath, Constants.SQLiteFlags);
#if DEBUG
var result =
#endif
await database.CreateTablesAsync(CreateFlags.None,
typeof(FlowerItem),
typeof(RecordItem),
typeof(PhotoItem),
typeof(UserItem),
typeof(DefinitionItem),
typeof(ParamItem));
#if DEBUG
foreach (var item in result.Results)
{
logger.LogInformation("create table {table}, result: {result}", item.Key, item.Value);
}
#endif
await Init();
return await database.InsertAsync(log);
}
public async Task<FlowerItem[]> GetFlowers()
@ -172,4 +179,47 @@ public class FlowerDatabase
await Init();
return await database.Table<FlowerItem>().ToArrayAsync();
}
public async Task<int> UpdateFlowers(IEnumerable<FlowerItem> flowers)
{
await Init();
var ids = flowers.Select(f => f.Id).ToList();
var count = await database.Table<FlowerItem>().DeleteAsync(f => ids.Contains(f.Id));
await database.Table<PhotoItem>().DeleteAsync(p => p.RecordId == null && ids.Contains(p.FlowerId));
await database.InsertAllAsync(flowers);
foreach (var flower in flowers)
{
if (flower.Photos?.Length > 0)
{
await database.InsertAllAsync(flower.Photos);
}
}
return count;
}
public async Task<int> SetUser(UserItem user)
{
await Init();
var count = user.Id > 0 ?
await database.Table<UserItem>().CountAsync(u => u.Id == user.Id) :
0;
if (count > 0)
{
count = await database.UpdateAsync(user);
}
else
{
count = await database.InsertAsync(user);
}
if (count > 0)
{
var c = await database.Table<ParamItem>().FirstOrDefaultAsync(p => p.Code == Constants.LastTokenName);
c ??= new ParamItem { Code = Constants.LastTokenName };
c.Value = user.Token;
await database.InsertOrReplaceAsync(c);
}
return count;
}
}

7
FlowerApp/Data/Model/FlowerItem.cs
View File

@ -1,4 +1,5 @@
using SQLite;
using System.Text.Json.Serialization;
namespace Blahblah.FlowerApp.Data.Model;
@ -12,19 +13,19 @@ public class FlowerItem
public int OwnerId { get; set; }
[Column("category"), NotNull]
public int Category { get; set; }
public int CategoryId { get; set; }
[Column("Name"), NotNull]
public string Name { get; set; } = null!;
[Column("datebuy"), NotNull]
[Column("datebuy"), JsonPropertyName("dateBuy"), NotNull]
public long DateBuyUnixTime { get; set; }
[Column("cost")]
public decimal? Cost { get; set; }
[Column("purchase")]
public string? PurchaseFrom { get; set; }
public string? Purchase { get; set; }
[Column("memo")]
public string? Memo { get; set; }

34
FlowerApp/Data/Model/LogItem.cs Normal file
View File

@ -0,0 +1,34 @@
using SQLite;
namespace Blahblah.FlowerApp.Data.Model;
[Table("logs")]
public class LogItem
{
[Column("lid"), PrimaryKey, AutoIncrement]
public int Id { get; set; }
[Column("logtime"), NotNull]
public long LogUnixTime { get; set; }
[Column("uid"), NotNull]
public int OwnerId { get; set; }
[Column("logtype"), NotNull]
public string LogType { get; set; } = null!;
[Column("category"), NotNull]
public string Category { get; set; } = null!;
[Column("message"), NotNull]
public string Message { get; set; } = null!;
[Column("source")]
public string? Source { get; set; } = null!;
[Column("description")]
public string? Description { get; set; }
[Column("client")]
public string? ClientAgent { get; set; }
}

11
FlowerApp/Data/Model/ParamItem.cs
View File

@ -5,15 +5,12 @@ namespace Blahblah.FlowerApp.Data.Model;
[Table("params")]
public class ParamItem
{
[Column("pid"), PrimaryKey, AutoIncrement]
public int Id { get; set; }
[Column("uid")]
public int? OwnerId { get; set; }
[Column("code"), NotNull]
[Column("code"), PrimaryKey, NotNull]
public string Code { get; set; } = null!;
[Column("uid"), NotNull]
public int OwnerId { get; set; } = AppResources.EmptyUserId;
[Column("value"), NotNull]
public string Value { get; set; } = null!;

7
FlowerApp/Data/Model/PhotoItem.cs
View File

@ -1,4 +1,5 @@
using SQLite;
using System.Text.Json.Serialization;
namespace Blahblah.FlowerApp.Data.Model;
@ -14,8 +15,8 @@ public class PhotoItem
[Column("fid"), NotNull]
public int FlowerId { get; set; }
[Column("rid"), NotNull]
public int RecordId { get; set; }
[Column("rid")]
public int? RecordId { get; set; }
[Column("filetype"), NotNull]
public string FileType { get; set; } = null!;
@ -26,7 +27,7 @@ public class PhotoItem
[Column("path"), NotNull]
public string Path { get; set; } = null!;
[Column("dateupload"), NotNull]
[Column("dateupload"), JsonPropertyName("dateUpload"), NotNull]
public long DateUploadUnixTime { get; set; }
[Column("url")]

9
FlowerApp/Data/Model/RecordItem.cs
View File

@ -1,7 +1,9 @@
using SQLite;
using System.Text.Json.Serialization;
namespace Blahblah.FlowerApp.Data.Model;
[Table("records")]
public class RecordItem
{
[Column("rid"), PrimaryKey, NotNull]
@ -14,9 +16,9 @@ public class RecordItem
public int FlowerId { get; set; }
[Column("event"), NotNull]
public int EventType { get; set; }
public int EventId { get; set; }
[Column("date"), NotNull]
[Column("date"), JsonPropertyName("date"), NotNull]
public long DateUnixTime { get; set; }
[Column("byuid")]
@ -33,4 +35,7 @@ public class RecordItem
[Column("longitude")]
public double? Longitude { get; set; }
[Ignore]
public PhotoItem[]? Photos { get; set; }
}

14
FlowerApp/Data/Model/UserItem.cs
View File

@ -1,7 +1,9 @@
using SQLite;
using System.Text.Json.Serialization;
namespace Blahblah.FlowerApp.Data.Model;
[Table("users")]
public class UserItem
{
[Column("uid"), PrimaryKey, NotNull]
@ -19,14 +21,9 @@ public class UserItem
[Column("level"), NotNull]
public int Level { get; set; }
[Column("regdate"), NotNull]
[Column("regdate"), JsonPropertyName("registerDate"), NotNull]
public long RegisterDateUnixTime { get; set; }
//[Column("activedate")]
//public long? ActiveDateUnixTime { get; set; }
//public DateTimeOffset? ActiveDate => ActiveDateUnixTime == null ? null : DateTimeOffset.FromUnixTimeMilliseconds(ActiveDateUnixTime.Value);
[Column("email")]
public string? Email { get; set; }
@ -35,4 +32,9 @@ public class UserItem
[Column("avatar")]
public byte[]? Avatar { get; set; }
public override string ToString()
{
return $"{{ Id: {Id}, Token: \"{Token}\", UserId: \"{UserId}\", Name: \"{Name}\", Level: {Level}, RegisterDate: \"{DateTimeOffset.FromUnixTimeMilliseconds(RegisterDateUnixTime)}\" }}";
}
}

121
FlowerApp/Extensions.cs
View File

@ -1,10 +1,21 @@
using Blahblah.FlowerApp.Data;
using Microsoft.Extensions.Logging;
using System.Net.Http.Json;
namespace Blahblah.FlowerApp;
internal sealed class Extensions
{
public static string L(string key, string defaultValue = "")
{
return LocalizationResource.GetText(key, defaultValue);
}
public static BindableProperty CreateProperty<T, V>(string propertyName, T? defaultValue = default)
{
return BindableProperty.Create(propertyName, typeof(T), typeof(V), defaultValue);
}
public static async Task<T?> FetchAsync<T>(string url, CancellationToken cancellation = default)
{
using var client = new HttpClient();
@ -15,4 +26,114 @@ internal sealed class Extensions
}
return await client.GetFromJsonAsync<T>($"{Constants.BaseUrl}/{url}", cancellation);
}
public static async Task<R?> PostAsync<T, R>(string url, T data, CancellationToken cancellation = default)
{
using var client = new HttpClient();
var authorization = Constants.Authorization;
if (authorization != null)
{
client.DefaultRequestHeaders.TryAddWithoutValidation("Authorization", authorization);
}
using var response = await client.PostAsJsonAsync($"{Constants.BaseUrl}/{url}", data, cancellation);
if (response != null)
{
response.EnsureSuccessStatusCode();
var content = response.Content;
if (content.Headers.TryGetValues("Authorization", out var values) &&
values.FirstOrDefault() is string oAuth)
{
Constants.SetAuthorization(oAuth);
var result = await content.ReadFromJsonAsync<R>(cancellation);
return result;
}
}
return default;
}
}
internal static class LoggerExtension
{
const LogLevel MinimumLogLevel = LogLevel.Information;
public static void LogInformation(this ILoggerContent content, string message)
{
Log(content, LogLevel.Information, null, message);
}
public static void LogWarning(this ILoggerContent content, string message)
{
Log(content, LogLevel.Warning, null, message);
}
public static void LogError(this ILoggerContent content, Exception? exception, string message)
{
Log(content, LogLevel.Error, exception, message);
}
private static void Log(ILoggerContent content, LogLevel level, Exception? exception, string message)
{
if (content?.Logger is ILogger logger)
{
logger.Log(level, exception, "[{time:MM/dd HH:mm:ss}] - {message}", DateTime.UtcNow, message);
if (content.Database is FlowerDatabase database)
{
_ = database.AddLog(new Data.Model.LogItem
{
OwnerId = AppResources.User.Id,
LogType = level.ToString(),
LogUnixTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
Category = "logger",
ClientAgent = Constants.UserAgent,
Message = message,
Description = exception?.ToString(),
Source = exception?.Source
});
}
}
}
}
internal static class PageExtension
{
public static Task AlertError(this ContentPage page, string error)
{
return Alert(page, LocalizationResource.GetText("error", "Error"), error);
}
public static Task Alert(this ContentPage page, string title, string message, string? cancel = null)
{
cancel ??= LocalizationResource.GetText("ok", "Ok");
if (MainThread.IsMainThread)
{
return page.DisplayAlert(title, message, cancel);
}
var taskSource = new TaskCompletionSource();
MainThread.BeginInvokeOnMainThread(async () =>
{
await page.DisplayAlert(title, message, cancel);
taskSource.TrySetResult();
});
return taskSource.Task;
}
public static Task<bool> Confirm(this ContentPage page, string title, string question, string? accept = null, string? cancel = null)
{
accept ??= LocalizationResource.GetText("yes", "Yes");
cancel ??= LocalizationResource.GetText("no", "No");
if (MainThread.IsMainThread)
{
return page.DisplayAlert(title, question, accept, cancel);
}
var taskSource = new TaskCompletionSource<bool>();
MainThread.BeginInvokeOnMainThread(async () =>
{
var result = await page.DisplayAlert(title, question, accept, cancel);
taskSource.TrySetResult(result);
});
return taskSource.Task;
}
}

24
FlowerApp/FlowerApp.csproj
View File

@ -17,10 +17,10 @@
<ApplicationId>org.blahblah.flowerstory</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>0.1.719</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>0.2.731</ApplicationDisplayVersion>
<ApplicationVersion>2</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">13.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23.0</SupportedOSPlatformVersion>
</PropertyGroup>
@ -52,6 +52,7 @@
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiIcon Include="Resources\AppIcon\appiconfg.svg" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
@ -67,6 +68,11 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<None Remove="Extensions.cs~RFf05ab26.TMP" />
<None Remove="Resources\AppIcon\appiconfg.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.9" />
@ -99,6 +105,18 @@
<Folder Include="Platforms\iOS\Controls\" />
</ItemGroup>
<ItemGroup>
<MauiXaml Update="LoginPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="SquarePage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="UserPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionFlowerAppHideInfoBar="True" /></VisualStudio></ProjectExtensions>
<!--<ItemGroup>

107
FlowerApp/Localizations.Designer.cs generated
View File

@ -60,6 +60,15 @@ namespace Blahblah.FlowerApp {
}
}
/// <summary>
/// Looks up a localized string similar to Add.
/// </summary>
internal static string add {
get {
return ResourceManager.GetString("add", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Error.
/// </summary>
@ -79,7 +88,43 @@ namespace Blahblah.FlowerApp {
}
/// <summary>
/// Looks up a localized string similar to Garden Square.
/// Looks up a localized string similar to Failed to login, please try again later..
/// </summary>
internal static string failedLogin {
get {
return ResourceManager.GetString("failedLogin", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Enter flower name to search....
/// </summary>
internal static string flowerSearchPlaceholder {
get {
return ResourceManager.GetString("flowerSearchPlaceholder", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Forgot password?.
/// </summary>
internal static string forgotPassword {
get {
return ResourceManager.GetString("forgotPassword", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Guest.
/// </summary>
internal static string guest {
get {
return ResourceManager.GetString("guest", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Garden.
/// </summary>
internal static string home {
get {
@ -87,6 +132,24 @@ namespace Blahblah.FlowerApp {
}
}
/// <summary>
/// Looks up a localized string similar to Log In.
/// </summary>
internal static string logIn {
get {
return ResourceManager.GetString("logIn", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to My Garden.
/// </summary>
internal static string myGarden {
get {
return ResourceManager.GetString("myGarden", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No.
/// </summary>
@ -97,11 +160,11 @@ namespace Blahblah.FlowerApp {
}
/// <summary>
/// Looks up a localized string similar to Nothing here....
/// Looks up a localized string similar to Click &quot;Add&quot; in the upper right corner to usher in the first plant in the garden..
/// </summary>
internal static string nothing {
internal static string noFlower {
get {
return ResourceManager.GetString("nothing", resourceCulture);
return ResourceManager.GetString("noFlower", resourceCulture);
}
}
@ -114,6 +177,24 @@ namespace Blahblah.FlowerApp {
}
}
/// <summary>
/// Looks up a localized string similar to Password.
/// </summary>
internal static string password {
get {
return ResourceManager.GetString("password", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Square.
/// </summary>
internal static string squarePage {
get {
return ResourceManager.GetString("squarePage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unknown.
/// </summary>
@ -123,6 +204,24 @@ namespace Blahblah.FlowerApp {
}
}
/// <summary>
/// Looks up a localized string similar to User ID.
/// </summary>
internal static string userId {
get {
return ResourceManager.GetString("userId", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Profile.
/// </summary>
internal static string userPage {
get {
return ResourceManager.GetString("userPage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Yes.
/// </summary>

39
FlowerApp/Localizations.resx
View File

@ -117,27 +117,60 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="add" xml:space="preserve">
<value>Add</value>
</data>
<data name="error" xml:space="preserve">
<value>Error</value>
</data>
<data name="failedGetFlowers" xml:space="preserve">
<value>Failed to get flowers, please try again.</value>
</data>
<data name="failedLogin" xml:space="preserve">
<value>Failed to login, please try again later.</value>
</data>
<data name="flowerSearchPlaceholder" xml:space="preserve">
<value>Enter flower name to search...</value>
</data>
<data name="forgotPassword" xml:space="preserve">
<value>Forgot password?</value>
</data>
<data name="guest" xml:space="preserve">
<value>Guest</value>
</data>
<data name="home" xml:space="preserve">
<value>Garden Square</value>
<value>Garden</value>
</data>
<data name="logIn" xml:space="preserve">
<value>Log In</value>
</data>
<data name="myGarden" xml:space="preserve">
<value>My Garden</value>
</data>
<data name="no" xml:space="preserve">
<value>No</value>
</data>
<data name="nothing" xml:space="preserve">
<value>Nothing here...</value>
<data name="noFlower" xml:space="preserve">
<value>Click "Add" in the upper right corner to usher in the first plant in the garden.</value>
</data>
<data name="ok" xml:space="preserve">
<value>Ok</value>
</data>
<data name="password" xml:space="preserve">
<value>Password</value>
</data>
<data name="squarePage" xml:space="preserve">
<value>Square</value>
</data>
<data name="unknown" xml:space="preserve">
<value>Unknown</value>
</data>
<data name="userId" xml:space="preserve">
<value>User ID</value>
</data>
<data name="userPage" xml:space="preserve">
<value>Profile</value>
</data>
<data name="yes" xml:space="preserve">
<value>Yes</value>
</data>

39
FlowerApp/Localizations.zh-CN.resx → FlowerApp/Localizations.zh.resx
View File

@ -117,27 +117,60 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="add" xml:space="preserve">
<value>添加</value>
</data>
<data name="error" xml:space="preserve">
<value>错误</value>
</data>
<data name="failedGetFlowers" xml:space="preserve">
<value>获取花草失败，请重试。</value>
</data>
<data name="failedLogin" xml:space="preserve">
<value>登录失败，请稍后重试。</value>
</data>
<data name="flowerSearchPlaceholder" xml:space="preserve">
<value>请输入植物名称进行搜索……</value>
</data>
<data name="forgotPassword" xml:space="preserve">
<value>忘记密码？</value>
</data>
<data name="guest" xml:space="preserve">
<value>访客</value>
</data>
<data name="home" xml:space="preserve">
<value>花园广场</value>
<value>小花园</value>
</data>
<data name="logIn" xml:space="preserve">
<value>登入</value>
</data>
<data name="myGarden" xml:space="preserve">
<value>我的小花园</value>
</data>
<data name="no" xml:space="preserve">
<value>否</value>
</data>
<data name="nothing" xml:space="preserve">
<value>没有任何东西...</value>
<data name="noFlower" xml:space="preserve">
<value>点击右上角的“添加”，迎来花园里的第一颗植物吧。</value>
</data>
<data name="ok" xml:space="preserve">
<value>好</value>
</data>
<data name="password" xml:space="preserve">
<value>密码</value>
</data>
<data name="squarePage" xml:space="preserve">
<value>广场</value>
</data>
<data name="unknown" xml:space="preserve">
<value>未知</value>
</data>
<data name="userId" xml:space="preserve">
<value>用户 ID</value>
</data>
<data name="userPage" xml:space="preserve">
<value>个人中心</value>
</data>
<data name="yes" xml:space="preserve">
<value>是</value>
</data>

33
FlowerApp/LoginPage.xaml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8" ?>
<l:AppContentPage
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Blahblah.FlowerApp.LoginPage"
x:Name="loginPage"
x:DataType="l:LoginPage">
<ContentPage.Resources>
<l:VisibleIfNotNullConverter x:Key="notNullConverter"/>
</ContentPage.Resources>
<Frame HasShadow="False" Margin="10" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
BorderColor="Transparent" BackgroundColor="White" BindingContext="{x:Reference loginPage}">
<Grid RowDefinitions="*,Auto,Auto,Auto,Auto,Auto,*" RowSpacing="12">
<Entry Grid.Row="1" Text="{Binding UserId}" IsEnabled="{Binding IsEnabled}" Keyboard="Email" Placeholder="{l:Lang userId, Default=User ID}"/>
<Entry Grid.Row="2" Text="{Binding Password}" IsEnabled="{Binding IsEnabled}" IsPassword="True" Placeholder="{l:Lang password, Default=Password}"/>
<Label Grid.Row="3" Text="{l:Lang forgotPassword, Default=Forgot password?}" Margin="0,20,0,0" TextColor="Gray"/>
<Label Grid.Row="4" Text="{Binding ErrorMessage}" Margin="0,10" TextColor="Red" IsVisible="{Binding ErrorMessage, Converter={StaticResource notNullConverter}}"/>
<Button Grid.Row="5" CornerRadius="6" Text="{l:Lang logIn, Default=Log In}" IsEnabled="{Binding IsEnabled}" BackgroundColor="#007bfc"
Clicked="Login_Clicked"/>
<Frame x:Name="loading" Grid.RowSpan="6" HasShadow="False" BorderColor="Transparent" Margin="0" Padding="20" BackgroundColor="#40000000"
IsVisible="False" Opacity="0" HorizontalOptions="Center" VerticalOptions="Center">
<ActivityIndicator HorizontalOptions="Center" VerticalOptions="Center" IsRunning="True"/>
</Frame>
</Grid>
</Frame>
</l:AppContentPage>

107
FlowerApp/LoginPage.xaml.cs Normal file
View File

@ -0,0 +1,107 @@
using Blahblah.FlowerApp.Data;
using Blahblah.FlowerApp.Data.Model;
using Microsoft.Extensions.Logging;
using System.Net.Http.Json;
using System.Text.Json.Serialization;
using static Blahblah.FlowerApp.Extensions;
namespace Blahblah.FlowerApp;
public partial class LoginPage : AppContentPage
{
static readonly BindableProperty UserIdProperty = CreateProperty<string, LoginPage>(nameof(UserId));
static readonly BindableProperty PasswordProperty = CreateProperty<string, LoginPage>(nameof(Password));
static readonly BindableProperty ErrorMessageProperty = CreateProperty<string?, LoginPage>(nameof(ErrorMessage));
public string UserId
{
get => (string)GetValue(UserIdProperty);
set => SetValue(UserIdProperty, value);
}
public string Password
{
get => (string)GetValue(PasswordProperty);
set => SetValue(PasswordProperty, value);
}
public string? ErrorMessage
{
get => (string?)GetValue(ErrorMessageProperty);
set => SetValue(ErrorMessageProperty, value);
}
public event EventHandler<UserItem>? AfterLogined;
public LoginPage(FlowerDatabase database, ILogger logger)
{
Database = database;
Logger = logger;
InitializeComponent();
}
private async void Login_Clicked(object sender, EventArgs e)
{
IsEnabled = false;
ErrorMessage = null;
await Loading(true);
var user = await Task.Run(() => DoLogin(UserId, Password));
if (user == null)
{
await Loading(false);
IsEnabled = true;
}
else
{
AppResources.SetUser(user);
var count = await Database.SetUser(user);
if (count <= 0)
{
this.LogWarning($"failed to save user item, with user: {user}");
}
AfterLogined?.Invoke(this, user);
}
}
private async Task<UserItem?> DoLogin(string userId, string password)
{
try
{
using var client = new HttpClient();
client.DefaultRequestHeaders.TryAddWithoutValidation("X-ClientAgent", Constants.UserAgent);
using var response = await client.PostAsJsonAsync($"{Constants.BaseUrl}/api/user/auth", new LoginParameter(userId, password));
if (response != null)
{
response.EnsureSuccessStatusCode();
if (response.Headers.TryGetValues("Authorization", out var values) &&
values.FirstOrDefault() is string oAuth)
{
Constants.SetAuthorization(oAuth);
var user = await response.Content.ReadFromJsonAsync<UserItem>();
if (user != null)
{
user.Token = oAuth;
return user;
}
}
}
}
catch (Exception ex)
{
//await this.AlertError(L("failedLogin", "Failed to login, please try again later."));
ErrorMessage = L("failedLogin", "Failed to login, please try again later.");
this.LogError(ex, $"error occurs in LoginPage, {ex.Message}");
}
return null;
}
record LoginParameter(string Id, string Password)
{
[JsonPropertyName("id")]
public string Id { get; init; } = Id;
[JsonPropertyName("password")]
public string Password { get; init; } = Password;
}
}

39
FlowerApp/MainPage.xaml
View File

@ -1,15 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
<l:AppContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Blahblah.FlowerApp.HomePage"
x:Name="homePage"
x:DataType="l:HomePage">
<l:AppContentPage
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Blahblah.FlowerApp.HomePage"
x:Name="homePage"
x:DataType="l:HomePage"
Title="{l:Lang myGarden, Default=My Garden}">
<Shell.SearchHandler>
<l:ItemSearchHandler TextColor="{AppThemeBinding Light={OnPlatform Android={StaticResource Primary}, iOS={StaticResource White}}, Dark={StaticResource White}}"
PlaceholderColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"
Placeholder="{l:Lang flowerSearchPlaceholder, Default=Enter flower name to search...}"
Flowers="{Binding Flowers, Source={x:Reference homePage}}" DisplayMemberName="Name"
FontFamily="OpenSansRegular" FontSize="14"
SearchBoxVisibility="Collapsible" ShowsResults="True"/>
</Shell.SearchHandler>
<ContentPage.ToolbarItems>
<ToolbarItem Text="Filter"/>
<ToolbarItem Text="{l:Lang add, Default=Add}"/>
</ContentPage.ToolbarItems>
<ContentPage.Resources>
@ -39,10 +50,12 @@
BindableLayout.ItemsSource="{Binding Flowers}"
BindableLayout.ItemTemplate="{StaticResource flowerTemplate}">
<BindableLayout.EmptyView>
<Label Text="{l:Lang nothing, Default=Nothing here...}"
HorizontalTextAlignment="Center"
AbsoluteLayout.LayoutFlags="SizeProportional"
AbsoluteLayout.LayoutBounds="0,20,1,1"/>
<VerticalStackLayout AbsoluteLayout.LayoutFlags="SizeProportional" AbsoluteLayout.LayoutBounds="0,20,1,1"
VerticalOptions="Start">
<Image Source="empty_flower.jpg" MaximumWidthRequest="200"/>
<Label Text="{l:Lang noFlower, Default=Click Add in the upper right corner to usher in the first plant in the garden.}"
HorizontalTextAlignment="Center" Margin="0,10"/>
</VerticalStackLayout>
</BindableLayout.EmptyView>
</AbsoluteLayout>
</ScrollView>

104
FlowerApp/MainPage.xaml.cs
View File

@ -2,7 +2,7 @@
using Blahblah.FlowerApp.Data;
using Blahblah.FlowerApp.Data.Model;
using Microsoft.Extensions.Logging;
using static Blahblah.FlowerApp.PropertyExtension;
using static Blahblah.FlowerApp.Extensions;
namespace Blahblah.FlowerApp;
@ -22,10 +22,9 @@ public partial class HomePage : AppContentPage
set => SetValue(IsRefreshingProperty, value);
}
readonly FlowerDatabase database;
readonly ILogger logger;
bool logined = false;
bool loaded = false;
bool? setup;
double pageWidth;
const int margin = 12;
@ -37,23 +36,54 @@ public partial class HomePage : AppContentPage
public HomePage(FlowerDatabase database, ILogger<HomePage> logger)
{
this.database = database;
this.logger = logger;
Database = database;
Logger = logger;
InitializeComponent();
Task.Run(async () =>
{
try
{
await Database.Setup();
}
catch (Exception ex)
{
this.LogError(ex, $"error occurs when setting up database, {ex.Message}");
}
finally
{
setup = true;
}
});
}
protected override void OnSizeAllocated(double width, double height)
{
base.OnSizeAllocated(width, height);
pageWidth = width - margin * 2;
if (!loaded)
if (!logined)
{
loaded = true;
IsRefreshing = true;
logined = true;
Task.Run(async () =>
{
while (setup == null)
{
await Task.Delay(100);
}
await DoValidationAsync();
if (!loaded)
{
loaded = true;
IsRefreshing = true;
}
});
}
else if (Flowers?.Length > 0)
pageWidth = width - margin * 2;
if (loaded && Flowers?.Length > 0)
{
DoInitSize();
foreach (var item in Flowers)
@ -63,6 +93,44 @@ public partial class HomePage : AppContentPage
}
}
private async Task<bool> DoValidationAsync()
{
bool invalid = true;
var oAuth = Constants.Authorization;
if (!string.IsNullOrEmpty(oAuth))
{
try
{
var user = await FetchAsync<UserItem>("api/user/profile");
if (user != null)
{
invalid = false;
AppResources.SetUser(user);
}
}
catch (Exception ex)
{
this.LogError(ex, $"token is invalid, token: {oAuth}, {ex.Message}");
}
}
if (invalid)
{
var source = new TaskCompletionSource<bool>();
MainThread.BeginInvokeOnMainThread(() =>
{
var login = new LoginPage(Database, Logger);
var sheet = this.ShowBottomSheet(login);
login.AfterLogined += (sender, user) =>
{
sheet.CloseBottomSheet();
source.TrySetResult(true);
};
});
return await source.Task;
}
return true;
}
private void DoInitSize()
{
ys = new double[cols];
@ -100,13 +168,15 @@ public partial class HomePage : AppContentPage
height);
}
private async void DoRefreshSquare()
private async Task DoRefreshAsync()
{
try
{
var result = await FetchAsync<FlowerResult>("api/flower/latest?photo=true");
if (result?.Count > 0)
{
await Database.UpdateFlowers(result.Flowers);
DoInitSize();
var flowers = result.Flowers.Select(f =>
{
@ -122,20 +192,20 @@ public partial class HomePage : AppContentPage
DoResizeItem(item);
return item;
});
logger.LogInformation("got {count} flowers.", result.Count);
this.LogInformation($"got {result.Count} flowers.");
Flowers = flowers.ToArray();
}
else
{
Flowers = Array.Empty<FlowerClientItem>();
logger.LogInformation("no flowers.");
this.LogInformation("no flowers.");
}
}
catch (Exception ex)
{
await AlertError(L("failedGetFlowers", "Failed to get flowers, please try again."));
logger.LogError("error occurs in HomePage, {exception}", ex);
await this.AlertError(L("failedGetFlowers", "Failed to get flowers, please try again."));
this.LogError(ex, $"error occurs in HomePage, {ex.Message}");
}
finally
{
@ -145,7 +215,7 @@ public partial class HomePage : AppContentPage
private void RefreshView_Refreshing(object sender, EventArgs e)
{
Task.Run(DoRefreshSquare);
Task.Run(DoRefreshAsync);
}
}

1
FlowerApp/MauiProgram.cs
View File

@ -28,6 +28,7 @@ public static class MauiProgram
#endif
builder.Services.AddSingleton<HomePage>();
builder.Services.AddSingleton<UserPage>();
builder.Services.AddSingleton<FlowerDatabase>();
builder.Services.AddLocalization();

23
FlowerApp/Platforms/Android/PageExtensions.cs Normal file
View File

@ -0,0 +1,23 @@
using Google.Android.Material.BottomSheet;
using Microsoft.Maui.Platform;
namespace Blahblah.FlowerApp;
public static partial class PageExtensions
{
public static BottomSheetDialog ShowBottomSheet(this Page page, IView content, bool dimDismiss = false)
{
var dialog = new BottomSheetDialog(Platform.CurrentActivity?.Window?.DecorView.FindViewById(Android.Resource.Id.Content)?.Context ?? throw new InvalidOperationException("Context is null"));
dialog.SetContentView(content.ToPlatform(page.Handler?.MauiContext ?? throw new Exception("MauiContext is null")));
dialog.Behavior.Hideable = dimDismiss;
dialog.SetCanceledOnTouchOutside(dimDismiss);
dialog.Behavior.FitToContents = true;
dialog.Show();
return dialog;
}
public static void CloseBottomSheet(this BottomSheetDialog dialog)
{
dialog.Dismiss();
}
}

39
FlowerApp/Platforms/iOS/PageExtensions.cs Normal file
View File

@ -0,0 +1,39 @@
using Microsoft.Maui.Platform;
using UIKit;
namespace Blahblah.FlowerApp;
public static partial class PageExtensions
{
public static UIViewController ShowBottomSheet(this Page page, IView content, bool dimDismiss = false)
{
var mauiContext = page.Handler?.MauiContext ?? throw new Exception("MauiContext is null");
var viewController = page.ToUIViewController(mauiContext);
var viewControllerToPresent = content.ToUIViewController(mauiContext);
viewControllerToPresent.ModalInPresentation = !dimDismiss;
var sheet = viewControllerToPresent.SheetPresentationController;
if (sheet != null)
{
sheet.Detents = new[]
{
UISheetPresentationControllerDetent.CreateLargeDetent()
};
//sheet.LargestUndimmedDetentIdentifier = dimDismiss ?
// UISheetPresentationControllerDetentIdentifier.Unknown :
// UISheetPresentationControllerDetentIdentifier.Medium;
sheet.PrefersScrollingExpandsWhenScrolledToEdge = false;
sheet.PrefersEdgeAttachedInCompactHeight = true;
sheet.WidthFollowsPreferredContentSizeWhenEdgeAttached = true;
}
viewController.PresentViewController(viewControllerToPresent, true, null);
return viewControllerToPresent;
}
public static void CloseBottomSheet(this UIViewController sheet)
{
sheet.DismissViewController(true, null);
}
}

9
FlowerApp/Resources/AppIcon/appiconfg.svg
View File

@ -1,8 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<svg xmlns="http://www.w3.org/2000/svg" width="812" height="812" viewBox="-150 -150 812 812" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="M480 160A128 128 0 0 0 352 32c-38.45 0-72.54 17.3-96 44.14C232.54 49.3 198.45 32 160 32A128 128 0 0 0 32 160c0 38.45 17.3 72.54 44.14 96C49.3 279.46 32 313.55 32 352a128 128 0 0 0 128 128c38.45 0 72.54-17.3 96-44.14C279.46 462.7 313.55 480 352 480a128 128 0 0 0 128-128c0-38.45-17.3-72.54-44.14-96C462.7 232.54 480 198.45 480 160zM256 336a80 80 0 1 1 80-80 80 80 0 0 1-80 80z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 740 B

1
FlowerApp/Resources/Images/cube.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 512 512"><!--! Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path d="M234.5 5.709C248.4 .7377 263.6 .7377 277.5 5.709L469.5 74.28C494.1 83.38 512 107.5 512 134.6V377.4C512 404.5 494.1 428.6 469.5 437.7L277.5 506.3C263.6 511.3 248.4 511.3 234.5 506.3L42.47 437.7C17 428.6 0 404.5 0 377.4V134.6C0 107.5 17 83.38 42.47 74.28L234.5 5.709zM256 65.98L82.34 128L256 190L429.7 128L256 65.98zM288 434.6L448 377.4V189.4L288 246.6V434.6z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 671 B

1
FlowerApp/Resources/Images/flower_tulip.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 512 512"><path d="M495.87 320h-47.26c-63 0-119.82 22.23-160.61 57.92V256a128 128 0 0 0 128-128V32l-80 48-78.86-80L176 80 96 32v96a128 128 0 0 0 128 128v121.92C183.21 342.23 126.37 320 63.39 320H16.13c-9.19 0-17 7.72-16.06 16.84C10.06 435 106.43 512 223.83 512h64.34c117.4 0 213.77-77 223.76-175.16.92-9.12-6.87-16.84-16.06-16.84z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 414 B

1
FlowerApp/Resources/Images/user.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 448 512"><!--! Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path d="M224 256c70.7 0 128-57.31 128-128s-57.3-128-128-128C153.3 0 96 57.31 96 128S153.3 256 224 256zM274.7 304H173.3C77.61 304 0 381.6 0 477.3c0 19.14 15.52 34.67 34.66 34.67h378.7C432.5 512 448 496.5 448 477.3C448 381.6 370.4 304 274.7 304z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 549 B

18
FlowerApp/SquarePage.xaml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<l:AppContentPage
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
x:Class="Blahblah.FlowerApp.SquarePage"
x:Name="squarePage"
x:DataType="l:SquarePage"
Title="{l:Lang squarePage, Default=Square}">
<VerticalStackLayout>
<Label
Text="Welcome to .NET MAUI!"
VerticalOptions="Center"
HorizontalOptions="Center" />
</VerticalStackLayout>
</l:AppContentPage>

9
FlowerApp/SquarePage.xaml.cs Normal file
View File

@ -0,0 +1,9 @@
namespace Blahblah.FlowerApp;
public partial class SquarePage : AppContentPage
{
public SquarePage()
{
InitializeComponent();
}
}

18
FlowerApp/UserPage.xaml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<l:AppContentPage
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:l="clr-namespace:Blahblah.FlowerApp"
x:Class="Blahblah.FlowerApp.UserPage"
x:Name="userPage"
x:DataType="l:UserPage"
Title="{l:Lang userPage, Default=Profile}">
<VerticalStackLayout>
<Label
Text="Welcome to .NET MAUI!"
VerticalOptions="Center"
HorizontalOptions="Center" />
</VerticalStackLayout>
</l:AppContentPage>

15
FlowerApp/UserPage.xaml.cs Normal file
View File

@ -0,0 +1,15 @@
using Blahblah.FlowerApp.Data;
using Microsoft.Extensions.Logging;
namespace Blahblah.FlowerApp;
public partial class UserPage : AppContentPage
{
public UserPage(FlowerDatabase database, ILogger<UserPage> logger)
{
Database = database;
Logger = logger;
InitializeComponent();
}
}

6
FlowerStory.sln
View File

@ -5,6 +5,8 @@ VisualStudioVersion = 17.7.33711.374
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{A551F94A-1997-4A20-A1E8-157050D92CEF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCase", "TestCase\TestCase.csproj", "{BE89C419-EE4D-4F0C-BB8E-4BEE2BC3AB0C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowerApp", "FlowerApp\FlowerApp.csproj", "{FCBB0455-071E-407B-9CB6-553C6D283756}"
EndProject
Global
@ -17,6 +19,10 @@ Global
{A551F94A-1997-4A20-A1E8-157050D92CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A551F94A-1997-4A20-A1E8-157050D92CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A551F94A-1997-4A20-A1E8-157050D92CEF}.Release|Any CPU.Build.0 = Release|Any CPU
{BE89C419-EE4D-4F0C-BB8E-4BEE2BC3AB0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE89C419-EE4D-4F0C-BB8E-4BEE2BC3AB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE89C419-EE4D-4F0C-BB8E-4BEE2BC3AB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE89C419-EE4D-4F0C-BB8E-4BEE2BC3AB0C}.Release|Any CPU.Build.0 = Release|Any CPU
{FCBB0455-071E-407B-9CB6-553C6D283756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCBB0455-071E-407B-9CB6-553C6D283756}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCBB0455-071E-407B-9CB6-553C6D283756}.Debug|Any CPU.Deploy.0 = Debug|Any CPU

5
Server/Controller/BaseController.cs
View File

@ -1,7 +1,6 @@
using Blahblah.FlowerStory.Server.Data;
using Blahblah.FlowerStory.Server.Data.Model;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Security.Cryptography;
using System.Text;
@ -55,10 +54,6 @@ public abstract partial class BaseController : ControllerBase
/// 管理员用户
/// </summary>
protected const int UserAdmin = 99;
/// <summary>
/// 封面事件
/// </summary>
protected const int EventCover = 0;
/// <summary>
/// 数据库对象

101
Server/Controller/FlowerApiController.cs
View File

@ -232,9 +232,7 @@ public class FlowerApiController : BaseController
{
foreach (var f in flowers)
{
f.Photos = database.Photos.Where(p =>
database.Records.Any(r =>
r.FlowerId == f.Id && r.EventId == EventCover && r.Id == p.RecordId)).ToList();
f.Photos = database.Photos.Where(p => p.FlowerId == f.Id && p.RecordId == null).ToList();
foreach (var photo in f.Photos)
{
photo.Url = $"photo/flower/{f.Id}/{photo.Path}";
@ -303,9 +301,7 @@ public class FlowerApiController : BaseController
if (includePhoto == true)
{
item.Photos = database.Photos.Where(p =>
database.Records.Any(r =>
r.FlowerId == item.Id && r.EventId == EventCover && r.Id == p.RecordId)).ToList();
item.Photos = database.Photos.Where(p => p.FlowerId == item.Id && p.RecordId == null).ToList();
foreach (var photo in item.Photos)
{
photo.Url = $"photo/flower/{item.Id}/{photo.Path}";
@ -487,25 +483,6 @@ public class FlowerApiController : BaseController
return BadRequest();
}
var record = database.Records.SingleOrDefault(r => r.FlowerId == item.Id && r.EventId == EventCover);
if (record == null)
{
record = new RecordItem
{
OwnerId = user.Id,
FlowerId = item.Id,
EventId = EventCover,
DateUnixTime = now,
ByUserId = user.Id,
ByUserName = user.Name,
//Memo = flower.Memo,
Latitude = flower.Latitude,
Longitude = flower.Longitude
};
database.Records.Add(record);
}
SaveDatabase();
try
{
await ExecuteTransaction(async token =>
@ -514,7 +491,6 @@ public class FlowerApiController : BaseController
{
OwnerId = user.Id,
FlowerId = item.Id,
RecordId = record.Id,
FileType = file.FileType,
FileName = file.Filename,
Path = file.Path,
@ -538,27 +514,7 @@ public class FlowerApiController : BaseController
var photo = database.Photos.SingleOrDefault(p => p.Id == coverId && p.OwnerId == user.Id);
if (photo != null)
{
var record = database.Records.SingleOrDefault(r => r.FlowerId == item.Id && r.EventId == EventCover);
if (record == null)
{
record = new RecordItem
{
OwnerId = user.Id,
FlowerId = item.Id,
EventId = EventCover,
DateUnixTime = now,
ByUserId = user.Id,
ByUserName = user.Name,
//Memo = flower.Memo,
Latitude = flower.Latitude,
Longitude = flower.Longitude
};
database.Records.Add(record);
SaveDatabase();
}
photo.FlowerId = item.Id;
photo.RecordId = record.Id;
SaveDatabase();
try
@ -737,33 +693,13 @@ public class FlowerApiController : BaseController
}
var now = user.ActiveDateUnixTime ?? DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
var record = database.Records.SingleOrDefault(r => r.FlowerId == update.Id && r.EventId == EventCover);
if (record == null)
var photos = database.Photos.Where(p => p.FlowerId == update.Id && p.RecordId == null).ToList();
if (photos.Count > 0)
{
record = new RecordItem
database.Photos.Where(p => p.RecordId == null).ExecuteDelete();
foreach (var photo in photos)
{
OwnerId = user.Id,
FlowerId = update.Id,
EventId = EventCover,
DateUnixTime = now,
ByUserId = user.Id,
ByUserName = user.Name,
//Memo = flower.Memo,
Latitude = flower.Latitude,
Longitude = flower.Longitude
};
database.Records.Add(record);
}
else
{
var photos = database.Photos.Where(p => p.RecordId == record.Id).ToList();
if (photos.Count > 0)
{
database.Photos.Where(p => p.RecordId == record.Id).ExecuteDelete();
foreach (var photo in photos)
{
DeleteFile(update.Id, photo.Path);
}
DeleteFile(update.Id, photo.Path);
}
}
SaveDatabase();
@ -776,7 +712,6 @@ public class FlowerApiController : BaseController
{
OwnerId = user.Id,
FlowerId = update.Id,
RecordId = record.Id,
FileType = file.FileType,
FileName = file.Filename,
Path = file.Path,
@ -865,23 +800,6 @@ public class FlowerApiController : BaseController
}
var now = user.ActiveDateUnixTime ?? DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
var record = database.Records.SingleOrDefault(r => r.FlowerId == param.Id && r.EventId == EventCover);
if (record == null)
{
record = new RecordItem
{
OwnerId = user.Id,
FlowerId = param.Id,
EventId = EventCover,
DateUnixTime = now,
ByUserId = user.Id,
ByUserName = user.Name,
//Memo = "",
Latitude = param.Latitude,
Longitude = param.Longitude
};
database.Records.Add(record);
}
flower.Latitude = param.Latitude;
flower.Longitude = param.Longitude;
@ -895,7 +813,6 @@ public class FlowerApiController : BaseController
{
OwnerId = user.Id,
FlowerId = param.Id,
RecordId = record.Id,
FileType = file.FileType,
FileName = file.Filename,
Path = file.Path,
@ -934,7 +851,7 @@ public class FlowerApiController : BaseController
///
/// </remarks>
/// <param name="id">花草唯一 id</param>
/// <param name="eventId">事件类型 id, 0 为封面</param>
/// <param name="eventId">事件类型 id</param>
/// <returns>验证通过则返回花草特定类型事件的照片列表</returns>
/// <response code="200">返回花草特定类型事件的照片列表</response>
/// <response code="401">未找到登录会话或已过期</response>
@ -948,7 +865,7 @@ public class FlowerApiController : BaseController
[ProducesErrorResponseType(typeof(ErrorResponse))]
[HttpGet]
[ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
public ActionResult<PhotoItem[]> GetCovers([Required][FromQuery] int id, [FromQuery(Name = "eid")] int? eventId = 0)
public ActionResult<PhotoItem[]> GetPhotos([Required][FromQuery] int id, [FromQuery(Name = "eid")] int? eventId = 0)
{
var (result, user) = CheckPermission();
if (result != null)

8
Server/Controller/UserApiController.cs
View File

@ -34,19 +34,19 @@ public partial class UserApiController : BaseController
/// </remarks>
/// <param name="login">登录参数</param>
/// <returns>成功登录则返回自定义认证头</returns>
/// <response code="204">返回自定义认证头</response>
/// <response code="200">返回用户对象，返回头中包含认证信息</response>
/// <response code="401">认证失败</response>
/// <response code="404">未找到用户</response>
/// <response code="500">服务器错误</response>
[Route("auth", Name = "authenticate")]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
[ProducesErrorResponseType(typeof(ErrorResponse))]
[HttpPost]
[Consumes("application/json")]
public ActionResult Authenticate([FromBody] LoginParamter login)
public ActionResult<UserItem> Authenticate([FromBody] LoginParamter login)
{
#if DEBUG
logger?.LogInformation("user \"{user}\" try to login with password \"{password}\"", login.Id, login.Password);
@ -100,7 +100,7 @@ public partial class UserApiController : BaseController
SaveDatabase();
Response.Headers.Add(AuthHeader, token.Id);
return NoContent();
return Ok(user);
}
/// <summary>

2
Server/Program.cs
View File

@ -11,7 +11,7 @@ public class Program
/// <inheritdoc/>
public const string ProjectName = "Flower Story";
/// <inheritdoc/>
public const string Version = "0.7.727";
public const string Version = "0.7.731";
/// <inheritdoc/>
public static void Main(string[] args)