From 517f3783886671c9c28d3ec9f53f2282cba85dc1 Mon Sep 17 00:00:00 2001
From: HN5107 <22e1259@andrew.ac.jp>
Date: Sat, 10 Jan 2026 16:54:32 +0900
Subject: [PATCH] change code

---
 .../curation_train_app/FollowSettings.kt      |  17 ++
 .../curation_train_app/MainActivity.kt        | 160 ++++++------------
 .../RegionSelectActivity.kt                   |  28 ++-
 .../example/curation_train_app/RssClient.kt   |   3 +
 .../TrafficDetailActivity.kt                  |  18 ++
 .../example/curation_train_app/TrafficItem.kt |   7 +
 app/src/main/res/layout/activity_main.xml     |  12 ++
 .../res/layout/activity_traffic_detail.xml    |  12 ++
 8 files changed, 146 insertions(+), 111 deletions(-)
 create mode 100644 app/src/main/java/com/example/curation_train_app/FollowSettings.kt
 create mode 100644 app/src/main/java/com/example/curation_train_app/TrafficDetailActivity.kt
 create mode 100644 app/src/main/java/com/example/curation_train_app/TrafficItem.kt
 create mode 100644 app/src/main/res/layout/activity_traffic_detail.xml

diff --git a/app/src/main/java/com/example/curation_train_app/FollowSettings.kt b/app/src/main/java/com/example/curation_train_app/FollowSettings.kt
new file mode 100644
index 0000000..fa2d09c
--- /dev/null
+++ b/app/src/main/java/com/example/curation_train_app/FollowSettings.kt
@@ -0,0 +1,17 @@
+package com.example.curation_train_app
+
+import android.content.Context
+
+object FollowSettings {
+
+    fun loadLines(context: Context): List<String> {
+        val prefs = context.getSharedPreferences("follow", Context.MODE_PRIVATE)
+        val set = prefs.getStringSet("lines", emptySet()) ?: emptySet()
+        return set.toList()
+    }
+
+    fun saveLines(context: Context, lines: List<String>) {
+        val prefs = context.getSharedPreferences("follow", Context.MODE_PRIVATE)
+        prefs.edit().putStringSet("lines", lines.toSet()).apply()
+    }
+}
diff --git a/app/src/main/java/com/example/curation_train_app/MainActivity.kt b/app/src/main/java/com/example/curation_train_app/MainActivity.kt
index cfea379..2bbaec8 100644
--- a/app/src/main/java/com/example/curation_train_app/MainActivity.kt
+++ b/app/src/main/java/com/example/curation_train_app/MainActivity.kt
@@ -2,33 +2,27 @@ package com.example.curation_train_app
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.activity.ComponentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.curation_train_app.ai.AiClient
 import com.example.curation_train_app.CharacterSettings
-import retrofit2.Retrofit
 import okhttp3.ResponseBody
 import org.jsoup.Jsoup
-
+import retrofit2.Retrofit
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import retrofit2.http.GET
 import retrofit2.Call
 
-
 class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        // --- キャラ初期画像 ---
         val charId = CharacterSettings.loadCharacter(this)
         val imageView = findViewById<ImageView>(R.id.imageCharacter)
 
@@ -43,61 +37,56 @@ class MainActivity : ComponentActivity() {
             "hiyori" -> R.drawable.hiyori_normal
             else -> R.drawable.reimu_normal
         }
-
         imageView.setImageResource(drawableId)
 
-
-
+        // ----- キャラ応答ボタン -----
         val btn = findViewById<Button>(R.id.btnTestReply)
         val inputText = findViewById<EditText>(R.id.inputText)
-        val inputCharacter = findViewById<EditText>(R.id.inputCharacter)
-        val textResult = findViewById<TextView>(R.id.textTestResult)
         val commentView = findViewById<TextView>(R.id.textCharacterComment)
 
