From 02ac33fc07f1abf17522ca52c0a35e46c6268b4c Mon Sep 17 00:00:00 2001 From: Tsanie Lily Date: Wed, 19 Jul 2023 21:01:19 +0800 Subject: [PATCH] change app directory --- App/App.xaml.cs | 12 -- App/AppShell.xaml.cs | 10 -- App/Constants.cs | 65 --------- App/Data/Model/FlowerItem.cs | 45 ------- App/Data/Model/PhotoItem.cs | 28 ---- App/Data/Model/RecordItem.cs | 50 ------- App/Data/Model/UserItem.cs | 20 --- App/Extensions.cs | 36 ----- App/FlowerStory.csproj | 95 ------------- App/MainPage.xaml.cs | 55 -------- App/MauiProgram.cs | 36 ----- App/Platforms/Android/MainActivity.cs | 11 -- App/Platforms/Android/MainApplication.cs | 16 --- App/Platforms/iOS/AppDelegate.cs | 10 -- App/Platforms/iOS/Program.cs | 16 --- Directory.Build.props | 6 + {App => FlowerApp}/App.xaml | 4 +- FlowerApp/App.xaml.cs | 11 ++ {App => FlowerApp}/AppShell.xaml | 4 +- FlowerApp/AppShell.xaml.cs | 9 ++ FlowerApp/Controls/WaterfallLayout.cs | 12 ++ FlowerApp/Data/Constants.cs | 19 +++ {App => FlowerApp}/Data/FlowerDatabase.cs | 15 ++- FlowerApp/Data/Model/FlowerItem.cs | 41 ++++++ FlowerApp/Data/Model/PhotoItem.cs | 36 +++++ FlowerApp/Data/Model/RecordItem.cs | 38 ++++++ FlowerApp/Data/Model/UserItem.cs | 40 ++++++ FlowerApp/FlowerApp.csproj | 101 ++++++++++++++ FlowerApp/Handlers/WaterfallLayoutHandler.cs | 20 +++ FlowerApp/LocalizationResource.cs | 36 +++++ {App => FlowerApp}/Localizations.Designer.cs | 4 +- {App => FlowerApp}/Localizations.resx | 0 {App => FlowerApp}/Localizations.zh-CN.resx | 0 {App => FlowerApp}/MainPage.xaml | 19 +-- FlowerApp/MainPage.xaml.cs | 49 +++++++ FlowerApp/MauiProgram.cs | 38 ++++++ .../Platforms/Android/AndroidManifest.xml | 0 FlowerApp/Platforms/Android/MainActivity.cs | 18 +++ .../Platforms/Android/MainApplication.cs | 15 +++ .../Android/Resources/values/colors.xml | 0 FlowerApp/Platforms/iOS/AppDelegate.cs | 9 ++ .../Platforms/iOS/Controls/FlowLayout.cs | 125 ++++++++++++++++++ .../iOS/Controls/MauiWaterfallLayout.cs | 86 ++++++++++++ .../iOS/Handlers/WaterfallLayoutHandler.cs | 26 ++++ {App => FlowerApp}/Platforms/iOS/Info.plist | 0 FlowerApp/Platforms/iOS/Program.cs | 14 ++ .../Resources/AppIcon/appicon.svg | 0 .../Resources/AppIcon/appiconfg.svg | 0 .../Resources/Fonts/OpenSans-Regular.ttf | Bin 107172 -> 107184 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 111060 -> 111012 bytes .../Resources/Images/dotnet_bot.svg | 0 .../Resources/Raw/AboutAssets.txt | 0 .../Resources/Splash/splash.svg | 0 .../Resources/Styles/Colors.xaml | 0 .../Resources/Styles/Styles.xaml | 0 FlowerStory.sln | 16 +-- 56 files changed, 781 insertions(+), 535 deletions(-) delete mode 100644 App/App.xaml.cs delete mode 100644 App/AppShell.xaml.cs delete mode 100644 App/Constants.cs delete mode 100644 App/Data/Model/FlowerItem.cs delete mode 100644 App/Data/Model/PhotoItem.cs delete mode 100644 App/Data/Model/RecordItem.cs delete mode 100644 App/Data/Model/UserItem.cs delete mode 100644 App/Extensions.cs delete mode 100644 App/FlowerStory.csproj delete mode 100644 App/MainPage.xaml.cs delete mode 100644 App/MauiProgram.cs delete mode 100644 App/Platforms/Android/MainActivity.cs delete mode 100644 App/Platforms/Android/MainApplication.cs delete mode 100644 App/Platforms/iOS/AppDelegate.cs delete mode 100644 App/Platforms/iOS/Program.cs create mode 100644 Directory.Build.props rename {App => FlowerApp}/App.xaml (83%) create mode 100644 FlowerApp/App.xaml.cs rename {App => FlowerApp}/AppShell.xaml (78%) create mode 100644 FlowerApp/AppShell.xaml.cs create mode 100644 FlowerApp/Controls/WaterfallLayout.cs create mode 100644 FlowerApp/Data/Constants.cs rename {App => FlowerApp}/Data/FlowerDatabase.cs (70%) create mode 100644 FlowerApp/Data/Model/FlowerItem.cs create mode 100644 FlowerApp/Data/Model/PhotoItem.cs create mode 100644 FlowerApp/Data/Model/RecordItem.cs create mode 100644 FlowerApp/Data/Model/UserItem.cs create mode 100644 FlowerApp/FlowerApp.csproj create mode 100644 FlowerApp/Handlers/WaterfallLayoutHandler.cs create mode 100644 FlowerApp/LocalizationResource.cs rename {App => FlowerApp}/Localizations.Designer.cs (97%) rename {App => FlowerApp}/Localizations.resx (100%) rename {App => FlowerApp}/Localizations.zh-CN.resx (100%) rename {App => FlowerApp}/MainPage.xaml (73%) create mode 100644 FlowerApp/MainPage.xaml.cs create mode 100644 FlowerApp/MauiProgram.cs rename {App => FlowerApp}/Platforms/Android/AndroidManifest.xml (100%) create mode 100644 FlowerApp/Platforms/Android/MainActivity.cs create mode 100644 FlowerApp/Platforms/Android/MainApplication.cs rename {App => FlowerApp}/Platforms/Android/Resources/values/colors.xml (100%) create mode 100644 FlowerApp/Platforms/iOS/AppDelegate.cs create mode 100644 FlowerApp/Platforms/iOS/Controls/FlowLayout.cs create mode 100644 FlowerApp/Platforms/iOS/Controls/MauiWaterfallLayout.cs create mode 100644 FlowerApp/Platforms/iOS/Handlers/WaterfallLayoutHandler.cs rename {App => FlowerApp}/Platforms/iOS/Info.plist (100%) create mode 100644 FlowerApp/Platforms/iOS/Program.cs rename {App => FlowerApp}/Resources/AppIcon/appicon.svg (100%) rename {App => FlowerApp}/Resources/AppIcon/appiconfg.svg (100%) rename {App => FlowerApp}/Resources/Fonts/OpenSans-Regular.ttf (95%) rename {App => FlowerApp}/Resources/Fonts/OpenSans-Semibold.ttf (96%) rename {App => FlowerApp}/Resources/Images/dotnet_bot.svg (100%) rename {App => FlowerApp}/Resources/Raw/AboutAssets.txt (100%) rename {App => FlowerApp}/Resources/Splash/splash.svg (100%) rename {App => FlowerApp}/Resources/Styles/Colors.xaml (100%) rename {App => FlowerApp}/Resources/Styles/Styles.xaml (100%) 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 5621cda9e48f855299ee04063d67f0593f3c0ddd..fb947d5b22ed90301fb6f5c14937bbbd30090cd6 100644 GIT binary patch delta 3716 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 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 02508d66519632e8438f8a003dfae0d678ed7f9c..7405bfd948381c2fd68edabbcf86cd82f38a847a 100644 GIT binary patch delta 2714 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 CT5fj$ delta 2729 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 Om*yZR#FkfwKIC6t28FQz 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