[김은서_Android] 11주차 과제 제출 #82
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.example.bcsd_android_2025_1 | ||
|
|
||
| import LapData | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import android.widget.TextView | ||
| import androidx.recyclerview.widget.RecyclerView | ||
|
|
||
| class LapAdapter(private val lapList: List<LapData>) : | ||
| RecyclerView.Adapter<LapAdapter.LapViewHolder>() { | ||
|
|
||
| class LapViewHolder(view: View) : RecyclerView.ViewHolder(view) { | ||
| val number: TextView = view.findViewById(R.id.lap_text_number) | ||
| val section: TextView = view.findViewById(R.id.lap_text_sectionRecord) | ||
| val total: TextView = view.findViewById(R.id.lap_text_totalTime) | ||
| } | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LapViewHolder { | ||
| val view = LayoutInflater.from(parent.context) | ||
| .inflate(R.layout.lap_list, parent, false) | ||
| return LapViewHolder(view) | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: LapViewHolder, position: Int) { | ||
| val lap = lapList[position] | ||
| holder.number.text = lap.number.toString() | ||
| holder.section.text = lap.sectionTime | ||
| holder.total.text = lap.totalTime | ||
| } | ||
|
|
||
| override fun getItemCount() = lapList.size | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| data class LapData( | ||
| val number: Int, | ||
| val sectionTime: String, | ||
| val totalTime: String | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,119 @@ | ||
| package com.example.bcsd_android_2025_1 | ||
|
|
||
| import LapData | ||
| import android.os.Bundle | ||
| import android.os.SystemClock | ||
| import android.widget.Button | ||
| import android.widget.TextView | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.lifecycle.lifecycleScope | ||
| import kotlinx.coroutines.Job | ||
| import kotlinx.coroutines.delay | ||
| import kotlinx.coroutines.launch | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| import androidx.recyclerview.widget.RecyclerView | ||
|
|
||
| class MainActivity : AppCompatActivity() { | ||
|
|
||
| private lateinit var timerText: TextView | ||
| private lateinit var startButton: Button | ||
| private lateinit var stopButton: Button | ||
| private lateinit var lapButton: Button | ||
| private lateinit var lapRecyclerView: RecyclerView | ||
| private lateinit var lapAdapter: LapAdapter | ||
| private val lapList = mutableListOf<LapData>() | ||
|
|
||
| private var isRunning = false | ||
| private var startTime = 0L // 시작시간 | ||
| private var beforeTime = 0L // 누적시간 | ||
| private var timerJob: Job? = null // 중단 위함 | ||
| private var lastLapTime = 0L // 마지막 기록된 시간 | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContentView(R.layout.activity_main) | ||
|
|
||
| timerText = findViewById(R.id.main_text_timer) | ||
| startButton = findViewById(R.id.main_button_start) | ||
| stopButton = findViewById(R.id.main_button_stop) | ||
| lapButton = findViewById(R.id.main_button_lap) | ||
| lapRecyclerView = findViewById(R.id.main_recycler_lap) | ||
|
|
||
| lapAdapter = LapAdapter(lapList) | ||
| lapRecyclerView.adapter = lapAdapter | ||
| lapRecyclerView.layoutManager = LinearLayoutManager(this) | ||
|
|
||
| startButton.setOnClickListener { | ||
| if (!isRunning) { | ||
| startTimer() | ||
| } else { | ||
| pauseTimer() | ||
| } | ||
| } | ||
|
|
||
| stopButton.setOnClickListener { | ||
| stopTimer() | ||
| } | ||
|
|
||
| lapButton.setOnClickListener { | ||
| if (!isRunning) return@setOnClickListener | ||
|
|
||
|
|
||
| val now = SystemClock.elapsedRealtime() | ||
|
Contributor
There was a problem hiding this comment. 오오... |
||
| val total = now - startTime + beforeTime | ||
| val section = if (lapList.isEmpty()) total else total - lastLapTime | ||
| lastLapTime = total | ||
|
|
||
| val lap = LapData( | ||
| number = lapList.size + 1, | ||
| sectionTime = formatTime(section), | ||
| totalTime = formatTime(total) | ||
| ) | ||
|
|
||
| lapList.add(0, lap) | ||
| lapAdapter.notifyItemInserted(0) | ||
| lapRecyclerView.scrollToPosition(0) | ||
| } | ||
| } | ||
|
|
||
| private fun startTimer() { | ||
| isRunning = true | ||
| startButton.text = getString(R.string.main_pause) | ||
| startTime = SystemClock.elapsedRealtime() // 시작시점 | ||
|
|
||
| timerJob = lifecycleScope.launch { | ||
| while (isRunning) { | ||
| val now = SystemClock.elapsedRealtime() | ||
| val totalTime = now - startTime + beforeTime // 총 누적 시간 = 현재 시간 - 시작시간 + 이전누적시간 | ||
| timerText.text = formatTime(totalTime) | ||
| delay(10) // 10ms마다 갱신 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun pauseTimer() { | ||
| isRunning = false | ||
| beforeTime += SystemClock.elapsedRealtime() - startTime // 이전 누적 시간에 이번에 흐른 시간 더함. | ||
| timerJob?.cancel() | ||
| startButton.text = getString(R.string.main_start) | ||
| } | ||
|
|
||
| private fun formatTime(ms: Long): String { | ||
|
Contributor
There was a problem hiding this comment. Long의 확장함수로 작성하면 더 좋을 것 같습니다 |
||
| val minutes = ms / 1000 / 60 | ||
| val seconds = (ms / 1000) % 60 | ||
| val millis = (ms % 1000) / 10 | ||
| return String.format("%02d : %02d : %02d", minutes, seconds, millis) | ||
| } | ||
|
|
||
| private fun stopTimer() { | ||
| isRunning = false | ||
| timerJob?.cancel() // 코루틴 정지 + 기록 초기화 | ||
| startTime = 0L | ||
| beforeTime = 0L | ||
| lastLapTime = 0L | ||
| timerText.text = getString(R.string.main_default_time) | ||
| startButton.text = getString(R.string.main_start) | ||
|
|
||
| lapList.clear() | ||
| lapAdapter.notifyDataSetChanged() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:id="@+id/lap_list" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/lap_text_number" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/main_default_number" | ||
| android:textAlignment="center" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@id/lap_text_sectionRecord" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintVertical_bias="0.55" | ||
| app:layout_constraintHorizontal_weight="1" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/lap_text_sectionRecord" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/main_default_time" | ||
| android:textAlignment="center" | ||
| app:layout_constraintStart_toEndOf="@id/lap_text_number" | ||
| app:layout_constraintEnd_toStartOf="@id/lap_text_totalTime" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintVertical_bias="0.55" | ||
| app:layout_constraintHorizontal_weight="1" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/lap_text_totalTime" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/main_default_time" | ||
| android:textAlignment="center" | ||
| app:layout_constraintStart_toEndOf="@id/lap_text_sectionRecord" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintVertical_bias="0.55" | ||
| app:layout_constraintHorizontal_weight="1" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,12 @@ | ||
| <resources> | ||
| <string name="app_name">BCSD_Android_2025-1</string> | ||
| <string name="main_default_time">00:00:00</string> | ||
| <string name="main_start">Start</string> | ||
| <string name="main_pause">Pause</string> | ||
| <string name="main_stop">Stop</string> | ||
| <string name="main_lap">Lap</string> | ||
| <string name="main_number">Number</string> | ||
| <string name="main_section_record">Section record</string> | ||
| <string name="main_total_time">Total time</string> | ||
| <string name="main_default_number">1</string> | ||
| </resources> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
사소한 점이긴 한데, package name이 누락되어 있네요