fix: align board detail toolbar and add-card dialog scaffolding
This commit is contained in:
@@ -471,16 +471,11 @@ class BoardDetailActivity : AppCompatActivity() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val filterItem = menu.add(Menu.NONE, R.id.actionFilterByTag, Menu.NONE, getString(R.string.filter_by_tag)).apply {
|
menuInflater.inflate(R.menu.menu_board_detail_main, menu)
|
||||||
setIcon(R.drawable.ic_filter_list_24)
|
val filterItem = menu.findItem(R.id.actionFilterByTag)
|
||||||
setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
|
val searchItem = menu.findItem(R.id.actionSearch)
|
||||||
tooltipText = getString(R.string.filter_by_tag)
|
filterItem?.tooltipText = getString(R.string.filter_by_tag)
|
||||||
}
|
searchItem?.tooltipText = getString(R.string.search)
|
||||||
val searchItem = menu.add(Menu.NONE, R.id.actionSearch, Menu.NONE, getString(R.string.search)).apply {
|
|
||||||
setIcon(R.drawable.ic_search_24)
|
|
||||||
setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
|
|
||||||
tooltipText = getString(R.string.search)
|
|
||||||
}
|
|
||||||
tintMainMenuIcon(filterItem, state.activeTagFilterIds.isNotEmpty())
|
tintMainMenuIcon(filterItem, state.activeTagFilterIds.isNotEmpty())
|
||||||
tintMainMenuIcon(searchItem, state.activeTitleQuery.isNotBlank())
|
tintMainMenuIcon(searchItem, state.activeTitleQuery.isNotBlank())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,5 +40,63 @@
|
|||||||
android:inputType="textMultiLine|textCapSentences"
|
android:inputType="textMultiLine|textCapSentences"
|
||||||
android:minLines="3" />
|
android:minLines="3" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/addCardDueDateRow"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/addCardDueDateText"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="@string/due_date"
|
||||||
|
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/addCardClearDueDateAction"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="8dp"
|
||||||
|
android:paddingTop="4dp"
|
||||||
|
android:paddingEnd="8dp"
|
||||||
|
android:paddingBottom="4dp"
|
||||||
|
android:text="@string/clear_due_date"
|
||||||
|
android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/addCardTagSection"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/addCardTagsLabel"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/add_card_tags"
|
||||||
|
android:textAppearance="@style/TextAppearance.Material3.TitleSmall" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/addCardTagsPlaceholderText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:text="@string/add_card_tags_placeholder"
|
||||||
|
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/addCardTagsContainer"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:orientation="vertical" />
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|||||||
@@ -63,5 +63,9 @@
|
|||||||
<string name="card_title">Card title</string>
|
<string name="card_title">Card title</string>
|
||||||
<string name="card_title_required">Card title is required</string>
|
<string name="card_title_required">Card title is required</string>
|
||||||
<string name="description">Description</string>
|
<string name="description">Description</string>
|
||||||
|
<string name="due_date">Due date</string>
|
||||||
|
<string name="clear_due_date">Clear date</string>
|
||||||
|
<string name="add_card_tags">Tags</string>
|
||||||
|
<string name="add_card_tags_placeholder">Tag selector will be wired in the next task.</string>
|
||||||
<string name="filter_tags_placeholder">Tag selector will be wired in the next task.</string>
|
<string name="filter_tags_placeholder">Tag selector will be wired in the next task.</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user