KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Spinner and EditText enhancements

Browse Source
pull/592/head
Zakhar Timoshenko 2 years ago
parent cfdca3434b
commit c3aff60a9c
9 changed files with 82 additions and 55 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/tags/TagsCatalogSheet.kt
Unescape Escape View File

@ -27,7 +27,7 @@ import org.koitharu.kotatsu.filter.ui.model.TagCatalogItem
@AndroidEntryPoint @AndroidEntryPoint
class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickListener<TagCatalogItem>, TextWatcher, class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickListener<TagCatalogItem>, TextWatcher,
AdaptiveSheetCallback, View.OnClickListener, View.OnFocusChangeListener, TextView.OnEditorActionListener { AdaptiveSheetCallback, View.OnFocusChangeListener, TextView.OnEditorActionListener {
private val viewModel by viewModels<TagsCatalogViewModel>( private val viewModel by viewModels<TagsCatalogViewModel>(
extrasProducer = { extrasProducer = {
@ -50,7 +50,6 @@ class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickL
binding.editSearch.addTextChangedListener(this) binding.editSearch.addTextChangedListener(this)
binding.editSearch.onFocusChangeListener = this binding.editSearch.onFocusChangeListener = this
binding.editSearch.setOnEditorActionListener(this) binding.editSearch.setOnEditorActionListener(this)
binding.buttonSearchClear.setOnClickListener(this)
viewModel.content.observe(viewLifecycleOwner, adapter) viewModel.content.observe(viewLifecycleOwner, adapter)
addSheetCallback(this) addSheetCallback(this)
disableFitToContents() disableFitToContents()
@ -61,12 +60,6 @@ class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickL
filter.setTag(item.tag, !item.isChecked) filter.setTag(item.tag, !item.isChecked)
} }
override fun onClick(v: View) {
when (v.id) {
R.id.button_search_clear -> viewBinding?.editSearch?.text?.clear()
}
}
override fun onFocusChange(v: View?, hasFocus: Boolean) { override fun onFocusChange(v: View?, hasFocus: Boolean) {
setExpanded( setExpanded(
isExpanded = hasFocus || isExpanded, isExpanded = hasFocus || isExpanded,
@ -90,7 +83,6 @@ class TagsCatalogSheet : BaseAdaptiveSheet<SheetTagsBinding>(), OnListItemClickL
override fun afterTextChanged(s: Editable?) { override fun afterTextChanged(s: Editable?) {
val q = s?.toString().orEmpty() val q = s?.toString().orEmpty()
viewModel.searchQuery.value = q viewModel.searchQuery.value = q
viewBinding?.buttonSearchClear?.isVisible = q.isNotEmpty()
} }
override fun onStateChanged(sheet: View, newState: Int) { override fun onStateChanged(sheet: View, newState: Int) {

15
app/src/main/res/drawable-v23/m3_spinner_popup_background.xml
Unescape Escape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?attr/colorSurfaceContainerHigh" />
<corners android:radius="4dp" />
</shape>
</item>
<item>
<shape>
<solid android:color="@color/m3_popupmenu_overlay_color" />
<corners android:radius="4dp" />
</shape>
</item>
</layer-list>

15
app/src/main/res/drawable/m3_spinner_popup_background.xml
Unescape Escape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/kotatsu_surfaceContainerHighest" />
<corners android:radius="4dp" />
</shape>
</item>
<item>
<shape>
<solid android:color="@color/kotatsu_surfaceContainerHighest" />
<corners android:radius="4dp" />
</shape>
</item>
</layer-list>

28
app/src/main/res/layout/sheet_filter.xml
Unescape Escape View File

@ -38,23 +38,20 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/card_order" android:id="@+id/card_order"
style="?materialCardViewOutlinedStyle" style="?m3SpinnerStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="@dimen/margin_normal" android:layout_marginTop="@dimen/margin_normal"
android:visibility="gone" android:visibility="gone"
app:cardBackgroundColor="@color/m3_chip_background_color"
app:shapeAppearance="?shapeAppearanceCornerMedium"
app:strokeColor="@color/m3_button_outline_color_selector"
app:strokeWidth="@dimen/m3_comp_outlined_button_outline_width"
tools:visibility="visible"> tools:visibility="visible">
<Spinner <Spinner
android:id="@+id/spinner_order" android:id="@+id/spinner_order"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="56dp"
android:minHeight="?listPreferredItemHeightSmall" /> android:minHeight="?listPreferredItemHeightSmall"
android:paddingHorizontal="8dp" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
@ -72,23 +69,21 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/card_locale" android:id="@+id/card_locale"
style="?materialCardViewOutlinedStyle" style="?m3SpinnerStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="@dimen/margin_normal" android:layout_marginTop="@dimen/margin_normal"
android:visibility="gone" android:visibility="gone"
app:cardBackgroundColor="@color/m3_chip_background_color"
app:shapeAppearance="?shapeAppearanceCornerMedium"
app:strokeColor="@color/m3_button_outline_color_selector"
app:strokeWidth="@dimen/m3_comp_outlined_button_outline_width"
tools:visibility="visible"> tools:visibility="visible">
<Spinner <Spinner
android:id="@+id/spinner_locale" android:id="@+id/spinner_locale"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="56dp"
android:minHeight="?listPreferredItemHeightSmall" /> android:minHeight="?listPreferredItemHeightSmall"
android:paddingHorizontal="8dp"
android:popupBackground="@drawable/m3_spinner_popup_background" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
@ -119,9 +114,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:paddingVertical="8dp"
android:drawablePadding="16dp"
android:paddingHorizontal="@dimen/margin_normal" android:paddingHorizontal="@dimen/margin_normal"
android:gravity="center_vertical"
android:textAppearance="?textAppearanceBodySmall" android:textAppearance="?textAppearanceBodySmall"
android:visibility="gone" android:visibility="gone"
app:drawableStartCompat="@drawable/ic_error_small"
app:drawableTint="?attr/colorControlNormal"
tools:text="@string/error_multiple_genres_not_supported" tools:text="@string/error_multiple_genres_not_supported"
tools:visibility="visible" /> tools:visibility="visible" />

9
app/src/main/res/layout/sheet_list_mode.xml
Unescape Escape View File

@ -113,22 +113,19 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/card_order" android:id="@+id/card_order"
style="?materialCardViewOutlinedStyle" style="?m3SpinnerStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="@dimen/margin_normal" android:layout_marginTop="@dimen/margin_normal"
android:visibility="gone" android:visibility="gone"
app:cardBackgroundColor="@color/m3_chip_background_color"
app:shapeAppearance="?shapeAppearanceCornerMedium"
app:strokeColor="@color/m3_button_outline_color_selector"
app:strokeWidth="@dimen/m3_comp_outlined_button_outline_width"
tools:visibility="visible"> tools:visibility="visible">
<Spinner <Spinner
android:id="@+id/spinner_order" android:id="@+id/spinner_order"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="56dp"
android:paddingHorizontal="8dp"
android:minHeight="?listPreferredItemHeightSmall" /> android:minHeight="?listPreferredItemHeightSmall" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>

44
app/src/main/res/layout/sheet_tags.xml
Unescape Escape View File

@ -15,38 +15,30 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/filter" /> app:title="@string/filter" />
<EditText <com.google.android.material.textfield.TextInputLayout
android:id="@+id/edit_search" android:id="@+id/text_input_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableStart="?android:actionModeWebSearchDrawable" app:startIconDrawable="?android:actionModeWebSearchDrawable"
android:drawablePadding="12dp" app:endIconMode="clear_text"
app:endIconDrawable="@drawable/abc_ic_clear_material"
android:hint="@string/genres_search_hint" android:hint="@string/genres_search_hint"
android:imeOptions="actionSearch|flagNoFullscreen" android:layout_marginHorizontal="16dp"
android:importantForAutofill="no" android:layout_marginBottom="4dp"
android:inputType="text"
android:paddingHorizontal="6dp"
android:singleLine="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/headerBar" app:layout_constraintTop_toBottomOf="@id/headerBar"
tools:ignore="LabelFor" /> app:layout_constraintBottom_toTopOf="@id/recyclerView">
<ImageButton <com.google.android.material.textfield.TextInputEditText
android:id="@+id/button_search_clear" android:id="@+id/edit_search"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="4dp" android:imeOptions="actionSearch|flagNoFullscreen"
android:background="?selectableItemBackgroundBorderless" android:importantForAutofill="no"
android:contentDescription="@string/clear" android:inputType="text"/>
android:minWidth="?minTouchTargetSize"
android:minHeight="?minTouchTargetSize" </com.google.android.material.textfield.TextInputLayout>
android:src="@drawable/abc_ic_clear_material"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/edit_search"
app:layout_constraintEnd_toEndOf="@id/edit_search"
app:layout_constraintTop_toTopOf="@id/edit_search"
tools:visibility="visible" />
<org.koitharu.kotatsu.core.ui.list.fastscroll.FastScrollRecyclerView <org.koitharu.kotatsu.core.ui.list.fastscroll.FastScrollRecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
@ -59,7 +51,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/edit_search" app:layout_constraintTop_toBottomOf="@id/text_input_layout"
app:scrollerOffset="8dp" app:scrollerOffset="8dp"
tools:listitem="@layout/item_checkable_new" /> tools:listitem="@layout/item_checkable_new" />

1
app/src/main/res/values/attrs.xml
Unescape Escape View File

@ -12,6 +12,7 @@
<attr name="m3ColorExploreButton" /> <attr name="m3ColorExploreButton" />
<attr name="m3ColorCardBackground" /> <attr name="m3ColorCardBackground" />
<attr name="m3ColorBottomMenuBackground" /> <attr name="m3ColorBottomMenuBackground" />
<attr name="m3SpinnerStyle" />
<!--CoverImageView attrs--> <!--CoverImageView attrs-->
<declare-styleable name="CoverImageView"> <declare-styleable name="CoverImageView">

13
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -58,6 +58,19 @@
<item name="android:paddingBottom">0dp</item> <item name="android:paddingBottom">0dp</item>
</style> </style>
<style name="Widget.Kotatsu.Spinner.DropDown" parent="Widget.AppCompat.Spinner.DropDown">
<item name="android:popupBackground">@drawable/m3_spinner_popup_background</item>
<item name="android:elevation">8dp</item>
<item name="android:popupElevation">3dp</item>
</style>
<style name="Widget.Kotatsu.Material3.Spinner" parent="Widget.Material3.CardView.Outlined">
<item name="cardBackgroundColor">@android:color/transparent</item>
<item name="strokeWidth">2dp</item>
<item name="strokeColor">?attr/colorOutline</item>
<item name="cardCornerRadius">4dp</item>
</style>
<style name="ShapeAppearanceOverlay.Kotatsu.BottomSheet" parent=""> <style name="ShapeAppearanceOverlay.Kotatsu.BottomSheet" parent="">
<item name="cornerFamily">rounded</item> <item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">@dimen/bottom_sheet_corner_radius</item> <item name="cornerSizeTopRight">@dimen/bottom_sheet_corner_radius</item>

2
app/src/main/res/values/themes.xml
Unescape Escape View File

@ -94,6 +94,8 @@
<item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator <item name="linearProgressIndicatorStyle">@style/Widget.Kotatsu.LinearProgressIndicator
</item> </item>
<item name="bottomSheetDragHandleStyle">@style/Widget.Kotatsu.BottomSheet.DragHandle</item> <item name="bottomSheetDragHandleStyle">@style/Widget.Kotatsu.BottomSheet.DragHandle</item>
<item name="android:dropDownSpinnerStyle">@style/Widget.Kotatsu.Spinner.DropDown</item>
<item name="m3SpinnerStyle">@style/Widget.Kotatsu.Material3.Spinner</item>
<!-- Text appearance --> <!-- Text appearance -->
<item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item> <item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item>

Write Preview
Loading…
Cancel
Save