Skip to content

Commit 3ed6d98

Browse files
ricknoutricknout
committed
Make titles more clear to reflect latest vs. predicted rankings
1 parent c0401ca commit 3ed6d98

File tree

4 files changed

+34
-20
lines changed

4 files changed

+34
-20
lines changed

‎app/src/main/java/com/ricknout/rugbyranker/ui/rankings/RankingsFragment.kt

+23-11
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
9898
setupBottomSheet()
9999
setupAddOrEditMatchInput()
100100
setupAddMatchButtons()
101-
setupTitle()
102101
setupSnackbar()
103102
setupViewModel()
104103
}
@@ -252,15 +251,8 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
252251
clearAddOrEditMatchInput()
253252
showBottomSheet()
254253
}
255-
TooltipCompat.setTooltipText(addMatchFab, getString(R.string.tooltip_add_match))
256-
TooltipCompat.setTooltipText(addMatchButton, getString(R.string.tooltip_add_match))
257-
}
258-
259-
private fun setupTitle() {
260-
titleTextView.setText(when (rankingsType) {
261-
RankingsType.MENS -> R.string.title_mens_rugby_rankings
262-
RankingsType.WOMENS -> R.string.title_womens_rugby_rankings
263-
})
254+
TooltipCompat.setTooltipText(addMatchFab, getString(R.string.tooltip_add_match_prediction))
255+
TooltipCompat.setTooltipText(addMatchButton, getString(R.string.tooltip_add_match_prediction))
264256
}
265257

266258
private fun setupSnackbar() {
@@ -291,13 +283,14 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
291283
matchResultAdapter.submitList(matchResults)
292284
val isEmpty = matchResults?.isEmpty() ?: true
293285
updateUiForMatchResults(!isEmpty)
286+
setTitle(!isEmpty)
294287
})
295288
viewModel.addOrEditMatchInputValid.observe(this, Observer { addOrEditMatchInputValid ->
296289
addOrEditButton.isEnabled = addOrEditMatchInputValid
297290
})
298291
viewModel.editingMatchResult.observe(this, Observer { editingMatchResult ->
299292
val isEditing = editingMatchResult != null
300-
addOrEditMatchTitleTextView.setText(if (isEditing) R.string.title_edit_match else R.string.title_add_match)
293+
addOrEditMatchTitleTextView.setText(if (isEditing) R.string.title_edit_match_prediction else R.string.title_add_match_prediction)
301294
cancelButton.isInvisible = !isEditing
302295
addOrEditButton.setText(if (isEditing) R.string.button_edit else R.string.button_add)
303296
})
@@ -317,6 +310,25 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
317310
addMatchButton.isEnabled = hasMatchResults
318311
}
319312

313+
private fun setTitle(hasMatchResults: Boolean) {
314+
titleTextView.setText(when (rankingsType) {
315+
RankingsType.MENS -> {
316+
if (hasMatchResults) {
317+
R.string.title_predicted_mens_rugby_rankings
318+
} else {
319+
R.string.title_latest_mens_rugby_rankings
320+
}
321+
}
322+
RankingsType.WOMENS -> {
323+
if (hasMatchResults) {
324+
R.string.title_predicted_womens_rugby_rankings
325+
} else {
326+
R.string.title_latest_womens_rugby_rankings
327+
}
328+
}
329+
})
330+
}
331+
320332
private fun showBottomSheet() {
321333
bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
322334
}

‎app/src/main/res/layout/fragment_rankings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
app:layout_constraintTop_toTopOf="parent"
2323
app:layout_constraintStart_toStartOf="parent"
2424
app:layout_constraintEnd_toEndOf="parent"
25-
tools:text="Men's Rankings" />
25+
tools:text="Latest Men's Rugby Rankings" />
2626

2727
<include
2828
android:id="@+id/rankingsHeader"
@@ -66,7 +66,7 @@
6666
app:hoveredFocusedTranslationZ="0dp"
6767
app:pressedTranslationZ="0dp"
6868
app:srcCompat="@drawable/ic_add_match_black_24dp"
69-
android:contentDescription="@string/content_description_add_match" />
69+
android:contentDescription="@string/content_description_add_match_prediction" />
7070

7171
<include layout="@layout/include_add_edit_match_bottom_sheet" />
7272

‎app/src/main/res/layout/include_add_edit_match_bottom_sheet.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
android:id="@+id/addOrEditMatchTitleTextView"
6464
android:layout_width="wrap_content"
6565
android:layout_height="wrap_content"
66-
android:text="@string/title_add_match"
66+
android:text="@string/title_add_match_prediction"
6767
android:textAppearance="?android:textAppearanceMedium"
6868
android:textColor="?android:textColorPrimary"
6969
app:layout_constraintTop_toTopOf="parent"

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

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
<string name="title_mens">Men\'s</string>
44
<string name="title_womens">Women\'s</string>
5-
<string name="title_mens_rugby_rankings">Men\'s Rugby Rankings</string>
6-
<string name="title_womens_rugby_rankings">Women\'s Rugby Rankings</string>
7-
<string name="title_add_match">Add match</string>
8-
<string name="title_edit_match">Edit match</string>
5+
<string name="title_latest_mens_rugby_rankings">Latest Men\'s Rugby Rankings</string>
6+
<string name="title_latest_womens_rugby_rankings">Latest Women\'s Rugby Rankings</string>
7+
<string name="title_predicted_mens_rugby_rankings">Predicted Men\'s Rugby Rankings</string>
8+
<string name="title_predicted_womens_rugby_rankings">Predicted Women\'s Rugby Rankings</string>
9+
<string name="title_add_match_prediction">Add match prediction</string>
10+
<string name="title_edit_match_prediction">Edit match prediction</string>
911

1012
<string name="subtitle_position" translatable="false">#</string>
1113
<string name="subtitle_team">Team</string>
@@ -32,11 +34,11 @@
3234

3335
<string name="menu_item_team" translatable="false">%1$s %2$s</string>
3436

35-
<string name="tooltip_add_match">Add match</string>
37+
<string name="tooltip_add_match_prediction">Add match prediction</string>
3638

3739
<string name="snackbar_fetching_world_rugby_rankings">Fetching World Rugby Rankings&#8230;</string>
3840

39-
<string name="content_description_add_match">Add match</string>
41+
<string name="content_description_add_match_prediction">Add match prediction</string>
4042
<string name="content_description_reset_matches">Reset matches</string>
4143
<string name="content_description_close">Close</string>
4244

0 commit comments

Comments
 (0)