-
         btn.setOnClickListener {
             val text = inputText.text.toString()
-            val charId = CharacterSettings.loadCharacter(this)   // ← 入力欄ではなく設定から読む
+            val charId = CharacterSettings.loadCharacter(this)
             val infoType = InfoClassifier.classify(text)
 
             Thread {
                 val result = CharacterReplyManager().replyWithAI(charId, text, infoType)
-
                 runOnUiThread {
                     commentView.text = result.text
                     updateCharacterExpression(charId, result.emotion)
                 }
-
             }.start()
         }
 
-
+        // --- 運行情報 & RSS 読み込み ---
         loadTraffic()
         loadRss()
 
-
+        // --- RecyclerView 初期設定 ---
         val recyclerNews = findViewById<RecyclerView>(R.id.recyclerNews)
-        recyclerNews.layoutManager =
-            LinearLayoutManager(this)
+        recyclerNews.layoutManager = LinearLayoutManager(this)
 
-
-
-
-        // ▲ リリース枠 ▲
-
-        // ▼ 地域セレクト画面へ ▼
+        // 路線設定画面へ遷移
         val btnOpenRegion = findViewById<TextView>(R.id.textFavorite)
         btnOpenRegion.setOnClickListener {
             val intent = Intent(this, RegionSelectActivity::class.java)
             startActivity(intent)
         }
-        // ▲ 地域セレクト画面へ ▲
 
-        // ▼ キャラ画像の初期配置 ▼
         applyCharacterLayoutDefault()
+
+        // 詳細画面へ遷移
+        val titleView = findViewById<TextView>(R.id.textTitle)
+        titleView.setOnClickListener {
+            val text = titleView.tag as? String ?: "（詳細情報なし）"
+            val intent = Intent(this, TrafficDetailActivity::class.java)
+            intent.putExtra("text", text)
+            startActivity(intent)
+        }
     }
 
