Skip to content

Commit

Permalink
Added images
Browse files Browse the repository at this point in the history
  • Loading branch information
Release-Candidate committed Apr 9, 2021
1 parent 4da012d commit 58f2d0b
Show file tree
Hide file tree
Showing 164 changed files with 184 additions and 19 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/Tzolkin.Android/Resources/drawable/01-Imix.png
Diff not rendered.
Binary file removed src/Tzolkin.Android/Resources/drawable/number-01.png
Diff not rendered.
136 changes: 128 additions & 8 deletions src/Tzolkin.Android/Tzolkin.Android.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,17 @@
<Import Project="..\packages\Xamarin.Google.Android.Material.1.0.0.1\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\packages\Xamarin.Google.Android.Material.1.0.0.1\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.1874\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.1874\build\Xamarin.Forms.targets')" />
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="MainActivity.fs" />
<None Include="packages.config" />
<None Include="Assets\AboutAssets.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Resources\AboutResources.txt" />
<AndroidResource Include="Resources\drawable\icon.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
<AndroidResource Include="Resources\layout\Tabbar.axml" />
<AndroidResource Include="Resources\layout\Toolbar.axml" />
<AndroidResource Include="Resources\values\styles.xml" />
<Compile Include="AssemblyInfo.fs" />
<Compile Include="MainActivity.fs" />
<None Include="packages.config" />
<AndroidResource Include="Resources\drawable\icon.png" />
<AndroidResource Include="Resources\drawable\glyph_01.png" />
<AndroidResource Include="Resources\drawable\glyph_02.png" />
<AndroidResource Include="Resources\drawable\glyph_03.png" />
<AndroidResource Include="Resources\drawable\glyph_04.png" />
Expand Down Expand Up @@ -198,7 +196,129 @@
<AndroidResource Include="Resources\drawable\number_18.png" />
<AndroidResource Include="Resources\drawable\number_19.png" />
<AndroidResource Include="Resources\drawable\number_20.png" />
<AndroidResource Include="Resources\drawable\glyph_01.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_01.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_02.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_03.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_04.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_05.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_06.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_07.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_08.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_09.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_10.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_11.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_12.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_13.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_14.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_15.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_16.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_17.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_18.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_19.png" />
<AndroidResource Include="Resources\drawable-hdpi\glyph_20.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_01.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_02.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_03.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_04.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_05.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_06.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_07.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_08.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_09.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_10.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_11.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_12.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_13.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_14.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_15.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_16.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_17.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_18.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_19.png" />
<AndroidResource Include="Resources\drawable-hdpi\number_20.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_01.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_02.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_03.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_04.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_05.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_06.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_07.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_08.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_09.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_10.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_11.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_12.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_13.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_14.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_15.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_16.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_17.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_18.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_19.png" />
<AndroidResource Include="Resources\drawable-xhdpi\glyph_20.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_01.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_02.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_03.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_04.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_05.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_06.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_07.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_08.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_09.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_10.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_11.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_12.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_13.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_14.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_15.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_16.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_17.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_18.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_19.png" />
<AndroidResource Include="Resources\drawable-xhdpi\number_20.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_01.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_02.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_03.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_04.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_05.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_06.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_07.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_08.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_09.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_10.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_11.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_12.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_13.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_14.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_15.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_16.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_17.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_18.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_19.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\glyph_20.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_01.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_02.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_03.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_04.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_05.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_06.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_07.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_08.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_09.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_10.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_11.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_12.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_13.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_14.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_15.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_16.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_17.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_18.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_19.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\number_20.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="Fabulous">
Expand Down
67 changes: 56 additions & 11 deletions src/Tzolkin/Tzolkin.fs
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,56 @@ module TzolkinApp =
let numImgName = sprintf "number_%02d.png" tzNumInt
let glyphImgName = sprintf "glyph_%02d.png" tzGlyphInt

View.StackLayout(
orientation = StackOrientation.Horizontal,
View.Grid(
verticalOptions = LayoutOptions.Start,
horizontalOptions = LayoutOptions.Start,
columnSpacing = 0.,
rowSpacing = 0.,
rowdefs =
[ Dimension.Absolute 25.
Dimension.Absolute 25. ],
coldefs =
[ Dimension.Stars 1.
Dimension.Absolute 25. ],
children =
[ View.Image(source = Image.fromPath numImgName)
View.Image(source = Image.fromPath glyphImgName) ]
[ View
.Image(source = Image.fromPath numImgName,
verticalOptions = LayoutOptions.Fill,
horizontalOptions = LayoutOptions.Start,
backgroundColor = Color.Blue)
.Row(1)
.Column(1)
View
.Image(source = Image.fromPath glyphImgName,
verticalOptions = LayoutOptions.Fill,
horizontalOptions = LayoutOptions.Start,
backgroundColor = Color.Yellow)
.Row(1)
.Column(2)
View
.Label(text = tzolkinDate.number.ToString(),
horizontalTextAlignment = TextAlignment.Center,
fontSize = fontSize,
textColor = Color.Black,
width = 35.,
verticalOptions = LayoutOptions.Start,
horizontalOptions = LayoutOptions.StartAndExpand,
height = 35.,
backgroundColor = Color.Red)
.Row(2)
.Column(1)
View
.Label(text = tzolkinDate.glyph.ToString(),
horizontalTextAlignment = TextAlignment.Center,
fontSize = fontSize,
textColor = Color.Black,
height = 35.,
width = 100.,
verticalOptions = LayoutOptions.Start,
horizontalOptions = LayoutOptions.StartAndExpand,
backgroundColor = Color.BlueViolet)
.Row(2)
.Column(2) ]
)

let tzolkinDateViewFirst model =
Expand All @@ -187,12 +232,6 @@ module TzolkinApp =
/// Select the Gregorian date and display the Tzolk’in date.
let dateSelector model dispatch =
[ tzolkinDateViewFirst model
View.Label(
text = sprintf "Tzolk’in date:\n%s" ((TzolkinDate.fromDate model.Date).ToString()),
horizontalTextAlignment = TextAlignment.Center,
fontSize = fontSize,
textColor = Color.Black
)

View.DatePicker(
minimumDate = DateTime.MinValue,
Expand All @@ -201,7 +240,10 @@ module TzolkinApp =
format = localeFormat,
dateSelected = (fun args -> SetDate args.NewDate |> dispatch),
width = 150.0,
fontSize = fontSize
verticalOptions = LayoutOptions.Fill,
fontSize = fontSize,
horizontalOptions = LayoutOptions.Center,
backgroundColor = Color.Peru
) ]

/// Select a Tzolk’in date.
Expand Down Expand Up @@ -270,6 +312,9 @@ module TzolkinApp =
children =
[ View.Frame(
hasShadow = true,
verticalOptions = LayoutOptions.Start,
height = 100.,
backgroundColor = Color.Green,
content =
View.StackLayout(
orientation = StackOrientation.Horizontal,
Expand Down

0 comments on commit 58f2d0b

Please sign in to comment.