replace GridView in library and search fragment with RecyclerView
closes #8
This commit is contained in:
parent
36c8678646
commit
adf8a48251
|
@ -103,12 +103,13 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
|
||||||
private fun load() {
|
private fun load() {
|
||||||
EncryptedPreferences.readCredentials(this)
|
EncryptedPreferences.readCredentials(this)
|
||||||
|
|
||||||
// make sure credentials are set and valid
|
// make sure credentials are set
|
||||||
if (EncryptedPreferences.password.isEmpty()) {
|
if (EncryptedPreferences.password.isEmpty()) {
|
||||||
showLoginDialog(true)
|
showLoginDialog(true)
|
||||||
} else if (!AoDParser().login()) {
|
|
||||||
showLoginDialog(false)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO save last loginSuccess, if false show login dialog even if credentials are present
|
||||||
|
AoDParser().listAnimes()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -5,17 +5,19 @@ import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import kotlinx.android.synthetic.main.fragment_library.*
|
import kotlinx.android.synthetic.main.fragment_library.*
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import org.mosad.teapod.MainActivity
|
import org.mosad.teapod.MainActivity
|
||||||
import org.mosad.teapod.R
|
import org.mosad.teapod.R
|
||||||
import org.mosad.teapod.parser.AoDParser
|
import org.mosad.teapod.parser.AoDParser
|
||||||
|
import org.mosad.teapod.util.MediaItemDecoration
|
||||||
import org.mosad.teapod.util.adapter.MediaItemAdapter
|
import org.mosad.teapod.util.adapter.MediaItemAdapter
|
||||||
import org.mosad.teapod.util.Media
|
|
||||||
|
|
||||||
class LibraryFragment : Fragment() {
|
class LibraryFragment : Fragment() {
|
||||||
|
|
||||||
private lateinit var adapter : MediaItemAdapter
|
private lateinit var adapter: MediaItemAdapter
|
||||||
|
private lateinit var layoutManager: GridLayoutManager
|
||||||
|
|
||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
return inflater.inflate(R.layout.fragment_library, container, false)
|
return inflater.inflate(R.layout.fragment_library, container, false)
|
||||||
|
@ -24,6 +26,7 @@ class LibraryFragment : Fragment() {
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
|
||||||
|
// init async
|
||||||
GlobalScope.launch {
|
GlobalScope.launch {
|
||||||
if (AoDParser.mediaList.isEmpty()) {
|
if (AoDParser.mediaList.isEmpty()) {
|
||||||
AoDParser().listAnimes()
|
AoDParser().listAnimes()
|
||||||
|
@ -32,22 +35,18 @@ class LibraryFragment : Fragment() {
|
||||||
// create and set the adapter, needs context
|
// create and set the adapter, needs context
|
||||||
withContext(Dispatchers.Main) {
|
withContext(Dispatchers.Main) {
|
||||||
context?.let {
|
context?.let {
|
||||||
adapter = MediaItemAdapter(it, AoDParser.mediaList)
|
layoutManager = GridLayoutManager(context, 2)
|
||||||
grid_media_library.adapter = adapter
|
adapter = MediaItemAdapter(AoDParser.mediaList)
|
||||||
|
adapter.onItemClick = { media, _ ->
|
||||||
|
(activity as MainActivity).showMediaFragment(media)
|
||||||
|
}
|
||||||
|
|
||||||
|
recycler_media_library.layoutManager = layoutManager
|
||||||
|
recycler_media_library.adapter = adapter
|
||||||
|
recycler_media_library.addItemDecoration(MediaItemDecoration(9))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
initActions()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun initActions() {
|
|
||||||
grid_media_library.setOnItemClickListener { _, _, position, _ ->
|
|
||||||
val media = adapter.getItem(position) as Media
|
|
||||||
println("selected item is: ${media.title}")
|
|
||||||
|
|
||||||
(activity as MainActivity).showMediaFragment(media)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -6,17 +6,20 @@ import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.SearchView
|
import android.widget.SearchView
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import kotlinx.android.synthetic.main.fragment_search.*
|
import kotlinx.android.synthetic.main.fragment_search.*
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import org.mosad.teapod.MainActivity
|
import org.mosad.teapod.MainActivity
|
||||||
import org.mosad.teapod.R
|
import org.mosad.teapod.R
|
||||||
import org.mosad.teapod.parser.AoDParser
|
import org.mosad.teapod.parser.AoDParser
|
||||||
|
import org.mosad.teapod.util.MediaItemDecoration
|
||||||
import org.mosad.teapod.util.adapter.MediaItemAdapter
|
import org.mosad.teapod.util.adapter.MediaItemAdapter
|
||||||
import org.mosad.teapod.util.Media
|
|
||||||
|
|
||||||
class SearchFragment : Fragment() {
|
class SearchFragment : Fragment() {
|
||||||
|
|
||||||
private var adapter : MediaItemAdapter? = null
|
private var adapter : MediaItemAdapter? = null
|
||||||
|
private lateinit var layoutManager: GridLayoutManager
|
||||||
|
|
||||||
|
|
||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
return inflater.inflate(R.layout.fragment_search, container, false)
|
return inflater.inflate(R.layout.fragment_search, container, false)
|
||||||
|
@ -33,8 +36,15 @@ class SearchFragment : Fragment() {
|
||||||
// create and set the adapter, needs context
|
// create and set the adapter, needs context
|
||||||
withContext(Dispatchers.Main) {
|
withContext(Dispatchers.Main) {
|
||||||
context?.let {
|
context?.let {
|
||||||
adapter = MediaItemAdapter(it, AoDParser.mediaList)
|
layoutManager = GridLayoutManager(context, 2)
|
||||||
grid_media_search.adapter = adapter
|
adapter = MediaItemAdapter(AoDParser.mediaList)
|
||||||
|
adapter!!.onItemClick = { media, _ ->
|
||||||
|
(activity as MainActivity).showMediaFragment(media)
|
||||||
|
}
|
||||||
|
|
||||||
|
recycler_media_search.layoutManager = layoutManager
|
||||||
|
recycler_media_search.adapter = adapter
|
||||||
|
recycler_media_search.addItemDecoration(MediaItemDecoration(9))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,14 +66,5 @@ class SearchFragment : Fragment() {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
grid_media_search.setOnItemClickListener { _, _, position, _ ->
|
|
||||||
search_text.clearFocus() // remove focus from the SearchView
|
|
||||||
|
|
||||||
val media = adapter?.getItem(position) as Media
|
|
||||||
println("selected item is: ${media.title}")
|
|
||||||
|
|
||||||
(activity as MainActivity).showMediaFragment(media)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
package org.mosad.teapod.util
|
||||||
|
|
||||||
|
import android.graphics.Rect
|
||||||
|
import android.view.View
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
|
||||||
|
class MediaItemDecoration(private val spacing: Int) : RecyclerView.ItemDecoration() {
|
||||||
|
|
||||||
|
override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
|
||||||
|
outRect.left = spacing
|
||||||
|
outRect.right = spacing
|
||||||
|
outRect.bottom = spacing
|
||||||
|
outRect.top = spacing
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,58 +1,62 @@
|
||||||
package org.mosad.teapod.util.adapter
|
package org.mosad.teapod.util.adapter
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.*
|
import android.widget.Filter
|
||||||
|
import android.widget.Filterable
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
|
import kotlinx.android.synthetic.main.item_media.view.*
|
||||||
import org.mosad.teapod.R
|
import org.mosad.teapod.R
|
||||||
import org.mosad.teapod.util.Media
|
import org.mosad.teapod.util.Media
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
import kotlin.collections.ArrayList
|
||||||
|
|
||||||
class MediaItemAdapter(val context: Context, private val originalMedia: ArrayList<Media>) : BaseAdapter(), Filterable {
|
class MediaItemAdapter(private val media: ArrayList<Media>) : RecyclerView.Adapter<MediaItemAdapter.ViewHolder>(), Filterable {
|
||||||
|
|
||||||
private var filteredMedia = originalMedia.map { it.copy() }
|
var onItemClick: ((Media, Int) -> Unit)? = null
|
||||||
private val filer = MediaFilter()
|
private val filter = MediaFilter()
|
||||||
|
private var filteredMedia = media.map { it.copy() }
|
||||||
|
|
||||||
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaItemAdapter.ViewHolder {
|
||||||
val view = convertView ?: LayoutInflater.from(context).inflate(R.layout.item_media, parent, false)
|
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_media, parent, false)
|
||||||
|
|
||||||
val textTitle = view.findViewById<TextView>(R.id.text_title)
|
return ViewHolder(view)
|
||||||
val imagePoster = view.findViewById<ImageView>(R.id.image_poster)
|
|
||||||
|
|
||||||
textTitle.text = filteredMedia[position].title
|
|
||||||
Glide.with(context).load(filteredMedia[position].info.posterLink).into(imagePoster)
|
|
||||||
|
|
||||||
return view
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getFilter(): Filter {
|
override fun onBindViewHolder(holder: MediaItemAdapter.ViewHolder, position: Int) {
|
||||||
return filer
|
holder.view.apply {
|
||||||
|
text_title.text = filteredMedia[position].title
|
||||||
|
Glide.with(context).load(filteredMedia[position].info.posterLink).into(image_poster)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getCount(): Int {
|
override fun getItemCount(): Int {
|
||||||
return filteredMedia.size
|
return filteredMedia.size
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getItem(position: Int): Any {
|
override fun getFilter(): Filter {
|
||||||
return filteredMedia[position]
|
return filter
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getItemId(position: Int): Long {
|
inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
|
||||||
return position.toLong()
|
init {
|
||||||
|
view.setOnClickListener {
|
||||||
|
onItemClick?.invoke(filteredMedia[adapterPosition], adapterPosition)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inner class MediaFilter : Filter() {
|
inner class MediaFilter : Filter() {
|
||||||
override fun performFiltering(constraint: CharSequence?): FilterResults {
|
override fun performFiltering(constraint: CharSequence?): FilterResults {
|
||||||
val filterTerm = constraint.toString().toLowerCase(Locale.ROOT)
|
val filterTerm = constraint.toString().toLowerCase(Locale.ROOT)
|
||||||
val results = FilterResults()
|
val results = FilterResults()
|
||||||
|
|
||||||
val filteredList = if (filterTerm.isEmpty()) {
|
val filteredList = if (filterTerm.isEmpty()) {
|
||||||
originalMedia
|
media
|
||||||
} else {
|
} else {
|
||||||
originalMedia.filter {
|
media.filter {
|
||||||
it.title.toLowerCase(Locale.ROOT).contains(filterTerm)
|
it.title.toLowerCase(Locale.ROOT).contains(filterTerm)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -68,10 +72,9 @@ class MediaItemAdapter(val context: Context, private val originalMedia: ArrayLis
|
||||||
* suppressing unchecked cast is safe, since we only use Media
|
* suppressing unchecked cast is safe, since we only use Media
|
||||||
*/
|
*/
|
||||||
override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
|
override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
|
||||||
filteredMedia = results?.values as ArrayList<Media>
|
filteredMedia = results?.values as java.util.ArrayList<Media>
|
||||||
notifyDataSetChanged()
|
notifyDataSetChanged()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -7,16 +7,15 @@
|
||||||
android:background="#f5f5f5"
|
android:background="#f5f5f5"
|
||||||
tools:context=".ui.library.LibraryFragment">
|
tools:context=".ui.library.LibraryFragment">
|
||||||
|
|
||||||
<GridView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/grid_media_library"
|
android:id="@+id/recycler_media_library"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:horizontalSpacing="7dp"
|
android:padding="3dp"
|
||||||
android:numColumns="2"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
android:padding="5dp"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
android:verticalSpacing="7dp"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
tools:layout_editor_absoluteX="5dp"
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
tools:layout_editor_absoluteY="5dp" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -20,16 +20,17 @@
|
||||||
|
|
||||||
</SearchView>
|
</SearchView>
|
||||||
|
|
||||||
<GridView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/grid_media_search"
|
android:id="@+id/recycler_media_search"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:horizontalSpacing="7dp"
|
android:padding="3dp"
|
||||||
android:numColumns="2"
|
|
||||||
android:padding="5dp"
|
|
||||||
android:verticalSpacing="7dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/search_text" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/search_text">
|
||||||
|
|
||||||
|
</androidx.recyclerview.widget.RecyclerView>
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -3,7 +3,8 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
|
android:backgroundTint="#FFFFFF"
|
||||||
app:cardCornerRadius="7dp"
|
app:cardCornerRadius="7dp"
|
||||||
app:cardElevation="4dp">
|
app:cardElevation="4dp">
|
||||||
|
|
||||||
|
@ -18,7 +19,7 @@
|
||||||
android:layout_height="112.5dp"
|
android:layout_height="112.5dp"
|
||||||
android:contentDescription="@string/media_poster_desc"
|
android:contentDescription="@string/media_poster_desc"
|
||||||
android:maxWidth="200dp"
|
android:maxWidth="200dp"
|
||||||
android:scaleType="fitXY"
|
android:scaleType="centerCrop"
|
||||||
app:srcCompat="@color/md_disabled_text_dark_theme" />
|
app:srcCompat="@color/md_disabled_text_dark_theme" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
Loading…
Reference in New Issue