-    // ▼ キャラ画像の位置調整関数 ▼
+    // -----------------------------
+
     private fun applyCharacterLayoutDefault() {
         val img = findViewById<ImageView>(R.id.imageCharacter)
         val scale = resources.displayMetrics.density
@@ -115,10 +104,10 @@ class MainActivity : ComponentActivity() {
         lp.topMargin = (offsetYdp * scale).toInt()
 
         img.layoutParams = lp
-        img.requestLayout()
     }
 
-    // ▼ RSS 読み込み ▼
+    // -----------------------------
+
     private fun loadRss() {
         Thread {
             try {
@@ -144,6 +133,8 @@ class MainActivity : ComponentActivity() {
         }.start()
     }
 
+    // -----------------------------
+
     private fun loadTraffic() {
         Thread {
             try {
@@ -153,74 +144,50 @@ class MainActivity : ComponentActivity() {
                     .build()
 
                 val client = retrofit.create(HtmlClient::class.java)
-
                 val response = client.getHtml().execute()
-                val html = response.body()?.string() ?: ""
+                val html = response.body()?.string() ?: return@Thread
 
                 val doc = Jsoup.parse(html)
-                val items = mutableListOf<NewsItem>()
+                val lines = doc.select("div.jisyo")
 
-                val list = doc.select("div.jisyo")   // ← 運行情報の1ブロック
-
-                for (block in list) {
-                    val title = block.select("h2.jisyo_title").text()
-                    val body = block.select("div.jisyo_contents p").text()
-
-                    if (title.isNotEmpty()) {
-                        items.add(
-                            NewsItem(
-                                company = "JR西日本",
-                                title = title,
-                                body = body
-                            )
-                        )
-                    }
-                }
-
-                // --- 総合判定 ---
-                var hasSuspension = false
                 var hasDelay = false
+                var hasSuspension = false
                 var hasInfo = false
 
-                for (item in items) {
-                    when (item.company) {   // ← company に status 入れてるよね？
-                        "運転見合わせ" -> hasSuspension = true
-                        "遅延" -> hasDelay = true
-                        "情報あり" -> hasInfo = true
-                    }
+                val items = mutableListOf<NewsItem>()
+
+                for (line in lines) {
+                    val title = line.select("h2").text()
+                    val body = line.select("p.gaiyo").text()
+                    val classes = line.classNames()
+
+                    if (classes.contains("stop")) hasSuspension = true
+                    if (classes.contains("delay")) hasDelay = true
+                    if (classes.contains("info")) hasInfo = true
+
                 }
 
-                val resultTitle = when {
-                    hasSuspension -> "運転見合わせがあります"
-                    hasDelay -> "遅延が発生しています"
-                    hasInfo -> "運行に関するお知らせがあります"
+                val statusText = when {
+                    hasSuspension -> "運転見合わせ"
+                    hasDelay -> "遅延"
+                    hasInfo -> "情報あり"
                     else -> "平常運転"
                 }
 
-
-
                 runOnUiThread {
-                    // 最上段のテキスト書き換え
-                    val titleView = findViewById<TextView>(R.id.textTitle)
-                    titleView.text = "近畿エリア：$resultTitle"
-
-                    // RecyclerView を更新
-                    val recycler = findViewById<RecyclerView>(R.id.recyclerNews)
-                    recycler.adapter = NewsAdapter(items)
+                    val statusView = findViewById<TextView>(R.id.trafficStatus)
+                    statusView.text = "設定した路線：$statusText"
+                    
+                    
                 }
 
-
             } catch (e: Exception) {
                 e.printStackTrace()
             }
         }.start()
     }
 
-
-
-
-
-
+    // -----------------------------
 
     fun emotionToExpression(type: EmotionType): String {
         return when (type) {
@@ -236,39 +203,19 @@ class MainActivity : ComponentActivity() {
     }
 
     fun updateCharacterExpression(charId: String, type: EmotionType) {
-
         val imageView = findViewById<ImageView>(R.id.imageCharacter)
-
-        // 感情 → 表情名("happy"など)
         val expression = emotionToExpression(type)
-
-        // charId("reimu") と合わせて画像ファイル名を作る
-        val resName = "${charId}_${expression}"  // → "reimu_happy"
-
+        val resName = "${charId}_${expression}"
         val resId = resources.getIdentifier(resName, "drawable", packageName)
 
-        if (resId != 0) {
+        if (resId != 0)
             imageView.setImageResource(resId)
-        } else {
-            // 画像がない場合は normal に戻す
+        else {
             val normalId = resources.getIdentifier("${charId}_normal", "drawable", packageName)
             imageView.setImageResource(normalId)
         }
     }
 
-    fun infoTypeToEmotion(info: InfoType): EmotionType {
-        return when (info) {
-            InfoType.DELAY -> EmotionType.WORRY
-            InfoType.SUSPENSION -> EmotionType.ANGRY
-            InfoType.REVISION -> EmotionType.THINK
-            InfoType.CONSTRUCTION -> EmotionType.THINK
-            InfoType.EVENT -> EmotionType.HAPPY
-            InfoType.WEATHER -> EmotionType.CONFUSED
-            InfoType.NEW_TRAIN -> EmotionType.SURPRISED
-            else -> EmotionType.NORMAL
-        }
-    }
-
     override fun onResume() {
         super.onResume()
 
@@ -278,7 +225,7 @@ class MainActivity : ComponentActivity() {
         val drawableId = when (charId) {
             "reimu" -> R.drawable.reimu_normal
             "marisa" -> R.drawable.marisa_normal
-            "flan" -> R.drawable.flandre_normal
+            "flandre" -> R.drawable.flandre_normal
             "sanae" -> R.drawable.sanae_normal
             "akane" -> R.drawable.akane_normal
             "momoka" -> R.drawable.momoka_normal
@@ -289,7 +236,6 @@ class MainActivity : ComponentActivity() {
 
         imageView.setImageResource(drawableId)
     }
-
-
-
 }
+
+
diff --git a/app/src/main/java/com/example/curation_train_app/RegionSelectActivity.kt b/app/src/main/java/com/example/curation_train_app/RegionSelectActivity.kt
index 19fea68..00c0596 100644
--- a/app/src/main/java/com/example/curation_train_app/RegionSelectActivity.kt
+++ b/app/src/main/java/com/example/curation_train_app/RegionSelectActivity.kt
@@ -33,6 +33,16 @@ class RegionSelectActivity : ComponentActivity() {
             finish()
         }
 
+
+        setupRegionButton(R.id.btnNorth, "hokkaido")
+        setupRegionButton(R.id.btnTohoku, "tohoku")
+        setupRegionButton(R.id.btnKanto, "kanto")
+        setupRegionButton(R.id.btnChubu, "chubu")
+        setupRegionButton(R.id.btnKansai, "kansai")
+        setupRegionButton(R.id.btnChugoku, "chugoku")
+        setupRegionButton(R.id.btnShikoku, "shikoku")
+        setupRegionButton(R.id.btnKyushu, "kyushu")
+
         reimuButton.setOnClickListener { selectCharacter("reimu") }
         marisaButton.setOnClickListener { selectCharacter("marisa") }
         flandreButton.setOnClickListener { selectCharacter("flandre") }
@@ -41,8 +51,18 @@ class RegionSelectActivity : ComponentActivity() {
         momokaButton.setOnClickListener { selectCharacter("momoka") }
         sayakaButton.setOnClickListener { selectCharacter("sayaka") }
         hiyoriButton.setOnClickListener { selectCharacter("hiyori") }
-
-        // ❌ これは絶対削除！
-        // CharacterSettings.saveCharacter(this, "reimu")
     }
-}
+
+    private fun setupRegionButton(buttonId: Int, region: String) {
+        val btn = findViewById<Button>(buttonId)
+        btn.setOnClickListener {
+            val intent = Intent(this, LineSelectActivity::class.java)
+            intent.putExtra("region", region)
+            startActivity(intent)
+
+            // ❌ これは絶対削除！
+            // CharacterSettings.saveCharacter(this, "reimu")
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/curation_train_app/RssClient.kt b/app/src/main/java/com/example/curation_train_app/RssClient.kt
index 5ade4ea..c1178cd 100644
--- a/app/src/main/java/com/example/curation_train_app/RssClient.kt
+++ b/app/src/main/java/com/example/curation_train_app/RssClient.kt
@@ -11,3 +11,6 @@ interface RssClient {
 }
 
 
+
+
+
diff --git a/app/src/main/java/com/example/curation_train_app/TrafficDetailActivity.kt b/app/src/main/java/com/example/curation_train_app/TrafficDetailActivity.kt
new file mode 100644
index 0000000..55a6556
--- /dev/null
+++ b/app/src/main/java/com/example/curation_train_app/TrafficDetailActivity.kt
@@ -0,0 +1,18 @@
+package com.example.curation_train_app
+
+import android.os.Bundle
+import android.widget.TextView
+import androidx.activity.ComponentActivity
+
+class TrafficDetailActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_traffic_detail)
+
+        val text = intent.getStringExtra("text") ?: ""
+
+        val tv = findViewById<TextView>(R.id.textDetail)
+        tv.text = text
+    }
+}
diff --git a/app/src/main/java/com/example/curation_train_app/TrafficItem.kt b/app/src/main/java/com/example/curation_train_app/TrafficItem.kt
new file mode 100644
index 0000000..366601c
--- /dev/null
+++ b/app/src/main/java/com/example/curation_train_app/TrafficItem.kt
@@ -0,0 +1,7 @@
+package com.example.curation_train_app
+
+data class TrafficItem(
+    val title: String,
+    val desc: String,
+    val status: String
+)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 95368a0..db0d9fa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,6 +18,17 @@
         android:background="@drawable/comment_background_white"
         android:elevation="2dp">
 
+        <TextView
+            android:id="@+id/trafficStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="読み込み中…"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:layout_margin="12dp"
+            />
+
+
         <TextView
             android:id="@+id/textTitle"
             android:layout_width="wrap_content"
@@ -26,6 +37,7 @@
             android:textSize="18sp"
             android:textStyle="bold"
             android:paddingBottom="8dp"
+            android:visibility="gone"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/activity_traffic_detail.xml b/app/src/main/res/layout/activity_traffic_detail.xml
new file mode 100644
index 0000000..a4836b4
--- /dev/null
+++ b/app/src/main/res/layout/activity_traffic_detail.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/textDetail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="15sp"/>
+</ScrollView>