diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt index 8e6075362..bbcd57ad5 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt @@ -59,6 +59,12 @@ class FilterCoordinator( } } + fun setTags(tags: Set) { + currentState.update { oldValue -> + FilterState(oldValue.sortOrder, tags) + } + } + fun reset() { currentState.update { oldValue -> FilterState(oldValue.sortOrder, emptySet()) diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt index 025dfd515..36f1bdcca 100644 --- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt @@ -110,6 +110,10 @@ class RemoteListViewModel( fun resetFilter() = filter.reset() + fun applyFilter(tags: Set) { + filter.setTags(tags) + } + private fun loadList(filterState: FilterState, append: Boolean) { if (loadingJob?.isActive == true) { return diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt index bd6a77cda..eb85bc179 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/MangaListActivity.kt @@ -15,7 +15,6 @@ import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.BaseActivity import org.koitharu.kotatsu.core.model.MangaTag import org.koitharu.kotatsu.databinding.ActivitySearchGlobalBinding -import org.koitharu.kotatsu.list.ui.filter.FilterState import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel @@ -63,7 +62,7 @@ class MangaListActivity : BaseActivity() { val viewModel = fragment.getViewModel { parametersOf(tag.source) } - viewModel.applyFilter(FilterState(viewModel.filter.sortOrder, setOf(tag))) + viewModel.applyFilter(setOf(tag)) } } diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt index e983be92b..64e53dc6b 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.search.ui.suggestion import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import org.koitharu.kotatsu.search.ui.suggestion.adapter.SearchSuggestionAdapter +import org.koitharu.kotatsu.search.ui.suggestion.adapter.SEARCH_SUGGESTION_ITEM_TYPE_QUERY import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem import org.koitharu.kotatsu.utils.ext.getItem @@ -18,7 +18,7 @@ class SearchSuggestionItemCallback( override fun getMovementFlags( recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, - ): Int = if (viewHolder.itemViewType == SearchSuggestionAdapter.ITEM_TYPE_QUERY) { + ): Int = if (viewHolder.itemViewType == SEARCH_SUGGESTION_ITEM_TYPE_QUERY) { movementFlags } else { 0 diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt index bb2002d82..02e7f2856 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionViewModel.kt @@ -2,10 +2,8 @@ package org.koitharu.kotatsu.search.ui.suggestion import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job +import kotlinx.coroutines.* import kotlinx.coroutines.flow.* -import kotlinx.coroutines.plus import org.koitharu.kotatsu.base.ui.BaseViewModel import org.koitharu.kotatsu.base.ui.widgets.ChipsView import org.koitharu.kotatsu.core.model.MangaSource @@ -14,11 +12,9 @@ import org.koitharu.kotatsu.search.domain.MangaSearchRepository import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem private const val DEBOUNCE_TIMEOUT = 500L -private const val SEARCH_THRESHOLD = 3 -private const val MAX_MANGA_ITEMS = 3 +private const val MAX_MANGA_ITEMS = 6 private const val MAX_QUERY_ITEMS = 16 private const val MAX_TAGS_ITEMS = 8 -private const val MAX_SUGGESTION_ITEMS = MAX_MANGA_ITEMS + MAX_QUERY_ITEMS + 2 class SearchSuggestionViewModel( private val repository: MangaSearchRepository, @@ -68,33 +64,49 @@ class SearchSuggestionViewModel( private fun setupSuggestion() { suggestionJob?.cancel() suggestionJob = combine( - query - .debounce(DEBOUNCE_TIMEOUT) - .mapLatest { q -> - q to repository.getQuerySuggestion(q, MAX_QUERY_ITEMS) - }, + query.debounce(DEBOUNCE_TIMEOUT), source, - isLocalSearch - ) { (q, queries), src, srcOnly -> - val result = ArrayList(MAX_SUGGESTION_ITEMS) + isLocalSearch, + ::Triple, + ).mapLatest { (searchQuery, src, srcOnly) -> + buildSearchSuggestion(searchQuery, src, srcOnly) + }.distinctUntilChanged() + .onEach { + suggestion.postValue(it) + }.launchIn(viewModelScope + Dispatchers.Default) + } + + private suspend fun buildSearchSuggestion( + searchQuery: String, + src: MangaSource?, + srcOnly: Boolean, + ): List = coroutineScope { + val queriesDeferred = async { + repository.getQuerySuggestion(searchQuery, MAX_QUERY_ITEMS) + } + val tagsDeferred = async { + repository.getTagsSuggestion(searchQuery, MAX_TAGS_ITEMS, src.takeIf { srcOnly }) + } + val mangaDeferred = async { + repository.getMangaSuggestion(searchQuery, MAX_MANGA_ITEMS, src.takeIf { srcOnly }) + } + + val tags = tagsDeferred.await() + val mangaList = mangaDeferred.await() + val queries = queriesDeferred.await() + + buildList(queries.size + 3) { if (src != null) { - result += SearchSuggestionItem.Header(src, isLocalSearch) + add(SearchSuggestionItem.Header(src, isLocalSearch)) } - val tags = repository.getTagsSuggestion(q, MAX_TAGS_ITEMS, src.takeIf { srcOnly }) if (tags.isNotEmpty()) { - result.add(SearchSuggestionItem.Tags(mapTags(tags))) + add(SearchSuggestionItem.Tags(mapTags(tags))) } - if (q.length >= SEARCH_THRESHOLD) { - repository.getMangaSuggestion(q, MAX_MANGA_ITEMS, src.takeIf { srcOnly }) - .mapTo(result) { - SearchSuggestionItem.MangaItem(it) - } + if (mangaList.isNotEmpty()) { + add(SearchSuggestionItem.MangaList(mangaList)) } - queries.mapTo(result) { SearchSuggestionItem.RecentQuery(it) } - result - }.onEach { - suggestion.postValue(it) - }.launchIn(viewModelScope + Dispatchers.Default) + queries.mapTo(this) { SearchSuggestionItem.RecentQuery(it) } + } } private fun mapTags(tags: List): List = tags.map { tag -> diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt index 5d1180d96..86a8d5283 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionAdapter.kt @@ -8,6 +8,8 @@ import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem import kotlin.jvm.internal.Intrinsics +const val SEARCH_SUGGESTION_ITEM_TYPE_QUERY = 0 + class SearchSuggestionAdapter( coil: ImageLoader, lifecycleOwner: LifecycleOwner, @@ -15,10 +17,11 @@ class SearchSuggestionAdapter( ) : AsyncListDifferDelegationAdapter(DiffCallback()) { init { - delegatesManager.addDelegate(ITEM_TYPE_MANGA, searchSuggestionMangaAD(coil, lifecycleOwner, listener)) - .addDelegate(ITEM_TYPE_QUERY, searchSuggestionQueryAD(listener)) - .addDelegate(ITEM_TYPE_HEADER, searchSuggestionHeaderAD(listener)) - .addDelegate(ITEM_TYPE_TAGS, searchSuggestionTagsAD(listener)) + delegatesManager + .addDelegate(SEARCH_SUGGESTION_ITEM_TYPE_QUERY, searchSuggestionQueryAD(listener)) + .addDelegate(searchSuggestionHeaderAD(listener)) + .addDelegate(searchSuggestionTagsAD(listener)) + .addDelegate(searchSuggestionMangaListAD(coil, lifecycleOwner, listener)) } private class DiffCallback : DiffUtil.ItemCallback() { @@ -27,15 +30,10 @@ class SearchSuggestionAdapter( oldItem: SearchSuggestionItem, newItem: SearchSuggestionItem, ): Boolean = when { - oldItem is SearchSuggestionItem.MangaItem && newItem is SearchSuggestionItem.MangaItem -> { - oldItem.manga.id == newItem.manga.id - } oldItem is SearchSuggestionItem.RecentQuery && newItem is SearchSuggestionItem.RecentQuery -> { oldItem.query == newItem.query } - oldItem is SearchSuggestionItem.Header && newItem is SearchSuggestionItem.Header -> true - oldItem is SearchSuggestionItem.Tags && newItem is SearchSuggestionItem.Tags -> true - else -> false + else -> oldItem.javaClass == newItem.javaClass } override fun areContentsTheSame( @@ -43,12 +41,4 @@ class SearchSuggestionAdapter( newItem: SearchSuggestionItem, ): Boolean = Intrinsics.areEqual(oldItem, newItem) } - - companion object { - - const val ITEM_TYPE_MANGA = 0 - const val ITEM_TYPE_QUERY = 1 - const val ITEM_TYPE_HEADER = 2 - const val ITEM_TYPE_TAGS = 3 - } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionMangaAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionMangaAD.kt deleted file mode 100644 index 2eed6b932..000000000 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionMangaAD.kt +++ /dev/null @@ -1,46 +0,0 @@ -package org.koitharu.kotatsu.search.ui.suggestion.adapter - -import androidx.lifecycle.LifecycleOwner -import coil.ImageLoader -import coil.request.Disposable -import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding -import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.databinding.ItemSearchSuggestionMangaBinding -import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener -import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem -import org.koitharu.kotatsu.utils.ext.enqueueWith -import org.koitharu.kotatsu.utils.ext.newImageRequest -import org.koitharu.kotatsu.utils.ext.textAndVisible - -fun searchSuggestionMangaAD( - coil: ImageLoader, - lifecycleOwner: LifecycleOwner, - listener: SearchSuggestionListener, -) = adapterDelegateViewBinding( - { inflater, parent -> ItemSearchSuggestionMangaBinding.inflate(inflater, parent, false) } -) { - - var imageRequest: Disposable? = null - - itemView.setOnClickListener { - listener.onMangaClick(item.manga) - } - - bind { - imageRequest?.dispose() - imageRequest = binding.imageViewCover.newImageRequest(item.manga.coverUrl) - .placeholder(R.drawable.ic_placeholder) - .fallback(R.drawable.ic_placeholder) - .error(R.drawable.ic_placeholder) - .allowRgb565(true) - .lifecycle(lifecycleOwner) - .enqueueWith(coil) - binding.textViewTitle.text = item.manga.title - binding.textViewSubtitle.textAndVisible = item.manga.altTitle - } - - onViewRecycled { - imageRequest?.dispose() - binding.imageViewCover.setImageDrawable(null) - } -} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt new file mode 100644 index 000000000..9c3eb37b1 --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionsMangaListAD.kt @@ -0,0 +1,89 @@ +package org.koitharu.kotatsu.search.ui.suggestion.adapter + +import androidx.core.view.updatePadding +import androidx.lifecycle.LifecycleOwner +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView +import coil.ImageLoader +import coil.request.Disposable +import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter +import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate +import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding +import org.koitharu.kotatsu.R +import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration +import org.koitharu.kotatsu.core.model.Manga +import org.koitharu.kotatsu.databinding.ItemSearchSuggestionMangaGridBinding +import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener +import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem +import org.koitharu.kotatsu.utils.ScrollResetCallback +import org.koitharu.kotatsu.utils.ext.enqueueWith +import org.koitharu.kotatsu.utils.ext.newImageRequest + +fun searchSuggestionMangaListAD( + coil: ImageLoader, + lifecycleOwner: LifecycleOwner, + listener: SearchSuggestionListener, +) = adapterDelegate(R.layout.item_search_suggestion_manga_list) { + + val adapter = AsyncListDifferDelegationAdapter( + SuggestionMangaDiffCallback(), + searchSuggestionMangaGridAD(coil, lifecycleOwner, listener), + ) + val recyclerView = itemView as RecyclerView + recyclerView.adapter = adapter + val spacing = context.resources.getDimensionPixelOffset(R.dimen.search_suggestions_manga_spacing) + recyclerView.updatePadding( + left = recyclerView.paddingLeft - spacing, + right = recyclerView.paddingRight - spacing, + ) + recyclerView.addItemDecoration(SpacingItemDecoration(spacing)) + val scrollResetCallback = ScrollResetCallback(recyclerView) + + bind { + adapter.setItems(item.items, scrollResetCallback) + } +} + +private fun searchSuggestionMangaGridAD( + coil: ImageLoader, + lifecycleOwner: LifecycleOwner, + listener: SearchSuggestionListener, +) = adapterDelegateViewBinding( + { layoutInflater, parent -> ItemSearchSuggestionMangaGridBinding.inflate(layoutInflater, parent, false) } +) { + + var imageRequest: Disposable? = null + + itemView.setOnClickListener { + listener.onMangaClick(item) + } + + bind { + imageRequest?.dispose() + imageRequest = binding.imageViewCover.newImageRequest(item.coverUrl) + .placeholder(R.drawable.ic_placeholder) + .fallback(R.drawable.ic_placeholder) + .error(R.drawable.ic_placeholder) + .allowRgb565(true) + .lifecycle(lifecycleOwner) + .enqueueWith(coil) + binding.textViewTitle.text = item.title + } + + onViewRecycled { + imageRequest?.dispose() + binding.imageViewCover.setImageDrawable(null) + } +} + +private class SuggestionMangaDiffCallback : DiffUtil.ItemCallback() { + + override fun areItemsTheSame(oldItem: Manga, newItem: Manga): Boolean { + return oldItem.id == newItem.id + } + + override fun areContentsTheSame(oldItem: Manga, newItem: Manga): Boolean { + return oldItem.title == newItem.title && oldItem.coverUrl == newItem.coverUrl + } + +} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt index e0dfcea2d..369639462 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/model/SearchSuggestionItem.kt @@ -4,23 +4,95 @@ import kotlinx.coroutines.flow.MutableStateFlow import org.koitharu.kotatsu.base.ui.widgets.ChipsView import org.koitharu.kotatsu.core.model.Manga import org.koitharu.kotatsu.core.model.MangaSource +import org.koitharu.kotatsu.utils.ext.areItemsEquals sealed interface SearchSuggestionItem { - data class MangaItem( - val manga: Manga, - ) : SearchSuggestionItem + class MangaList( + val items: List, + ) : SearchSuggestionItem { - data class RecentQuery( + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as MangaList + + return items.areItemsEquals(other.items) { a, b -> + a.title == b.title && a.coverUrl == b.coverUrl + } + } + + override fun hashCode(): Int { + return items.fold(0) { acc, t -> + var r = 31 * acc + t.title.hashCode() + r = 31 * r + t.coverUrl.hashCode() + r + } + } + } + + class RecentQuery( val query: String, - ) : SearchSuggestionItem + ) : SearchSuggestionItem { - data class Header( + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as RecentQuery + + if (query != other.query) return false + + return true + } + + override fun hashCode(): Int { + return query.hashCode() + } + } + + class Header( val source: MangaSource, val isChecked: MutableStateFlow, - ) : SearchSuggestionItem + ) : SearchSuggestionItem { - data class Tags( + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as Header + + if (source != other.source) return false + if (isChecked !== other.isChecked) return false + + return true + } + + override fun hashCode(): Int { + var result = source.hashCode() + result = 31 * result + isChecked.hashCode() + return result + } + } + + class Tags( val tags: List, - ) : SearchSuggestionItem + ) : SearchSuggestionItem { + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as Tags + + if (tags != other.tags) return false + + return true + } + + override fun hashCode(): Int { + return tags.hashCode() + } + } } diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ScrollResetCallback.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ScrollResetCallback.kt new file mode 100644 index 000000000..5a279f4ec --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ScrollResetCallback.kt @@ -0,0 +1,13 @@ +package org.koitharu.kotatsu.utils + +import androidx.recyclerview.widget.RecyclerView +import java.lang.ref.WeakReference + +class ScrollResetCallback(recyclerView: RecyclerView) : Runnable { + + private val recyclerViewRef = WeakReference(recyclerView) + + override fun run() { + recyclerViewRef.get()?.scrollToPosition(0) + } +} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt index 441b87c31..58797833c 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt @@ -1,6 +1,5 @@ package org.koitharu.kotatsu.utils.ext -import android.util.SparseArray import androidx.collection.ArrayMap import androidx.collection.ArraySet import androidx.collection.LongSparseArray @@ -82,4 +81,18 @@ fun MutableList.move(sourceIndex: Int, targetIndex: Int) { } else { Collections.rotate(subList(targetIndex, sourceIndex + 1), 1) } +} + +inline fun List.areItemsEquals(other: List, equals: (T, T) -> Boolean): Boolean { + if (size != other.size) { + return false + } + for (i in indices) { + val a = this[i] + val b = other[i] + if (!equals(a, b)) { + return false + } + } + return true } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 359e1d52a..682ca84a3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -42,6 +42,7 @@ android:background="@null" android:focusable="true" android:focusableInTouchMode="true" + android:theme="@style/ThemeOverlay.Kotatsu.MainToolbar" app:contentInsetStartWithNavigation="0dp" app:titleTextAppearance="@style/TextAppearance.Kotatsu.PersistentToolbarTitle" app:titleTextColor="?android:colorControlNormal" @@ -52,6 +53,7 @@ style="@style/Widget.Kotatsu.SearchView" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginEnd="2dp" android:background="@null" android:gravity="center_vertical" android:hint="@string/search_manga" @@ -59,7 +61,7 @@ android:importantForAutofill="no" android:paddingBottom="1dp" android:singleLine="true" - tools:drawableEnd="@drawable/ic_clear" /> + tools:drawableEnd="@drawable/abc_ic_clear_material" /> diff --git a/app/src/main/res/layout/item_search_suggestion_manga.xml b/app/src/main/res/layout/item_search_suggestion_manga.xml deleted file mode 100644 index c0cf277fd..000000000 --- a/app/src/main/res/layout/item_search_suggestion_manga.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_suggestion_manga_grid.xml b/app/src/main/res/layout/item_search_suggestion_manga_grid.xml new file mode 100644 index 000000000..dad0dddd8 --- /dev/null +++ b/app/src/main/res/layout/item_search_suggestion_manga_grid.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_suggestion_manga_list.xml b/app/src/main/res/layout/item_search_suggestion_manga_list.xml new file mode 100644 index 000000000..88bcf54fb --- /dev/null +++ b/app/src/main/res/layout/item_search_suggestion_manga_list.xml @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 734613783..3f5cbbf6d 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -19,6 +19,8 @@ 48dp 16dp + 124dp + 4dp \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f65fca080..08ab43dec 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,4 +1,4 @@ - + @@ -76,6 +76,10 @@ @bool/elevation_overlay_enabled + + + +