From 68ea475743a0b736826bb98b9dc2f02931181902 Mon Sep 17 00:00:00 2001 From: Kyle Corry Date: Sat, 11 Jan 2025 12:46:48 -0500 Subject: [PATCH] Update more guides Signed-off-by: Kyle Corry --- .../{Bambusoideae.webp => bamboo.webp} | Bin .../field_guide/{Rubus.webp => brambles.webp} | Bin .../field_guide/{Typha.webp => cattail.webp} | Bin ...tiporus.webp => chicken_of_the_woods.webp} | Bin ...antago major.webp => common_plantain.webp} | Bin .../infrastructure/BuiltInFieldGuide.kt | 55 ++++++++++-------- app/src/main/res/raw/bambusoideae.txt | 6 -- app/src/main/res/raw/field_guide_bamboo.txt | 6 ++ app/src/main/res/raw/field_guide_brambles.txt | 8 +++ app/src/main/res/raw/field_guide_cattail.txt | 8 +++ .../raw/field_guide_chicken_of_the_woods.txt | 6 ++ .../res/raw/field_guide_common_plantain.txt | 6 ++ app/src/main/res/raw/field_guide_sunfish.txt | 2 + app/src/main/res/raw/laetiporus.txt | 6 -- app/src/main/res/raw/plantago_major.txt | 6 -- app/src/main/res/raw/rubus.txt | 6 -- app/src/main/res/raw/typha.txt | 6 -- 17 files changed, 68 insertions(+), 53 deletions(-) rename app/src/main/assets/field_guide/{Bambusoideae.webp => bamboo.webp} (100%) rename app/src/main/assets/field_guide/{Rubus.webp => brambles.webp} (100%) rename app/src/main/assets/field_guide/{Typha.webp => cattail.webp} (100%) rename app/src/main/assets/field_guide/{Laetiporus.webp => chicken_of_the_woods.webp} (100%) rename app/src/main/assets/field_guide/{Plantago major.webp => common_plantain.webp} (100%) delete mode 100644 app/src/main/res/raw/bambusoideae.txt create mode 100644 app/src/main/res/raw/field_guide_bamboo.txt create mode 100644 app/src/main/res/raw/field_guide_brambles.txt create mode 100644 app/src/main/res/raw/field_guide_cattail.txt create mode 100644 app/src/main/res/raw/field_guide_chicken_of_the_woods.txt create mode 100644 app/src/main/res/raw/field_guide_common_plantain.txt delete mode 100644 app/src/main/res/raw/laetiporus.txt delete mode 100644 app/src/main/res/raw/plantago_major.txt delete mode 100644 app/src/main/res/raw/rubus.txt delete mode 100644 app/src/main/res/raw/typha.txt diff --git a/app/src/main/assets/field_guide/Bambusoideae.webp b/app/src/main/assets/field_guide/bamboo.webp similarity index 100% rename from app/src/main/assets/field_guide/Bambusoideae.webp rename to app/src/main/assets/field_guide/bamboo.webp diff --git a/app/src/main/assets/field_guide/Rubus.webp b/app/src/main/assets/field_guide/brambles.webp similarity index 100% rename from app/src/main/assets/field_guide/Rubus.webp rename to app/src/main/assets/field_guide/brambles.webp diff --git a/app/src/main/assets/field_guide/Typha.webp b/app/src/main/assets/field_guide/cattail.webp similarity index 100% rename from app/src/main/assets/field_guide/Typha.webp rename to app/src/main/assets/field_guide/cattail.webp diff --git a/app/src/main/assets/field_guide/Laetiporus.webp b/app/src/main/assets/field_guide/chicken_of_the_woods.webp similarity index 100% rename from app/src/main/assets/field_guide/Laetiporus.webp rename to app/src/main/assets/field_guide/chicken_of_the_woods.webp diff --git a/app/src/main/assets/field_guide/Plantago major.webp b/app/src/main/assets/field_guide/common_plantain.webp similarity index 100% rename from app/src/main/assets/field_guide/Plantago major.webp rename to app/src/main/assets/field_guide/common_plantain.webp diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/infrastructure/BuiltInFieldGuide.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/infrastructure/BuiltInFieldGuide.kt index eef302d8a..cad4cd62e 100644 --- a/app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/infrastructure/BuiltInFieldGuide.kt +++ b/app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/infrastructure/BuiltInFieldGuide.kt @@ -468,27 +468,25 @@ object BuiltInFieldGuide { FieldGuidePageTag.Edible ) ), - // TODO: Update the below guides BuiltInFieldGuidePage( - // Cattail - R.raw.typha, - "field_guide/Typha.webp", + R.raw.field_guide_cattail, + "field_guide/cattail.webp", listOf( FieldGuidePageTag.Africa, FieldGuidePageTag.Asia, FieldGuidePageTag.Australia, FieldGuidePageTag.Europe, FieldGuidePageTag.NorthAmerica, + FieldGuidePageTag.SouthAmerica, FieldGuidePageTag.Plant, - FieldGuidePageTag.Grassland, FieldGuidePageTag.Wetland, - FieldGuidePageTag.Freshwater + FieldGuidePageTag.Freshwater, + FieldGuidePageTag.Edible ) ), BuiltInFieldGuidePage( - // Bamboo - R.raw.bambusoideae, - "field_guide/Bambusoideae.webp", + R.raw.field_guide_bamboo, + "field_guide/bamboo.webp", listOf( FieldGuidePageTag.Africa, FieldGuidePageTag.Asia, @@ -500,50 +498,61 @@ object BuiltInFieldGuide { FieldGuidePageTag.Forest, FieldGuidePageTag.Grassland, FieldGuidePageTag.Mountain, - FieldGuidePageTag.Marine, - FieldGuidePageTag.Freshwater + FieldGuidePageTag.Wetland, + FieldGuidePageTag.Edible, + FieldGuidePageTag.Crafting ) ), BuiltInFieldGuidePage( - // Common Plantain - R.raw.plantago_major, - "field_guide/Plantago major.webp", + R.raw.field_guide_common_plantain, + "field_guide/common_plantain.webp", listOf( + FieldGuidePageTag.Africa, FieldGuidePageTag.Asia, + FieldGuidePageTag.Australia, FieldGuidePageTag.Europe, FieldGuidePageTag.NorthAmerica, + FieldGuidePageTag.SouthAmerica, FieldGuidePageTag.Plant, FieldGuidePageTag.Grassland, - FieldGuidePageTag.Urban + FieldGuidePageTag.Urban, + FieldGuidePageTag.Edible, + FieldGuidePageTag.Medicinal ) ), BuiltInFieldGuidePage( - // Brambles - R.raw.rubus, - "field_guide/Rubus.webp", + R.raw.field_guide_brambles, + "field_guide/brambles.webp", listOf( + FieldGuidePageTag.Africa, FieldGuidePageTag.Asia, + FieldGuidePageTag.Australia, FieldGuidePageTag.Europe, FieldGuidePageTag.NorthAmerica, + FieldGuidePageTag.SouthAmerica, FieldGuidePageTag.Plant, FieldGuidePageTag.Grassland, - FieldGuidePageTag.Urban + FieldGuidePageTag.Forest, + FieldGuidePageTag.Urban, + FieldGuidePageTag.Edible ) ), BuiltInFieldGuidePage( - // Chicken of the Woods - R.raw.laetiporus, - "field_guide/Laetiporus.webp", + R.raw.field_guide_chicken_of_the_woods, + "field_guide/chicken_of_the_woods.webp", listOf( FieldGuidePageTag.Africa, FieldGuidePageTag.Asia, + FieldGuidePageTag.Australia, FieldGuidePageTag.Europe, FieldGuidePageTag.NorthAmerica, FieldGuidePageTag.SouthAmerica, FieldGuidePageTag.Fungus, - FieldGuidePageTag.Forest + FieldGuidePageTag.Forest, + FieldGuidePageTag.Edible ) ), + // TODO: Update the below guides BuiltInFieldGuidePage( // Bolete R.raw.boletales, diff --git a/app/src/main/res/raw/bambusoideae.txt b/app/src/main/res/raw/bambusoideae.txt deleted file mode 100644 index aeaee75a5..000000000 --- a/app/src/main/res/raw/bambusoideae.txt +++ /dev/null @@ -1,6 +0,0 @@ -Bamboo -Bamboos are a diverse group of mostly evergreen perennial flowering plants making up the subfamily Bambusoideae of the grass family Poaceae. Giant bamboos are the largest members of the grass family, in the case of Dendrocalamus sinicus having individual stalks (culms) reaching a length of 46 meters (151 ft), up to 36 centimeters (14 in) in thickness and a weight of up to 450 kilograms (1,000 lb). The internodes of bamboos can also be of great length. Kinabaluchloa wrayi has internodes up to 2.5 meters (8 ft) in length. and Arthrostylidium schomburgkii has internodes up to 5 meters (16 ft) in length, exceeded in length only by papyrus. By contrast, the stalks of the tiny bamboo Raddiella vanessiae of the savannas of French Guiana measure only 10–20 millimeters (0.4–0.8 in) in length by about 2 millimeters (0.08 in) in width. The origin of the word "bamboo" is uncertain, but it probably comes from the Dutch or Portuguese language, which originally borrowed it from Malay or Kannada. - -Text derived from https://en.m.wikipedia.org/wiki/Bamboo (CC BY-SA 4.0) - -Image by Kamakura (CC BY-SA 3.0) \ No newline at end of file diff --git a/app/src/main/res/raw/field_guide_bamboo.txt b/app/src/main/res/raw/field_guide_bamboo.txt new file mode 100644 index 000000000..dbc51a95a --- /dev/null +++ b/app/src/main/res/raw/field_guide_bamboo.txt @@ -0,0 +1,6 @@ +Bamboo +A tall, fast-growing grass with hollow stems. Young shoots are edible when properly cooked to remove bitterness. Bamboo can also be used as a building material. + +https://en.m.wikipedia.org/wiki/Bamboo + +Image by Kamakura (CC BY-SA 3.0) \ No newline at end of file diff --git a/app/src/main/res/raw/field_guide_brambles.txt b/app/src/main/res/raw/field_guide_brambles.txt new file mode 100644 index 000000000..1870042f2 --- /dev/null +++ b/app/src/main/res/raw/field_guide_brambles.txt @@ -0,0 +1,8 @@ +Brambles +A thorny shrub, typically found in forests and fields, often bearing aggregate berries such as blackberries. The fruits of most brambles are edible once mature. Be cautious of thorns when harvesting. + +Common species include: blackberry, dewberry, and raspberry. + +https://en.m.wikipedia.org/wiki/Rubus + +Image by Kolforn (CC BY-SA 4.0) diff --git a/app/src/main/res/raw/field_guide_cattail.txt b/app/src/main/res/raw/field_guide_cattail.txt new file mode 100644 index 000000000..ca7331261 --- /dev/null +++ b/app/src/main/res/raw/field_guide_cattail.txt @@ -0,0 +1,8 @@ +Cattail +A wetland plant with tall, cylindrical flower spikes, commonly found near ponds, lakes, and marshes. Most parts are edible. + +Also known as bulrush, reed, raupo, cumbungi, and punks. + +https://en.m.wikipedia.org/wiki/Typha + +Image by Tysto (Public domain) \ No newline at end of file diff --git a/app/src/main/res/raw/field_guide_chicken_of_the_woods.txt b/app/src/main/res/raw/field_guide_chicken_of_the_woods.txt new file mode 100644 index 000000000..9dd02eef8 --- /dev/null +++ b/app/src/main/res/raw/field_guide_chicken_of_the_woods.txt @@ -0,0 +1,6 @@ +Chicken of the Woods +A bright orange-yellow shelf mushroom that grows on trees, often found on hardwoods in forests. The underside will have pores instead of gills and be white or yellow. It is edible when young and tender, but can cause gastrointestinal upset in some individuals. + +https://en.m.wikipedia.org/wiki/Laetiporus + +Image by Jean-Pol GRANDMONT (CC BY 2.5) \ No newline at end of file diff --git a/app/src/main/res/raw/field_guide_common_plantain.txt b/app/src/main/res/raw/field_guide_common_plantain.txt new file mode 100644 index 000000000..682dd2369 --- /dev/null +++ b/app/src/main/res/raw/field_guide_common_plantain.txt @@ -0,0 +1,6 @@ +Common Plantain +A low-growing plant with broad, oval leaves, often found in lawns and disturbed areas. Its leaves are edible, and have medicinal properties as a poultice for bites or wounds. + +https://en.m.wikipedia.org/wiki/Plantago_major + +Image by Rasbak (CC BY-SA 3.0) \ No newline at end of file diff --git a/app/src/main/res/raw/field_guide_sunfish.txt b/app/src/main/res/raw/field_guide_sunfish.txt index f44735d1d..c66227ea4 100644 --- a/app/src/main/res/raw/field_guide_sunfish.txt +++ b/app/src/main/res/raw/field_guide_sunfish.txt @@ -1,6 +1,8 @@ Sunfish A small freshwater fish with a tall and flat body shape and sharp dorsal spines. They are typically found near the shore in weedy areas and are most active during the day. Sunfish feed on small insects and worms but can also be caught using vibrantly colored lures. +Common species include: bluegill, pumpkinseed, and redear. + https://en.m.wikipedia.org/wiki/Lepomis Image by Pvmoutside (Public domain) \ No newline at end of file diff --git a/app/src/main/res/raw/laetiporus.txt b/app/src/main/res/raw/laetiporus.txt deleted file mode 100644 index 64345248c..000000000 --- a/app/src/main/res/raw/laetiporus.txt +++ /dev/null @@ -1,6 +0,0 @@ -Laetiporus -Laetiporus is a genus of edible mushrooms found throughout much of the world. Some species, especially Laetiporus sulphureus, are commonly known as sulphur shelf, chicken of the woods, the chicken mushroom, or the chicken fungus because it is often described as tasting like and having a texture similar to that of chicken meat. - -Text derived from https://en.m.wikipedia.org/wiki/Laetiporus (CC BY-SA 4.0) - -Image by Jean-Pol GRANDMONT (CC BY 2.5) \ No newline at end of file diff --git a/app/src/main/res/raw/plantago_major.txt b/app/src/main/res/raw/plantago_major.txt deleted file mode 100644 index 06c23bf55..000000000 --- a/app/src/main/res/raw/plantago_major.txt +++ /dev/null @@ -1,6 +0,0 @@ -Plantago Major -Plantago major, the broadleaf plantain, white man's footprint, waybread, or greater plantain, is a species of flowering plant in the plantain family Plantaginaceae. The plant is native to Eurasia. - -Text derived from https://en.m.wikipedia.org/wiki/Plantago_major (CC BY-SA 4.0) - -Image by Rasbak (CC BY-SA 3.0) \ No newline at end of file diff --git a/app/src/main/res/raw/rubus.txt b/app/src/main/res/raw/rubus.txt deleted file mode 100644 index 75e6be373..000000000 --- a/app/src/main/res/raw/rubus.txt +++ /dev/null @@ -1,6 +0,0 @@ -Brambles -Rubus is a large and diverse genus of flowering plants in the rose family, Rosaceae, subfamily Rosoideae, commonly known as brambles. Fruits of various species are known as raspberries, blackberries, dewberries, and bristleberries. It is a diverse genus, with the estimated number of Rubus species varying from 250 to over 1000, found across all continents except Antarctica. - -Text derived from https://en.m.wikipedia.org/wiki/Rubus (CC BY-SA 4.0) - -Image by Kolforn (CC BY-SA 4.0) diff --git a/app/src/main/res/raw/typha.txt b/app/src/main/res/raw/typha.txt deleted file mode 100644 index 3e8a0c7c0..000000000 --- a/app/src/main/res/raw/typha.txt +++ /dev/null @@ -1,6 +0,0 @@ -Typha -Typha is a genus of about 30 species of monocotyledonous flowering plants in the family Typhaceae. These plants have a variety of common names, in British English as bulrush or reedmace, in American English as cattail, or punks, in Australia as cumbungi or bulrush, in Canada as bulrush or cattail, and in New Zealand as reed, cattail, bulrush or raupo. Other taxa of plants may be known as bulrush, including some sedges in Scirpus and related genera. - -Text derived from https://en.m.wikipedia.org/wiki/Typha (CC BY-SA 4.0) - -Image by Tysto (Public domain) \ No newline at end of file