Skip to content

Commit

Permalink
Update more guides
Browse files Browse the repository at this point in the history
Signed-off-by: Kyle Corry <[email protected]>
  • Loading branch information
kylecorry31 committed Jan 12, 2025
1 parent 0c9d75c commit 47f988d
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 125 deletions.
Binary file removed app/src/main/assets/field_guide/Basalt.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/field_guide/Granite.webp
Binary file not shown.
Binary file removed app/src/main/assets/field_guide/Obsidian.webp
Binary file not shown.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -568,110 +568,48 @@ object BuiltInFieldGuide {
)
),
BuiltInFieldGuidePage(
// Morel
R.raw.morchella,
"field_guide/Morchella.webp",
R.raw.field_guide_morel,
"field_guide/morel.webp",
listOf(
FieldGuidePageTag.Africa,
FieldGuidePageTag.Asia,
FieldGuidePageTag.Australia,
FieldGuidePageTag.Europe,
FieldGuidePageTag.NorthAmerica,
FieldGuidePageTag.SouthAmerica,
FieldGuidePageTag.Fungus,
FieldGuidePageTag.Forest,
FieldGuidePageTag.Mountain,
FieldGuidePageTag.Urban,
FieldGuidePageTag.Cave
FieldGuidePageTag.Edible
)
),
BuiltInFieldGuidePage(
// Oyster Mushroom
R.raw.pleurotus,
"field_guide/Pleurotus.webp",
R.raw.field_guide_oyster_mushroom,
"field_guide/oyster_mushroom.webp",
listOf(
FieldGuidePageTag.Africa,
FieldGuidePageTag.Asia,
FieldGuidePageTag.Australia,
FieldGuidePageTag.Europe,
FieldGuidePageTag.NorthAmerica,
FieldGuidePageTag.SouthAmerica,
FieldGuidePageTag.Fungus
)
),
BuiltInFieldGuidePage(
// Giant Puffball
R.raw.calvatia_gigantea,
"field_guide/Calvatia gigantea.webp",
listOf(
FieldGuidePageTag.Fungus,
FieldGuidePageTag.Forest,
FieldGuidePageTag.Grassland,
FieldGuidePageTag.Freshwater
)
),
BuiltInFieldGuidePage(
// Reindeer Lichen
R.raw.cladonia_rangiferina,
"field_guide/Cladonia rangiferina.webp",
listOf(
FieldGuidePageTag.Fungus,
FieldGuidePageTag.Forest,
FieldGuidePageTag.Grassland,
FieldGuidePageTag.Mountain,
FieldGuidePageTag.Tundra
)
),
BuiltInFieldGuidePage(
R.raw.chert,
"field_guide/Chert.webp",
listOf(
FieldGuidePageTag.Africa,
FieldGuidePageTag.Australia,
FieldGuidePageTag.NorthAmerica,
FieldGuidePageTag.Mountain,
FieldGuidePageTag.Marine,
FieldGuidePageTag.Freshwater,
FieldGuidePageTag.Rock
FieldGuidePageTag.Edible
)
),
BuiltInFieldGuidePage(
R.raw.basalt,
"field_guide/Basalt.webp",
R.raw.field_guide_chert,
"field_guide/chert.webp",
listOf(
FieldGuidePageTag.Africa,
FieldGuidePageTag.Asia,
FieldGuidePageTag.Grassland,
FieldGuidePageTag.Marine,
FieldGuidePageTag.Freshwater,
FieldGuidePageTag.Rock
)
),
BuiltInFieldGuidePage(
R.raw.granite,
"field_guide/Granite.webp",
listOf(
FieldGuidePageTag.Antarctica,
FieldGuidePageTag.Asia,
FieldGuidePageTag.Australia,
FieldGuidePageTag.Grassland,
FieldGuidePageTag.Mountain,
FieldGuidePageTag.Freshwater,
FieldGuidePageTag.Rock
)
),
BuiltInFieldGuidePage(
R.raw.obsidian,
"field_guide/Obsidian.webp",
listOf(
FieldGuidePageTag.Asia,
FieldGuidePageTag.Australia,
FieldGuidePageTag.Europe,
FieldGuidePageTag.NorthAmerica,
FieldGuidePageTag.Urban,
FieldGuidePageTag.Marine,
FieldGuidePageTag.Freshwater,
FieldGuidePageTag.SouthAmerica,
FieldGuidePageTag.Rock
)
),
)
)

fun getFieldGuide(context: Context): List<FieldGuidePage> {
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/raw/basalt.txt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/raw/calvatia_gigantea.txt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/raw/chert.txt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/raw/cladonia_rangiferina.txt

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/raw/field_guide_bolete.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bolete
A mushroom with a spongy, porous underside instead of gills, commonly found in forests near trees. Many boletes are edible, but some are toxic, so avoid ones with red or orange pores or turn blue when cut.
A mushroom with a spongy, porous underside instead of gills, commonly found near trees. Many boletes are edible, but some are toxic, so avoid ones with red or orange pores or turn blue when cut.

https://en.m.wikipedia.org/wiki/Boletales

Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/raw/field_guide_chert.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Chert
A sedimentary rock that forms sharp edges when fractured, often used for tools or fire-starting. It has a dull shine and comes in white, red, brown, black, or gray. Chert is commonly found in sedimentary rock outcroppings, along roads, rivers, and shorelines.

Also known as flint or jasper.

https://en.m.wikipedia.org/wiki/Chert

Image by Saperaud~commonswiki (Public domain)
6 changes: 6 additions & 0 deletions app/src/main/res/raw/field_guide_morel.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Morel
A hollow mushroom with a honeycomb-like, conical cap that is connected to the stem at the base. They are edible and can be found during the Spring. Be cautious of inedible lookalikes with a brain-like appearence or caps attached only at the top.

https://en.m.wikipedia.org/wiki/Morchella

Image by Denniss (CC BY-SA 4.0)
6 changes: 6 additions & 0 deletions app/src/main/res/raw/field_guide_oyster_mushroom.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Oyster Mushroom
A gilled mushroom that grows on decaying hardwood, often in clusters. It can be identified by its fan or oyster shape and white gills that extend down the short stem. Oyster mushrooms are edible.

https://en.m.wikipedia.org/wiki/Pleurotus

Image by Harmil~commonswiki (CC BY 2.5)
6 changes: 0 additions & 6 deletions app/src/main/res/raw/granite.txt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/raw/morchella.txt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/raw/obsidian.txt

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/main/res/raw/pleurotus.txt

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
androidApplication = "8.7.3"
androidApplication = "8.8.0"
androidXTest = "1.6.1"
androidXTestRunner = "1.6.2"
androidXTestUiAutomator = "2.3.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 47f988d

Please sign in to comment.