refactor: remove placeholder card-detail route artifacts
This commit is contained in:
@@ -807,7 +807,7 @@ class BoardDetailFlowTest {
|
||||
|
||||
onView(withId(R.id.cardItemRoot)).perform(click())
|
||||
val expectedFallback = ApplicationProvider.getApplicationContext<android.content.Context>()
|
||||
.getString(R.string.card_detail_placeholder_fallback_title)
|
||||
.getString(R.string.card_detail_fallback_title)
|
||||
|
||||
Intents.intended(hasComponent(CardDetailActivity::class.java.name))
|
||||
Intents.intended(not(hasComponent("space.hackenslacker.kanbn4droid.app.CardDetailPlaceholderActivity")))
|
||||
|
||||
@@ -231,7 +231,7 @@ class BoardDetailActivity : AppCompatActivity() {
|
||||
lifecycleScope.launch {
|
||||
viewModel.events.collect { event ->
|
||||
when (event) {
|
||||
is BoardDetailUiEvent.NavigateToCardPlaceholder -> {
|
||||
is BoardDetailUiEvent.NavigateToCardDetail -> {
|
||||
val cardTitle = viewModel.uiState.value.boardDetail
|
||||
?.lists
|
||||
.orEmpty()
|
||||
@@ -241,7 +241,7 @@ class BoardDetailActivity : AppCompatActivity() {
|
||||
?.title
|
||||
.orEmpty()
|
||||
.trim()
|
||||
.ifBlank { getString(R.string.card_detail_placeholder_fallback_title) }
|
||||
.ifBlank { getString(R.string.card_detail_fallback_title) }
|
||||
openCardDetail(cardId = event.cardId, cardTitle = cardTitle)
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ data class BoardDetailUiState(
|
||||
}
|
||||
|
||||
sealed interface BoardDetailUiEvent {
|
||||
data class NavigateToCardPlaceholder(val cardId: String) : BoardDetailUiEvent
|
||||
data class NavigateToCardDetail(val cardId: String) : BoardDetailUiEvent
|
||||
data class ShowServerError(val message: String) : BoardDetailUiEvent
|
||||
data class ShowWarning(val message: String) : BoardDetailUiEvent
|
||||
}
|
||||
@@ -176,7 +176,7 @@ class BoardDetailViewModel(
|
||||
}
|
||||
|
||||
viewModelScope.launch {
|
||||
_events.emit(BoardDetailUiEvent.NavigateToCardPlaceholder(cardId))
|
||||
_events.emit(BoardDetailUiEvent.NavigateToCardDetail(cardId))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
<?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:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="24dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/cardDetailPlaceholderTitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/cardDetailPlaceholderSubtitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/card_detail_placeholder_subtitle"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/cardDetailPlaceholderTitle" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -44,10 +44,7 @@
|
||||
<string name="move_cards_to_list">Move cards to list</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="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>
|
||||
<string name="card_detail_fallback_title">Card</string>
|
||||
<string name="board_detail_unable_to_open_board">Unable to open board.</string>
|
||||
<string name="board_detail_session_expired">Session expired. Please sign in again.</string>
|
||||
<string name="board_detail_add">Add</string>
|
||||
|
||||
@@ -420,8 +420,8 @@ class BoardDetailViewModelTest {
|
||||
advanceUntilIdle()
|
||||
|
||||
val event = eventDeferred.await()
|
||||
assertTrue(event is BoardDetailUiEvent.NavigateToCardPlaceholder)
|
||||
assertEquals("card-1", (event as BoardDetailUiEvent.NavigateToCardPlaceholder).cardId)
|
||||
assertTrue(event is BoardDetailUiEvent.NavigateToCardDetail)
|
||||
assertEquals("card-1", (event as BoardDetailUiEvent.NavigateToCardDetail).cardId)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user