Seil0/teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

replace GridView in library and search fragment with RecyclerView

Browse Source 
closes #8
This commit is contained in:
Jannik
2020-10-15 13:00:44 +02:00
parent 36c8678646
commit adf8a48251
8 changed files with 94 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mosad/teapod/MainActivity.kt
View File

@ -103,12 +103,13 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
private fun load() {
EncryptedPreferences.readCredentials(this)
// make sure credentials are set and valid
// make sure credentials are set
if (EncryptedPreferences.password.isEmpty()) {
showLoginDialog(true)
} else if (!AoDParser().login()) {
showLoginDialog(false)
}
// TODO save last loginSuccess, if false show login dialog even if credentials are present
AoDParser().listAnimes()
}
/**

29
app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt
View File

@ -5,17 +5,19 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.GridLayoutManager
import kotlinx.android.synthetic.main.fragment_library.*
import kotlinx.coroutines.*
import org.mosad.teapod.MainActivity
import org.mosad.teapod.R
import org.mosad.teapod.parser.AoDParser
import org.mosad.teapod.util.MediaItemDecoration
import org.mosad.teapod.util.adapter.MediaItemAdapter
import org.mosad.teapod.util.Media
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? {
return inflater.inflate(R.layout.fragment_library, container, false)
@ -24,6 +26,7 @@ class LibraryFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
// init async
GlobalScope.launch {
if (AoDParser.mediaList.isEmpty()) {
AoDParser().listAnimes()
@ -32,22 +35,18 @@ class LibraryFragment : Fragment() {
// create and set the adapter, needs context
withContext(Dispatchers.Main) {
context?.let {
adapter = MediaItemAdapter(it, AoDParser.mediaList)
grid_media_library.adapter = adapter
layoutManager = GridLayoutManager(context, 2)
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)
}
}
}

25
app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt
View File

@ -6,17 +6,20 @@ import android.view.View
import android.view.ViewGroup
import android.widget.SearchView
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.GridLayoutManager
import kotlinx.android.synthetic.main.fragment_search.*
import kotlinx.coroutines.*
import org.mosad.teapod.MainActivity
import org.mosad.teapod.R
import org.mosad.teapod.parser.AoDParser
import org.mosad.teapod.util.MediaItemDecoration
import org.mosad.teapod.util.adapter.MediaItemAdapter
import org.mosad.teapod.util.Media
class SearchFragment : Fragment() {
private var adapter : MediaItemAdapter? = null
private lateinit var layoutManager: GridLayoutManager
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_search, container, false)
@ -33,8 +36,15 @@ class SearchFragment : Fragment() {
// create and set the adapter, needs context
withContext(Dispatchers.Main) {
context?.let {
adapter = MediaItemAdapter(it, AoDParser.mediaList)
grid_media_search.adapter = adapter
layoutManager = GridLayoutManager(context, 2)
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
}
})
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)
}
}
}

16
app/src/main/java/org/mosad/teapod/util/MediaItemDecoration.kt Normal file
View File

@ -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
}
}

55
app/src/main/java/org/mosad/teapod/util/adapter/MediaItemAdapter.kt
View File

@ -1,58 +1,62 @@
package org.mosad.teapod.util.adapter
import android.content.Context
import android.view.LayoutInflater
import android.view.View
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 kotlinx.android.synthetic.main.item_media.view.*
import org.mosad.teapod.R
import org.mosad.teapod.util.Media
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() }
private val filer = MediaFilter()
var onItemClick: ((Media, Int) -> Unit)? = null
private val filter = MediaFilter()
private var filteredMedia = media.map { it.copy() }
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
val view = convertView ?: LayoutInflater.from(context).inflate(R.layout.item_media, parent, false)
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MediaItemAdapter.ViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_media, parent, false)
val textTitle = view.findViewById<TextView>(R.id.text_title)
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
return ViewHolder(view)
}
override fun getFilter(): Filter {
return filer
override fun onBindViewHolder(holder: MediaItemAdapter.ViewHolder, position: Int) {
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
}
override fun getItem(position: Int): Any {
return filteredMedia[position]
override fun getFilter(): Filter {
return filter
}
override fun getItemId(position: Int): Long {
return position.toLong()
inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
init {
view.setOnClickListener {
onItemClick?.invoke(filteredMedia[adapterPosition], adapterPosition)
}
}
}
inner class MediaFilter : Filter() {
override fun performFiltering(constraint: CharSequence?): FilterResults {
val filterTerm = constraint.toString().toLowerCase(Locale.ROOT)
val results = FilterResults()
val filteredList = if (filterTerm.isEmpty()) {
originalMedia
media
} else {
originalMedia.filter {
media.filter {
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
*/
override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
filteredMedia = results?.values as ArrayList<Media>
filteredMedia = results?.values as java.util.ArrayList<Media>
notifyDataSetChanged()
}
}
}

15
app/src/main/res/layout/fragment_library.xml
View File

@ -7,16 +7,15 @@
android:background="#f5f5f5"
tools:context=".ui.library.LibraryFragment">
<GridView
android:id="@+id/grid_media_library"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_media_library"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:horizontalSpacing="7dp"
android:numColumns="2"
android:padding="5dp"
android:verticalSpacing="7dp"
tools:layout_editor_absoluteX="5dp"
tools:layout_editor_absoluteY="5dp" />
android:padding="3dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

15
app/src/main/res/layout/fragment_search.xml
View File

@ -20,16 +20,17 @@
</SearchView>
<GridView
android:id="@+id/grid_media_search"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_media_search"
android:layout_width="match_parent"
android:layout_height="0dp"
android:clipToPadding="false"
android:horizontalSpacing="7dp"
android:numColumns="2"
android:padding="5dp"
android:verticalSpacing="7dp"
android:padding="3dp"
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>

5
app/src/main/res/layout/item_media.xml
View File

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="#FFFFFF"
app:cardCornerRadius="7dp"
app:cardElevation="4dp">
@ -18,7 +19,7 @@
android:layout_height="112.5dp"
android:contentDescription="@string/media_poster_desc"
android:maxWidth="200dp"
android:scaleType="fitXY"
android:scaleType="centerCrop"
app:srcCompat="@color/md_disabled_text_dark_theme" />
<TextView