Added glyph descriptions

Release-Candidate · Apr 11, 2021 · 38fcc46 · 38fcc46
1 parent 8d03335
commit 38fcc46
Show file tree

Hide file tree

Showing 21 changed files with 3,028 additions and 116 deletions.
diff --git a/README.md b/README.md
@@ -40,6 +40,8 @@ Online general Maya (not only Tzolk’in) calendar converter: [Maya Converter of
 
 [Convertidor Al Calendario Maya Smithsonian NMIA](https://maya.nmai.si.edu/es/calendario/convertidor-de-calendario-maya)
 
+Meaning of the Tzolk’in day glyphs [Arqueología Mexicana](https://arqueologiamexicana.mx/dias-mayas)
+
 Mayan Glyphs and Unicode: [Roadmap to the SMP](https://www.unicode.org/roadmaps/smp/) and the PDF [Updated List of Characters for Mayan Codices](https://www.unicode.org/L2/L2020/20248-mayan-update.pdf)
 
 ## Download

diff --git a/Tzolkin.sln b/Tzolkin.sln
@@ -27,7 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CHANGELOG.md = CHANGELOG.md
 		fake.cmd = fake.cmd
 		fake.sh = fake.sh
-		IMAGE_LICENSES.md = IMAGE_LICENSES.md
 		LICENSE = LICENSE
 		mkdocs.yml = mkdocs.yml
 		Pipfile = Pipfile

diff --git a/src/Tzolkin.Android/AssemblyInfo.fs b/src/Tzolkin.Android/AssemblyInfo.fs
@@ -1,5 +1,11 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
 // Copyright 2018 Fabulous contributors.
+// Copyright 2021 Roland Csaszar
+//
+// Project:  Tzolkin.Android
+// File:     AssemblyInfo.fs
+//
+//==============================================================================
 
 namespace Tzolkin.Android
 
@@ -16,12 +22,12 @@ type Resources = Tzolkin.Android.Resource
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[<assembly: AssemblyTitle("Tzolkin.Android")>]
+[<assembly: AssemblyTitle("Tzolkin")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]
 [<assembly: AssemblyCompany("")>]
-[<assembly: AssemblyProduct("Tzolkin.Android")>]
-[<assembly: AssemblyCopyright("Copyright ©  2014")>]
+[<assembly: AssemblyProduct("Tzolkin")>]
+[<assembly: AssemblyCopyright("Copyright © 2021 Roland Csaszar")>]
 [<assembly: AssemblyTrademark("")>]
 [<assembly: AssemblyCulture("")>]
 [<assembly: ComVisible(false)>]

diff --git a/src/Tzolkin.Android/MainActivity.fs b/src/Tzolkin.Android/MainActivity.fs
@@ -1,10 +1,15 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
 // Copyright 2018 Fabulous contributors.
+// Copyright 2021 Roland Csaszar
+//
+// Project:  Tzolkin.Android
+// File:     MainActivity.fs
+//
+//==============================================================================
 
 namespace Tzolkin.Android
 
 open System
-
 open Android.App
 open Android.Content
 open Android.Content.PM
@@ -13,9 +18,10 @@ open Android.Views
 open Android.Widget
 open Android.OS
 open Xamarin.Forms.Platform.Android
+
 open TzolkinApp
 
-[<Activity(Label = "Tzolkin.Android",
+[<Activity(Label = "Tzolkin",
            Icon = "@drawable/icon",
            Theme = "@style/MainTheme",
            MainLauncher = true,

diff --git a/src/Tzolkin.Android/Properties/AndroidManifest.xml b/src/Tzolkin.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="7" android:versionName="0.9.7" package="com.RC.Tzolkin" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="9" android:versionName="0.9.9" package="com.RC.Tzolkin" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<application android:label="Tzolkin" android:icon="@drawable/icon"></application>
 </manifest>
diff --git a/src/Tzolkin.Android/Resources/Resource.designer.cs b/src/Tzolkin.Android/Resources/Resource.designer.cs
diff --git a/src/Tzolkin.Android/Tzolkin.Android.fsproj b/src/Tzolkin.Android/Tzolkin.Android.fsproj
@@ -322,17 +322,21 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Fabulous">
-      <HintPath>..\..\packages\Fabulous.1.0.0\lib\netstandard2.0\Fabulous.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.1.0.1\lib\netstandard2.0\Fabulous.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous" />
     <Reference Include="Fabulous.LiveUpdate">
-      <HintPath>..\..\packages\Fabulous.LiveUpdate.1.0.0\lib\netstandard2.0\Fabulous.LiveUpdate.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.LiveUpdate.1.0.1\lib\netstandard2.0\Fabulous.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous.LiveUpdate" />
     <Reference Include="Fabulous.XamarinForms">
-      <HintPath>..\..\packages\Fabulous.XamarinForms.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.XamarinForms.1.0.1\lib\netstandard2.0\Fabulous.XamarinForms.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous.XamarinForms" />
     <Reference Include="Fabulous.XamarinForms.LiveUpdate">
-      <HintPath>..\..\packages\Fabulous.XamarinForms.LiveUpdate.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.XamarinForms.LiveUpdate.1.0.1\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous.XamarinForms.LiveUpdate" />
     <Reference Include="FormsViewGroup">
       <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2012\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
     </Reference>
@@ -352,11 +356,13 @@
       <HintPath>..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll</HintPath>
     </Reference>
     <Reference Include="SkiaSharp.Views.Android">
-      <HintPath>..\..\packages\SkiaSharp.Views.1.68.1\lib\MonoAndroid\SkiaSharp.Views.Android.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.2.80.2\lib\monoandroid1.0\SkiaSharp.Views.Android.dll</HintPath>
     </Reference>
+    <Reference Include="SkiaSharp.Views.Android" />
     <Reference Include="SkiaSharp.Views.Forms">
-      <HintPath>..\..\packages\SkiaSharp.Views.Forms.1.68.1\lib\MonoAndroid\SkiaSharp.Views.Forms.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Forms.2.80.2\lib\monoandroid1.0\SkiaSharp.Views.Forms.dll</HintPath>
     </Reference>
+    <Reference Include="SkiaSharp.Views.Forms" />
     <Reference Include="System" />
     <Reference Include="System.Buffers">
       <Private>True</Private>

diff --git a/src/Tzolkin.Android/packages.config b/src/Tzolkin.Android/packages.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fabulous" version="1.0.0" targetFramework="monoandroid11.0" />
-  <package id="Fabulous.LiveUpdate" version="1.0.0" targetFramework="monoandroid11.0" />
-  <package id="Fabulous.XamarinForms" version="1.0.0" targetFramework="monoandroid11.0" />
-  <package id="Fabulous.XamarinForms.LiveUpdate" version="1.0.0" targetFramework="monoandroid11.0" />
+  <package id="Fabulous" version="1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Fabulous.LiveUpdate" version="1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Fabulous.XamarinForms" version="1.0.1" targetFramework="monoandroid11.0" />
+  <package id="Fabulous.XamarinForms.LiveUpdate" version="1.0.1" targetFramework="monoandroid11.0" />
   <package id="FSharp.Core" version="5.0.1" targetFramework="monoandroid11.0" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid11.0" />
   <package id="SkiaSharp" version="2.80.2" targetFramework="monoandroid11.0" />
   <package id="SkiaSharp.Svg" version="1.60.0" targetFramework="monoandroid11.0" />
-  <package id="SkiaSharp.Views" version="1.68.1" targetFramework="monoandroid11.0" />
-  <package id="SkiaSharp.Views.Forms" version="1.68.1" targetFramework="monoandroid11.0" />
+  <package id="SkiaSharp.Views" version="2.80.2" targetFramework="monoandroid11.0" />
+  <package id="SkiaSharp.Views.Forms" version="2.80.2" targetFramework="monoandroid11.0" />
   <package id="System.Buffers" version="4.5.1" targetFramework="monoandroid11.0" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="monoandroid11.0" />
   <package id="Xamarin.Android.FSharp.ResourceProvider" version="1.0.0.28" targetFramework="monoandroid11.0" />

diff --git a/src/Tzolkin.iOS/AppDelegate.fs b/src/Tzolkin.iOS/AppDelegate.fs
@@ -1,5 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2018 Fabulous contributors.
+// Copyright 2021 Roland Csaszar
+//
+// Project:  Tzolkin.iOS
+// File:     AppDelegate.fs
+//
+//==============================================================================
+
 namespace Tzolkin.iOS
 
 open System
@@ -8,19 +15,23 @@ open Foundation
 open Xamarin.Forms
 open Xamarin.Forms.Platform.iOS
 
+open TzolkinApp
+
+
+
 [<Register("AppDelegate")>]
-type AppDelegate() =
-    inherit FormsApplicationDelegate()
+type AppDelegate () =
+    inherit FormsApplicationDelegate ()
 
     override this.FinishedLaunching(app, options) =
-        Forms.Init()
+        Forms.Init ()
 
-        let appcore = new Tzolkin.App()
-        this.LoadApplication(appcore)
-        base.FinishedLaunching(app, options)
+        let appcore = new TzolkinApp.App ()
+        this.LoadApplication (appcore)
+        base.FinishedLaunching (app, options)
 
 module Main =
     [<EntryPoint>]
     let main args =
-        UIApplication.Main(args, null, "AppDelegate")
+        UIApplication.Main (args, null, "AppDelegate")
         0
diff --git a/src/Tzolkin.iOS/Tzolkin.iOS.fsproj b/src/Tzolkin.iOS/Tzolkin.iOS.fsproj
@@ -147,17 +147,21 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Fabulous">
-      <HintPath>..\..\packages\Fabulous.1.0.0\lib\netstandard2.0\Fabulous.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.1.0.1\lib\netstandard2.0\Fabulous.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous" />
     <Reference Include="Fabulous.LiveUpdate">
-      <HintPath>..\..\packages\Fabulous.LiveUpdate.1.0.0\lib\netstandard2.0\Fabulous.LiveUpdate.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.LiveUpdate.1.0.1\lib\netstandard2.0\Fabulous.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous.LiveUpdate" />
     <Reference Include="Fabulous.XamarinForms">
-      <HintPath>..\..\packages\Fabulous.XamarinForms.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.XamarinForms.1.0.1\lib\netstandard2.0\Fabulous.XamarinForms.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous.XamarinForms" />
     <Reference Include="Fabulous.XamarinForms.LiveUpdate">
-      <HintPath>..\..\packages\Fabulous.XamarinForms.LiveUpdate.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
+      <HintPath>..\..\packages\Fabulous.XamarinForms.LiveUpdate.1.0.1\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
     </Reference>
+    <Reference Include="Fabulous.XamarinForms.LiveUpdate" />
     <Reference Include="FSharp.Core">
       <Private>True</Private>
     </Reference>
@@ -173,11 +177,13 @@
       <HintPath>..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll</HintPath>
     </Reference>
     <Reference Include="SkiaSharp.Views.Forms">
-      <HintPath>..\..\packages\SkiaSharp.Views.Forms.1.68.1\lib\Xamarin.iOS\SkiaSharp.Views.Forms.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Forms.2.80.2\lib\xamarinios1.0\SkiaSharp.Views.Forms.dll</HintPath>
     </Reference>
+    <Reference Include="SkiaSharp.Views.Forms" />
     <Reference Include="SkiaSharp.Views.iOS">
-      <HintPath>..\..\packages\SkiaSharp.Views.1.68.1\lib\Xamarin.iOS\SkiaSharp.Views.iOS.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.2.80.2\lib\xamarinios1.0\SkiaSharp.Views.iOS.dll</HintPath>
     </Reference>
+    <Reference Include="SkiaSharp.Views.iOS" />
     <Reference Include="System" />
     <Reference Include="System.Buffers">
       <Private>True</Private>

diff --git a/src/Tzolkin.iOS/packages.config b/src/Tzolkin.iOS/packages.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fabulous" version="1.0.0" targetFramework="xamarinios10" />
-  <package id="Fabulous.LiveUpdate" version="1.0.0" targetFramework="xamarinios10" />
-  <package id="Fabulous.XamarinForms" version="1.0.0" targetFramework="xamarinios10" />
-  <package id="Fabulous.XamarinForms.LiveUpdate" version="1.0.0" targetFramework="xamarinios10" />
+  <package id="Fabulous" version="1.0.1" targetFramework="xamarinios10" />
+  <package id="Fabulous.LiveUpdate" version="1.0.1" targetFramework="xamarinios10" />
+  <package id="Fabulous.XamarinForms" version="1.0.1" targetFramework="xamarinios10" />
+  <package id="Fabulous.XamarinForms.LiveUpdate" version="1.0.1" targetFramework="xamarinios10" />
   <package id="FSharp.Core" version="5.0.1" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
   <package id="SkiaSharp" version="2.80.2" targetFramework="xamarinios10" />
   <package id="SkiaSharp.Svg" version="1.60.0" targetFramework="xamarinios10" />
-  <package id="SkiaSharp.Views" version="1.68.1" targetFramework="xamarinios10" />
-  <package id="SkiaSharp.Views.Forms" version="1.68.1" targetFramework="xamarinios10" />
+  <package id="SkiaSharp.Views" version="2.80.2" targetFramework="xamarinios10" />
+  <package id="SkiaSharp.Views.Forms" version="2.80.2" targetFramework="xamarinios10" />
   <package id="System.Buffers" version="4.5.1" targetFramework="xamarinios10" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="xamarinios10" />
   <package id="WebP.Touch" version="1.0.8" targetFramework="xamarinios10" />

diff --git a/src/Tzolkin/AssemblyInfo.fs b/src/Tzolkin/AssemblyInfo.fs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+// Copyright (C) 2021 Roland Csaszar
+//
+// Project:  TzolkinApp
+// File:     AssemblyInfo.fs
+// Date:     4/11/2021 2:37:41 PM
+//==============================================================================
+
+/// The namespace of the IOS and Android Tzolkin app.
+namespace TzolkinApp
+
+open Xamarin.Forms
+
+[<assembly: ExportFont("Tzolkin.ttf")>]
+
+do ()
diff --git a/src/Tzolkin/DateList.fs b/src/Tzolkin/DateList.fs
@@ -23,13 +23,12 @@ module DateList =
 
     let cmdScrollToCenter = ScrollListCenter |> Cmd.ofMsg
 
-    /// Fills the list view with filtered dates.
-    let fillListViewFilter (model: Model) =
+    let fullFilterList model tzolkinDate =
         let lastList =
-            TzolkinDate.getLastList 500 model.ListTzolkinDate DateTime.Today
+            TzolkinDate.getLastList 500 tzolkinDate DateTime.Today
             |> List.rev
 
-        let nextList = TzolkinDate.getNextList 500 model.ListTzolkinDate DateTime.Today
+        let nextList = TzolkinDate.getNextList 500 tzolkinDate DateTime.Today
 
         let dateList = lastList @ nextList
 
@@ -59,16 +58,33 @@ module DateList =
         |> filterYear
         |> List.map (fun elem -> View.TextCell (elem.ToShortDateString ()))
 
+    let allListView () = []
+
+    let filterListViewNum tzolkinNum = []
+
+    let filterListViewGlyph tzolkinGlyph = []
+
+    /// Fills the list view with filtered dates.
+    let fillListViewFilter (model: Model) =
+        match model.ListTzolkinNumber, model.ListTzolkinGlyph with
+        | None, None -> allListView ()
+        | None, Some tzolkinGlyph -> filterListViewGlyph tzolkinGlyph
+        | Some tzolkinNum, None -> filterListViewNum tzolkinNum
+        | Some tzolkinNum, Some tzolkinGlyph ->
+            fullFilterList
+                model
+                { number = tzolkinNum
+                  glyph = tzolkinGlyph }
 
 
     /// Select a Tzolk’in date.
     let tzolkinSelector model dispatch =
         [ View.Picker (
             title = "Number:",
             horizontalOptions = LayoutOptions.Start,
-            selectedIndex = int (model.ListTzolkinDate.number) - 1,
+            selectedIndex = modelNumToInt model,
             items = numberPickList,
-            selectedIndexChanged = (fun (i, item) -> dispatch (SetListNumber <| i + 1)),
+            selectedIndexChanged = (fun (i, item) -> dispatch (SetListNumber i)),
             width = 35.0,
             fontSize = Style.fontSize,
             textColor = Style.foregroundColor model.IsDarkMode,
@@ -79,12 +95,12 @@ module DateList =
           View.Picker (
               title = "Glyph:",
               horizontalOptions = LayoutOptions.Start,
-              selectedIndex = int (model.ListTzolkinDate.glyph) - 1,
+              selectedIndex = modelGlyphToInt model,
               items = glyphPickList,
               fontSize = Style.fontSize,
               textColor = Style.foregroundColor model.IsDarkMode,
               backgroundColor = Style.backgroundColor model.IsDarkMode,
-              selectedIndexChanged = (fun (i, item) -> dispatch (SetListGlyph <| i + 1))
+              selectedIndexChanged = (fun (i, item) -> dispatch (SetListGlyph i))
           ) ]
 
     /// The Filter section
@@ -94,7 +110,7 @@ module DateList =
             horizontalOptions = LayoutOptions.Start,
             selectedIndex = model.Filter.day,
             items = "" :: [ for i in 1 .. 31 -> i.ToString () ],
-            selectedIndexChanged = (fun (i, item) -> dispatch (SetFilterDay <| i)),
+            selectedIndexChanged = (fun (i, item) -> dispatch (SetFilterDay i)),
             fontSize = Style.fontSize,
             textColor = Style.foregroundColor model.IsDarkMode,
             backgroundColor = Style.backgroundColor model.IsDarkMode,
@@ -106,15 +122,16 @@ module DateList =
               horizontalOptions = LayoutOptions.Start,
               selectedIndex = model.Filter.month,
               items = "" :: [ for i in 1 .. 12 -> i.ToString () ],
-              selectedIndexChanged = (fun (i, item) -> dispatch (SetFilterMonth <| i)),
+              selectedIndexChanged = (fun (i, item) -> dispatch (SetFilterMonth i)),
               fontSize = Style.fontSize,
               textColor = Style.foregroundColor model.IsDarkMode,
               backgroundColor = Style.backgroundColor model.IsDarkMode,
               width = 35.0,
               ref = monthPicker
           )
           View.Entry (
-              text = model.Filter.year,
+              text = "",
+              textChanged = (fun text -> SetFilterYear text.NewTextValue |> dispatch),
               completed = (fun text -> SetFilterYear text |> dispatch),
               keyboard = Keyboard.Numeric,
               fontSize = Style.fontSize,
@@ -124,7 +141,7 @@ module DateList =
               ref = yearPicker
           ) ]
 
-    /// 
+    ///
     let dateView model dispatch =
         View.Grid (
             backgroundColor = Style.backgroundColor model.IsDarkMode,
@@ -140,7 +157,7 @@ module DateList =
                 [ Dimension.Stars 0.4
                   Dimension.Stars 0.6 ],
             children =
-                [ (tzolkinDateView model.ListTzolkinDate model.IsDarkMode).Row(0).Column (1)
+                [ (tzolkinDateView (modelTzolkinDate model) model.IsDarkMode).Row(0).Column (1)
 
                   View
                       .StackLayout(children = tzolkinSelector model dispatch,
@@ -160,8 +177,10 @@ module DateList =
                       .Row(3)
                       .Column (1)
                   //View
-                  //    .BoxView(color = Color.Yellow,
-                  //             verticalOptions = LayoutOptions.Start)
+                  //    .Label(fontFamily = "Tzolkin",
+                  //           text = "𕏲",
+                  //           fontSize = FontSize.fromValue 50.,
+                  //           verticalOptions = LayoutOptions.Start)
                   //    .Row(4)
                   //    .Column (1)
                   View