Skip to content

Commit 7ebf981

Browse files
caleb-bitcaleb-bit
committed
Resolve text warnings
1 parent fb17088 commit 7ebf981

5 files changed

Lines changed: 51 additions & 14 deletions

File tree

‎app/src/main/java/com/cornellappdev/coursegrab/ui/details/CourseDetailsActivity.kt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ class CourseDetailsActivity : AppCompatActivity() {
3636

3737
val courseDetails: SearchResult = intent.getParcelableExtra<SearchResult>("courseDetails") as SearchResult
3838

39-
binding.headerTextView.text = "${courseDetails.subjectCode} ${courseDetails.courseNum}"
39+
binding.headerTextView.text = getString(
40+
R.string.course_header_format,
41+
courseDetails.subjectCode,
42+
courseDetails.courseNum
43+
)
4044

4145
binding.courseTitle.text = courseDetails.title
4246
binding.courseDetails.text =
@@ -91,7 +95,11 @@ class CourseDetailsActivity : AppCompatActivity() {
9195
holder.sectionStatus.setImageResource(if (availableCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
9296

9397
//change tracking text
94-
holder.trackText.text = availableCourses[position].numTracking.toString() + " Tracking"
98+
holder.trackText.text = context.resources.getQuantityString(
99+
R.plurals.tracking_count,
100+
availableCourses[position].numTracking,
101+
availableCourses[position].numTracking
102+
)
95103

96104
//Change the track button to remove button
97105
holder.removeButton.visibility =

‎app/src/main/java/com/cornellappdev/coursegrab/ui/main/MainActivity.kt‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ class MainActivity : AppCompatActivity() {
140140
layoutManager = LinearLayoutManager(this@MainActivity)
141141
adapter = AvailableAdapter(state.available, this@MainActivity)
142142
}
143-
binding.availableTitle.text = "${state.available.size} Available"
143+
binding.availableTitle.text = getString(R.string.available_count, state.available.size)
144144

145145
binding.awaitingList.apply {
146146
layoutManager = LinearLayoutManager(this@MainActivity)
147147
adapter = AwaitingAdapter(state.awaiting, this@MainActivity)
148148
}
149-
binding.awaitingTitle.text = "${state.awaiting.size} Awaiting"
149+
binding.awaitingTitle.text = getString(R.string.awaiting_count, state.awaiting.size)
150150

151151
binding.layoutAvailable.visibility =
152152
if (state.available.isNotEmpty()) View.VISIBLE else View.GONE
@@ -209,10 +209,15 @@ class MainActivity : AppCompatActivity() {
209209
}
210210

211211
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
212-
holder.courseTitle.text =
213-
"${availableCourses[position].subjectCode} ${availableCourses[position].courseNum}: ${availableCourses[position].title}"
212+
holder.courseTitle.text = context.getString(
213+
R.string.course_title_format,
214+
availableCourses[position].subjectCode,
215+
availableCourses[position].courseNum,
216+
availableCourses[position].title
217+
)
214218
holder.courseTime.text = availableCourses[position].section.uppercase(getDefault())
215-
holder.coursePin.text = availableCourses[position].catalogNum.toString()
219+
holder.coursePin.text =
220+
context.getString(R.string.course_pin_format, availableCourses[position].catalogNum)
216221
holder.courseStatus.setImageResource(if (availableCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
217222

218223
holder.removeButton.setOnClickListener {
@@ -260,10 +265,15 @@ class MainActivity : AppCompatActivity() {
260265
}
261266

262267
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
263-
holder.courseTitle.text =
264-
"${awaitingCourses[position].subjectCode} ${awaitingCourses[position].courseNum}: ${awaitingCourses[position].title}"
268+
holder.courseTitle.text = context.getString(
269+
R.string.course_title_format,
270+
awaitingCourses[position].subjectCode,
271+
awaitingCourses[position].courseNum,
272+
awaitingCourses[position].title
273+
)
265274
holder.courseTime.text = awaitingCourses[position].section.uppercase(getDefault())
266-
holder.coursePin.text = awaitingCourses[position].catalogNum.toString()
275+
holder.coursePin.text =
276+
context.getString(R.string.course_pin_format, awaitingCourses[position].catalogNum)
267277
holder.courseStatus.setImageResource(if (awaitingCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
268278

269279
holder.removeButton.setOnClickListener {

‎app/src/main/java/com/cornellappdev/coursegrab/ui/notification/NotificationModal.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ class NotificationModal : AppCompatActivity() {
2323
val course: Course =
2424
(intent.getParcelableExtra<CourseNotification>("courseDetails") as CourseNotification).section
2525

26-
binding.courseTitle.text = "${course.subjectCode} ${course.courseNum}: ${course.title}"
26+
binding.courseTitle.text = getString(
27+
R.string.course_title_format,
28+
course.subjectCode,
29+
course.courseNum,
30+
course.title
31+
)
2732
binding.courseSection.text = course.section
28-
binding.coursePin.text = course.catalogNum.toString()
33+
binding.coursePin.text = getString(R.string.course_pin_format, course.catalogNum)
2934

3035
binding.buttonStudentCenter.setOnClickListener {
3136
val browserIntent =

‎app/src/main/java/com/cornellappdev/coursegrab/ui/search/SearchActivity.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,12 @@ class SearchActivity : AppCompatActivity() {
139139
}
140140

141141
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
142-
holder.courseTitle.text =
143-
"${resultsCourses[position].subjectCode} ${resultsCourses[position].courseNum}: ${resultsCourses[position].title}"
142+
holder.courseTitle.text = context.getString(
143+
R.string.course_title_format,
144+
resultsCourses[position].subjectCode,
145+
resultsCourses[position].courseNum,
146+
resultsCourses[position].title
147+
)
144148

145149
holder.expandButton.setOnClickListener {
146150
val intent = Intent(context, CourseDetailsActivity::class.java).apply {

‎app/src/main/res/values/strings.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@
4343
<string name="no_results_alert_subtext_try_another">
4444
Try a different query
4545
</string>
46+
<!-- Course display formats: "CS 2110: Object-Oriented Programming" -->
47+
<string name="course_title_format">%1$s %2$d: %3$s</string>
48+
<string name="course_header_format">%1$s %2$d</string>
49+
<string name="course_pin_format">%d</string>
50+
<string name="available_count">%d Available</string>
51+
<string name="awaiting_count">%d Awaiting</string>
52+
<plurals name="tracking_count">
53+
<item quantity="one">%d Tracking</item>
54+
<item quantity="other">%d Tracking</item>
55+
</plurals>
4656
<plurals name="search_results_count">
4757
<item quantity="one">%d Result</item>
4858
<item quantity="other">%d Results</item>

0 commit comments

Comments
 (0)