Skip to content

各タスク名の設定と確認用の説明文の設定 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

各タスク名の設定と確認用の説明文の設定 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1a167e
各タスク名の設定と確認用の説明文の設定
Oct 10, 2025
37fa37d
インフォメーション機能の完成
Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions app/src/main/java/com/example/ecodule/repository/datastore/DataStoreEcoActionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,25 @@ class DataStoreEcoActionRepository @Inject constructor(
// アプリ内で共有されるエコ活の全リスト
private val allEcoActions: List<EcoAction> = listOf(
// 買い物
EcoAction("shopping_1", EcoActionCategory.SHOPPING, "マイバッグを持参する", co2Kg = 0.02, savedYen = 5.0),
EcoAction("shopping_2", EcoActionCategory.SHOPPING, "買い物リストを事前に作る", co2Kg = 0.01, savedYen = 10.0),
EcoAction("shopping_3", EcoActionCategory.SHOPPING, "地元の野菜・商品を選ぶ", co2Kg = 0.05, savedYen = 15.0),
EcoAction("shopping_4", EcoActionCategory.SHOPPING, "レジ袋を断る", co2Kg = 0.02, savedYen = 5.0),
EcoAction("shopping_1", EcoActionCategory.SHOPPING, "マイバックを持参する", co2Kg = 0.02, savedYen = 5.0),
EcoAction("shopping_2", EcoActionCategory.SHOPPING, "徒歩や自転車で移動する", co2Kg = 0.24, savedYen = 11.0),
EcoAction("shopping_3", EcoActionCategory.SHOPPING, "公共交通機関を使う", co2Kg = 0.14, savedYen = 0.0),
EcoAction("shopping_4", EcoActionCategory.SHOPPING, "牛肉の代わりに鶏肉を買う", co2Kg = 2.87, savedYen = 240.0),
EcoAction("shopping_5", EcoActionCategory.SHOPPING, "電気やエアコンを消す", co2Kg = 0.44, savedYen = 20.0),
// 外出
EcoAction("outing_1", EcoActionCategory.OUTING, "徒歩や自転車で移動する", co2Kg = 0.1, savedYen = 50.0),
EcoAction("outing_2", EcoActionCategory.OUTING, "公共交通機関を利用する", co2Kg = 0.05, savedYen = 30.0),
EcoAction("outing_3", EcoActionCategory.OUTING, "マイボトルを持参する", co2Kg = 0.01, savedYen = 10.0),
EcoAction("outing_1", EcoActionCategory.OUTING, "徒歩や自転車で移動する", co2Kg = 0.24, savedYen = 11.0),
EcoAction("outing_2", EcoActionCategory.OUTING, "公共交通機関を使う", co2Kg = 0.14, savedYen = 0.0),
EcoAction("outing_3", EcoActionCategory.OUTING, "マイボトルを持参する", co2Kg = 0.1, savedYen = 100.0),
EcoAction("outing_4", EcoActionCategory.OUTING, "電気やエアコンを消す", co2Kg = 0.44, savedYen = 20.0),
// ゴミ出し
EcoAction("garbage_1", EcoActionCategory.GARBAGE, "ゴミを分別する", co2Kg = 0.03, savedYen = 0.0),
EcoAction("garbage_2", EcoActionCategory.GARBAGE, "生ゴミはコンポスト利用", co2Kg = 0.05, savedYen = 0.0),
EcoAction("garbage_1", EcoActionCategory.GARBAGE, "牛乳パックを資源ごみへ", co2Kg = 0.05, savedYen = 1.0),
EcoAction("garbage_2", EcoActionCategory.GARBAGE, "生ごみは水分を絞る", co2Kg = 0.1, savedYen = 1.0),
EcoAction("garbage_3", EcoActionCategory.GARBAGE, "エコキャップ活動への参加", co2Kg = 0.05, savedYen = 3.0),
// 通勤/通学
EcoAction("commute_1", EcoActionCategory.COMMUTE, "徒歩や自転車で通う", co2Kg = 0.2, savedYen = 100.0),
EcoAction("commute_2", EcoActionCategory.COMMUTE, "公共交通機関を使う", co2Kg = 0.07, savedYen = 50.0),
EcoAction("commute_3", EcoActionCategory.COMMUTE, "マイボトルを持参する", co2Kg = 0.01, savedYen = 10.0),
EcoAction("commute_1", EcoActionCategory.COMMUTE, "徒歩や自転車で移動する", co2Kg = 0.24, savedYen = 11.0),
EcoAction("commute_2", EcoActionCategory.COMMUTE, "公共交通機関を使う", co2Kg = 0.14, savedYen = 0.0),
EcoAction("commute_3", EcoActionCategory.COMMUTE, "マイボトルを持参する", co2Kg = 0.1, savedYen = 100.0),
EcoAction("commute_4", EcoActionCategory.COMMUTE, "電気やエアコンを消す", co2Kg = 0.44, savedYen = 20.0),
)

override suspend fun getActionsForCategory(category: EcoActionCategory): List<EcoAction> {
Expand Down
27 changes: 24 additions & 3 deletions app/src/main/java/com/example/ecodule/ui/taskListContent/TaskListInformation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ object TaskListInformation {
const val WalkOrBike = "walk_or_bike"
const val UsePublicTransport = "use_public_transport"
const val BringMyBottle = "bring_my_bottle"
const val MilkCartonRecyclable = "milk_carton_recyclable"
const val EcocapParticipation = "ecocap_participation"
const val ReduceFoodWasteMoisture = "reduce_food_waste_moisture"
const val PowerOffConfirmed = "power_off_confirmed"
const val HaveMybag = "have_my_bag"
const val BuyChickenInsteadOfBeef = "buy_chicken_instead_of_beef"
const val BuyChickenInsteadOfFish = "buy_chicken_instead_of_fish"
}

// ID ベースの説明
Expand All @@ -24,17 +31,31 @@ object TaskListInformation {
Code.UseCompost to "生ごみは家庭用コンポストで堆肥化します。ごみ量と焼却に伴う CO₂ 排出を抑制できます。",
Code.WalkOrBike to "近距離の移動は徒歩や自転車を選びます。健康増進と同時に交通由来の排出を削減します。",
Code.UsePublicTransport to "可能な移動は公共交通機関を利用します。自家用車の利用頻度を下げ、排出を抑制します。",
Code.BringMyBottle to "外出時はマイボトルを持参し、使い捨て容器の利用を減らします。資源消費と廃棄を抑えます。"
Code.BringMyBottle to "外出時はマイボトルを持参し、使い捨て容器の利用を減らします。資源消費と廃棄を抑えます。",
Code.MilkCartonRecyclable to "牛乳パックは、燃えるゴミでなく資源ごみに出します。資源消費と廃棄を抑えます。",
Code.EcocapParticipation to "ペットボトルのキャップを集めてリサイクルします。資源消費と廃棄を抑えます。",
Code.ReduceFoodWasteMoisture to "生ごみは水分を絞って捨てます。焼却の負担を減らします。",
Code.PowerOffConfirmed to "外出する際に電気とエアコンを消します。発電によるCO₂排出を抑制できます。",
Code.HaveMybag to "買い物の際はマイバックを持参し使い捨ての袋の利用を減らします。資源消費と廃棄を抑えます。",
Code.BuyChickenInsteadOfBeef to "牛肉の代わりに鶏肉を買います。牛由来のメタンガスの排出を減らします。",
Code.BuyChickenInsteadOfFish to "牛肉の代わりに魚を買います。牛由来のメタンガスの排出を減らします。",
)

// タイトルによるフォールバック（UI に安定 ID が無い場合）
// タイトル文言を変更する場合は、必ずこちらも更新してください
private val byTitle: Map<String, String> = mapOf(
"ゴミを分別する" to byId.getValue(Code.SeparateWaste),
"生ゴミはコンポスト利用" to byId.getValue(Code.UseCompost),
"徒歩や自転車で通う" to byId.getValue(Code.WalkOrBike),
"徒歩や自転車で移動する" to byId.getValue(Code.WalkOrBike),
"公共交通機関を使う" to byId.getValue(Code.UsePublicTransport),
"マイボトルを持参する" to byId.getValue(Code.BringMyBottle)
"マイボトルを持参する" to byId.getValue(Code.BringMyBottle),
"牛乳パックを資源ごみへ" to byId.getValue(Code.MilkCartonRecyclable),
"エコキャップ活動への参加" to byId.getValue(Code.EcocapParticipation),
"生ごみは水分を絞る" to byId.getValue(Code.ReduceFoodWasteMoisture),
"電気やエアコンを消す" to byId.getValue(Code.PowerOffConfirmed),
"マイバックを持参する" to byId.getValue(Code.HaveMybag),
"牛肉の代わりに鶏肉を買う" to byId.getValue(Code.BuyChickenInsteadOfBeef),
"牛肉の代わりに魚を買う" to byId.getValue(Code.BuyChickenInsteadOfFish)
)

/**
Expand Down