diff --git a/App/App.xaml.cs b/App/App.xaml.cs deleted file mode 100644 index 96a05bd..0000000 --- a/App/App.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Blahblah.FlowerStory -{ - public partial class App : Application - { - public App() - { - InitializeComponent(); - - MainPage = new AppShell(); - } - } -} \ No newline at end of file diff --git a/App/AppShell.xaml.cs b/App/AppShell.xaml.cs deleted file mode 100644 index ca1ba4d..0000000 --- a/App/AppShell.xaml.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Blahblah.FlowerStory -{ - public partial class AppShell : Shell - { - public AppShell() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/App/Constants.cs b/App/Constants.cs deleted file mode 100644 index efc9eff..0000000 --- a/App/Constants.cs +++ /dev/null @@ -1,65 +0,0 @@ -namespace Blahblah.FlowerStory; - -public sealed class Constants -{ - public const string CategoryOther = "other"; - public const string EventUnknown = "unknown"; - - public const string BaseUrl = "https://flower.tsanie.org"; - - public const SQLite.SQLiteOpenFlags Flags = - SQLite.SQLiteOpenFlags.ReadWrite | - SQLite.SQLiteOpenFlags.Create | - SQLite.SQLiteOpenFlags.SharedCache; - - private const string databaseFilename = "flowerstory.db3"; - public static string DatabasePath => Path.Combine(FileSystem.AppDataDirectory, databaseFilename); - - public static readonly Dictionary Categories = new() - { - [0] = CategoryOther, - [1] = "cactus", // 仙人球 - [2] = "hibiscus", // 扶桑花 - [3] = "bougainvillea", // 三角梅 - [4] = "sunflower", // 太阳花 - [5] = "milanflower", // 米兰花 - [6] = "jasmine", // 茉莉花 - [7] = "periwinkle", // 长春花 - [8] = "nasturtium", // 旱金莲 - [9] = "mirabilis", // 紫薇花 - [10] = "tigerthornplum", // 虎刺梅 - [11] = "geranium", // 天竺葵 - [12] = "ballorchid", // 球兰 - [13] = "medalchrysanthemum", // 勋章菊 - [14] = "dianthus", // 石竹 - [15] = "fivecolorplum", // 五色梅 - [16] = "fuchsia", // 倒挂金钟 - [17] = "bamboocrabapple", // 竹节海棠 - [18] = "impatiens", // 凤仙花 - [19] = "beautysakura", // 美女樱 - [20] = "petunias", // 矮牵牛 - [21] = "desertrose", // 沙漠玫瑰 - [22] = "trailingcampanula", // 蔓性风铃花 - [23] = "chineserose", // 月季花 - }; - - public static readonly Dictionary Events = new() - { - [0] = new(EventUnknown), - [1] = new("buy", true), // 购买 - [2] = new("born", true), // 出生 - [3] = new("changebasin"), // 换盆 - [4] = new("watering"), // 浇水 - [5] = new("fertilize"), // 施肥 - [6] = new("germination"), // 发芽 - [7] = new("blossom"), // 开花 - [8] = new("fallenleaves"), // 落叶 - [9] = new("prune"), // 修剪 - [10] = new("sick"), // 生病 - [11] = new("death", true), // 死亡 - [12] = new("sell", true), // 出售 - [13] = new("share"), // 分享 - }; -} - -public record Event(string Name, bool Unique = false); diff --git a/App/Data/Model/FlowerItem.cs b/App/Data/Model/FlowerItem.cs deleted file mode 100644 index 408eb7c..0000000 --- a/App/Data/Model/FlowerItem.cs +++ /dev/null @@ -1,45 +0,0 @@ -using SQLite; - -namespace Blahblah.FlowerStory.Data.Model; - -[Table("flowers")] -public class FlowerItem -{ - [Column("fid"), PrimaryKey, AutoIncrement] - public int Id { get; set; } - - [Column("categoryid")] - public int CategoryId { get; set; } - - private string categoryName; - public string CategoryName - { - get - { - if (categoryName == null) - { - if (!Constants.Categories.TryGetValue(CategoryId, out var name)) - { - name = Constants.CategoryOther; - } - categoryName = LocalizationResource.GetText(name); - } - return categoryName; - } - } - - [Column("name")] - public string Name { get; set; } - - [Column("datebuy")] - public DateTimeOffset DateBuy { get; set; } - - [Column("cost")] - public decimal? Cost { get; set; } - - [Column("purchase")] - public string Purchase { get; set; } - - [Column("memo")] - public string Memo { get; set; } -} diff --git a/App/Data/Model/PhotoItem.cs b/App/Data/Model/PhotoItem.cs deleted file mode 100644 index ca46aeb..0000000 --- a/App/Data/Model/PhotoItem.cs +++ /dev/null @@ -1,28 +0,0 @@ -using SQLite; - -namespace Blahblah.FlowerStory.Data.Model; - -[Table("photos")] -public class PhotoItem -{ - [Column("pid"), PrimaryKey, AutoIncrement] - public int Id { get; set; } - - [Column("fid")] - public int FlowerId { get; set; } - - [Column("rid")] - public int RecordId { get; set; } - - [Column("filetype")] - public string FileType { get; set; } - - [Column("filename")] - public string FileName { get; set; } - - [Column("path")] - public string Path { get; set; } - - [Column("dateupload")] - public DateTimeOffset DateUpload { get; set; } -} diff --git a/App/Data/Model/RecordItem.cs b/App/Data/Model/RecordItem.cs deleted file mode 100644 index 742d2ba..0000000 --- a/App/Data/Model/RecordItem.cs +++ /dev/null @@ -1,50 +0,0 @@ -using SQLite; - -namespace Blahblah.FlowerStory.Data.Model; - -[Table("records")] -public class RecordItem -{ - [Column("rid"), PrimaryKey, AutoIncrement] - public int Id { get; set; } - - [Column("fid")] - public int FlowerId { get; set; } - - [Column("eid")] - public int EventId { get; set; } - - private string eventName; - public string EventName - { - get - { - if (eventName == null) - { - string evtkey; - if (Constants.Events.TryGetValue(EventId, out var @event)) - { - evtkey = @event.Name; - } - else - { - evtkey = Constants.EventUnknown; - } - eventName = LocalizationResource.GetText(evtkey); - } - return eventName; - } - } - - [Column("date")] - public DateTimeOffset Date { get; set; } - - [Column("byuid")] - public int? ByUserId { get; set; } - - [Column("byname")] - public string ByUserName { get; set; } - - [Column("memo")] - public string Memo { get; set; } -} diff --git a/App/Data/Model/UserItem.cs b/App/Data/Model/UserItem.cs deleted file mode 100644 index 0638988..0000000 --- a/App/Data/Model/UserItem.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Blahblah.FlowerStory.Data.Model; - -public class UserItem -{ - public int Id { get; set; } - - public string UserId { get; set; } - - public int Level { get; set; } - - public DateTimeOffset RegisterDate { get; set; } - - public string Name { get; set; } - - public string Email { get; set; } - - public string Mobile { get; set; } - - public byte[] Avatar { get; set; } -} diff --git a/App/Extensions.cs b/App/Extensions.cs deleted file mode 100644 index 742a2a2..0000000 --- a/App/Extensions.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Microsoft.Extensions.Localization; -using System.Text; - -namespace Blahblah.FlowerStory; - -[ContentProperty(nameof(Key))] -public class LocalizeExtension : IMarkupExtension -{ - //private IStringLocalizer Localizer { get; } - - public string Key { get; set; } - - //public LocalizeExtension() - //{ - // Localizer = MauiApplication.Current.Services.GetService>(); - //} - - public object ProvideValue(IServiceProvider _) - { - return LocalizationResource.Localizer.GetString(Key); - } - - object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider) => ProvideValue(serviceProvider); -} - -sealed class LocalizationResource -{ - private static IStringLocalizer localizer; - - public static IStringLocalizer Localizer => localizer ??= MauiApplication.Current.Services.GetService>(); - - public static string GetText(string key) - { - return Localizer.GetString(key); - } -} diff --git a/App/FlowerStory.csproj b/App/FlowerStory.csproj deleted file mode 100644 index 3b86351..0000000 --- a/App/FlowerStory.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - net7.0-android - - Exe - Blahblah.FlowerStory - true - true - enable - - - - Flower Story - - - org.blahblah.flowerstory - 4a6f7f22-fb2a-4771-b257-8b94ab57ce2f - - - 0.1.518 - 1 - - 13.0 - 23.0 - - - - android-x64 - - - - apk - android-arm64;android-x64 - True - - - - false - Automatic - manual - - - - iPhone Developer - - - iPhone Distribution - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Localizations.resx - - - - - - ResXFileCodeGenerator - Localizations.Designer.cs - - - diff --git a/App/MainPage.xaml.cs b/App/MainPage.xaml.cs deleted file mode 100644 index 599b831..0000000 --- a/App/MainPage.xaml.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Blahblah.FlowerStory.Data; -using Microsoft.Extensions.Logging; - -namespace Blahblah.FlowerStory -{ - public partial class MainPage : ContentPage - { - int count = 0; - readonly FlowerDatabase database; - - private readonly ILogger logger; - public MainPage(FlowerDatabase database, ILogger logger) - { - this.logger = logger; - - this.database = database; - InitializeComponent(); - } - - private void OnCounterClicked(object sender, EventArgs e) - { - count++; - - if (count == 1) - CounterBtn.Text = $"Clicked {count} time"; - else - CounterBtn.Text = $"Clicked {count} times"; - - SemanticScreenReader.Announce(CounterBtn.Text); - } - - protected override void OnAppearing() - { - base.OnAppearing(); - - Task.Run(async () => - { - try - { - var list = await database.GetFlowers(); - logger.LogInformation("got {count} flowers.", list.Count); - } - catch (Exception ex) - { - logger.LogError("error occurs, {exception}", ex); - } - }); - } - - private void canvasView_PaintSurface(object sender, SkiaSharp.Views.Maui.SKPaintSurfaceEventArgs e) - { - - } - } -} \ No newline at end of file diff --git a/App/MauiProgram.cs b/App/MauiProgram.cs deleted file mode 100644 index b0d28ce..0000000 --- a/App/MauiProgram.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Blahblah.FlowerStory.Data; -#if DEBUG -using Microsoft.Extensions.Logging; -#endif - -namespace Blahblah.FlowerStory -{ - public static class MauiProgram - { - public static MauiApp CreateMauiApp() - { - var builder = MauiApp.CreateBuilder(); - builder - .UseMauiApp() - .ConfigureFonts(fonts => - { - fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); - fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); - }) - .ConfigureMauiHandlers(handlers => - { - }); - -#if DEBUG - builder.Logging.AddDebug(); -#endif - - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - - builder.Services.AddLocalization(); - - return builder.Build(); - } - } -} \ No newline at end of file diff --git a/App/Platforms/Android/MainActivity.cs b/App/Platforms/Android/MainActivity.cs deleted file mode 100644 index 3e2b316..0000000 --- a/App/Platforms/Android/MainActivity.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Android.App; -using Android.Content.PM; -using Android.OS; - -namespace Blahblah.FlowerStory -{ - [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] - public class MainActivity : MauiAppCompatActivity - { - } -} \ No newline at end of file diff --git a/App/Platforms/Android/MainApplication.cs b/App/Platforms/Android/MainApplication.cs deleted file mode 100644 index cbc40d8..0000000 --- a/App/Platforms/Android/MainApplication.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Android.App; -using Android.Runtime; - -namespace Blahblah.FlowerStory -{ - [Application] - public class MainApplication : MauiApplication - { - public MainApplication(IntPtr handle, JniHandleOwnership ownership) - : base(handle, ownership) - { - } - - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); - } -} \ No newline at end of file diff --git a/App/Platforms/iOS/AppDelegate.cs b/App/Platforms/iOS/AppDelegate.cs deleted file mode 100644 index b6262a4..0000000 --- a/App/Platforms/iOS/AppDelegate.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Foundation; - -namespace Blahblah.FlowerStory -{ - [Register("AppDelegate")] - public class AppDelegate : MauiUIApplicationDelegate - { - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); - } -} \ No newline at end of file diff --git a/App/Platforms/iOS/Program.cs b/App/Platforms/iOS/Program.cs deleted file mode 100644 index b58c28a..0000000 --- a/App/Platforms/iOS/Program.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ObjCRuntime; -using UIKit; - -namespace Blahblah.FlowerStory -{ - public class Program - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(AppDelegate)); - } - } -} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..ae8bdf5 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,6 @@ + + + enable + 11.0.0 + + diff --git a/App/App.xaml b/FlowerApp/App.xaml similarity index 83% rename from App/App.xaml rename to FlowerApp/App.xaml index d8a1a11..9959494 100644 --- a/App/App.xaml +++ b/FlowerApp/App.xaml @@ -1,8 +1,8 @@  + xmlns:local="clr-namespace:Blahblah.FlowerApp" + x:Class="Blahblah.FlowerApp.App"> diff --git a/FlowerApp/App.xaml.cs b/FlowerApp/App.xaml.cs new file mode 100644 index 0000000..1b612c3 --- /dev/null +++ b/FlowerApp/App.xaml.cs @@ -0,0 +1,11 @@ +namespace Blahblah.FlowerApp; + +public partial class App : Application +{ + public App() + { + InitializeComponent(); + + MainPage = new AppShell(); + } +} \ No newline at end of file diff --git a/App/AppShell.xaml b/FlowerApp/AppShell.xaml similarity index 78% rename from App/AppShell.xaml rename to FlowerApp/AppShell.xaml index 9c115bf..9ff868e 100644 --- a/App/AppShell.xaml +++ b/FlowerApp/AppShell.xaml @@ -1,9 +1,9 @@ diff --git a/FlowerApp/AppShell.xaml.cs b/FlowerApp/AppShell.xaml.cs new file mode 100644 index 0000000..f837ee3 --- /dev/null +++ b/FlowerApp/AppShell.xaml.cs @@ -0,0 +1,9 @@ +namespace Blahblah.FlowerApp; + +public partial class AppShell : Shell +{ + public AppShell() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/FlowerApp/Controls/WaterfallLayout.cs b/FlowerApp/Controls/WaterfallLayout.cs new file mode 100644 index 0000000..e771ad5 --- /dev/null +++ b/FlowerApp/Controls/WaterfallLayout.cs @@ -0,0 +1,12 @@ +namespace Blahblah.FlowerApp.Controls; + +public class WaterfallLayout : View +{ + public static readonly BindableProperty ColumnsProperty = BindableProperty.Create(nameof(Columns), typeof(int), typeof(WaterfallLayout), defaultValue: 2); + + public int Columns + { + get => (int)GetValue(ColumnsProperty); + set => SetValue(ColumnsProperty, value); + } +} diff --git a/FlowerApp/Data/Constants.cs b/FlowerApp/Data/Constants.cs new file mode 100644 index 0000000..e42125e --- /dev/null +++ b/FlowerApp/Data/Constants.cs @@ -0,0 +1,19 @@ +using SQLite; + +namespace Blahblah.FlowerApp.Data; + +public sealed class Constants +{ + public const string CategoryOther = "other"; + public const string EventUnknown = "unknown"; + + public const string BaseUrl = "https://flower.tsanie.org"; + + public const SQLiteOpenFlags SQLiteFlags = + SQLiteOpenFlags.ReadWrite | + SQLiteOpenFlags.Create | + SQLiteOpenFlags.SharedCache; + + private const string dbFilename = "flowerstory.db3"; + public static string DatabasePath => Path.Combine(FileSystem.AppDataDirectory, dbFilename); +} diff --git a/App/Data/FlowerDatabase.cs b/FlowerApp/Data/FlowerDatabase.cs similarity index 70% rename from App/Data/FlowerDatabase.cs rename to FlowerApp/Data/FlowerDatabase.cs index aaa9b33..fa4990c 100644 --- a/App/Data/FlowerDatabase.cs +++ b/FlowerApp/Data/FlowerDatabase.cs @@ -1,14 +1,15 @@ -using Blahblah.FlowerStory.Data.Model; +using Blahblah.FlowerApp.Data.Model; using Microsoft.Extensions.Logging; using SQLite; -namespace Blahblah.FlowerStory.Data; +namespace Blahblah.FlowerApp.Data; public class FlowerDatabase { - private SQLiteAsyncConnection database; + private SQLiteAsyncConnection database = null!; private readonly ILogger logger; + public FlowerDatabase(ILogger logger) { this.logger = logger; @@ -21,12 +22,12 @@ public class FlowerDatabase return; } - database = new SQLiteAsyncConnection(Constants.DatabasePath, Constants.Flags); + database = new SQLiteAsyncConnection(Constants.DatabasePath, Constants.SQLiteFlags); #if DEBUG var result = #endif - await database.CreateTablesAsync(); + await database.CreateTablesAsync(); #if DEBUG foreach (var item in result.Results) @@ -36,9 +37,9 @@ public class FlowerDatabase #endif } - public async Task> GetFlowers() + public async Task GetFlowers() { await Init(); - return await database.Table().ToListAsync(); + return await database.Table().ToArrayAsync(); } } diff --git a/FlowerApp/Data/Model/FlowerItem.cs b/FlowerApp/Data/Model/FlowerItem.cs new file mode 100644 index 0000000..9152d7c --- /dev/null +++ b/FlowerApp/Data/Model/FlowerItem.cs @@ -0,0 +1,41 @@ +using SQLite; + +namespace Blahblah.FlowerApp.Data.Model; + +[Table("flowers")] +public class FlowerItem +{ + [Column("fid"), PrimaryKey, NotNull] + public int Id { get; set; } + + [Column("uid"), NotNull] + public int OwnerId { get; set; } + + [Column("category"), NotNull] + public int Category { get; set; } + + [Column("Name"), NotNull] + public string Name { get; set; } = null!; + + [Column("datebuy"), NotNull] + public long DateBuyUnixTime { get; set; } + + public DateTimeOffset DateBuy => DateTimeOffset.FromUnixTimeMilliseconds(DateBuyUnixTime); + + [Column("cost")] + public decimal? Cost { get; set; } + + [Column("purchase")] + public string? PurchaseFrom { get; set; } + + [Column("memo")] + public string? Memo { get; set; } + + [Column("latitude")] + public double? Latitude { get; set; } + + [Column("longitude")] + public double? Longitude { get; set; } + + public int? Distance { get; set; } +} diff --git a/FlowerApp/Data/Model/PhotoItem.cs b/FlowerApp/Data/Model/PhotoItem.cs new file mode 100644 index 0000000..6785db8 --- /dev/null +++ b/FlowerApp/Data/Model/PhotoItem.cs @@ -0,0 +1,36 @@ +using SQLite; + +namespace Blahblah.FlowerApp.Data.Model; + +[Table("photos")] +public class PhotoItem +{ + [Column("pid"), PrimaryKey, NotNull] + public int Id { get; set; } + + [Column("uid"), NotNull] + public int OwnerId { get; set; } + + [Column("fid"), NotNull] + public int FlowerId { get; set; } + + [Column("rid"), NotNull] + public int RecordId { get; set; } + + [Column("filetype"), NotNull] + public string FileType { get; set; } = null!; + + [Column("filename"), NotNull] + public string FileName { get; set; } = null!; + + [Column("path"), NotNull] + public string Path { get; set; } = null!; + + [Column("dateupload"), NotNull] + public long DateUploadUnixTime { get; set; } + + public DateTimeOffset DateUpload => DateTimeOffset.FromUnixTimeMilliseconds(DateUploadUnixTime); + + [Column("url")] + public string Url { get; set; } = null!; +} diff --git a/FlowerApp/Data/Model/RecordItem.cs b/FlowerApp/Data/Model/RecordItem.cs new file mode 100644 index 0000000..63d7a8e --- /dev/null +++ b/FlowerApp/Data/Model/RecordItem.cs @@ -0,0 +1,38 @@ +using SQLite; + +namespace Blahblah.FlowerApp.Data.Model; + +public class RecordItem +{ + [Column("rid"), PrimaryKey, NotNull] + public int Id { get; set; } + + [Column("uid"), NotNull] + public int OwnerId { get; set; } + + [Column("fid"), NotNull] + public int FlowerId { get; set; } + + [Column("event"), NotNull] + public int EventType { get; set; } + + [Column("date"), NotNull] + public long DateUnixTime { get; set; } + + public DateTimeOffset Date => DateTimeOffset.FromUnixTimeMilliseconds(DateUnixTime); + + [Column("byuid")] + public int? ByUserId { get; set; } + + [Column("byname")] + public string? ByUserName { get; set; } + + [Column("memo")] + public string? Memo { get; set; } + + [Column("latitude")] + public double? Latitude { get; set; } + + [Column("longitude")] + public double? Longitude { get; set; } +} diff --git a/FlowerApp/Data/Model/UserItem.cs b/FlowerApp/Data/Model/UserItem.cs new file mode 100644 index 0000000..fe78138 --- /dev/null +++ b/FlowerApp/Data/Model/UserItem.cs @@ -0,0 +1,40 @@ +using SQLite; + +namespace Blahblah.FlowerApp.Data.Model; + +public class UserItem +{ + [Column("uid"), PrimaryKey, AutoIncrement] + public int Id { get; set; } + + [Column("id"), NotNull] + public string UserId { get; set; } = null!; + + [Column("token"), NotNull] + public string Token { get; set; } = null!; + + [Column("name"), NotNull] + public string Name { get; set; } = null!; + + [Column("level"), NotNull] + public int Level { get; set; } + + [Column("regdate"), NotNull] + public long RegisterDateUnixTime { get; set; } + + public DateTimeOffset RegisterDate => DateTimeOffset.FromUnixTimeMilliseconds(RegisterDateUnixTime); + + //[Column("activedate")] + //public long? ActiveDateUnixTime { get; set; } + + //public DateTimeOffset? ActiveDate => ActiveDateUnixTime == null ? null : DateTimeOffset.FromUnixTimeMilliseconds(ActiveDateUnixTime.Value); + + [Column("email")] + public string? Email { get; set; } + + [Column("mobile")] + public string? Mobile { get; set; } + + [Column("avatar")] + public byte[]? Avatar { get; set; } +} diff --git a/FlowerApp/FlowerApp.csproj b/FlowerApp/FlowerApp.csproj new file mode 100644 index 0000000..b23a472 --- /dev/null +++ b/FlowerApp/FlowerApp.csproj @@ -0,0 +1,101 @@ + + + + net8.0-android;net8.0-ios + + Exe + Blahblah.FlowerApp + true + true + enable + + + + Flower Story + + + org.blahblah.flowerstory + + + 0.1.719 + 1 + + 13.0 + 23.0 + + + + android-x64 + + + + android-x64;android-arm64 + apk + true + + + + false + manual + + + + Apple Development + Flower Story Development + + + + Apple Distribution + Flower Story Ad-Hoc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Localizations.resx + + + + + + ResXFileCodeGenerator + Localizations.Designer.cs + + + + + + + + + diff --git a/FlowerApp/Handlers/WaterfallLayoutHandler.cs b/FlowerApp/Handlers/WaterfallLayoutHandler.cs new file mode 100644 index 0000000..9c06c96 --- /dev/null +++ b/FlowerApp/Handlers/WaterfallLayoutHandler.cs @@ -0,0 +1,20 @@ +using Blahblah.FlowerApp.Controls; + +namespace Blahblah.FlowerApp.Handlers; + +public partial class WaterfallLayoutHandler +{ + static readonly IPropertyMapper PropertyMapper = new PropertyMapper(ViewMapper) + { + [nameof(WaterfallLayout.Columns)] = MapColumns + }; + + static readonly CommandMapper CommandMapper = new(ViewCommandMapper) + { + + }; + + public WaterfallLayoutHandler() : base(PropertyMapper, CommandMapper) + { + } +} diff --git a/FlowerApp/LocalizationResource.cs b/FlowerApp/LocalizationResource.cs new file mode 100644 index 0000000..2cf71ab --- /dev/null +++ b/FlowerApp/LocalizationResource.cs @@ -0,0 +1,36 @@ +using Microsoft.Extensions.Localization; + +namespace Blahblah.FlowerApp; + +sealed class LocalizationResource +{ + private static IStringLocalizer? localizer; + + public static IStringLocalizer? Localizer => localizer ??= +#if __ANDROID__ + MauiApplication +#else + MauiUIApplicationDelegate +#endif + .Current.Services.GetService>(); + + public static string GetText(string key, string defaultValue = "") + { + return Localizer?.GetString(key) ?? defaultValue; + } +} + +[ContentProperty(nameof(Key))] +public class LangExtension : IMarkupExtension +{ + public required string Key { get; set; } + + public string Default { get; set; } = string.Empty; + + public object ProvideValue(IServiceProvider _) + { + return LocalizationResource.GetText(Key, Default); + } + + object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider) => ProvideValue(serviceProvider); +} diff --git a/App/Localizations.Designer.cs b/FlowerApp/Localizations.Designer.cs similarity index 97% rename from App/Localizations.Designer.cs rename to FlowerApp/Localizations.Designer.cs index 77b7667..6ba343a 100644 --- a/App/Localizations.Designer.cs +++ b/FlowerApp/Localizations.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Blahblah.FlowerStory { +namespace Blahblah.FlowerApp { using System; @@ -39,7 +39,7 @@ namespace Blahblah.FlowerStory { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Blahblah.FlowerStory.Localizations", typeof(Localizations).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Blahblah.FlowerApp.Localizations", typeof(Localizations).Assembly); resourceMan = temp; } return resourceMan; diff --git a/App/Localizations.resx b/FlowerApp/Localizations.resx similarity index 100% rename from App/Localizations.resx rename to FlowerApp/Localizations.resx diff --git a/App/Localizations.zh-CN.resx b/FlowerApp/Localizations.zh-CN.resx similarity index 100% rename from App/Localizations.zh-CN.resx rename to FlowerApp/Localizations.zh-CN.resx diff --git a/App/MainPage.xaml b/FlowerApp/MainPage.xaml similarity index 73% rename from App/MainPage.xaml rename to FlowerApp/MainPage.xaml index 0c38c9a..bfbd785 100644 --- a/App/MainPage.xaml +++ b/FlowerApp/MainPage.xaml @@ -1,12 +1,14 @@  + xmlns:l="clr-namespace:Blahblah.FlowerApp" + xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls" + x:Class="Blahblah.FlowerApp.MainPage" + x:Name="mainPage" + x:DataType="l:MainPage"> - - + + diff --git a/FlowerApp/MainPage.xaml.cs b/FlowerApp/MainPage.xaml.cs new file mode 100644 index 0000000..26dd0fb --- /dev/null +++ b/FlowerApp/MainPage.xaml.cs @@ -0,0 +1,49 @@ +using Blahblah.FlowerApp.Data; +using Microsoft.Extensions.Logging; + +namespace Blahblah.FlowerApp; + +public partial class MainPage : ContentPage +{ + int count = 0; + readonly FlowerDatabase database; + readonly ILogger logger; + + public MainPage(FlowerDatabase database, ILogger logger) + { + this.database = database; + this.logger = logger; + + InitializeComponent(); + } + + protected override void OnAppearing() + { + base.OnAppearing(); + + Task.Run(async () => + { + try + { + var list = await database.GetFlowers(); + logger.LogInformation("got {count} flowers.", list.Length); + } + catch (Exception ex) + { + logger.LogError("error occurs in MainPage, {exception}", ex); + } + }); + } + + //private void OnCounterClicked(object sender, EventArgs e) + //{ + // count++; + + // if (count == 1) + // CounterBtn.Text = $"Clicked {count} time"; + // else + // CounterBtn.Text = $"Clicked {count} times"; + + // SemanticScreenReader.Announce(CounterBtn.Text); + //} +} \ No newline at end of file diff --git a/FlowerApp/MauiProgram.cs b/FlowerApp/MauiProgram.cs new file mode 100644 index 0000000..df174ed --- /dev/null +++ b/FlowerApp/MauiProgram.cs @@ -0,0 +1,38 @@ +using Blahblah.FlowerApp.Controls; +using Blahblah.FlowerApp.Data; +using Blahblah.FlowerApp.Handlers; +#if DEBUG +using Microsoft.Extensions.Logging; +#endif + +namespace Blahblah.FlowerApp; + +public static class MauiProgram +{ + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }) + .ConfigureMauiHandlers(handlers => + { + handlers.AddHandler(); + }); + +#if DEBUG + builder.Logging.AddDebug(); +#endif + + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + + builder.Services.AddLocalization(); + + return builder.Build(); + } +} \ No newline at end of file diff --git a/App/Platforms/Android/AndroidManifest.xml b/FlowerApp/Platforms/Android/AndroidManifest.xml similarity index 100% rename from App/Platforms/Android/AndroidManifest.xml rename to FlowerApp/Platforms/Android/AndroidManifest.xml diff --git a/FlowerApp/Platforms/Android/MainActivity.cs b/FlowerApp/Platforms/Android/MainActivity.cs new file mode 100644 index 0000000..c0b0842 --- /dev/null +++ b/FlowerApp/Platforms/Android/MainActivity.cs @@ -0,0 +1,18 @@ +using Android.App; +using Android.Content.PM; + +namespace Blahblah.FlowerApp; + +[Activity( + Theme = "@style/Maui.SplashTheme", + MainLauncher = true, + ConfigurationChanges = + ConfigChanges.ScreenSize | + ConfigChanges.Orientation | + ConfigChanges.UiMode | + ConfigChanges.ScreenLayout | + ConfigChanges.SmallestScreenSize | + ConfigChanges.Density)] +public class MainActivity : MauiAppCompatActivity +{ +} \ No newline at end of file diff --git a/FlowerApp/Platforms/Android/MainApplication.cs b/FlowerApp/Platforms/Android/MainApplication.cs new file mode 100644 index 0000000..6ce464b --- /dev/null +++ b/FlowerApp/Platforms/Android/MainApplication.cs @@ -0,0 +1,15 @@ +using Android.App; +using Android.Runtime; + +namespace Blahblah.FlowerApp; + +[Application] +public class MainApplication : MauiApplication +{ + public MainApplication(IntPtr handle, JniHandleOwnership ownership) + : base(handle, ownership) + { + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} \ No newline at end of file diff --git a/App/Platforms/Android/Resources/values/colors.xml b/FlowerApp/Platforms/Android/Resources/values/colors.xml similarity index 100% rename from App/Platforms/Android/Resources/values/colors.xml rename to FlowerApp/Platforms/Android/Resources/values/colors.xml diff --git a/FlowerApp/Platforms/iOS/AppDelegate.cs b/FlowerApp/Platforms/iOS/AppDelegate.cs new file mode 100644 index 0000000..b036af9 --- /dev/null +++ b/FlowerApp/Platforms/iOS/AppDelegate.cs @@ -0,0 +1,9 @@ +using Foundation; + +namespace Blahblah.FlowerApp; + +[Register("AppDelegate")] +public class AppDelegate : MauiUIApplicationDelegate +{ + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} \ No newline at end of file diff --git a/FlowerApp/Platforms/iOS/Controls/FlowLayout.cs b/FlowerApp/Platforms/iOS/Controls/FlowLayout.cs new file mode 100644 index 0000000..7a7f864 --- /dev/null +++ b/FlowerApp/Platforms/iOS/Controls/FlowLayout.cs @@ -0,0 +1,125 @@ +using CoreGraphics; +using Foundation; +using UIKit; + +namespace Blahblah.FlowerApp.Platforms.iOS.Controls; + +public class FlowLayout : UICollectionViewFlowLayout +{ + public CalculateCellHeightHandler? CalculateCellHeight { get; set; } + + private readonly List layoutAttributes = new(); + + private CGSize oldBounds; + private bool dirty; + private int cols; + private nfloat[]? yArray; + private nfloat maxHeight; + + public FlowLayout(int cols = 2) + { + SetCols(cols); + } + + public void SetCols(int cols) + { + if (this.cols != cols) + { + dirty = true; + this.cols = cols; + } + } + + public void Invalidate() + { + dirty = true; + } + + private void Clean() + { + dirty = false; + yArray = new nfloat[cols]; + maxHeight = 0f; + layoutAttributes.Clear(); + } + + public override CGSize CollectionViewContentSize => new(CollectionView.Bounds.Width, maxHeight); + + public override bool ShouldInvalidateLayoutForBoundsChange(CGRect newBounds) + { + return newBounds.Width != CollectionView.Bounds.Width; + } + + public override void PrepareLayout() + { + base.PrepareLayout(); + + var bounds = CollectionView.Bounds.Size; + if (dirty || oldBounds.Width != bounds.Width) + { + oldBounds = bounds; + Clean(); + } + + var sectionLeft = SectionInset.Left; + var sectionTop = SectionInset.Top; + var minSpacing = MinimumInteritemSpacing; + var itemWidth = (bounds.Width - sectionLeft - SectionInset.Right - minSpacing * (cols - 1)) / cols; + var itemCount = CollectionView.NumberOfItemsInSection(0); + for (nint i = layoutAttributes.Count; i < itemCount; i++) + { + var indexPath = NSIndexPath.FromItemSection(i, 0); + var attr = UICollectionViewLayoutAttributes.CreateForCell(indexPath); + var itemHeight = CalculateCellHeight?.Invoke(indexPath, itemWidth) ?? 20; + nfloat value = nfloat.MaxValue; + int minHeightIndex = 0; + if (yArray?.Length >= cols) + { + for (var n = 0; n < cols; n++) + { + if (yArray[n] < value) + { + value = yArray[n]; + minHeightIndex = n; + } + } + } + var itemY = value; + if (itemY < sectionTop) + { + itemY = sectionTop; + } + if (i >= cols) + { + itemY += minSpacing; + } + + var itemX = sectionLeft + (itemWidth + minSpacing) * minHeightIndex; + attr.Frame = new CGRect(itemX, itemY, itemWidth, itemHeight); + layoutAttributes.Add(attr); + if (yArray != null) + { + yArray[minHeightIndex] = itemY + itemHeight; + } + } + nfloat y = 0f; + if (yArray != null) + { + for (var i = 0; i < yArray.Length; i++) + { + if (yArray[i] > y) + { + y = yArray[i]; + } + } + } + maxHeight = y + SectionInset.Bottom; + } + + public override UICollectionViewLayoutAttributes[] LayoutAttributesForElementsInRect(CGRect rect) + { + return layoutAttributes.Where(a => a.Frame.IntersectsWith(rect)).ToArray(); + } +} + +public delegate nfloat CalculateCellHeightHandler(NSIndexPath indexPath, nfloat itemWidth); \ No newline at end of file diff --git a/FlowerApp/Platforms/iOS/Controls/MauiWaterfallLayout.cs b/FlowerApp/Platforms/iOS/Controls/MauiWaterfallLayout.cs new file mode 100644 index 0000000..b70bb45 --- /dev/null +++ b/FlowerApp/Platforms/iOS/Controls/MauiWaterfallLayout.cs @@ -0,0 +1,86 @@ +using Blahblah.FlowerApp.Controls; +using Foundation; +using UIKit; + +namespace Blahblah.FlowerApp.Platforms.iOS.Controls; + +public class MauiWaterfallLayout : UIView, IUICollectionViewDataSource, IUICollectionViewDelegate +{ + WaterfallLayout? layout; + UICollectionView? collectionView; + + public MauiWaterfallLayout(WaterfallLayout layout) + { + this.layout = layout; + + var flow = new FlowLayout(layout.Columns) + { + //CalculateCellHeight = + MinimumInteritemSpacing = 12f, + SectionInset = new UIEdgeInsets(12f, 12f, 12f, 12f) + }; + + var refreshControl = new UIRefreshControl + { + TintColor = UIColor.SystemFill + }; + refreshControl.ValueChanged += (sender, e) => + { + if (sender is UIRefreshControl control) + { + control.EndRefreshing(); + } + }; + + collectionView = new UICollectionView(Bounds, flow) + { + DataSource = this, + Delegate = this, + RefreshControl = refreshControl, + TranslatesAutoresizingMaskIntoConstraints = false + }; + AddSubview(collectionView); + + var safe = SafeAreaLayoutGuide; + AddConstraints(new[] + { + NSLayoutConstraint.Create(collectionView, NSLayoutAttribute.Leading, NSLayoutRelation.Equal, safe, NSLayoutAttribute.Leading, 1f, 0f), + NSLayoutConstraint.Create(collectionView, NSLayoutAttribute.Trailing, NSLayoutRelation.Equal, safe, NSLayoutAttribute.Trailing, 1f, 0f), + NSLayoutConstraint.Create(collectionView, NSLayoutAttribute.Top, NSLayoutRelation.Equal, safe, NSLayoutAttribute.Top, 1f, 0f), + NSLayoutConstraint.Create(collectionView, NSLayoutAttribute.Bottom, NSLayoutRelation.Equal, safe, NSLayoutAttribute.Bottom, 1f, 0f), + }); + } + + public UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath) + { + return new UICollectionViewCell(); + } + + public nint GetItemsCount(UICollectionView collectionView, nint section) + { + return 5; + } + + public void UpdateColumns() + { + if (layout != null && collectionView?.CollectionViewLayout is FlowLayout flow) + { + flow.SetCols(layout.Columns); + } + } + + protected override void Dispose(bool disposing) + { + if (disposing) + { + if (collectionView != null) + { + collectionView.Dispose(); + collectionView = null; + } + layout = null; + } + + base.Dispose(disposing); + } +} diff --git a/FlowerApp/Platforms/iOS/Handlers/WaterfallLayoutHandler.cs b/FlowerApp/Platforms/iOS/Handlers/WaterfallLayoutHandler.cs new file mode 100644 index 0000000..92af691 --- /dev/null +++ b/FlowerApp/Platforms/iOS/Handlers/WaterfallLayoutHandler.cs @@ -0,0 +1,26 @@ +using Blahblah.FlowerApp.Controls; +using Blahblah.FlowerApp.Platforms.iOS.Controls; +using Microsoft.Maui.Handlers; + +namespace Blahblah.FlowerApp.Handlers; + +partial class WaterfallLayoutHandler : ViewHandler +{ + static void MapColumns(WaterfallLayoutHandler handler, WaterfallLayout layout) + { + handler.PlatformView?.UpdateColumns(); + } + + protected override MauiWaterfallLayout CreatePlatformView() => new MauiWaterfallLayout(VirtualView); + + protected override void ConnectHandler(MauiWaterfallLayout platformView) + { + base.ConnectHandler(platformView); + } + + protected override void DisconnectHandler(MauiWaterfallLayout platformView) + { + platformView.Dispose(); + base.DisconnectHandler(platformView); + } +} diff --git a/App/Platforms/iOS/Info.plist b/FlowerApp/Platforms/iOS/Info.plist similarity index 100% rename from App/Platforms/iOS/Info.plist rename to FlowerApp/Platforms/iOS/Info.plist diff --git a/FlowerApp/Platforms/iOS/Program.cs b/FlowerApp/Platforms/iOS/Program.cs new file mode 100644 index 0000000..6f568b6 --- /dev/null +++ b/FlowerApp/Platforms/iOS/Program.cs @@ -0,0 +1,14 @@ +using UIKit; + +namespace Blahblah.FlowerApp; + +public class Program +{ + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } +} \ No newline at end of file diff --git a/App/Resources/AppIcon/appicon.svg b/FlowerApp/Resources/AppIcon/appicon.svg similarity index 100% rename from App/Resources/AppIcon/appicon.svg rename to FlowerApp/Resources/AppIcon/appicon.svg diff --git a/App/Resources/AppIcon/appiconfg.svg b/FlowerApp/Resources/AppIcon/appiconfg.svg similarity index 100% rename from App/Resources/AppIcon/appiconfg.svg rename to FlowerApp/Resources/AppIcon/appiconfg.svg diff --git a/App/Resources/Fonts/OpenSans-Regular.ttf b/FlowerApp/Resources/Fonts/OpenSans-Regular.ttf similarity index 95% rename from App/Resources/Fonts/OpenSans-Regular.ttf rename to FlowerApp/Resources/Fonts/OpenSans-Regular.ttf index 5621cda..fb947d5 100644 Binary files a/App/Resources/Fonts/OpenSans-Regular.ttf and b/FlowerApp/Resources/Fonts/OpenSans-Regular.ttf differ diff --git a/App/Resources/Fonts/OpenSans-Semibold.ttf b/FlowerApp/Resources/Fonts/OpenSans-Semibold.ttf similarity index 96% rename from App/Resources/Fonts/OpenSans-Semibold.ttf rename to FlowerApp/Resources/Fonts/OpenSans-Semibold.ttf index 02508d6..7405bfd 100644 Binary files a/App/Resources/Fonts/OpenSans-Semibold.ttf and b/FlowerApp/Resources/Fonts/OpenSans-Semibold.ttf differ diff --git a/App/Resources/Images/dotnet_bot.svg b/FlowerApp/Resources/Images/dotnet_bot.svg similarity index 100% rename from App/Resources/Images/dotnet_bot.svg rename to FlowerApp/Resources/Images/dotnet_bot.svg diff --git a/App/Resources/Raw/AboutAssets.txt b/FlowerApp/Resources/Raw/AboutAssets.txt similarity index 100% rename from App/Resources/Raw/AboutAssets.txt rename to FlowerApp/Resources/Raw/AboutAssets.txt diff --git a/App/Resources/Splash/splash.svg b/FlowerApp/Resources/Splash/splash.svg similarity index 100% rename from App/Resources/Splash/splash.svg rename to FlowerApp/Resources/Splash/splash.svg diff --git a/App/Resources/Styles/Colors.xaml b/FlowerApp/Resources/Styles/Colors.xaml similarity index 100% rename from App/Resources/Styles/Colors.xaml rename to FlowerApp/Resources/Styles/Colors.xaml diff --git a/App/Resources/Styles/Styles.xaml b/FlowerApp/Resources/Styles/Styles.xaml similarity index 100% rename from App/Resources/Styles/Styles.xaml rename to FlowerApp/Resources/Styles/Styles.xaml diff --git a/FlowerStory.sln b/FlowerStory.sln index 15e39f2..073f348 100644 --- a/FlowerStory.sln +++ b/FlowerStory.sln @@ -3,26 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.33711.374 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowerStory", "App\FlowerStory.csproj", "{A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{A551F94A-1997-4A20-A1E8-157050D92CEF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowerApp", "FlowerApp\FlowerApp.csproj", "{FCBB0455-071E-407B-9CB6-553C6D283756}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}.Release|Any CPU.Build.0 = Release|Any CPU - {A2EB9F7A-8BB8-4D6D-989C-21C6CF10CE4C}.Release|Any CPU.Deploy.0 = Release|Any CPU {A551F94A-1997-4A20-A1E8-157050D92CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {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 + {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 + {FCBB0455-071E-407B-9CB6-553C6D283756}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCBB0455-071E-407B-9CB6-553C6D283756}.Release|Any CPU.Build.0 = Release|Any CPU + {FCBB0455-071E-407B-9CB6-553C6D283756}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE