fix: use string resources for card placeholder navigation labels
This commit is contained in:
@@ -6,6 +6,7 @@ import android.view.inputmethod.EditorInfo
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import androidx.test.core.app.ActivityScenario
|
import androidx.test.core.app.ActivityScenario
|
||||||
|
import androidx.test.core.app.ApplicationProvider
|
||||||
import androidx.test.espresso.Espresso.onView
|
import androidx.test.espresso.Espresso.onView
|
||||||
import androidx.test.espresso.action.ViewActions.click
|
import androidx.test.espresso.action.ViewActions.click
|
||||||
import androidx.test.espresso.action.ViewActions.longClick
|
import androidx.test.espresso.action.ViewActions.longClick
|
||||||
@@ -267,10 +268,12 @@ class BoardDetailFlowTest {
|
|||||||
launchBoardDetail()
|
launchBoardDetail()
|
||||||
|
|
||||||
onView(withId(R.id.cardItemRoot)).perform(click())
|
onView(withId(R.id.cardItemRoot)).perform(click())
|
||||||
|
val expectedFallback = ApplicationProvider.getApplicationContext<android.content.Context>()
|
||||||
|
.getString(R.string.card_detail_placeholder_fallback_title)
|
||||||
|
|
||||||
Intents.intended(hasComponent(CardDetailPlaceholderActivity::class.java.name))
|
Intents.intended(hasComponent(CardDetailPlaceholderActivity::class.java.name))
|
||||||
Intents.intended(hasExtra(CardDetailPlaceholderActivity.EXTRA_CARD_ID, "card-1"))
|
Intents.intended(hasExtra(CardDetailPlaceholderActivity.EXTRA_CARD_ID, "card-1"))
|
||||||
Intents.intended(hasExtra(CardDetailPlaceholderActivity.EXTRA_CARD_TITLE, "Card"))
|
Intents.intended(hasExtra(CardDetailPlaceholderActivity.EXTRA_CARD_TITLE, expectedFallback))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun launchBoardDetail(): ActivityScenario<BoardDetailActivity> {
|
private fun launchBoardDetail(): ActivityScenario<BoardDetailActivity> {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class CardDetailPlaceholderActivity : AppCompatActivity() {
|
|||||||
val cardTitle = intent.getStringExtra(EXTRA_CARD_TITLE).orEmpty()
|
val cardTitle = intent.getStringExtra(EXTRA_CARD_TITLE).orEmpty()
|
||||||
|
|
||||||
val titleView: TextView = findViewById(R.id.cardDetailPlaceholderTitle)
|
val titleView: TextView = findViewById(R.id.cardDetailPlaceholderTitle)
|
||||||
titleView.text = "$cardTitle\n(id: $cardId)"
|
titleView.text = getString(R.string.card_detail_placeholder_title, cardTitle, cardId)
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ class BoardDetailActivity : AppCompatActivity() {
|
|||||||
?.title
|
?.title
|
||||||
.orEmpty()
|
.orEmpty()
|
||||||
.trim()
|
.trim()
|
||||||
.ifBlank { "Card" }
|
.ifBlank { getString(R.string.card_detail_placeholder_fallback_title) }
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(this@BoardDetailActivity, CardDetailPlaceholderActivity::class.java)
|
Intent(this@BoardDetailActivity, CardDetailPlaceholderActivity::class.java)
|
||||||
.putExtra(CardDetailPlaceholderActivity.EXTRA_CARD_ID, event.cardId)
|
.putExtra(CardDetailPlaceholderActivity.EXTRA_CARD_ID, event.cardId)
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/board_detail_card_detail_coming_soon"
|
android:text="@string/card_detail_placeholder_subtitle"
|
||||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|||||||
@@ -44,4 +44,7 @@
|
|||||||
<string name="delete_cards_confirmation">Delete selected cards?</string>
|
<string name="delete_cards_confirmation">Delete selected cards?</string>
|
||||||
<string name="delete_cards_second_confirmation">Are you sure you want to permanently delete the selected cards?</string>
|
<string name="delete_cards_second_confirmation">Are you sure you want to permanently delete the selected cards?</string>
|
||||||
<string name="board_detail_card_detail_coming_soon">Card detail view is coming soon.</string>
|
<string name="board_detail_card_detail_coming_soon">Card detail view is coming soon.</string>
|
||||||
|
<string name="card_detail_placeholder_title">%1$s\n(id: %2$s)</string>
|
||||||
|
<string name="card_detail_placeholder_fallback_title">Card</string>
|
||||||
|
<string name="card_detail_placeholder_subtitle">Card detail view is coming soon.</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user